From 402b6a23a780feb020033ca1b3e68e81d04b88de Mon Sep 17 00:00:00 2001
From: Winston Sung <winston21.sung@gmail.com>
Date: Fri, 14 Mar 2025 16:36:14 +0800
Subject: [PATCH] Add "selected" background color to in-app language picker

Bug: #105
Bug: #104
Change-Id: If76bbe58da42adae1cd1b6f302a9d9186153bf72
---
 .../java/app/opass/ccip/ui/LanguagePreferenceFragment.kt   | 4 ++++
 app/src/main/res/layout/item_option_language.xml           | 7 ++++---
 app/src/main/res/values-night/colors.xml                   | 1 +
 app/src/main/res/values/colors.xml                         | 1 +
 4 files changed, 10 insertions(+), 3 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 454c8d7a..89ec87cb 100644
--- a/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt
+++ b/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
@@ -141,11 +142,14 @@ class LanguagePreferenceAdapter(
 
         if (!isSelected) {
             holder.selectedIcon.setImageDrawable(null)
+        } else {
+            holder.optionItem.setBackgroundResource(R.color.secondaryContainer)
         }
     }
 }
 
 class LanguagePreferenceViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    val optionItem: LinearLayout = view.findViewById(R.id.option_language_item)
     val localName: TextView = view.findViewById(R.id.option_local_name)
     val translatedName: TextView = view.findViewById(R.id.option_translated_name)
     val selectedIcon: ImageView = view.findViewById(R.id.icon_selected)
diff --git a/app/src/main/res/layout/item_option_language.xml b/app/src/main/res/layout/item_option_language.xml
index 527ca2ca..3786d128 100644
--- a/app/src/main/res/layout/item_option_language.xml
+++ b/app/src/main/res/layout/item_option_language.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/option_language_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
@@ -41,6 +43,5 @@
         android:layout_height="fill_parent"
         android:padding="5dp"
         android:src="@drawable/ic_baseline_done_24"
-        app:tint="@color/colorWhite"
-        tools:tint="@color/colorAccent"/>
+        app:tint="@color/textColorPrimary" />
 </LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 887b0852..b0413efe 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -11,4 +11,5 @@
     <color name="textColorPrimary">@android:color/white</color>
     <color name="textColorSecondary">@color/colorAccent</color>
     <color name="backgroundColorPrimary">@color/background_material_dark</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 ed94b526..b47daf68 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,4 +11,5 @@
     <color name="textColorPrimary">@android:color/black</color>
     <color name="textColorSecondary">@color/colorPrimary</color>
     <color name="backgroundColorPrimary">@color/background_material_light</color>
+    <color name="secondaryContainer">#E8DEF8</color>
 </resources>