From 12bc77e8dd370b5e639bbcade9b3f7d021dbd782 Mon Sep 17 00:00:00 2001
From: Winston Sung <winston21.sung@gmail.com>
Date: Sat, 15 Mar 2025 12:43:45 +0800
Subject: [PATCH] Fix various color, overflow and margin/padding issues

Bug: #106
Bug: #98
Bug: #99
Change-Id: I05c11c273bad401a891f10ddce6e71dffa4a7a41
---
 .../ccip/ui/LanguagePreferenceFragment.kt     |  9 ++++++++
 .../opass/ccip/ui/wifi/WiFiNetworkAdapter.kt  | 12 ++++++++++
 app/src/main/res/drawable/room_background.xml |  2 +-
 .../main/res/drawable/tag_round_corner.xml    |  2 +-
 .../res/layout/activity_session_detail.xml    |  1 +
 .../main/res/layout/fragment_schedule_tab.xml |  3 ++-
 .../main/res/layout/include_auth_header.xml   |  2 +-
 app/src/main/res/layout/item_event.xml        |  4 ++--
 .../main/res/layout/item_option_language.xml  | 10 ++++----
 app/src/main/res/layout/item_session.xml      |  3 ++-
 app/src/main/res/layout/item_wifi_network.xml |  9 ++++----
 app/src/main/res/values-night/colors.xml      |  4 +++-
 app/src/main/res/values/colors.xml            |  4 +++-
 app/src/main/res/values/styles.xml            | 23 +++++++++++++++++++
 14 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt b/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt
index 363c8d33..eae2d3fa 100644
--- a/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt
+++ b/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt
@@ -15,6 +15,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import app.opass.ccip.R
+import app.opass.ccip.extension.updateMargin
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class LanguagePreferenceFragment : DialogFragment() {
@@ -140,6 +141,14 @@ class LanguagePreferenceAdapter(
         holder.localName.text = item.localName
         holder.translatedName.text = item.translatedName
 
+        if (position == 0) {
+            holder.optionItem.updateMargin(top = 36)
+        }
+
+        if (position == items.size - 1) {
+            holder.optionItem.updateMargin(bottom = 36)
+        }
+
         if (!isSelected) {
             holder.selectedIcon.setImageDrawable(null)
         } else {
diff --git a/app/src/main/java/app/opass/ccip/ui/wifi/WiFiNetworkAdapter.kt b/app/src/main/java/app/opass/ccip/ui/wifi/WiFiNetworkAdapter.kt
index 5e2bcf96..78d70f6c 100644
--- a/app/src/main/java/app/opass/ccip/ui/wifi/WiFiNetworkAdapter.kt
+++ b/app/src/main/java/app/opass/ccip/ui/wifi/WiFiNetworkAdapter.kt
@@ -3,10 +3,13 @@ package app.opass.ccip.ui.wifi
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.view.isGone
+import androidx.core.view.marginTop
 import androidx.recyclerview.widget.RecyclerView
 import app.opass.ccip.R
+import app.opass.ccip.extension.updateMargin
 import app.opass.ccip.model.WifiNetworkInfo
 
 class WifiNetworkAdapter(
@@ -38,10 +41,19 @@ class WifiNetworkAdapter(
 
         holder.password.text = item.password
         holder.password.isGone = false
+
+        if (position == 0) {
+            holder.networkItem.updateMargin(top = 36)
+        }
+
+        if (position == items.size - 1) {
+            holder.networkItem.updateMargin(bottom = 36)
+        }
     }
 }
 
 class WifiNetworkViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    val networkItem: LinearLayout = view.findViewById(R.id.network_item)
     val name: TextView = view.findViewById(R.id.network_name)
     val password: TextView = view.findViewById(R.id.network_password)
 }
diff --git a/app/src/main/res/drawable/room_background.xml b/app/src/main/res/drawable/room_background.xml
index 4d5fc763..dec420cd 100644
--- a/app/src/main/res/drawable/room_background.xml
+++ b/app/src/main/res/drawable/room_background.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/colorPrimary" />
+            <solid android:color="@color/backgroundColorAccent" />
         </shape>
     </item>
 </selector>
diff --git a/app/src/main/res/drawable/tag_round_corner.xml b/app/src/main/res/drawable/tag_round_corner.xml
index 3e9347be..93d839df 100644
--- a/app/src/main/res/drawable/tag_round_corner.xml
+++ b/app/src/main/res/drawable/tag_round_corner.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="?attr/colorAccent" />
+    <solid android:color="@color/colorAccentDark" />
 
     <corners android:radius="16dp" />
 </shape>
diff --git a/app/src/main/res/layout/activity_session_detail.xml b/app/src/main/res/layout/activity_session_detail.xml
index d9120038..d71648b2 100644
--- a/app/src/main/res/layout/activity_session_detail.xml
+++ b/app/src/main/res/layout/activity_session_detail.xml
@@ -65,6 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
         android:src="@drawable/ic_star_border_white_48dp"
+        app:backgroundTint="@color/colorPrimary"
         app:layout_anchor="@id/app_bar"
         app:layout_anchorGravity="bottom|end" />
 
diff --git a/app/src/main/res/layout/fragment_schedule_tab.xml b/app/src/main/res/layout/fragment_schedule_tab.xml
index ceae0ad2..e6bf68d7 100644
--- a/app/src/main/res/layout/fragment_schedule_tab.xml
+++ b/app/src/main/res/layout/fragment_schedule_tab.xml
@@ -26,7 +26,8 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:contentDescription="@string/filter"
-        android:tint="?attr/colorOnSecondary"
+        app:backgroundTint="@color/colorPrimary"
+        android:tint="?attr/colorOnPrimary"
         android:visibility="invisible"
         app:srcCompat="@drawable/ic_baseline_filter_list_24" />
 
diff --git a/app/src/main/res/layout/include_auth_header.xml b/app/src/main/res/layout/include_auth_header.xml
index ebe30399..71956a61 100644
--- a/app/src/main/res/layout/include_auth_header.xml
+++ b/app/src/main/res/layout/include_auth_header.xml
@@ -18,7 +18,7 @@
 
     <Button
         android:id="@+id/not_this_event"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+        style="@style/TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/item_event.xml b/app/src/main/res/layout/item_event.xml
index f8fcc037..630040ef 100644
--- a/app/src/main/res/layout/item_event.xml
+++ b/app/src/main/res/layout/item_event.xml
@@ -23,7 +23,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="150dp"
-                android:background="?attr/colorSecondary">
+                android:background="@color/backgroundColorAccent">
 
                 <ImageView
                     android:id="@+id/event_logo"
@@ -31,7 +31,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:padding="10dp"
-                    card_view:srcCompat="?attr/colorSecondary" />
+                    card_view:srcCompat="@color/backgroundColorAccent" />
             </RelativeLayout>
 
             <TextView
diff --git a/app/src/main/res/layout/item_option_language.xml b/app/src/main/res/layout/item_option_language.xml
index 3786d128..a8e00b3b 100644
--- a/app/src/main/res/layout/item_option_language.xml
+++ b/app/src/main/res/layout/item_option_language.xml
@@ -9,17 +9,15 @@
     android:background="?attr/selectableItemBackground"
     android:focusable="true"
     android:orientation="horizontal"
-    android:paddingStart="32dp"
-    android:paddingTop="16dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="16dp">
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp">
 
     <LinearLayout
         android:layout_weight="1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
-        android:focusable="true"
         android:orientation="vertical">
         <TextView
             android:id="@+id/option_local_name"
diff --git a/app/src/main/res/layout/item_session.xml b/app/src/main/res/layout/item_session.xml
index 093f5135..9d70e2b6 100644
--- a/app/src/main/res/layout/item_session.xml
+++ b/app/src/main/res/layout/item_session.xml
@@ -29,9 +29,10 @@
                 android:layout_marginStart="12dp"
                 android:layout_marginTop="8dp"
                 android:autoSizeTextType="uniform"
+                android:autoSizeMinTextSize="8dp"
                 android:maxLines="1"
                 android:padding="2dp"
-                android:text="New Text"
+                android:text="TR412-1"
                 app:layout_constraintBottom_toTopOf="@id/tagsBarrier"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/item_wifi_network.xml b/app/src/main/res/layout/item_wifi_network.xml
index ee27bed5..a6f0a1f3 100644
--- a/app/src/main/res/layout/item_wifi_network.xml
+++ b/app/src/main/res/layout/item_wifi_network.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/network_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
     android:focusable="true"
     android:orientation="vertical"
-    android:paddingStart="32dp"
-    android:paddingTop="16dp"
-    android:paddingEnd="8dp"
-    android:paddingBottom="16dp">
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp">
 
     <TextView
         android:id="@+id/network_name"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index b0413efe..1779aacf 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,7 +2,8 @@
 <resources>
     <color name="colorPrimary">#3C2354</color>
     <color name="colorPrimaryDark">#1D162B</color>
-    <color name="colorAccent">#765987</color>
+    <color name="colorAccent">#b4a0c0</color>
+    <color name="colorAccentDark">#694f78</color>
     <color name="colorDietMeat">#FFA000</color>
     <color name="colorDietVegetarian">#298A08</color>
     <color name="colorWhite">#FFFFFF</color>
@@ -11,5 +12,6 @@
     <color name="textColorPrimary">@android:color/white</color>
     <color name="textColorSecondary">@color/colorAccent</color>
     <color name="backgroundColorPrimary">@color/background_material_dark</color>
+    <color name="backgroundColorAccent">@color/colorAccentDark</color>
     <color name="secondaryContainer">#4A4458</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b47daf68..d80bcac0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,7 +2,8 @@
 <resources>
     <color name="colorPrimary">#3C2354</color>
     <color name="colorPrimaryDark">#1D162B</color>
-    <color name="colorAccent">#765987</color>
+    <color name="colorAccent">#b4a0c0</color>
+    <color name="colorAccentDark">#694f78</color>
     <color name="colorDietMeat">#FFA000</color>
     <color name="colorDietVegetarian">#298A08</color>
     <color name="colorWhite">#FFFFFF</color>
@@ -11,5 +12,6 @@
     <color name="textColorPrimary">@android:color/black</color>
     <color name="textColorSecondary">@color/colorPrimary</color>
     <color name="backgroundColorPrimary">@color/background_material_light</color>
+    <color name="backgroundColorAccent">@color/colorPrimary</color>
     <color name="secondaryContainer">#E8DEF8</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 98887fb7..69e839b6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,6 +15,7 @@
         <item name="android:textColorSecondary">@color/textColorSecondary</item>
         <item name="android:colorBackground">@color/backgroundColorPrimary</item>
         <item name="android:navigationBarColor">@color/navigationBarColor</item>
+        <item name="materialAlertDialogTheme">@style/AlertDialogTheme</item>
         <item name="textAppearanceButton">@style/ButtonTextAppearance</item>
     </style>
 
@@ -22,6 +23,24 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
 
+    <style name="AlertDialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+    </style>
+
+    <style name="NeutralButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/textColorSecondary</item>
+    </style>
+
+    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/textColorSecondary</item>
+    </style>
+
+    <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/textColorSecondary</item>
+    </style>
+
     <style name="Widget.CardContent" parent="android:Widget">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
@@ -55,4 +74,8 @@
     <style name="ButtonTextAppearance" parent="TextAppearance.MaterialComponents.Button">
         <item name="android:letterSpacing">0</item>
     </style>
+
+    <style name="TextButton" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/textColorSecondary</item>
+    </style>
 </resources>