From 60abdb72471220381ebc5dbab1c71956dab1ec43 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Wed, 10 Jun 2020 22:08:51 +0900
Subject: [PATCH] minor fixes

---
 lib/widgets/album/app_bar.dart           |  3 ++-
 lib/widgets/common/labeled_checkbox.dart |  6 +-----
 lib/widgets/welcome.dart                 | 15 ++++++---------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/widgets/album/app_bar.dart b/lib/widgets/album/app_bar.dart
index ea5241da6..1dbc5774d 100644
--- a/lib/widgets/album/app_bar.dart
+++ b/lib/widgets/album/app_bar.dart
@@ -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:
diff --git a/lib/widgets/common/labeled_checkbox.dart b/lib/widgets/common/labeled_checkbox.dart
index be10a3cb5..c8b2d4e87 100644
--- a/lib/widgets/common/labeled_checkbox.dart
+++ b/lib/widgets/common/labeled_checkbox.dart
@@ -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
diff --git a/lib/widgets/welcome.dart b/lib/widgets/welcome.dart
index 02ed615d7..d86497447 100644
--- a/lib/widgets/welcome.dart
+++ b/lib/widgets/welcome.dart
@@ -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(