From 73e517b9b82b7fdcd4c148f9a9356ba21ae786db Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Tue, 30 Aug 2022 20:27:18 -0400
Subject: [PATCH] Stat details: reorder stat filters + cleanup

Only show category filter if use has categories
Also add a style for the chips to reduce code
---
 .../stats/details/StatsDetailsController.kt   |   3 +-
 .../res/layout/stats_details_controller.xml   | 121 ++++++------------
 app/src/main/res/values/styles.xml            |  15 +++
 3 files changed, 53 insertions(+), 86 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsController.kt
index d10e7e224b..53771d55fe 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsController.kt
@@ -508,7 +508,8 @@ class StatsDetailsController :
             chipStatus.isVisible = presenter.selectedStat !in listOf(Stats.STATUS, Stats.READ_DURATION)
             chipLanguage.isVisible = presenter.selectedStat !in listOf(Stats.LANGUAGE, Stats.READ_DURATION) &&
                 (presenter.selectedStat == Stats.SOURCE || presenter.selectedSource.isEmpty())
-            chipCategory.isVisible = presenter.selectedStat !in listOf(Stats.CATEGORY, Stats.READ_DURATION)
+            chipCategory.isVisible = presenter.selectedStat !in listOf(Stats.CATEGORY, Stats.READ_DURATION) &&
+                presenter.categoriesStats.size > 1
             statSort.isVisible = presenter.selectedStat !in listOf(
                 Stats.SCORE, Stats.LENGTH, Stats.START_YEAR, Stats.READ_DURATION,
             )
diff --git a/app/src/main/res/layout/stats_details_controller.xml b/app/src/main/res/layout/stats_details_controller.xml
index 0ad53aba8d..31715a27da 100644
--- a/app/src/main/res/layout/stats_details_controller.xml
+++ b/app/src/main/res/layout/stats_details_controller.xml
@@ -74,101 +74,52 @@
 
                 <com.google.android.material.chip.Chip
                     android:id="@+id/chip_stat"
+                    style="@style/Widget.Tachiyomi.Chip.Stat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/series_type"
-                    android:textColor="?attr/colorOnBackground"
-                    app:checkedIconEnabled="false"
                     app:chipIcon="@drawable/ic_query_stats_24dp"
-                    app:chipIconEnabled="true"
-                    app:chipIconTint="?attr/colorOnBackground"
-                    app:chipStrokeColor="?attr/colorSecondary"
-                    app:chipStrokeWidth="1dp"
-                    app:closeIcon="@drawable/ic_arrow_drop_down_24dp"
-                    app:closeIconEnabled="true"
-                    app:closeIconTint="?attr/colorOnBackground" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_series_type"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/series_type"
-                    android:textColor="?attr/colorOnBackground"
-                    android:visibility="gone"
-                    app:checkedIconEnabled="false"
-                    app:chipIcon="@drawable/ic_style_24dp"
-                    app:chipIconEnabled="false"
-                    app:chipIconTint="?attr/colorOnBackground"
-                    app:chipStrokeColor="?attr/colorSecondary"
-                    app:chipStrokeWidth="1dp"
-                    app:closeIcon="@drawable/ic_arrow_drop_down_24dp"
-                    app:closeIconEnabled="true"
-                    app:closeIconTint="?attr/colorOnBackground"
-                    tools:visibility="visible" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_source"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/source"
-                    android:textColor="?attr/colorOnBackground"
-                    app:checkedIconEnabled="false"
-                    app:chipIcon="@drawable/ic_browse_24dp"
-                    app:chipIconEnabled="false"
-                    app:chipIconTint="?attr/colorOnBackground"
-                    app:chipStrokeColor="?attr/colorSecondary"
-                    app:chipStrokeWidth="1dp"
-                    app:closeIcon="@drawable/ic_arrow_drop_down_24dp"
-                    app:closeIconEnabled="true"
-                    app:closeIconTint="?attr/colorOnBackground" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/status"
-                    android:textColor="?attr/colorOnBackground"
-                    app:checkedIconEnabled="false"
-                    app:chipIcon="@drawable/ic_progress_clock_24dp"
-                    app:chipIconEnabled="false"
-                    app:chipIconTint="?attr/colorOnBackground"
-                    app:chipStrokeColor="?attr/colorSecondary"
-                    app:chipStrokeWidth="1dp"
-                    app:closeIcon="@drawable/ic_arrow_drop_down_24dp"
-                    app:closeIconEnabled="true"
-                    app:closeIconTint="?attr/colorOnBackground" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_language"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/language"
-                    android:textColor="?attr/colorOnBackground"
-                    app:checkedIconEnabled="false"
-                    app:chipIcon="@drawable/ic_translate_24dp"
-                    app:chipIconEnabled="false"
-                    app:chipIconTint="?attr/colorOnBackground"
-                    app:chipStrokeColor="?attr/colorSecondary"
-                    app:chipStrokeWidth="1dp"
-                    app:closeIcon="@drawable/ic_arrow_drop_down_24dp"
-                    app:closeIconEnabled="true"
-                    app:closeIconTint="?attr/colorOnBackground" />
+                    app:chipIconEnabled="true" />
 
                 <com.google.android.material.chip.Chip
                     android:id="@+id/chip_category"
+                    style="@style/Widget.Tachiyomi.Chip.Stat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/category"
-                    android:textColor="?attr/colorOnBackground"
-                    app:checkedIconEnabled="false"
-                    app:chipIcon="@drawable/ic_label_outline_24dp"
-                    app:chipIconEnabled="false"
-                    app:chipIconTint="?attr/colorOnBackground"
-                    app:chipStrokeColor="?attr/colorSecondary"
-                    app:chipStrokeWidth="1dp"
-                    app:closeIcon="@drawable/ic_arrow_drop_down_24dp"
-                    app:closeIconEnabled="true"
-                    app:closeIconTint="?attr/colorOnBackground" />
+                    app:chipIcon="@drawable/ic_label_outline_24dp" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_source"
+                    style="@style/Widget.Tachiyomi.Chip.Stat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/source"
+                    app:closeIcon="@drawable/ic_arrow_drop_down_24dp" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_status"
+                    style="@style/Widget.Tachiyomi.Chip.Stat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/status"
+                    app:chipIcon="@drawable/ic_progress_clock_24dp" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_series_type"
+                    style="@style/Widget.Tachiyomi.Chip.Stat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/series_type"
+                    app:chipIcon="@drawable/ic_style_24dp" />
+
+                 <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_language"
+                     style="@style/Widget.Tachiyomi.Chip.Stat"
+                     android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/language"
+                    app:chipIcon="@drawable/ic_translate_24dp" />
             </com.google.android.material.chip.ChipGroup>
         </LinearLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f243de61cc..5416d33980 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -354,6 +354,21 @@
         <item name="android:checkable">false</item>
     </style>
 
+    <style name="Widget.Tachiyomi.Chip.Stat" parent="Widget.Material3.Chip.Assist">
+        <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:checkable">false</item>
+        <item name="checkedIconEnabled">false</item>
+        <item name="chipIconVisible">false</item>
+        <item name="chipIconEnabled">false</item>
+        <item name="chipIconTint">?attr/colorOnBackground</item>
+        <item name="chipStrokeColor">?attr/colorSecondary</item>
+        <item name="chipStrokeWidth">1dp</item>
+        <item name="closeIconEnabled">true</item>
+        <item name="closeIconVisible">true</item>
+        <item name="closeIcon">@drawable/ic_arrow_drop_down_24dp</item>
+        <item name="closeIconTint">?attr/colorOnBackground</item>
+    </style>
+
     <style name="Widget.Tachiyomi.Chip.AddTag" parent="Widget.Material3.Chip.Suggestion">
         <item name="chipBackgroundColor">@android:color/transparent</item>
         <item name="chipMinHeight">28dp</item>