upgraded flutter to beta v2.2.0-10.2.pre

.github/workflows/check.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: beta
-          flutter-version: '2.2.0-10.1.pre'
+          flutter-version: '2.2.0-10.2.pre'
 
       - name: Clone the repository.
         uses: actions/checkout@v2

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: beta
-          flutter-version: '2.2.0-10.1.pre'
+          flutter-version: '2.2.0-10.2.pre'
 
       # Workaround for this Android Gradle Plugin issue (supposedly fixed in AGP 4.1):
       # https://issuetracker.google.com/issues/144111441
@@ -50,8 +50,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 --bundle-sksl-path shaders_2.2.0-10.1.pre.sksl.json
+          flutter build apk --bundle-sksl-path shaders_2.2.0-10.2.pre.sksl.json
-          flutter build appbundle --bundle-sksl-path shaders_2.2.0-10.1.pre.sksl.json
+          flutter build appbundle --bundle-sksl-path shaders_2.2.0-10.2.pre.sksl.json
           rm $AVES_STORE_FILE
         env:
           AVES_STORE_FILE: ${{ github.workspace }}/key.jks

CHANGELOG.md

@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+### Changed
+- Upgraded Flutter to beta v2.2.0-10.2.pre
 
 ## [v1.4.1] - 2021-04-29
 ### Added

lib/l10n/app_en.arb

@@ -555,9 +555,9 @@
   "@settingsVideoEnableHardwareAcceleration": {},
   "settingsVideoEnableAutoPlay": "Auto play",
   "@settingsVideoEnableAutoPlay": {},
-  "settingsVideoLoopModeTile":  "Loop mode",
+  "settingsVideoLoopModeTile": "Loop mode",
   "@settingsVideoLoopModeTile": {},
-  "settingsVideoLoopModeTitle":  "Loop Mode",
+  "settingsVideoLoopModeTitle": "Loop Mode",
   "@settingsVideoLoopModeTitle": {},
 
   "settingsSectionPrivacy": "Privacy",

lib/l10n/app_ko.arb

@@ -259,8 +259,8 @@
   "settingsVideoShowVideos": "미디어에 동영상 표시",
   "settingsVideoEnableHardwareAcceleration": "하드웨어 가속",
   "settingsVideoEnableAutoPlay": "자동 재생",
-  "settingsVideoLoopModeTile":  "반복 모드",
+  "settingsVideoLoopModeTile": "반복 모드",
-  "settingsVideoLoopModeTitle":  "반복 모드",
+  "settingsVideoLoopModeTitle": "반복 모드",
 
   "settingsSectionPrivacy": "개인정보 보호",
   "settingsEnableAnalytics": "진단 데이터 보내기",

lib/widgets/common/identity/aves_expansion_tile.dart

@@ -20,7 +20,7 @@ class AvesExpansionTile extends StatelessWidget {
     this.initiallyExpanded = false,
     this.showHighlight = true,
     @required this.children,
-  }): value = value ?? title;
+  }) : value = value ?? title;
 
   @override
   Widget build(BuildContext context) {

lib/widgets/drawer/app_drawer.dart

@@ -140,6 +140,7 @@ class _AppDrawerState extends State<AppDrawer> {
                 runSpacing: 8,
                 children: [
                   OutlinedButton.icon(
+                    key: Key('drawer-about-button'),
                     onPressed: () => goTo(AboutPage.routeName, (_) => AboutPage()),
                     icon: Icon(AIcons.info),
                     label: Row(
@@ -175,6 +176,7 @@ class _AppDrawerState extends State<AppDrawer> {
                     ),
                   ),
                   OutlinedButton.icon(
+                    key: Key('drawer-settings-button'),
                     onPressed: () => goTo(SettingsPage.routeName, (_) => SettingsPage()),
                     icon: Icon(AIcons.settings),
                     label: Text(context.l10n.settingsPageTitle),

lib/widgets/viewer/info/metadata/xmp_namespaces.dart

@@ -57,8 +57,7 @@ class XmpNamespace {
   Map<String, String> get buildProps => rawProps;
 
   List<Widget> buildNamespaceSection() {
-    final props = buildProps
+    final props = buildProps.entries
-        .entries
         .map((kv) {
           final prop = XmpProp(kv.key, kv.value);
           return extractData(prop) ? null : prop;

pubspec.lock

@@ -312,7 +312,7 @@ packages:
     description:
       path: "."
       ref: "issues/829-nullsafety"
-      resolved-ref: "622d7e894034681c46470a4e4c94964d0ccd6454"
+      resolved-ref: "09b306afdfc5d748cdaf3307084e70fcb6a21c6d"
       url: "git://github.com/fleaflet/flutter_map.git"
     source: git
     version: "0.12.0"
@@ -365,7 +365,7 @@ packages:
       name: get_it
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.1"
+    version: "7.0.0"
   github:
     dependency: "direct main"
     description:
@@ -414,7 +414,7 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.1"
+    version: "0.13.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -652,7 +652,7 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.0.0"
+    version: "7.1.0"
   permission_handler_platform_interface:
     dependency: transitive
     description:

test_driver/app_test.dart

@@ -68,7 +68,7 @@ void visitAbout() {
     await driver.tap(find.byValueKey('appbar-leading-button'));
     await driver.waitUntilNoTransientCallbacks();
 
-    await driver.tap(find.byValueKey('About-tile'));
+    await driver.tap(find.byValueKey('drawer-about-button'));
     await driver.waitUntilNoTransientCallbacks();
 
     await pressDeviceBackButton();
@@ -81,7 +81,7 @@ void visitSettings() {
     await driver.tap(find.byValueKey('appbar-leading-button'));
     await driver.waitUntilNoTransientCallbacks();
 
-    await driver.tap(find.byValueKey('Settings-tile'));
+    await driver.tap(find.byValueKey('drawer-settings-button'));
     await driver.waitUntilNoTransientCallbacks();
 
     await pressDeviceBackButton();