From 6979af70b97a5b0499ee44f624cd4c5ac5ca21a3 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sun, 27 Aug 2023 22:31:33 +0200 Subject: [PATCH 1/4] upgrades --- plugins/aves_services_google/pubspec.lock | 16 ++++++------- plugins/aves_video_mpv/pubspec.lock | 16 ++++++------- pubspec.lock | 28 +++++++++++------------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/plugins/aves_services_google/pubspec.lock b/plugins/aves_services_google/pubspec.lock index c5d2257bc..c3e7d7992 100644 --- a/plugins/aves_services_google/pubspec.lock +++ b/plugins/aves_services_google/pubspec.lock @@ -196,18 +196,18 @@ packages: dependency: "direct main" description: name: google_maps_flutter_android - sha256: fb3e52f94d0736f6ee8bcdef290f8eab9325376d676f61303347c10ccf15379c + sha256: "0a3db57610487c5dc133b28b8025933148bacc007d0af500ec66e1ecdf304b96" url: "https://pub.dev" source: hosted - version: "2.4.16" + version: "2.5.0" google_maps_flutter_ios: dependency: transitive description: name: google_maps_flutter_ios - sha256: a9462a433bf3ebe60aadcf4906d2d6341a270d69d3e0fcaa8eb2b64699fcfb4f + sha256: "954083b0b8ef60d059b41a37382afb22d7eea565002bf0bbf093fe748b5cef82" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.0" google_maps_flutter_platform_interface: dependency: "direct main" description: @@ -220,10 +220,10 @@ packages: dependency: transitive description: name: google_maps_flutter_web - sha256: "229391997f216d37c76bfc10d9b5837a1dfeb98c4b4063c605016382e5bcd910" + sha256: a0a7f40aad00dd07e76abb80b7d28213b5f62c6d7d56e7e85efc15849fabcfbb url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.4" html: dependency: transitive description: @@ -449,10 +449,10 @@ packages: dependency: transitive description: name: win32 - sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0 + sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" url: "https://pub.dev" source: hosted - version: "5.0.6" + version: "5.0.7" win32_registry: dependency: transitive description: diff --git a/plugins/aves_video_mpv/pubspec.lock b/plugins/aves_video_mpv/pubspec.lock index 90eb0ba38..aef08cfa0 100644 --- a/plugins/aves_video_mpv/pubspec.lock +++ b/plugins/aves_video_mpv/pubspec.lock @@ -172,18 +172,18 @@ packages: dependency: "direct main" description: name: media_kit - sha256: d7a827080fb28f0ba4e8a7ab3f3e3f868fa817f0a94499640466ade84a1c31c9 + sha256: "92c7f59e075d74471b31e703f81ccc1d7102739ebcce945b30a6417fa2f751d5" url: "https://pub.dev" source: hosted - version: "1.1.5" + version: "1.1.7" media_kit_libs_android_video: dependency: "direct main" description: name: media_kit_libs_android_video - sha256: "142d389bf3efcf8469594a9c7a06a92fc25843fc6c0c3247f76cdcf70b3b29de" + sha256: "498a5062bc5f000bd23ada3be788ea886ab32c52f7a8252dde1264ca019b819b" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.3" media_kit_native_event_loop: dependency: "direct main" description: @@ -196,10 +196,10 @@ packages: dependency: "direct main" description: name: media_kit_video - sha256: d4143a96d97965d025bbb8b88db0ebf301e3c4cfa10c7e2ad7fd47c86a7febae + sha256: cd3ab78e7626146f115134b82c4029ac5987ba6351719c9067d86789723e0c12 url: "https://pub.dev" source: hosted - version: "1.1.6" + version: "1.1.8" meta: dependency: transitive description: @@ -425,10 +425,10 @@ packages: dependency: transitive description: name: win32 - sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0 + sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" url: "https://pub.dev" source: hosted - version: "5.0.6" + version: "5.0.7" xml: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index 502e2a31e..09c4066ac 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -619,18 +619,18 @@ packages: dependency: transitive description: name: google_maps_flutter_android - sha256: fb3e52f94d0736f6ee8bcdef290f8eab9325376d676f61303347c10ccf15379c + sha256: "0a3db57610487c5dc133b28b8025933148bacc007d0af500ec66e1ecdf304b96" url: "https://pub.dev" source: hosted - version: "2.4.16" + version: "2.5.0" google_maps_flutter_ios: dependency: transitive description: name: google_maps_flutter_ios - sha256: a9462a433bf3ebe60aadcf4906d2d6341a270d69d3e0fcaa8eb2b64699fcfb4f + sha256: "954083b0b8ef60d059b41a37382afb22d7eea565002bf0bbf093fe748b5cef82" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.0" google_maps_flutter_platform_interface: dependency: transitive description: @@ -643,10 +643,10 @@ packages: dependency: transitive description: name: google_maps_flutter_web - sha256: "229391997f216d37c76bfc10d9b5837a1dfeb98c4b4063c605016382e5bcd910" + sha256: a0a7f40aad00dd07e76abb80b7d28213b5f62c6d7d56e7e85efc15849fabcfbb url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.4" highlight: dependency: transitive description: @@ -835,18 +835,18 @@ packages: dependency: transitive description: name: media_kit - sha256: d7a827080fb28f0ba4e8a7ab3f3e3f868fa817f0a94499640466ade84a1c31c9 + sha256: "92c7f59e075d74471b31e703f81ccc1d7102739ebcce945b30a6417fa2f751d5" url: "https://pub.dev" source: hosted - version: "1.1.5" + version: "1.1.7" media_kit_libs_android_video: dependency: transitive description: name: media_kit_libs_android_video - sha256: "142d389bf3efcf8469594a9c7a06a92fc25843fc6c0c3247f76cdcf70b3b29de" + sha256: "498a5062bc5f000bd23ada3be788ea886ab32c52f7a8252dde1264ca019b819b" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.3" media_kit_native_event_loop: dependency: transitive description: @@ -859,10 +859,10 @@ packages: dependency: transitive description: name: media_kit_video - sha256: d4143a96d97965d025bbb8b88db0ebf301e3c4cfa10c7e2ad7fd47c86a7febae + sha256: cd3ab78e7626146f115134b82c4029ac5987ba6351719c9067d86789723e0c12 url: "https://pub.dev" source: hosted - version: "1.1.6" + version: "1.1.8" meta: dependency: transitive description: @@ -1667,10 +1667,10 @@ packages: dependency: transitive description: name: win32 - sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0 + sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" url: "https://pub.dev" source: hosted - version: "5.0.6" + version: "5.0.7" win32_registry: dependency: transitive description: From af2380ec1e91ebd242ab910b93bef73b7942228a Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 28 Aug 2023 22:47:16 +0200 Subject: [PATCH 2/4] downgraded android target version --- CHANGELOG.md | 4 ++++ android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 5 +++++ .../deckers/thibault/aves/AnalysisWorker.kt | 20 +++++++++++++++---- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0627004a9..d204110bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Changed + +- target API 33 to prevent foreground service crashes with Android 14 beta 5 + ## [v1.9.2] - 2023-08-24 ### Changed diff --git a/android/app/build.gradle b/android/app/build.gradle index f34fb9948..b2ca6c651 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -83,7 +83,7 @@ android { // which implementation `DocumentBuilderImpl` is provided by the OS and is not customizable on Android, // but the implementation on API <19 is not robust enough and fails to build XMP documents minSdkVersion 19 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName manifestPlaceholders = [googleApiKey: keystoreProperties["googleApiKey"] ?: "", diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 06247d156..add648546 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -32,6 +32,11 @@ + + + + + diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/AnalysisWorker.kt b/android/app/src/main/kotlin/deckers/thibault/aves/AnalysisWorker.kt index 16e47dd16..9c0e7cbfb 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/AnalysisWorker.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/AnalysisWorker.kt @@ -3,6 +3,7 @@ package deckers.thibault.aves import android.app.PendingIntent import android.content.Context import android.content.Intent +import android.content.pm.ServiceInfo import android.os.Build import android.util.Log import androidx.core.app.NotificationChannelCompat @@ -148,16 +149,27 @@ class AnalysisWorker(context: Context, parameters: WorkerParameters) : Coroutine WorkManager.getInstance(applicationContext).createCancelPendingIntent(id) ).build() val icon = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) R.drawable.ic_notification else R.mipmap.ic_launcher_round + val contentTitle = title ?: applicationContext.getText(R.string.analysis_notification_default_title) val notification = NotificationCompat.Builder(applicationContext, NOTIFICATION_CHANNEL) - .setContentTitle(title ?: applicationContext.getText(R.string.analysis_notification_default_title)) + .setContentTitle(contentTitle) + .setTicker(contentTitle) .setContentText(message) - .setBadgeIconType(NotificationCompat.BADGE_ICON_NONE) .setSmallIcon(icon) + .setOngoing(true) .setContentIntent(openAppIntent) - .setPriority(NotificationCompat.PRIORITY_LOW) .addAction(stopAction) .build() - return ForegroundInfo(NOTIFICATION_ID, notification) + // TODO TLAD revisit with Android 14 >beta5 + return ForegroundInfo(NOTIFICATION_ID, notification); +// return if (Build.VERSION.SDK_INT >= 34) { +// // as of Android 14 beta 5, foreground service type is mandatory +// // despite the sample code omitting it at: +// // https://developer.android.com/guide/background/persistent/how-to/long-running +// val type = ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC +// ForegroundInfo(NOTIFICATION_ID, notification, type) +// } else { +// ForegroundInfo(NOTIFICATION_ID, notification) +// } } companion object { From 84980fe99fa8af4a4a02733560005dc4d3979080 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Mon, 28 Aug 2023 22:49:58 +0200 Subject: [PATCH 3/4] l10n by weblate (#726) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translate-URL: https://hosted.weblate.org/projects/aves/app-android/my/ Translate-URL: https://hosted.weblate.org/projects/aves/app-android/sk/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/es/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/eu/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/fr/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/hu/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/id/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/it/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/ko/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/my/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/nb_NO/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/pl/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/ru/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/sk/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/uk/ Translate-URL: https://hosted.weblate.org/projects/aves/app-main/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/aves/store-short-description/my/ Translation: Aves/App - Android Translation: Aves/App - Main Translation: Aves/Store - Short description Co-authored-by: Aitor Salaberria Co-authored-by: Allan Nordhøy Co-authored-by: Htet Oo Hlaing Co-authored-by: JY3 Co-authored-by: Linerly Co-authored-by: Martin Frandel Co-authored-by: Skrripy Co-authored-by: Thibault Deckers Co-authored-by: gallegonovato Co-authored-by: glemco Co-authored-by: rehork Co-authored-by: wickdj Co-authored-by: Макар Разин --- lib/l10n/app_hu.arb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb index ac6d72b72..bb22e4151 100644 --- a/lib/l10n/app_hu.arb +++ b/lib/l10n/app_hu.arb @@ -1506,5 +1506,13 @@ "aboutDataUsageSectionTitle": "Adatforgalom", "@aboutDataUsageSectionTitle": {}, "aboutDataUsageCache": "Gyorsítótár", - "@aboutDataUsageCache": {} + "@aboutDataUsageCache": {}, + "overlayHistogramNone": "Nincs", + "@overlayHistogramNone": {}, + "overlayHistogramRGB": "RGB", + "@overlayHistogramRGB": {}, + "overlayHistogramLuminance": "Fényerő", + "@overlayHistogramLuminance": {}, + "settingsViewerShowHistogram": "Hisztogram megjelenítése", + "@settingsViewerShowHistogram": {} } From 61ca2e41d76292270807cbdbaa6b3941828b30cd Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 28 Aug 2023 23:04:36 +0200 Subject: [PATCH 4/4] version bump --- CHANGELOG.md | 2 ++ fastlane/metadata/android/en-US/changelogs/104.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/10401.txt | 5 +++++ pubspec.yaml | 2 +- untranslated.json | 7 ------- whatsnew/whatsnew-en-US | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/104.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/10401.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index d204110bc..e15cae936 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [v1.9.3] - 2023-08-28 + ### Changed - target API 33 to prevent foreground service crashes with Android 14 beta 5 diff --git a/fastlane/metadata/android/en-US/changelogs/104.txt b/fastlane/metadata/android/en-US/changelogs/104.txt new file mode 100644 index 000000000..5c5ca1669 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/104.txt @@ -0,0 +1,5 @@ +In v1.9.3: +- play your animated AVIF, AV1, and HDR videos +- filter by rating ranges +- judge tonal distributions with the viewer histogram +Full changelog available on GitHub \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/10401.txt b/fastlane/metadata/android/en-US/changelogs/10401.txt new file mode 100644 index 000000000..5c5ca1669 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/10401.txt @@ -0,0 +1,5 @@ +In v1.9.3: +- play your animated AVIF, AV1, and HDR videos +- filter by rating ranges +- judge tonal distributions with the viewer histogram +Full changelog available on GitHub \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 7ce2e37d6..3558da0a0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ repository: https://github.com/deckerst/aves # - play changelog: /whatsnew/whatsnew-en-US # - izzy changelog: /fastlane/metadata/android/en-US/changelogs/XXX01.txt # - libre changelog: /fastlane/metadata/android/en-US/changelogs/XXX.txt -version: 1.9.2+103 +version: 1.9.3+104 publish_to: none environment: diff --git a/untranslated.json b/untranslated.json index 5045aef6a..84e2c11b9 100644 --- a/untranslated.json +++ b/untranslated.json @@ -4072,13 +4072,6 @@ "filePickerUseThisFolder" ], - "hu": [ - "overlayHistogramNone", - "overlayHistogramRGB", - "overlayHistogramLuminance", - "settingsViewerShowHistogram" - ], - "it": [ "overlayHistogramRGB" ], diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US index f2c89cff5..5c5ca1669 100644 --- a/whatsnew/whatsnew-en-US +++ b/whatsnew/whatsnew-en-US @@ -1,4 +1,4 @@ -In v1.9.2: +In v1.9.3: - play your animated AVIF, AV1, and HDR videos - filter by rating ranges - judge tonal distributions with the viewer histogram