#525 Adjust design to new style of Nextcloud app

4 files changed, 7 insertions, 44 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
index 6aec91c6c..849c77243 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
@@ -25,6 +25,7 @@ import androidx.annotation.RequiresApi;
 import androidx.annotation.UiThread;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.util.Pair;
 import androidx.core.view.GravityCompat;
@@ -198,7 +199,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
         }).observe(this, (List<Account> accounts) -> {
             if (accounts == null || accounts.size() == 0) {
                 // Last account has been deleted. hasAccounts LiveData will handle this, but we make sure, that branding is reset.
-                saveBrandColors(this, colorAccent);
+                saveBrandColors(this, ContextCompat.getColor(this, R.color.defaultBrand));
                 return;
             }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java
index e825200aa..b0b0d68ae 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java
@@ -1,14 +1,13 @@
 package it.niedermann.nextcloud.deck.ui;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.view.View;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 
@@ -17,22 +16,16 @@ import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ActivityPushNotificationBinding;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
-import it.niedermann.nextcloud.deck.ui.branding.BrandedActivity;
 import it.niedermann.nextcloud.deck.ui.card.EditActivity;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler;
 
 import static android.graphics.Color.parseColor;
 import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.isBrandingEnabled;
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.saveBrandColors;
 
-public class PushNotificationActivity extends BrandedActivity {
+public class PushNotificationActivity extends AppCompatActivity {
 
     private ActivityPushNotificationBinding binding;
 
-    private boolean brandingEnabled;
-
     // Provided by Files app NotificationJob
     private static final String KEY_SUBJECT = "subject";
     private static final String KEY_MESSAGE = "message";
@@ -54,8 +47,6 @@ public class PushNotificationActivity extends BrandedActivity {
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
 
-        brandingEnabled = isBrandingEnabled(this);
-
         binding.subject.setText(getIntent().getStringExtra(KEY_SUBJECT));
 
         final String message = getIntent().getStringExtra(KEY_MESSAGE);
@@ -80,13 +71,6 @@ public class PushNotificationActivity extends BrandedActivity {
                     if (account != null) {
                         SingleAccountHelper.setCurrentAccount(this, account.getName());
                         final SyncManager syncManager = new SyncManager(this);
-                        try {
-                            if (brandingEnabled) {
-                                applyBrand(parseColor(account.getColor()));
-                            }
-                        } catch (Throwable t) {
-                            DeckLog.logError(t);
-                        }
                         DeckLog.verbose("account: " + account);
                         observeOnce(syncManager.getLocalBoardIdByCardRemoteIdAndAccount(cardRemoteId, account), PushNotificationActivity.this, (boardLocalId -> {
                             DeckLog.verbose("BoardLocalId " + boardLocalId);
@@ -151,11 +135,6 @@ public class PushNotificationActivity extends BrandedActivity {
 
     @UiThread
     private void launchEditActivity(@NonNull Account account, Long boardId, Long cardId) {
-        try {
-            saveBrandColors(this, Color.parseColor(account.getColor()));
-        } catch (Throwable t) {
-            DeckLog.logError(t);
-        }
         DeckLog.info("starting " + EditActivity.class.getSimpleName() + " with [" + account + ", " + boardId + ", " + cardId + "]");
         startActivity(EditActivity.createEditCardIntent(this, account, boardId, cardId));
         finish();
@@ -167,13 +146,6 @@ public class PushNotificationActivity extends BrandedActivity {
         return true;
     }
 
-    @Override
-    public void applyBrand(@ColorInt int mainColor) {
-        if (brandingEnabled) {
-            binding.cancel.setTextColor(getSecondaryForegroundColorDependingOnTheme(this, mainColor));
-        }
-    }
-
     public void applyBrandToSubmitButton(@NonNull Account account) {
         try {
             binding.submit.setBackgroundColor(parseColor(account.getColor()));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandingUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandingUtil.java
index 220b4cf4f..2d3eb9229 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandingUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandingUtil.java
@@ -46,7 +46,7 @@ public abstract class BrandingUtil {
         if (isBrandingEnabled(context)) {
             SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
             DeckLog.log("--- Read: shared_preference_theme_main");
-            return sharedPreferences.getInt(context.getString(R.string.shared_preference_theme_main), context.getApplicationContext().getResources().getColor(R.color.accent));
+            return sharedPreferences.getInt(context.getString(R.string.shared_preference_theme_main), context.getApplicationContext().getResources().getColor(R.color.defaultBrand));
         } else {
             return context.getResources().getColor(R.color.defaultBrand);
         }
@@ -66,7 +66,7 @@ public abstract class BrandingUtil {
     public static void clearBrandColors(@NonNull Context context) {
         if (isBrandingEnabled(context) && context instanceof BrandedActivity) {
             final BrandedActivity activity = (BrandedActivity) context;
-            activity.applyBrand(ContextCompat.getColor(context, R.color.accent));
+            activity.applyBrand(ContextCompat.getColor(context, R.color.defaultBrand));
         }
         SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
         DeckLog.log("--- Write: Remove: shared_preference_theme_main" + " | ");
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountsActivity.java
index c7db3feb5..2be39a8b9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountsActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountsActivity.java
@@ -1,6 +1,5 @@
 package it.niedermann.nextcloud.deck.ui.manageaccounts;
 
-import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -13,13 +12,11 @@ import it.niedermann.nextcloud.deck.Application;
 import it.niedermann.nextcloud.deck.databinding.ActivityManageAccountsBinding;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
-import it.niedermann.nextcloud.deck.ui.branding.BrandedActivity;
 
 import static it.niedermann.nextcloud.deck.Application.saveCurrentAccountId;
 import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.saveBrandColors;
 
-public class ManageAccountsActivity extends BrandedActivity {
+public class ManageAccountsActivity extends AppCompatActivity {
 
     private static final String TAG = ManageAccountsActivity.class.getSimpleName();
 
@@ -41,7 +38,6 @@ public class ManageAccountsActivity extends BrandedActivity {
         adapter = new ManageAccountAdapter((account) -> {
             SingleAccountHelper.setCurrentAccount(getApplicationContext(), account.getName());
             syncManager = new SyncManager(this);
-            saveBrandColors(this, Color.parseColor(account.getColor()));
             saveCurrentAccountId(this, account.getId());
         }, (accountPair) -> {
             if (accountPair.first != null) {
@@ -52,7 +48,6 @@ public class ManageAccountsActivity extends BrandedActivity {
             Account newAccount = accountPair.second;
             if (newAccount != null) {
                 SingleAccountHelper.setCurrentAccount(getApplicationContext(), newAccount.getName());
-                saveBrandColors(this, Color.parseColor(newAccount.getColor()));
                 saveCurrentAccountId(this, newAccount.getId());
                 syncManager = new SyncManager(this);
             } else {
@@ -79,9 +74,4 @@ public class ManageAccountsActivity extends BrandedActivity {
     public void onBackPressed() {
         onSupportNavigateUp();
     }
-
-    @Override
-    public void applyBrand(int mainColor) {
-        // Nothing to do...
-    }
 }