Merge branch 'develop'

.github/workflows/main.yml

@@ -47,8 +47,8 @@ jobs:
           echo "${{ secrets.KEY_JKS }}" > release.keystore.asc
           gpg -d --passphrase "${{ secrets.KEY_JKS_PASSPHRASE }}" --batch release.keystore.asc > $AVES_STORE_FILE
           rm release.keystore.asc
-          flutter build apk
+          flutter build apk --bundle-sksl-path shaders.sksl.json
-          flutter build appbundle
+          flutter build appbundle --bundle-sksl-path shaders.sksl.json
           rm $AVES_STORE_FILE
         env:
           AVES_STORE_FILE: ${{ github.workspace }}/key.jks
@@ -61,7 +61,7 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           artifacts: "build/app/outputs/apk/release/*.apk,build/app/outputs/bundle/release/*.aab"
-          token: ${{ secrets.RELEASE_WORKFLOW_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload app bundle
         uses: actions/upload-artifact@v2

android/app/build.gradle

@@ -80,6 +80,9 @@ android {
         debug {
             applicationIdSuffix ".debug"
         }
+        profile {
+            applicationIdSuffix ".profile"
+        }
         release {
             signingConfig signingConfigs.release
         }

android/app/google-services.json

@@ -14,6 +14,14 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "100907092477-ml1c4hr4l24ekg7l7nqid06n03kek6c8.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "deckers.thibault.aves",
+            "certificate_hash": "1395888aacca42247286fdd2aba2d4047fe6cdad"
+          }
+        },
         {
           "client_id": "100907092477-u7sm8gp5t2sotn42oq20ufhtn3craodu.apps.googleusercontent.com",
           "client_type": 3
@@ -63,6 +71,35 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:100907092477:android:92d0e4e5e6c971b4ec7194",
+        "android_client_info": {
+          "package_name": "deckers.thibault.aves.profile"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "100907092477-u7sm8gp5t2sotn42oq20ufhtn3craodu.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAsAb_CN9AxeT05jLGhdnNLFQ6U5esTjjY"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "100907092477-u7sm8gp5t2sotn42oq20ufhtn3craodu.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
     }
   ],
   "configuration_version": "1"

android/app/src/profile/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Aves [Profile]</string>
+</resources>

lib/model/image_entry.dart

@@ -289,7 +289,7 @@ class ImageEntry {
         );
       }
     } catch (exception, stack) {
-      debugPrint('$runtimeType addAddressToMetadata failed with path=$path coordinates=$coordinates exception=$exception\n$stack');
+      debugPrint('$runtimeType locate failed with path=$path coordinates=$coordinates exception=$exception\n$stack');
     }
   }
 

lib/utils/constants.dart

@@ -22,14 +22,6 @@ class Constants {
   static const svgBackground = Colors.white;
   static const svgColorFilter = ColorFilter.mode(svgBackground, BlendMode.dstOver);
 
-  static const dialogContentHorizontalPadding = EdgeInsets.symmetric(horizontal: 24);
-  static const dialogActionsPadding = EdgeInsets.symmetric(horizontal: 8);
-  static const dialogShape = RoundedRectangleBorder(
-    borderRadius: BorderRadius.all(
-      Radius.circular(24),
-    ),
-  );
-
   static const List<Dependency> androidDependencies = [
     Dependency(
       name: 'CWAC-Document',

lib/widgets/common/action_delegates/create_album_dialog.dart

@@ -1,11 +1,12 @@
 import 'dart:io';
 
 import 'package:aves/utils/android_file_utils.dart';
-import 'package:aves/utils/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:path/path.dart';
 
+import '../dialog.dart';
+
 class CreateAlbumDialog extends StatefulWidget {
   @override
   _CreateAlbumDialogState createState() => _CreateAlbumDialogState();
@@ -34,14 +35,12 @@ class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
+    return AvesDialog(
-      title: Text('New Album'),
+      title: 'New Album',
-      content: ListView(
+      scrollableContent: [
-        shrinkWrap: true,
-        children: [
         if (_allVolumes.length > 1) ...[
           Padding(
-              padding: Constants.dialogContentHorizontalPadding,
+            padding: AvesDialog.contentHorizontalPadding + EdgeInsets.only(top: 20),
             child: Text('Storage:'),
           ),
           ..._allVolumes.map((volume) => RadioListTile<StorageVolume>(
@@ -68,7 +67,7 @@ class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
           SizedBox(height: 8),
         ],
         Padding(
-            padding: Constants.dialogContentHorizontalPadding,
+          padding: AvesDialog.contentHorizontalPadding,
           child: ValueListenableBuilder<bool>(
               valueListenable: _existsNotifier,
               builder: (context, exists, child) {
@@ -83,8 +82,6 @@ class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
               }),
         ),
       ],
-      ),
-      contentPadding: EdgeInsets.only(top: 20),
       actions: [
         FlatButton(
           onPressed: () => Navigator.pop(context),
@@ -95,8 +92,6 @@ class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
           child: Text('Create'.toUpperCase()),
         ),
       ],
-      actionsPadding: Constants.dialogActionsPadding,
-      shape: Constants.dialogShape,
     );
   }
 

lib/widgets/common/action_delegates/entry_action_delegate.dart

@@ -4,10 +4,10 @@ import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/services/android_app_service.dart';
 import 'package:aves/services/image_file_service.dart';
-import 'package:aves/utils/constants.dart';
 import 'package:aves/widgets/common/action_delegates/feedback.dart';
 import 'package:aves/widgets/common/action_delegates/permission_aware.dart';
 import 'package:aves/widgets/common/action_delegates/rename_entry_dialog.dart';
+import 'package:aves/widgets/common/dialog.dart';
 import 'package:aves/widgets/common/entry_actions.dart';
 import 'package:aves/widgets/common/image_providers/uri_image_provider.dart';
 import 'package:aves/widgets/fullscreen/debug.dart';
@@ -120,7 +120,7 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin {
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (context) {
-        return AlertDialog(
+        return AvesDialog(
           content: Text('Are you sure?'),
           actions: [
             FlatButton(
@@ -132,8 +132,6 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin {
               child: Text('Delete'.toUpperCase()),
             ),
           ],
-          actionsPadding: Constants.dialogActionsPadding,
-          shape: Constants.dialogShape,
         );
       },
     );

lib/widgets/common/action_delegates/group_collection_dialog.dart

@@ -1,9 +1,10 @@
 import 'package:aves/model/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/utils/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
+import '../dialog.dart';
+
 class GroupCollectionDialog extends StatefulWidget {
   @override
   _GroupCollectionDialogState createState() => _GroupCollectionDialogState();
@@ -20,18 +21,14 @@ class _GroupCollectionDialogState extends State<GroupCollectionDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
+    return AvesDialog(
-      title: Text('Group'),
+      title: 'Group',
-      content: ListView(
+      scrollableContent: [
-        shrinkWrap: true,
-        children: [
         _buildRadioListTile(GroupFactor.album, 'By album'),
         _buildRadioListTile(GroupFactor.month, 'By month'),
         _buildRadioListTile(GroupFactor.day, 'By day'),
         _buildRadioListTile(GroupFactor.none, 'Do not group'),
       ],
-      ),
-      contentPadding: EdgeInsets.only(top: 20),
       actions: [
         FlatButton(
           onPressed: () => Navigator.pop(context),
@@ -42,8 +39,6 @@ class _GroupCollectionDialogState extends State<GroupCollectionDialog> {
           child: Text('Apply'.toUpperCase()),
         ),
       ],
-      actionsPadding: Constants.dialogActionsPadding,
-      shape: Constants.dialogShape,
     );
   }
 

lib/widgets/common/action_delegates/permission_aware.dart

@@ -1,8 +1,9 @@
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/services/android_file_service.dart';
-import 'package:aves/utils/constants.dart';
 import 'package:flutter/material.dart';
 
+import '../dialog.dart';
+
 mixin PermissionAwareMixin {
   Future<bool> checkStoragePermission(BuildContext context, Iterable<ImageEntry> entries) {
     return checkStoragePermissionForAlbums(context, entries.where((e) => e.path != null).map((e) => e.directory).toSet());
@@ -23,8 +24,8 @@ mixin PermissionAwareMixin {
       final confirmed = await showDialog<bool>(
         context: context,
         builder: (context) {
-          return AlertDialog(
+          return AvesDialog(
-            title: Text('Storage Volume Access'),
+            title: 'Storage Volume Access',
             content: Text('Please select the $dirDisplayName directory of “$volumeDescription” in the next screen, so that this app can access it and complete your request.'),
             actions: [
               FlatButton(
@@ -36,8 +37,6 @@ mixin PermissionAwareMixin {
                 child: Text('OK'.toUpperCase()),
               ),
             ],
-            actionsPadding: Constants.dialogActionsPadding,
-            shape: Constants.dialogShape,
           );
         },
       );

lib/widgets/common/action_delegates/rename_entry_dialog.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/utils/constants.dart';
+import 'package:aves/widgets/common/dialog.dart';
 import 'package:flutter/material.dart';
 
 class RenameEntryDialog extends StatefulWidget {
@@ -29,7 +29,7 @@ class _RenameEntryDialogState extends State<RenameEntryDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
+    return AvesDialog(
       content: TextField(
         controller: _nameController,
         autofocus: true,
@@ -44,8 +44,6 @@ class _RenameEntryDialogState extends State<RenameEntryDialog> {
           child: Text('Apply'.toUpperCase()),
         ),
       ],
-      actionsPadding: Constants.dialogActionsPadding,
-      shape: Constants.dialogShape,
     );
   }
 }

lib/widgets/common/action_delegates/selection_action_delegate.dart

@@ -15,6 +15,7 @@ import 'package:aves/widgets/album/empty.dart';
 import 'package:aves/widgets/common/action_delegates/create_album_dialog.dart';
 import 'package:aves/widgets/common/action_delegates/feedback.dart';
 import 'package:aves/widgets/common/action_delegates/permission_aware.dart';
+import 'package:aves/widgets/common/dialog.dart';
 import 'package:aves/widgets/common/entry_actions.dart';
 import 'package:aves/widgets/common/icons.dart';
 import 'package:aves/widgets/filter_grid_page.dart';
@@ -189,7 +190,7 @@ class SelectionActionDelegate with FeedbackMixin, PermissionAwareMixin {
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (context) {
-        return AlertDialog(
+        return AvesDialog(
           content: Text('Are you sure you want to delete ${Intl.plural(count, one: 'this item', other: 'these $count items')}?'),
           actions: [
             FlatButton(
@@ -201,8 +202,6 @@ class SelectionActionDelegate with FeedbackMixin, PermissionAwareMixin {
               child: Text('Delete'.toUpperCase()),
             ),
           ],
-          actionsPadding: Constants.dialogActionsPadding,
-          shape: Constants.dialogShape,
         );
       },
     );

lib/widgets/common/action_delegates/sort_collection_dialog.dart

@@ -1,9 +1,10 @@
 import 'package:aves/model/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/utils/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
+import '../dialog.dart';
+
 class SortCollectionDialog extends StatefulWidget {
   @override
   _SortCollectionDialogState createState() => _SortCollectionDialogState();
@@ -20,17 +21,13 @@ class _SortCollectionDialogState extends State<SortCollectionDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
+    return AvesDialog(
-      title: Text('Sort'),
+      title: 'Sort',
-      content: ListView(
+      scrollableContent: [
-        shrinkWrap: true,
-        children: [
         _buildRadioListTile(SortFactor.date, 'By date'),
         _buildRadioListTile(SortFactor.size, 'By size'),
         _buildRadioListTile(SortFactor.name, 'By album & file name'),
       ],
-      ),
-      contentPadding: EdgeInsets.only(top: 20),
       actions: [
         FlatButton(
           onPressed: () => Navigator.pop(context),
@@ -41,8 +38,6 @@ class _SortCollectionDialogState extends State<SortCollectionDialog> {
           child: Text('Apply'.toUpperCase()),
         ),
       ],
-      actionsPadding: Constants.dialogActionsPadding,
-      shape: Constants.dialogShape,
     );
   }
 

lib/widgets/common/dialog.dart

@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+
+class AvesDialog extends AlertDialog {
+  static const contentHorizontalPadding = EdgeInsets.symmetric(horizontal: 24);
+
+  AvesDialog({
+    String title,
+    List<Widget> scrollableContent,
+    Widget content,
+    @required List<Widget> actions,
+  })  : assert((scrollableContent != null) ^ (content != null)),
+        super(
+          title: title != null ? DialogTitle(title: title) : null,
+          titlePadding: EdgeInsets.zero,
+          // the `scrollable` flag of `AlertDialog` makes it
+          // scroll both the title and the content together,
+          // and overflow feedback ignores the dialog shape,
+          // so we restrict scrolling to the content instead
+          content: scrollableContent != null
+              ? Builder(
+                  builder: (context) => Container(
+                    // workaround because the dialog tries
+                    // to size itself to the content intrinsic size,
+                    // but the `ListView` viewport does not have one
+                    width: 1,
+                    child: ListView(
+                      shrinkWrap: true,
+                      children: scrollableContent,
+                    ),
+                  ),
+                )
+              : content,
+          contentPadding: scrollableContent != null ? EdgeInsets.zero : EdgeInsets.fromLTRB(24, 20, 24, 24),
+          actions: actions,
+          actionsPadding: EdgeInsets.symmetric(horizontal: 8),
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(
+              Radius.circular(24),
+            ),
+          ),
+        );
+}
+
+class DialogTitle extends StatelessWidget {
+  final String title;
+
+  const DialogTitle({@required this.title});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 20),
+          child: Text(
+            title,
+            style: TextStyle(
+              fontWeight: FontWeight.bold,
+              fontFamily: 'Concourse Caps',
+            ),
+          ),
+        ),
+        Divider(height: 1),
+      ],
+    );
+  }
+}

lib/widgets/welcome_page.dart

@@ -140,8 +140,7 @@ class _WelcomePageState extends State<WelcomePage> {
         borderRadius: BorderRadius.circular(16),
         child: Markdown(
           data: terms,
-          // TODO TLAD make it selectable when this fix (in 1.18.0-6.0.pre) lands on stable: https://github.com/flutter/flutter/pull/54479
+          selectable: true,
-          selectable: false,
           onTapLink: (url) async {
             if (await canLaunch(url)) {
               await launch(url);

pubspec.lock

@@ -21,14 +21,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   barcode:
     dependency: transitive
     description:
       name: barcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.0"
+    version: "1.16.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -36,6 +36,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   charcode:
     dependency: transitive
     description:
@@ -57,13 +64,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.9.0"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   collection:
     dependency: "direct main"
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.12"
+    version: "1.14.13"
   convert:
     dependency: transitive
     description:
@@ -77,7 +91,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   draggable_scrollbar:
     dependency: "direct main"
     description:
@@ -103,6 +117,13 @@ packages:
       url: "git://github.com/deckerst/expansion_tile_card.git"
     source: git
     version: "1.0.3"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   file:
     dependency: transitive
     description:
@@ -116,7 +137,7 @@ packages:
       name: firebase_crashlytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3+3"
+    version: "0.1.4+1"
   flushbar:
     dependency: "direct main"
     description:
@@ -134,17 +155,17 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: e32cd834e1c76fa172efbd6600a3b1464416100c
+      resolved-ref: d5a827929882f06a30cb82de29feec545d8f00da
       url: "git://github.com/deckerst/flutter_ijkplayer.git"
     source: git
-    version: "0.3.6"
+    version: "0.3.7"
   flutter_markdown:
     dependency: "direct main"
     description:
       name: flutter_markdown
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.3"
   flutter_native_timezone:
     dependency: "direct main"
     description:
@@ -172,7 +193,7 @@ packages:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.17.4"
+    version: "0.18.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -196,21 +217,21 @@ packages:
       name: google_maps_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.28+1"
+    version: "0.5.29"
   google_maps_flutter_platform_interface:
     dependency: transitive
     description:
       name: google_maps_flutter_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   image:
     dependency: transitive
     description:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.12"
+    version: "2.1.14"
   intl:
     dependency: "direct main"
     description:
@@ -238,14 +259,14 @@ packages:
       name: markdown
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.7"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.8"
   meta:
     dependency: transitive
     description:
@@ -287,7 +308,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
+    version: "1.7.0"
   path_drawing:
     dependency: transitive
     description:
@@ -322,7 +343,7 @@ packages:
       name: pdf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.10.0"
   pedantic:
     dependency: "direct main"
     description:
@@ -357,7 +378,7 @@ packages:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "3.0.4"
   photo_view:
     dependency: "direct main"
     description:
@@ -408,7 +429,7 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.1"
+    version: "4.3.2"
   pub_semver:
     dependency: transitive
     description:
@@ -504,7 +525,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.9.5"
   stream_channel:
     dependency: transitive
     description:
@@ -553,7 +574,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.15"
+    version: "0.2.17"
   tuple:
     dependency: "direct main"
     description:
@@ -567,7 +588,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.2.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -637,7 +658,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.6.1"
+    version: "4.2.0"
 sdks:
-  dart: ">=2.8.0 <3.0.0"
+  dart: ">=2.9.0-14.0.dev <3.0.0"
-  flutter: ">=1.17.0 <2.0.0"
+  flutter: ">=1.18.0-6.0.pre <2.0.0"

pubspec.yaml

@@ -11,7 +11,7 @@ description: A new Flutter application.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.2+14
+version: 1.1.3+15
 
 # video_player (as of v0.10.8+2, backed by ExoPlayer):
 # - does not support content URIs (by default, but trivial by fork)