Merge branch 'develop'

.github/workflows/check.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: stable
-          flutter-version: '2.10.1'
+          flutter-version: '2.10.2'
 
       - name: Clone the repository.
         uses: actions/checkout@v2

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: stable
-          flutter-version: '2.10.1'
+          flutter-version: '2.10.2'
 
       # Workaround for this Android Gradle Plugin issue (supposedly fixed in AGP 4.1):
       # https://issuetracker.google.com/issues/144111441
@@ -52,12 +52,12 @@ jobs:
           rm release.keystore.asc
           mkdir outputs
           (cd scripts/; ./apply_flavor_play.sh)
-          flutter build appbundle -t lib/main_play.dart --flavor play --bundle-sksl-path shaders_2.10.1.sksl.json
+          flutter build appbundle -t lib/main_play.dart --flavor play --bundle-sksl-path shaders_2.10.2.sksl.json
           cp build/app/outputs/bundle/playRelease/*.aab outputs
-          flutter build apk -t lib/main_play.dart --flavor play --bundle-sksl-path shaders_2.10.1.sksl.json
+          flutter build apk -t lib/main_play.dart --flavor play --bundle-sksl-path shaders_2.10.2.sksl.json
           cp build/app/outputs/apk/play/release/*.apk outputs
           (cd scripts/; ./apply_flavor_izzy.sh)
-          flutter build apk -t lib/main_izzy.dart --flavor izzy --split-per-abi --bundle-sksl-path shaders_2.10.1.sksl.json
+          flutter build apk -t lib/main_izzy.dart --flavor izzy --split-per-abi --bundle-sksl-path shaders_2.10.2.sksl.json
           cp build/app/outputs/apk/izzy/release/*.apk outputs
           rm $AVES_STORE_FILE
         env:

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ## <a id="unreleased"></a>[Unreleased]
 
-## <a id="v1.6.0"></a>[v1.6.0] - 2022-02-22
+## <a id="v1.6.1"></a>[v1.6.1] - 2022-02-23
 
 ### Added
 
@@ -21,7 +21,7 @@ All notable changes to this project will be documented in this file.
 - Collection: improved performance for sort/group by name
 - load previous top items on startup
 - locale independent colors for known filters
-- upgraded Flutter to stable v2.10.1
+- upgraded Flutter to stable v2.10.2
 
 ### Removed
 
@@ -31,6 +31,8 @@ All notable changes to this project will be documented in this file.
 
 - navigating from Album page when picking an item for another app
 
+## <a id="v1.6.0"></a>[v1.6.0] - 2022-02-22 [YANKED]
+
 ## <a id="v1.5.11"></a>[v1.5.11] - 2022-01-30
 
 ### Added

android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt

@@ -20,7 +20,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import java.io.File
 
 class ImageOpStreamHandler(private val activity: Activity, private val arguments: Any?) : EventChannel.StreamHandler {
     private val ioScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
@@ -109,13 +108,11 @@ class ImageOpStreamHandler(private val activity: Activity, private val arguments
             val mimeType = entry.mimeType
             val trashed = entry.trashed
 
-            val uri = if (trashed) Uri.fromFile(File(entry.trashPath!!)) else entry.uri
+            val uri = entry.uri
             val path = if (trashed) entry.trashPath else entry.path
 
             val result: FieldMap = hashMapOf(
-                // `uri` should reference original content URI,
+                "uri" to uri.toString(),
-                // so it is different with `sourceUri` when deleting trashed entries
-                "uri" to entry.uri.toString(),
             )
             if (isCancelledOp()) {
                 result["skipped"] = true

android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt

@@ -393,7 +393,7 @@ class MediaStoreImageProvider : ImageProvider() {
                 val mimeType = entry.mimeType
                 val trashed = entry.trashed
 
-                val sourceUri = if (trashed) Uri.fromFile(File(entry.trashPath!!)) else entry.uri
+                val sourceUri = entry.uri
                 val sourcePath = if (trashed) entry.trashPath else entry.path
 
                 var desiredName: String? = null
@@ -402,9 +402,7 @@ class MediaStoreImageProvider : ImageProvider() {
                 }
 
                 val result: FieldMap = hashMapOf(
-                    // `uri` should reference original content URI,
+                    "uri" to sourceUri.toString(),
-                    // so it is different with `sourceUri` when recycling trashed entries
-                    "uri" to entry.uri.toString(),
                     "success" to false,
                 )
 

fastlane/metadata/android/en-US/changelogs/1067.txt

@@ -0,0 +1,5 @@
+In v1.6.1:
+- recycle bin
+- view small and large images at their actual size
+- enjoy the app in Indonesian
+Full changelog available on GitHub

lib/model/source/media_store_source.dart

@@ -107,15 +107,7 @@ class MediaStoreSource extends CollectionSource {
       await loadCatalogMetadata();
       await loadAddresses();
       updateDerivedFilters();
-    }
 
-    // clean up obsolete entries
-    if (removedEntries.isNotEmpty) {
-      debugPrint('$runtimeType refresh ${stopwatch.elapsed} remove obsolete entries');
-      await metadataDb.removeIds(removedEntries.map((entry) => entry.id));
-    }
-
-    if (directory != null) {
       // trash
       await loadTrashDetails();
       unawaited(deleteExpiredTrash().then(
@@ -129,6 +121,12 @@ class MediaStoreSource extends CollectionSource {
       ));
     }
 
+    // clean up obsolete entries
+    if (removedEntries.isNotEmpty) {
+      debugPrint('$runtimeType refresh ${stopwatch.elapsed} remove obsolete entries');
+      await metadataDb.removeIds(removedEntries.map((entry) => entry.id));
+    }
+
     // verify paths because some apps move files without updating their `last modified date`
     debugPrint('$runtimeType refresh ${stopwatch.elapsed} check obsolete paths');
     final knownPathByContentId = Map.fromEntries(knownLiveEntries.map((entry) => MapEntry(entry.contentId, entry.path)));

lib/theme/icons.dart

@@ -95,7 +95,7 @@ class AIcons {
   static const IconData share = Icons.share_outlined;
   static const IconData show = Icons.visibility_outlined;
   static const IconData speed = Icons.speed_outlined;
-  static const IconData stats = Icons.pie_chart_outlined;
+  static const IconData stats = Icons.pie_chart_outline_outlined;
   static const IconData streams = Icons.translate_outlined;
   static const IconData streamVideo = Icons.movie_outlined;
   static const IconData streamAudio = Icons.audiotrack_outlined;

lib/widgets/viewer/debug/debug_page.dart

@@ -78,11 +78,18 @@ class ViewerDebugPage extends StatelessWidget {
             'sourceTitle': entry.sourceTitle ?? '',
             'sourceMimeType': entry.sourceMimeType,
             'mimeType': entry.mimeType,
-            'trashed': '${entry.trashed}',
             'isMissingAtPath': '${entry.isMissingAtPath}',
           },
         ),
         const Divider(),
+        InfoRowGroup(
+          info: {
+            'trashed': '${entry.trashed}',
+            'trashPath': '${entry.trashDetails?.path}',
+            'trashDateMillis': '${entry.trashDetails?.dateMillis}',
+          },
+        ),
+        const Divider(),
         InfoRowGroup(
           info: {
             'catalogDateMillis': toDateValue(entry.catalogDateMillis),

pubspec.lock

@@ -119,14 +119,14 @@ packages:
       name: connectivity_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   connectivity_plus_linux:
     dependency: transitive
     description:
       name: connectivity_plus_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   connectivity_plus_macos:
     dependency: transitive
     description:
@@ -196,7 +196,7 @@ packages:
       name: dbus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.8"
+    version: "0.7.1"
   decorated_icon:
     dependency: "direct main"
     description:
@@ -210,7 +210,7 @@ packages:
       name: device_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   device_info_plus_linux:
     dependency: transitive
     description:
@@ -340,7 +340,7 @@ packages:
       name: flex_color_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   fluster:
     dependency: "direct main"
     description:
@@ -489,7 +489,7 @@ packages:
       name: http_multi_server
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.2.0"
   http_parser:
     dependency: transitive
     description:
@@ -503,7 +503,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
   intl:
     dependency: "direct main"
     description:
@@ -622,7 +622,7 @@ packages:
       name: nm
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.4"
+    version: "0.5.0"
   node_preamble:
     dependency: transitive
     description:
@@ -650,7 +650,7 @@ packages:
       name: package_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   package_info_plus_linux:
     dependency: transitive
     description:
@@ -692,7 +692,7 @@ packages:
       name: palette_generator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.2"
+    version: "0.3.3"
   panorama:
     dependency: "direct main"
     description:
@@ -755,7 +755,21 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.3.0"
+    version: "9.2.0"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "9.0.2"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "9.0.2"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -763,6 +777,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.7.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.0"
   petitparser:
     dependency: transitive
     description:
@@ -895,7 +916,7 @@ packages:
       name: shared_preferences_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.1.0"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1112,7 +1133,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.18"
+    version: "6.0.20"
   url_launcher_android:
     dependency: transitive
     description:
@@ -1133,14 +1154,14 @@ packages:
       name: url_launcher_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "3.0.0"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "3.0.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1161,7 +1182,7 @@ packages:
       name: url_launcher_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "3.0.0"
   vector_math:
     dependency: transitive
     description:
@@ -1210,7 +1231,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.11"
+    version: "2.4.1"
   wkt_parser:
     dependency: transitive
     description:

pubspec.yaml

@@ -6,7 +6,7 @@ repository: https://github.com/deckerst/aves
 # - github changelog: /CHANGELOG.md
 # - play changelog:   /whatsnew/whatsnew-en-US
 # - izzy changelog:   /fastlane/metadata/android/en-US/changelogs/1XXX.txt
-version: 1.6.0+66
+version: 1.6.1+67
 publish_to: none
 
 environment:
@@ -26,7 +26,7 @@ dependencies:
   collection:
   connectivity_plus:
   country_code:
-# TODO TLAD as of 2022/01/30, null safe version is pre-release
+# TODO TLAD as of 2022/02/22, null safe version is pre-release
   custom_rounded_rectangle_border: '>=0.2.0-nullsafety.0'
   decorated_icon:
   device_info_plus:
@@ -54,7 +54,7 @@ dependencies:
   overlay_support:
   package_info_plus:
   palette_generator:
-# TODO TLAD as of 2022/01/30, latest version (v0.4.1) has this issue: https://github.com/zesage/panorama/issues/25
+# TODO TLAD as of 2022/02/22, latest version (v0.4.1) has this issue: https://github.com/zesage/panorama/issues/25
   panorama: 0.4.0
   pdf:
   percent_indicator:
@@ -63,7 +63,7 @@ dependencies:
   provider:
   screen_brightness:
   shared_preferences:
-# TODO TLAD as of 2022/02/12, latest version (v2.0.11) fails to load from analysis service (target wrong channel?)
+# TODO TLAD as of 2022/02/22, latest version (v2.0.11) fails to load from analysis service (target wrong channel?)
   shared_preferences_android: 2.0.10
   sqflite:
   streams_channel:

test_driver/driver_shaders.dart

@@ -1,6 +1,7 @@
 import 'dart:ui';
 
 import 'package:aves/main_play.dart' as app;
+import 'package:aves/model/settings/defaults.dart';
 import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:flutter_driver/driver_extension.dart';
@@ -19,6 +20,8 @@ Future<void> configureAndLaunch() async {
     ..locale = const Locale('en')
     ..keepScreenOn = KeepScreenOn.always
     ..homePage = HomePageSetting.collection
+    // collection
+    ..collectionBrowsingQuickActions = SettingsDefaults.collectionBrowsingQuickActions
     // viewer
     ..imageBackground = EntryBackground.checkered
     // info

test_driver/utils/driver_extension.dart

@@ -19,6 +19,7 @@ extension ExtraFlutterDriver on FlutterDriver {
 
   Future<void> scanMediaDir(String dir) async {
     await tapKeyAndWait('appbar-leading-button');
+    await scroll(find.byValueKey('drawer-settings-button'), 0, -500, const Duration(milliseconds: 500));
     await tapKeyAndWait('drawer-debug');
 
     await tapKeyAndWait('appbar-menu-button');

whatsnew/whatsnew-en-US

@@ -1,5 +1,5 @@
 Thanks for using Aves!
-In v1.6.0:
+In v1.6.1:
 - recycle bin
 - view small and large images at their actual size
 - enjoy the app in Indonesian