feat(theming): Get rid of textColor property

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

Author: stefan-niedermann

app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java

@@ -223,8 +223,8 @@ private String buildFormattingHelp() {
     }
 
     @Override
-    public void applyBrand(int mainColor, int textColor) {
-        final var util = BrandingUtil.of(mainColor, this);
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, this);
         util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java

@@ -50,8 +50,8 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public void applyBrand(int mainColor, int textColor) {
-        final var util = BrandingUtil.of(mainColor, this);
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, this);
         util.material.themeTabLayout(binding.tabs);
         util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
     }

app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentLicenseTab.java

@@ -34,8 +34,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     }
 
     @Override
-    public void applyBrand(int mainColor, int textColor) {
-        final var util = BrandingUtil.of(mainColor, requireContext());
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, requireContext());
         util.material.colorMaterialButtonPrimaryFilled(binding.aboutAppLicenseButton);
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/accountpicker/AccountPickerDialogFragment.java

@@ -109,7 +109,7 @@ public static DialogFragment newInstance(@NonNull ArrayList<Account> targetAccou
     }
 
     @Override
-    public void applyBrand(int mainColor, int textColor) {
+    public void applyBrand(int color) {
         // Nothing to do...
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java

@@ -116,8 +116,8 @@ public static DialogFragment newInstance(long currentAccountId) {
     }
 
     @Override
-    public void applyBrand(int mainColor, int textColor) {
-        final var util = BrandingUtil.of(mainColor, requireContext());
-        util.notes.colorLayerDrawable((LayerDrawable) binding.check.getDrawable(), R.id.area, mainColor);
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, requireContext());
+        util.notes.colorLayerDrawable((LayerDrawable) binding.check.getDrawable(), R.id.area, color);
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/branding/Branded.java

@@ -5,5 +5,5 @@
 
 public interface Branded {
     @UiThread
-    void applyBrand(@ColorInt int mainColor, @ColorInt int textColor);
+    void applyBrand(@ColorInt int color);
 }

app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java

@@ -1,6 +1,6 @@
 package it.niedermann.owncloud.notes.branding;
 
-import static it.niedermann.owncloud.notes.branding.BrandingUtil.readBrandColors;
+import static it.niedermann.owncloud.notes.branding.BrandingUtil.readBrandMainColorLiveData;
 
 import android.util.TypedValue;
 import android.view.Menu;
@@ -23,7 +23,7 @@ protected void onStart() {
         getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true);
         colorAccent = typedValue.data;
 
-        readBrandColors(this).observe(this, (pair) -> applyBrand(pair.first, pair.second));
+        readBrandMainColorLiveData(this).observe(this, this::applyBrand);
     }
 
     @Override

app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedDialogFragment.java

@@ -13,8 +13,7 @@ public void onStart() {
         super.onStart();
 
         @Nullable final var context = requireContext();
-        @ColorInt final int mainColor = BrandingUtil.readBrandMainColor(context);
-        @ColorInt final int textColor = BrandingUtil.readBrandTextColor(context);
-        applyBrand(mainColor, textColor);
+        @ColorInt final int color = BrandingUtil.readBrandMainColor(context);
+        applyBrand(color);
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.java

@@ -28,9 +28,8 @@ public void onStart() {
         context.getTheme().resolveAttribute(R.attr.colorPrimary, typedValue, true);
         colorPrimary = typedValue.data;
 
-        @ColorInt final int mainColor = BrandingUtil.readBrandMainColor(context);
-        @ColorInt final int textColor = BrandingUtil.readBrandTextColor(context);
-        applyBrand(mainColor, textColor);
+        @ColorInt final int color = BrandingUtil.readBrandMainColor(context);
+        applyBrand(color);
     }
 
     @Override

app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSwitchPreference.java

@@ -17,9 +17,6 @@ public class BrandedSwitchPreference extends SwitchPreference implements Branded
     @ColorInt
     private Integer mainColor = null;
 
-    @ColorInt
-    private Integer textColor = null;
-
     @SuppressLint("UseSwitchCompatOrMaterialCode")
     @Nullable
     private Switch switchView;
@@ -46,16 +43,15 @@ public void onBindViewHolder(PreferenceViewHolder holder) {
 
         if (holder.itemView instanceof ViewGroup) {
             switchView = findSwitchWidget(holder.itemView);
-            if (mainColor != null && textColor != null) {
+            if (mainColor != null) {
                 applyBrand();
             }
         }
     }
 
     @Override
-    public void applyBrand(@ColorInt int mainColor, @ColorInt int textColor) {
-        this.mainColor = mainColor;
-        this.textColor = textColor;
+    public void applyBrand(@ColorInt int color) {
+        this.mainColor = color;
         // onBindViewHolder is called after applyBrand, therefore we have to store the given values and apply them later.
         applyBrand();
     }