minor fixes

This commit is contained in:
Thibault Deckers 2020-06-10 22:08:51 +09:00
parent 995242f239
commit 60abdb7247
3 changed files with 9 additions and 15 deletions

View file

@ -407,7 +407,8 @@ class _SourceStateSubtitleState extends State<SourceStateSubtitle> {
break;
case SourceState.locating:
subtitle = 'Locating';
progress = entries.where((entry) => entry.isLocated).length.toDouble() / entries.length;
final entriesToLocate = entries.where((entry) => entry.hasGps).toList();
progress = entriesToLocate.where((entry) => entry.isLocated).length.toDouble() / entriesToLocate.length;
break;
case SourceState.ready:
default:

View file

@ -23,11 +23,7 @@ class _LabeledCheckboxState extends State<LabeledCheckbox> {
@override
void initState() {
super.initState();
_tapRecognizer = TapGestureRecognizer()
..onTap = () {
debugPrint('tapped');
widget.onChanged(!widget.value);
};
_tapRecognizer = TapGestureRecognizer()..onTap = () => widget.onChanged(!widget.value);
}
@override

View file

@ -35,7 +35,11 @@ class _WelcomePageState extends State<WelcomePage> {
child: child,
),
),
children: _buildChildren(context),
children: [
..._buildTop(context),
Flexible(child: _buildTerms()),
..._buildBottomControls(context),
],
),
),
),
@ -43,14 +47,6 @@ class _WelcomePageState extends State<WelcomePage> {
);
}
List<Widget> _buildChildren(BuildContext context) {
return [
..._buildTop(context),
Flexible(child: _buildTerms()),
..._buildBottomControls(context),
];
}
List<Widget> _buildTop(BuildContext context) {
const message = Text(
'Welcome to Aves',
@ -124,6 +120,7 @@ class _WelcomePageState extends State<WelcomePage> {
borderRadius: BorderRadius.circular(16),
color: Colors.white10,
),
constraints: const BoxConstraints(maxWidth: 460),
child: ClipRRect(
borderRadius: BorderRadius.circular(16),
child: Markdown(