From faa417d8cd36488bd5bf7235b702c83e6704f5a5 Mon Sep 17 00:00:00 2001
From: Rahul Patel <whyorean@gmail.com>
Date: Wed, 4 Dec 2024 19:32:19 +0530
Subject: [PATCH] AppDetails: Tweak tags UI

---
 .../view/ui/details/AppDetailsFragment.kt     |  6 +-
 .../res/layout/layout_details_description.xml | 89 +++++++------------
 app/src/main/res/layout/sheet_filter.xml      |  6 +-
 app/src/main/res/values-night/themes.xml      |  2 +-
 app/src/main/res/values/themes.xml            | 11 ++-
 5 files changed, 45 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
index 84c1bc998..1b259f7db 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
@@ -28,16 +28,12 @@ import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
 import android.view.View
-import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.RelativeLayout
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -123,7 +119,7 @@ class AppDetailsFragment : BaseFragment<FragmentDetailsBinding>() {
     private var isUpdatable: Boolean = false
     private var uninstallActionEnabled = false
 
-    private val tags = mutableListOf<String>()
+    private val tags = mutableSetOf<String>()
 
     private val isExtendedUpdateEnabled: Boolean
         get() = Preferences.getBoolean(requireContext(), PREFERENCE_UPDATES_EXTENDED)
diff --git a/app/src/main/res/layout/layout_details_description.xml b/app/src/main/res/layout/layout_details_description.xml
index 434963328..6b3b1f0d2 100644
--- a/app/src/main/res/layout/layout_details_description.xml
+++ b/app/src/main/res/layout/layout_details_description.xml
@@ -33,72 +33,45 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <HorizontalScrollView
+        <com.google.android.material.chip.ChipGroup
             android:id="@+id/layout_extras"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scrollbars="none">
+            android:paddingStart="@dimen/padding_medium"
+            android:paddingEnd="@dimen/padding_medium"
+            app:selectionRequired="false"
+            app:singleLine="true">
 
-            <LinearLayout
+            <com.google.android.material.chip.Chip
+                android:id="@+id/txt_rating"
+                style="@style/Chip.Tag"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:divider="@drawable/divider_line"
-                android:dividerPadding="@dimen/padding_xsmall"
-                android:orientation="horizontal"
-                android:padding="@dimen/padding_small"
-                android:showDividers="middle">
+                app:chipIcon="@drawable/ic_star"
+                tools:text="3.5" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/txt_rating"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_small"
-                    android:layout_marginEnd="@dimen/margin_small"
-                    android:drawablePadding="@dimen/padding_small"
-                    android:gravity="center_vertical"
-                    android:textAppearance="@style/TextAppearance.Aurora.Line1"
-                    app:drawableStartCompat="@drawable/ic_star"
-                    app:drawableTint="?colorAccent"
-                    tools:text="3.5" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/txt_installs"
+                style="@style/Chip.Tag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:chipIcon="@drawable/ic_download_manager"
+                tools:text="2500" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/txt_installs"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_small"
-                    android:layout_marginEnd="@dimen/margin_small"
-                    android:drawablePadding="@dimen/padding_small"
-                    android:gravity="center_vertical"
-                    android:textAppearance="@style/TextAppearance.Aurora.Line1"
-                    app:drawableStartCompat="@drawable/ic_download_manager"
-                    app:drawableTint="?colorAccent"
-                    tools:text="2500" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/txt_size"
+                style="@style/Chip.Tag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="25 MB" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/txt_size"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_small"
-                    android:layout_marginEnd="@dimen/margin_small"
-                    android:drawablePadding="@dimen/padding_small"
-                    android:gravity="center_vertical"
-                    android:textAppearance="@style/TextAppearance.Aurora.Line1"
-                    app:drawableTint="?colorAccent"
-                    tools:text="25 MB" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/txt_updated"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_small"
-                    android:layout_marginEnd="@dimen/margin_small"
-                    android:drawablePadding="@dimen/padding_small"
-                    android:gravity="center_vertical"
-                    android:textAppearance="@style/TextAppearance.Aurora.Line1"
-                    app:drawableTint="?colorAccent"
-                    tools:text="Jan 21 2020" />
-            </LinearLayout>
-        </HorizontalScrollView>
+            <com.google.android.material.chip.Chip
+                android:id="@+id/txt_updated"
+                style="@style/Chip.Tag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Jan 21 2020" />
+        </com.google.android.material.chip.ChipGroup>
 
         <LinearLayout
             android:id="@+id/layout_description"
diff --git a/app/src/main/res/layout/sheet_filter.xml b/app/src/main/res/layout/sheet_filter.xml
index da4eee12d..c4f5246e1 100644
--- a/app/src/main/res/layout/sheet_filter.xml
+++ b/app/src/main/res/layout/sheet_filter.xml
@@ -87,21 +87,21 @@
 
                     <com.google.android.material.chip.Chip
                         android:id="@+id/filter_gfs"
-                        style="@style/AppTheme.FilterChip"
+                        style="@style/Chip.Filter"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/action_filter_gsf_dependent_apps" />
 
                     <com.google.android.material.chip.Chip
                         android:id="@+id/filter_paid"
-                        style="@style/AppTheme.FilterChip"
+                        style="@style/Chip.Filter"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/action_filter_paid_apps" />
 
                     <com.google.android.material.chip.Chip
                         android:id="@+id/filter_ads"
-                        style="@style/AppTheme.FilterChip"
+                        style="@style/Chip.Filter"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/action_filter_apps_with_ads" />
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b12707032..c70d8103a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <style name="AppTheme" parent="Theme.Material3.DynamicColors.Dark.NoActionBar">
-        <item name="chipStyle">@style/AppTheme.FilterChip</item>
+        <item name="chipStyle">@style/Chip.Filter</item>
         <item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item>
         <item name="android:statusBarColor">@color/colorTransparent</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 01191ab05..fcebd0b0f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -20,7 +20,7 @@
 <resources>
 
     <style name="AppTheme" parent="Theme.Material3.DynamicColors.Light.NoActionBar">
-        <item name="chipStyle">@style/AppTheme.FilterChip</item>
+        <item name="chipStyle">@style/Chip.Filter</item>
         <item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item>
         <item name="bottomSheetStyle">@style/AppTheme.BottomSheetStyle</item>
         <item name="android:statusBarColor">@color/colorTransparent</item>
@@ -47,5 +47,12 @@
         <item name="widgetLayout">@layout/preference_material_switch</item>
     </style>
 
-    <style name="AppTheme.FilterChip" parent="@style/Widget.Material3.Chip.Filter" />
+    <style name="Chip.Filter" parent="@style/Widget.Material3.Chip.Filter" />
+
+    <style name="Chip.Tag" parent="@style/Widget.Material3.Chip.Assist.Elevated">
+        <item name="chipBackgroundColor">?colorControlHighlight</item>
+        <item name="android:textAppearance">@style/TextAppearance.Aurora.Line2</item>
+        <item name="chipStrokeWidth">0dp</item>
+        <item name="android:clickable">false</item>
+    </style>
 </resources>