Merge branch 'develop'

deckerst · Jul 11, 2024 · 6d4c765 · 6d4c765
2 parents a396635 + 0cb139b
commit 6d4c765
Show file tree

Hide file tree

Showing 69 changed files with 60 additions and 1,141 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -49,9 +49,6 @@ jobs:
           cp build/app/outputs/bundle/playRelease/*.aab outputs
           ./flutterw build apk -t lib/main_play.dart --flavor play --bundle-sksl-path shaders.sksl.json
           cp build/app/outputs/apk/play/release/*.apk outputs
-          scripts/apply_flavor_huawei.sh
-          ./flutterw build apk -t lib/main_huawei.dart --flavor huawei --bundle-sksl-path shaders.sksl.json
-          cp build/app/outputs/apk/huawei/release/*.apk outputs
           scripts/apply_flavor_izzy.sh
           ./flutterw build apk -t lib/main_izzy.dart --flavor izzy --split-per-abi
           cp build/app/outputs/apk/izzy/release/*.apk outputs
@@ -65,7 +62,6 @@ jobs:
           AVES_KEY_ALIAS: ${{ secrets.AVES_KEY_ALIAS }}
           AVES_KEY_PASSWORD: ${{ secrets.AVES_KEY_PASSWORD }}
           AVES_GOOGLE_API_KEY: ${{ secrets.AVES_GOOGLE_API_KEY }}
-          AVES_HUAWEI_API_KEY: ${{ secrets.AVES_HUAWEI_API_KEY }}
 
       - name: Create a release with the APK and App Bundle.
         uses: ncipollo/release-action@v1

diff --git a/CHANGELOG.md b/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.11.4"></a>[v1.11.4] - 2024-07-09
+## <a id="v1.11.5"></a>[v1.11.5] - 2024-07-11
 
 ### Added
 
@@ -19,6 +19,12 @@ All notable changes to this project will be documented in this file.
 - handling wallpaper intent without URI
 - sizing widgets with some launchers on Android >=12
 
+### Removed
+
+- `huawei` app flavor
+
+## <a id="v1.11.4"></a>[v1.11.4] - 2024-07-09 [YANKED]
+
 ## <a id="v1.11.3"></a>[v1.11.3] - 2024-06-17
 
 ### Added

diff --git a/README.md b/README.md
@@ -12,9 +12,6 @@ Aves is a gallery and metadata explorer app. It is built for Android, with Flutt
 [<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
       alt='Get it on Google Play'
       height="80">](https://play.google.com/store/apps/details?id=deckers.thibault.aves&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1)
-[<img src="https://raw.githubusercontent.com/deckerst/common/main/assets/huawei-appgallery-badge-english-black.png"
-      alt='Get it on Huawei AppGallery'
-      height="80">](https://appgallery.huawei.com/app/C106014023)
 [<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png"
       alt='Get it on IzzyOnDroid'
       height="80">](https://apt.izzysoft.de/fdroid/index/apk/deckers.thibault.aves)

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -40,7 +40,6 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties["keyAlias"] = System.getenv("AVES_KEY_ALIAS") ?: "<NONE>"
     keystoreProperties["keyPassword"] = System.getenv("AVES_KEY_PASSWORD") ?: "<NONE>"
     keystoreProperties["googleApiKey"] = System.getenv("AVES_GOOGLE_API_KEY") ?: "<NONE>"
-    keystoreProperties["huaweiApiKey"] = System.getenv("AVES_HUAWEI_API_KEY") ?: "<NONE>"
 }
 
 android {
@@ -70,8 +69,7 @@ android {
         targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        manifestPlaceholders = [googleApiKey: keystoreProperties["googleApiKey"] ?: "<NONE>",
-                                huaweiApiKey: keystoreProperties["huaweiApiKey"] ?: "<NONE>"]
+        manifestPlaceholders = [googleApiKey: keystoreProperties["googleApiKey"] ?: "<NONE>"]
         multiDexEnabled true
     }
 
@@ -94,13 +92,6 @@ android {
             ext.useNdkAbiFilters = true
         }
 
-        huawei {
-            // Huawei AppGallery
-            dimension "store"
-            // generate a universal APK without x86 native libs
-            ext.useNdkAbiFilters = true
-        }
-
         izzy {
             // IzzyOnDroid
             // check offending libraries with `scanapk`
@@ -198,7 +189,7 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:1.7.0"
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-process:2.8.2'
+    implementation 'androidx.lifecycle:lifecycle-process:2.8.3'
     implementation 'androidx.media:media:1.7.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.security:security-crypto:1.1.0-alpha06'
@@ -221,9 +212,6 @@ dependencies {
     implementation 'com.github.deckerst.mp4parser:muxer:4cc0c5d06c'
     implementation 'com.github.deckerst:pixymeta-android:9ec7097f17'
 
-    // huawei flavor only
-    huaweiImplementation "com.huawei.agconnect:agconnect-core:$huawei_agconnect_version"
-
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 
     kapt 'androidx.annotation:annotation:1.8.0'
@@ -237,8 +225,3 @@ if (useCrashlytics) {
     apply plugin: 'com.google.gms.google-services'
     apply plugin: 'com.google.firebase.crashlytics'
 }
-
-if (useHms) {
-    println("Building flavor with HMS plugin")
-    apply plugin: 'com.huawei.agconnect'
-}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -313,9 +313,6 @@
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="${googleApiKey}" />
-        <meta-data
-            android:name="deckers.thibault.aves.huawei.API_KEY"
-            android:value="${huaweiApiKey}" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="false" />

diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/HomeWidgetProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/HomeWidgetProvider.kt
@@ -41,16 +41,15 @@ class HomeWidgetProvider : AppWidgetProvider() {
         for (widgetId in appWidgetIds) {
             val widgetInfo = appWidgetManager.getAppWidgetOptions(widgetId)
 
-            goAsync().run {
-                defaultScope.launch {
-                    val backgroundProps = getProps(context, widgetId, widgetInfo, drawEntryImage = false)
-                    updateWidgetImage(context, appWidgetManager, widgetId, backgroundProps)
+            val pendingResult = goAsync()
+            defaultScope.launch() {
+                val backgroundProps = getProps(context, widgetId, widgetInfo, drawEntryImage = false)
+                updateWidgetImage(context, appWidgetManager, widgetId, backgroundProps)
 
-                    val imageProps = getProps(context, widgetId, widgetInfo, drawEntryImage = true, reuseEntry = false)
-                    updateWidgetImage(context, appWidgetManager, widgetId, imageProps)
+                val imageProps = getProps(context, widgetId, widgetInfo, drawEntryImage = true, reuseEntry = false)
+                updateWidgetImage(context, appWidgetManager, widgetId, imageProps)
 
-                    finish()
-                }
+                pendingResult?.finish()
             }
         }
     }

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,50 +1,28 @@
 buildscript {
     ext {
-        agp_version = '8.5.0' // same as `settings.ext.agp_version` in `/android/settings.gradle`
         glide_version = '4.16.0'
-        // AppGallery Connect plugin versions: https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-sdk-changenotes-0000001058732550
-        huawei_agconnect_version = '1.9.1.300'
         abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
         useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") }
-        useHms = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("huawei") }
     }
 
     repositories {
         google()
         mavenCentral()
-
-        if (useHms) {
-            // HMS (used by some flavors only)
-            maven { url 'https://developer.huawei.com/repo/' }
-        }
     }
 
     dependencies {
-        // necessary when applying plugin `com.huawei.agconnect`
-        classpath "com.android.tools.build:gradle:$agp_version"
-
         if (useCrashlytics) {
             // GMS & Firebase Crashlytics (used by some flavors only)
             classpath 'com.google.gms:google-services:4.4.1'
             classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         }
-
-        if (useHms) {
-            // HMS (used by some flavors only)
-            classpath "com.huawei.agconnect:agcp:$huawei_agconnect_version"
-        }
     }
 }
 
 allprojects {
     repositories {
         google()
         mavenCentral()
-
-        if (useHms) {
-            // HMS (used by some flavors only)
-            maven { url 'https://developer.huawei.com/repo/' }
-        }
     }
 
 //    gradle.projectsEvaluated {

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -20,7 +20,3 @@ android.nonFinalResIds=false
 # full mode is too aggressive and removes essential code
 # of `metadata-extractor` even when adding `-keep class com.drew.**{ *; }`
 android.enableR8.fullMode=false
-
-# fix for AppGallery Connect plugin which does not support yet Gradle 8
-# cf https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-common-faq-0000001063210244#section17273113244910
-apmsInstrumentationEnabled=false
diff --git a/android/key_template.properties b/android/key_template.properties
@@ -3,4 +3,3 @@ storePassword=<KEYSTORE_PASSWORD>
 keyAlias=<KEY_ALIAS>
 keyPassword=<KEY_PASSWORD>
 googleApiKey=<GOOGLE_API_KEY>
-huaweiApiKey=<HUAWEI_API_KEY>
diff --git a/fastlane/metadata/android/en-US/changelogs/124.txt b/fastlane/metadata/android/en-US/changelogs/124.txt
@@ -0,0 +1,4 @@
+In v1.11.5:
+- explore your collection with the... explorer
+- convert your motion photos to stills in bulk
+Full changelog available on GitHub
diff --git a/fastlane/metadata/android/en-US/changelogs/12401.txt b/fastlane/metadata/android/en-US/changelogs/12401.txt
@@ -0,0 +1,4 @@
+In v1.11.5:
+- explore your collection with the... explorer
+- convert your motion photos to stills in bulk
+Full changelog available on GitHub
diff --git a/lib/app_flavor.dart b/lib/app_flavor.dart
@@ -1,11 +1,10 @@
-enum AppFlavor { play, huawei, izzy, libre }
+enum AppFlavor { play, izzy, libre }
 
 extension ExtraAppFlavor on AppFlavor {
   bool get canEnableErrorReporting {
     switch (this) {
       case AppFlavor.play:
         return true;
-      case AppFlavor.huawei:
       case AppFlavor.izzy:
       case AppFlavor.libre:
         return false;
@@ -15,7 +14,6 @@ extension ExtraAppFlavor on AppFlavor {
   bool get hasMapStyleDefault {
     switch (this) {
       case AppFlavor.play:
-      case AppFlavor.huawei:
         return true;
       case AppFlavor.izzy:
       case AppFlavor.libre:

diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
@@ -313,8 +313,6 @@
   "@exportEntryDialogFormat": {},
   "widgetOpenPageHome": "إفتح الرئيسية",
   "@widgetOpenPageHome": {},
-  "mapStyleHuaweiNormal": "خرائط بيتال (هواوي)",
-  "@mapStyleHuaweiNormal": {},
   "keepScreenOnAlways": "دائما",
   "@keepScreenOnAlways": {},
   "appExportSettings": "إعدادات",
@@ -571,8 +569,6 @@
   "@settingsSubtitleThemeTextAlignmentLeft": {},
   "settingsVideoGestureSideDoubleTapSeek": "انقر نقرًا مزدوجًا على حواف الشاشة للتقدم للأمام/للخلف",
   "@settingsVideoGestureSideDoubleTapSeek": {},
-  "mapStyleHuaweiTerrain": "خرائط بيتال (التضاريس)",
-  "@mapStyleHuaweiTerrain": {},
   "sortByItemCount": "حسب عدد العناصر",
   "@sortByItemCount": {},
   "sectionUnknown": "مجهول",

diff --git a/lib/l10n/app_be.arb b/lib/l10n/app_be.arb
@@ -327,10 +327,6 @@
   "@mapStyleGoogleNormal": {},
   "mapStyleGoogleTerrain": "Карты Google (Рэльеф мясцовасці)",
   "@mapStyleGoogleTerrain": {},
-  "mapStyleHuaweiNormal": "Карты Petal",
-  "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "Карты Petal (Рэльеф мясцовасці)",
-  "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "Гуманітарная ОСМ",
   "@mapStyleOsmHot": {},
   "mapStyleStamenWatercolor": "Тычынка Акварэль",

diff --git a/lib/l10n/app_ca.arb b/lib/l10n/app_ca.arb
@@ -214,8 +214,6 @@
   "@mapStyleGoogleHybrid": {},
   "mapStyleGoogleTerrain": "Google Maps (Terreny)",
   "@mapStyleGoogleTerrain": {},
-  "mapStyleHuaweiTerrain": "Petal Maps (Terreny)",
-  "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "Humanitarian OSM",
   "@mapStyleOsmHot": {},
   "mapStyleStamenWatercolor": "Stamen Watercolor",
@@ -715,8 +713,6 @@
   "@filterTypeSphericalVideoLabel": {},
   "filterMimeImageLabel": "Imatge",
   "@filterMimeImageLabel": {},
-  "mapStyleHuaweiNormal": "Petal Maps",
-  "@mapStyleHuaweiNormal": {},
   "filterMimeVideoLabel": "Vídeo",
   "@filterMimeVideoLabel": {},
   "maxBrightnessAlways": "Sempre",

diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
@@ -277,10 +277,6 @@
   },
   "mapStyleGoogleTerrain": "Mapy Google (terén)",
   "@mapStyleGoogleTerrain": {},
-  "mapStyleHuaweiNormal": "Mapy Petal",
-  "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "Mapy Petal (terénní)",
-  "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "Humanitární OSM",
   "@mapStyleOsmHot": {},
   "mapStyleStamenWatercolor": "Stamen Watercolor (vodové barvy)",

diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -243,10 +243,6 @@
   "@mapStyleGoogleHybrid": {},
   "mapStyleGoogleTerrain": "Google Maps (Gelände)",
   "@mapStyleGoogleTerrain": {},
-  "mapStyleHuaweiNormal": "Petal Maps",
-  "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "Petal Maps (Gelände)",
-  "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "Humanitäres OSM",
   "@mapStyleOsmHot": {},
   "mapStyleStamenWatercolor": "Stamen Watercolor (Aquarell)",

diff --git a/lib/l10n/app_el.arb b/lib/l10n/app_el.arb
@@ -243,10 +243,6 @@
   "@mapStyleGoogleHybrid": {},
   "mapStyleGoogleTerrain": "Google Maps (Terrain)",
   "@mapStyleGoogleTerrain": {},
-  "mapStyleHuaweiNormal": "Petal Maps",
-  "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "Petal Maps (Terrain)",
-  "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "Humanitarian OSM",
   "@mapStyleOsmHot": {},
   "mapStyleStamenWatercolor": "Stamen Watercolor",

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -238,8 +238,6 @@
   "mapStyleGoogleNormal": "Google Maps",
   "mapStyleGoogleHybrid": "Google Maps (Hybrid)",
   "mapStyleGoogleTerrain": "Google Maps (Terrain)",
-  "mapStyleHuaweiNormal": "Petal Maps",
-  "mapStyleHuaweiTerrain": "Petal Maps (Terrain)",
   "mapStyleOsmHot": "Humanitarian OSM",
   "mapStyleStamenWatercolor": "Stamen Watercolor",
 

diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
@@ -231,10 +231,6 @@
   "@mapStyleGoogleHybrid": {},
   "mapStyleGoogleTerrain": "Google Maps (Relieve)",
   "@mapStyleGoogleTerrain": {},
-  "mapStyleHuaweiNormal": "Petal Maps",
-  "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "Petal Maps (Relieve)",
-  "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "OSM Humanitario",
   "@mapStyleOsmHot": {},
   "mapStyleStamenWatercolor": "Stamen Watercolor (Acuarela)",

diff --git a/lib/l10n/app_eu.arb b/lib/l10n/app_eu.arb
@@ -283,16 +283,12 @@
   "@mapStyleGoogleHybrid": {},
   "mapStyleGoogleTerrain": "Google Maps (lurra)",
   "@mapStyleGoogleTerrain": {},
-  "mapStyleHuaweiNormal": "Petal Maps",
-  "@mapStyleHuaweiNormal": {},
   "mapStyleOsmHot": "OSM humanitarioa",
   "@mapStyleOsmHot": {},
   "mapStyleStamenWatercolor": "Stamen Watercolor (akuarela)",
   "@mapStyleStamenWatercolor": {},
   "keepScreenOnNever": "Inoiz",
   "@keepScreenOnNever": {},
-  "mapStyleHuaweiTerrain": "Petal Maps (lurra)",
-  "@mapStyleHuaweiTerrain": {},
   "nameConflictStrategyReplace": "Ordezkatu",
   "@nameConflictStrategyReplace": {},
   "keepScreenOnVideoPlayback": "Bideoa erreproduzitzean",

diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
@@ -339,10 +339,6 @@
       "count": {}
     }
   },
-  "mapStyleHuaweiNormal": "پتال مپس",
-  "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "پتال مپس (نمایش زمین)",
-  "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "اوپن‌استریت‌مپ بشردوستانه",
   "@mapStyleOsmHot": {},
   "subtitlePositionBottom": "پایین",

diff --git a/lib/l10n/app_fi.arb b/lib/l10n/app_fi.arb
@@ -352,10 +352,6 @@
   "@lengthUnitPercent": {},
   "mapStyleGoogleNormal": "Google Maps",
   "@mapStyleGoogleNormal": {},
-  "mapStyleHuaweiNormal": "Petal Maps",
-  "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "Petal Maps (Maasto)",
-  "@mapStyleHuaweiTerrain": {},
   "overlayHistogramRGB": "RGB",
   "@overlayHistogramRGB": {},
   "subtitlePositionTop": "Ylhäällä",

diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
@@ -243,10 +243,6 @@
   "@mapStyleGoogleHybrid": {},
   "mapStyleGoogleTerrain": "Google Maps (Relief)",
   "@mapStyleGoogleTerrain": {},
-  "mapStyleHuaweiNormal": "Petal Maps",
-  "@mapStyleHuaweiNormal": {},
-  "mapStyleHuaweiTerrain": "Petal Maps (Relief)",
-  "@mapStyleHuaweiTerrain": {},
   "mapStyleOsmHot": "OSM Humanitaire",
   "@mapStyleOsmHot": {},
   "mapStyleStamenWatercolor": "Stamen Watercolor (Aquarelle)",