diff --git a/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java b/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java index 67b43a92d..ab290ec1a 100644 --- a/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java +++ b/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java @@ -14,6 +14,8 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.core.view.WindowInsetsControllerCompat; public class CatimaAppCompatActivity extends AppCompatActivity { + protected boolean activityOverridesNavBarColor = false; + @Override protected void attachBaseContext(Context base) { // Apply chosen language @@ -51,7 +53,9 @@ public class CatimaAppCompatActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - Utils.setNavigationBarColor(this, null, Utils.resolveBackgroundColor(this), !Utils.isDarkModeEnabled(this)); + if (!activityOverridesNavBarColor) { + Utils.setNavigationBarColor(this, null, Utils.resolveBackgroundColor(this), !Utils.isDarkModeEnabled(this)); + } } protected void enableToolbarBackButton() { diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index b10c06290..e9a553601 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -555,6 +555,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements @Override protected void onResume() { + activityOverridesNavBarColor = true; super.onResume(); Log.i(TAG, "To view card: " + loyaltyCardId);