From f91b94d100c3af80472c5bf79182cbee39596233 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sat, 4 Oct 2025 14:11:42 +0200 Subject: [PATCH] Dep/bump ucrop (#2748) * Bump com.github.yalantis:ucrop from 2.2.10 to 2.2.11 Bumps [com.github.yalantis:ucrop](https://github.com/Yalantis/uCrop) from 2.2.10 to 2.2.11. - [Release notes](https://github.com/Yalantis/uCrop/releases) - [Commits](https://github.com/Yalantis/uCrop/compare/2.2.10...2.2.11) --- updated-dependencies: - dependency-name: com.github.yalantis:ucrop dependency-version: 2.2.11 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Fix build While testing on Android 15, no difference was found in the status bar colour on Android 15 with or without the setting * Use non-native release * Apply autogenerated ProGuard missing rules --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle.kts | 2 +- app/proguard-rules.pro | 17 ++++++++++++++++- .../card_locker/LoyaltyCardEditActivity.java | 1 - 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 88d61d0a3..4784727d1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -126,7 +126,7 @@ dependencies { // Third-party implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar") - implementation("com.github.yalantis:ucrop:2.2.10") + implementation("com.github.yalantis:ucrop:2.2.11") implementation("com.google.zxing:core:3.5.3") implementation("org.apache.commons:commons-csv:1.9.0") implementation("com.jaredrummler:colorpicker:1.1.0") diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 630cbe09c..65b0b4a0c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -21,4 +21,19 @@ -keepattributes SourceFile,LineNumberTable # This keep the class and method names the same, for debugging stack traces --dontobfuscate \ No newline at end of file +-dontobfuscate + +# Required for uCrop 2.2.11 +# This is generated automatically by the Android Gradle plugin. +-dontwarn javax.annotation.processing.AbstractProcessor +-dontwarn javax.annotation.processing.SupportedOptions +-dontwarn okhttp3.Call +-dontwarn okhttp3.Dispatcher +-dontwarn okhttp3.OkHttpClient +-dontwarn okhttp3.Request$Builder +-dontwarn okhttp3.Request +-dontwarn okhttp3.Response +-dontwarn okhttp3.ResponseBody +-dontwarn okio.BufferedSource +-dontwarn okio.Okio +-dontwarn okio.Sink diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index eb1c52dd3..99d2c04bf 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -719,7 +719,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface)); int colorBackground = MaterialColors.getColor(this, android.R.attr.colorBackground, ContextCompat.getColor(this, R.color.md_theme_light_onSurface)); mCropperOptions.setToolbarColor(colorSurface); - mCropperOptions.setStatusBarColor(colorSurface); mCropperOptions.setToolbarWidgetColor(colorOnSurface); mCropperOptions.setRootViewBackgroundColor(colorBackground); // set tool tip to be the darker of primary color