Fix #577 Apply board branding to active filter indicator

2 files changed, 30 insertions, 16 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 81e2afa71..b5713909b 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
@@ -110,6 +110,7 @@ import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.Liv
 import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToFAB;
 import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToPrimaryTabLayout;
 import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.clearBrandColors;
+import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
 import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.saveBrandColors;
 import static it.niedermann.nextcloud.deck.util.ColorUtil.contrastRatioIsSufficient;
 import static it.niedermann.nextcloud.deck.util.ColorUtil.contrastRatioIsSufficientBigAreas;
@@ -372,11 +373,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
                 }
             });
             filterViewModel.getFilterInformation().observe(this, (info) ->
-                    binding.filter.setImageDrawable(getResources().getDrawable(
-                            filterViewModel.getFilterInformation().getValue() == null
-                                    ? R.drawable.ic_filter_list_white_24dp
-                                    : R.drawable.ic_filter_list_active_white_24dp)
-                    ));
+                    binding.filterIndicator.setVisibility(filterViewModel.getFilterInformation().getValue() == null ? View.GONE : View.VISIBLE));
 
             binding.filter.setOnClickListener((v) -> FilterDialogFragment.newInstance().show(getSupportFragmentManager(), EditStackDialogFragment.class.getCanonicalName()));
             binding.archivedCards.setOnClickListener((v) -> startActivity(ArchivedCardsActvitiy.createIntent(this, mainViewModel.getCurrentAccount(), mainViewModel.getCurrentBoardLocalId(), mainViewModel.currentBoardHasEditPermission())));
@@ -430,6 +427,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
         @ColorInt final int headerTextColor = contrastRatioIsSufficientBigAreas(mainColor, Color.WHITE) ? Color.WHITE : Color.BLACK;
         DrawableCompat.setTint(headerBinding.logo.getDrawable(), headerTextColor);
         headerBinding.appName.setTextColor(headerTextColor);
+        DrawableCompat.setTint(binding.filterIndicator.getDrawable(), getSecondaryForegroundColorDependingOnTheme(this, mainColor));
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5413b6219..a5c926a5e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -122,19 +122,35 @@
                     app:srcCompat="@drawable/ic_baseline_account_circle_24"
                     tools:targetApi="o" />
 
-                <ImageView
-                    android:id="@+id/filter"
+                <FrameLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical|end"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/simple_filter"
-                    android:padding="12dp"
-                    android:tint="?attr/colorAccent"
-                    android:tooltipText="@string/simple_filter"
-                    android:translationX="6dp"
-                    app:srcCompat="@drawable/ic_filter_list_white_24dp"
-                    tools:targetApi="o" />
+                    android:translationX="6dp">
+
+                    <ImageView
+                        android:id="@+id/filter"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:contentDescription="@string/simple_filter"
+                        android:padding="12dp"
+                        android:tint="?attr/colorAccent"
+                        android:tooltipText="@string/simple_filter"
+                        app:srcCompat="@drawable/ic_filter_list_white_24dp"
+                        tools:targetApi="o" />
+
+                    <ImageView
+                        android:id="@+id/filter_indicator"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom|end"
+                        android:layout_marginEnd="12dp"
+                        android:layout_marginBottom="12dp"
+                        android:contentDescription="@null"
+                        android:src="@drawable/circle_grey600_8dp"
+                        android:tint="@color/defaultBrand" />
+                </FrameLayout>
 
                 <ImageView
                     android:id="@+id/archivedCards"
@@ -201,9 +217,9 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
+        android:background="?attr/colorPrimary"
         android:fitsSystemWindows="false"
         android:theme="@style/NavigationView"
-        android:background="?attr/colorPrimary"
         app:headerLayout="@layout/nav_header_main" />
 
 </androidx.drawerlayout.widget.DrawerLayout>