#317 Adjust theme for each account

Signed-off-by: Stefan Niedermann <info@niedermann.it>

2 files changed, 25 insertions, 13 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java
index 3a1185c7a..66a49f218 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java
@@ -4,7 +4,6 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Lifecycle;
@@ -16,12 +15,14 @@ import it.niedermann.nextcloud.deck.Application;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ActivityAboutBinding;
 import it.niedermann.nextcloud.deck.model.Account;
+import it.niedermann.nextcloud.deck.ui.AbstractThemableActivity;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler;
 
 import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.BUNDLE_KEY_ACCOUNT;
 
-public class AboutActivity extends AppCompatActivity {
+public class AboutActivity extends AbstractThemableActivity {
 
+    private ActivityAboutBinding binding;
     private final static int[] tabTitles = new int[]{
             R.string.about_credits_tab_title,
             R.string.about_contribution_tab_title,
@@ -34,7 +35,7 @@ public class AboutActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
 
-        ActivityAboutBinding binding = ActivityAboutBinding.inflate(getLayoutInflater());
+        binding = ActivityAboutBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         setSupportActionBar(binding.toolbar);
@@ -80,4 +81,13 @@ public class AboutActivity extends AppCompatActivity {
         finish(); // close this activity as oppose to navigating up
         return true;
     }
+
+    @Override
+    public void applyNextcloudTheme(int mainColor, int textColor) {
+        super.applyNextcloudTheme(mainColor, textColor);
+        binding.toolbar.setBackgroundColor(mainColor);
+        binding.toolbar.setTitleTextColor(textColor);
+        binding.tabLayout.setBackgroundColor(mainColor);
+        binding.tabLayout.setTabTextColors(textColor, textColor);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
index d7aab83d5..9ead2c02e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
@@ -43,16 +43,18 @@ public class AboutFragmentCreditsTab extends Fragment {
         binding.aboutVersion.setText(getString(R.string.about_version, strong(BuildConfig.VERSION_NAME)));
         SyncManager syncManager = new SyncManager(requireActivity());
         if (getArguments() != null && getArguments().containsKey(BUNDLE_KEY_ACCOUNT)) {
-            try {
-                syncManager.getServerVersion(new IResponseCallback<Capabilities>((Account) getArguments().getSerializable(BUNDLE_KEY_ACCOUNT)) {
-                    @Override
-                    public void onResponse(Capabilities response) {
-                        requireActivity().runOnUiThread(() -> binding.aboutServerAppVersion.setText(strong(response.getDeckVersion().getOriginalVersion())));
-                    }
-                });
-            } catch (OfflineException e) {
-                binding.aboutServerAppVersion.setText(disabled(getString(R.string.you_are_currently_offline), requireContext()));
-            }
+            new Thread(() -> {
+                try {
+                    syncManager.getServerVersion(new IResponseCallback<Capabilities>((Account) getArguments().getSerializable(BUNDLE_KEY_ACCOUNT)) {
+                        @Override
+                        public void onResponse(Capabilities response) {
+                            requireActivity().runOnUiThread(() -> binding.aboutServerAppVersion.setText(strong(response.getDeckVersion().getOriginalVersion())));
+                        }
+                    });
+                } catch (OfflineException e) {
+                    requireActivity().runOnUiThread(() -> binding.aboutServerAppVersion.setText(disabled(getString(R.string.you_are_currently_offline), requireContext())));
+                }
+            }).start();
         } else {
             binding.aboutServerAppVersionContainer.setVisibility(View.GONE);
         }