From 655ec322e4b555a23791bbf885eb8df4bde9f828 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 22:48:02 +0000
Subject: [PATCH 01/19] Initial plan


From 97bf80c9aec0fde5eafd620b2d8fae335c7c8d8c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 22:50:49 +0000
Subject: [PATCH 02/19] Initial plan for Material 3 migration

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 gradlew | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From 1fef187aaf337b2ce211d2ce2e98d6e8d57248e4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 22:53:18 +0000
Subject: [PATCH 03/19] Add Material 3 themes and extract hardcoded colors

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 .../ui/adapter/ExpandableStatsAdapter.kt      |   8 +-
 .../ui/viewcaptain/tabs/CaptainFragment.kt    |  40 ++--
 wows/src/main/res/drawable/background.xml     |   2 +-
 wows/src/main/res/values/colors.xml           | 125 ++++++++++++
 wows/src/main/res/values/themes_material3.xml | 190 ++++++++++++++++++
 5 files changed, 340 insertions(+), 25 deletions(-)
 create mode 100644 wows/src/main/res/values/themes_material3.xml

diff --git a/wows/src/main/java/com/half/wowsca/ui/adapter/ExpandableStatsAdapter.kt b/wows/src/main/java/com/half/wowsca/ui/adapter/ExpandableStatsAdapter.kt
index 3ba965d..eac5862 100644
--- a/wows/src/main/java/com/half/wowsca/ui/adapter/ExpandableStatsAdapter.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/adapter/ExpandableStatsAdapter.kt
@@ -145,13 +145,13 @@ class ExpandableStatsAdapter(
             xVals.add(child.titles[i])
             val key = child.types[i]
             if (key.equals("cruiser", ignoreCase = true)) {
-                colorList.add(Color.parseColor("#4CAF50"))
+                colorList.add(ContextCompat.getColor(ctx, R.color.chart_green))
             } else if (key.equals("battleship", ignoreCase = true)) {
-                colorList.add(Color.parseColor("#F44336"))
+                colorList.add(ContextCompat.getColor(ctx, R.color.chart_red))
             } else if (key.equals("aircarrier", ignoreCase = true)) {
-                colorList.add(Color.parseColor("#673AB7"))
+                colorList.add(ContextCompat.getColor(ctx, R.color.chart_purple))
             } else if (key.equals("destroyer", ignoreCase = true)) {
-                colorList.add(Color.parseColor("#FDD835"))
+                colorList.add(ContextCompat.getColor(ctx, R.color.chart_yellow))
             }
         }
 
diff --git a/wows/src/main/java/com/half/wowsca/ui/viewcaptain/tabs/CaptainFragment.kt b/wows/src/main/java/com/half/wowsca/ui/viewcaptain/tabs/CaptainFragment.kt
index ca928a5..4730d2c 100644
--- a/wows/src/main/java/com/half/wowsca/ui/viewcaptain/tabs/CaptainFragment.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/viewcaptain/tabs/CaptainFragment.kt
@@ -1351,23 +1351,23 @@ class CaptainFragment : CAFragment() {
                                 val key = itea.next()
                                 xVals.add(key)
                                 if (key == "ussr") {
-                                    colorList.add(Color.parseColor("#F44336")) // RED
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_red)) // RED
                                 } else if (key == "germany") {
-                                    colorList.add(Color.parseColor("#9E9E9E")) // blackish
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_grey)) // blackish
                                 } else if (key == "usa") {
-                                    colorList.add(Color.parseColor("#2196F3")) // Blue
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_blue)) // Blue
                                 } else if (key == "poland") {
-                                    colorList.add(Color.parseColor("#FAFA00")) // yellow
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_bright_yellow)) // yellow
                                 } else if (key == "japan") {
-                                    colorList.add(Color.parseColor("#4CAF50")) // Green
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_green)) // Green
                                 } else if (key == "uk") {
-                                    colorList.add(Color.parseColor("#E1F5FE")) // whiteish blue
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_light_blue)) // whiteish blue
                                 }
                             }
-                            colorList.add(Color.parseColor("#AAE157"))
-                            colorList.add(Color.parseColor("#FF9800"))
-                            colorList.add(Color.parseColor("#22FFCB"))
-                            colorList.add(Color.parseColor("#795548"))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_lime))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_orange))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_cyan))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_brown))
 
                             val yVals1 = ArrayList<Entry>()
                             for (i in xVals.indices) {
@@ -1450,19 +1450,19 @@ class CaptainFragment : CAFragment() {
                             while (itea.hasNext()) {
                                 val key = itea.next()
                                 if (key.equals("cruiser", ignoreCase = true)) {
-                                    colorList.add(Color.parseColor("#4CAF50"))
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_green))
                                 } else if (key.equals("battleship", ignoreCase = true)) {
-                                    colorList.add(Color.parseColor("#F44336"))
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_red))
                                 } else if (key.equals("aircarrier", ignoreCase = true)) {
-                                    colorList.add(Color.parseColor("#673AB7"))
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_purple))
                                 } else if (key.equals("destroyer", ignoreCase = true)) {
-                                    colorList.add(Color.parseColor("#FDD835"))
+                                    colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_yellow))
                                 }
 
                                 xVals.add(key)
                             }
-                            colorList.add(Color.parseColor("#009688"))
-                            colorList.add(Color.parseColor("#795548"))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_teal))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_brown))
 
                             val yVals1 = ArrayList<BarEntry>()
                             for (i in xVals.indices) {
@@ -1774,16 +1774,16 @@ class CaptainFragment : CAFragment() {
                             yAxis2.textColor = textColor
 
                             val colorList: MutableList<Int> = ArrayList()
-                            colorList.add(Color.parseColor("#F44336"))
-                            colorList.add(Color.parseColor("#FF9800"))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_red))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_orange))
                             colorList.add(
                                 ContextCompat.getColor(
                                     chartSurvivalRate!!.context,
                                     R.color.average_up
                                 )
                             )
-                            colorList.add(Color.parseColor("#2196F3"))
-                            colorList.add(Color.parseColor("#FAFA00"))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_blue))
+                            colorList.add(ContextCompat.getColor(requireContext(), R.color.chart_bright_yellow))
 
                             val l = chartSurvivalRate!!.legend
                             l.isEnabled = false
diff --git a/wows/src/main/res/drawable/background.xml b/wows/src/main/res/drawable/background.xml
index 9c5016a..8ddad7c 100644
--- a/wows/src/main/res/drawable/background.xml
+++ b/wows/src/main/res/drawable/background.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <gradient android:angle="90" android:endColor="#FF3E95DC" android:startColor="#FF163F6E" android:type="linear" />
+            <gradient android:angle="90" android:endColor="@color/top_background" android:startColor="@color/bottom_background" android:type="linear" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/wows/src/main/res/values/colors.xml b/wows/src/main/res/values/colors.xml
index df1d022..ad37b92 100644
--- a/wows/src/main/res/values/colors.xml
+++ b/wows/src/main/res/values/colors.xml
@@ -65,5 +65,130 @@
     <color name="div_pvp_2">#FAFA00</color>
     <color name="ranked_color">#CCCCCC</color>
 
+    <!-- MaterialDrawer colors for Ocean theme -->
+    <color name="material_drawer_background">#FFFFFF</color>
+    <color name="material_drawer_selected">#E8F5E9</color>
+    <color name="material_drawer_header_selection_text">#FFFFFF</color>
+
+    <!-- MaterialDrawer colors for Dark theme -->
+    <color name="material_drawer_dark_background">#424242</color>
+    <color name="material_drawer_dark_primary_text">#FFFFFF</color>
+    <color name="material_drawer_dark_primary_icon">#FFFFFF</color>
+    <color name="material_drawer_dark_secondary_text">#B3FFFFFF</color>
+    <color name="material_drawer_dark_hint_text">#80FFFFFF</color>
+    <color name="material_drawer_dark_divider">#1FFFFFFF</color>
+    <color name="material_drawer_dark_selected">#E8F5E9</color>
+    <color name="material_drawer_dark_header_selection_text">#FFFFFF</color>
+
+    <!-- Material 3 - Navy Theme (Ocean) Colors -->
+    <color name="md_theme_navy_primary">#3E95DC</color>
+    <color name="md_theme_navy_onPrimary">#FFFFFF</color>
+    <color name="md_theme_navy_primaryContainer">#D1E4FF</color>
+    <color name="md_theme_navy_onPrimaryContainer">#001D36</color>
+    <color name="md_theme_navy_secondary">#163F6E</color>
+    <color name="md_theme_navy_onSecondary">#FFFFFF</color>
+    <color name="md_theme_navy_secondaryContainer">#C8E6FF</color>
+    <color name="md_theme_navy_onSecondaryContainer">#001E30</color>
+    <color name="md_theme_navy_tertiary">#448AFF</color>
+    <color name="md_theme_navy_onTertiary">#FFFFFF</color>
+    <color name="md_theme_navy_tertiaryContainer">#D6E3FF</color>
+    <color name="md_theme_navy_onTertiaryContainer">#001849</color>
+    <color name="md_theme_navy_error">#BA1A1A</color>
+    <color name="md_theme_navy_errorContainer">#FFDAD6</color>
+    <color name="md_theme_navy_onError">#FFFFFF</color>
+    <color name="md_theme_navy_onErrorContainer">#410002</color>
+    <color name="md_theme_navy_background">#1A1C1E</color>
+    <color name="md_theme_navy_onBackground">#E2E2E6</color>
+    <color name="md_theme_navy_surface">#1A1C1E</color>
+    <color name="md_theme_navy_onSurface">#E2E2E6</color>
+    <color name="md_theme_navy_surfaceVariant">#42474E</color>
+    <color name="md_theme_navy_onSurfaceVariant">#C2C7CF</color>
+    <color name="md_theme_navy_outline">#8C9199</color>
+    <color name="md_theme_navy_inverseOnSurface">#1A1C1E</color>
+    <color name="md_theme_navy_inverseSurface">#E2E2E6</color>
+    <color name="md_theme_navy_inversePrimary">#3E95DC</color>
+    <color name="md_theme_navy_shadow">#000000</color>
+    <color name="md_theme_navy_surfaceTint">#3E95DC</color>
+    <color name="md_theme_navy_outlineVariant">#42474E</color>
+    <color name="md_theme_navy_scrim">#000000</color>
+
+    <!-- Material 3 - Black Theme (Pure Dark) Colors -->
+    <color name="md_theme_black_primary">#448AFF</color>
+    <color name="md_theme_black_onPrimary">#FFFFFF</color>
+    <color name="md_theme_black_primaryContainer">#1565C0</color>
+    <color name="md_theme_black_onPrimaryContainer">#BBDEFB</color>
+    <color name="md_theme_black_secondary">#4CAF50</color>
+    <color name="md_theme_black_onSecondary">#FFFFFF</color>
+    <color name="md_theme_black_secondaryContainer">#1B5E20</color>
+    <color name="md_theme_black_onSecondaryContainer">#C8E6C9</color>
+    <color name="md_theme_black_tertiary">#FF9800</color>
+    <color name="md_theme_black_onTertiary">#000000</color>
+    <color name="md_theme_black_tertiaryContainer">#E65100</color>
+    <color name="md_theme_black_onTertiaryContainer">#FFE0B2</color>
+    <color name="md_theme_black_error">#F44336</color>
+    <color name="md_theme_black_errorContainer">#B71C1C</color>
+    <color name="md_theme_black_onError">#FFFFFF</color>
+    <color name="md_theme_black_onErrorContainer">#FFCDD2</color>
+    <color name="md_theme_black_background">#000000</color>
+    <color name="md_theme_black_onBackground">#E0E0E0</color>
+    <color name="md_theme_black_surface">#121212</color>
+    <color name="md_theme_black_onSurface">#E0E0E0</color>
+    <color name="md_theme_black_surfaceVariant">#1E1E1E</color>
+    <color name="md_theme_black_onSurfaceVariant">#BDBDBD</color>
+    <color name="md_theme_black_outline">#757575</color>
+    <color name="md_theme_black_inverseOnSurface">#000000</color>
+    <color name="md_theme_black_inverseSurface">#E0E0E0</color>
+    <color name="md_theme_black_inversePrimary">#448AFF</color>
+    <color name="md_theme_black_shadow">#000000</color>
+    <color name="md_theme_black_surfaceTint">#448AFF</color>
+    <color name="md_theme_black_outlineVariant">#424242</color>
+    <color name="md_theme_black_scrim">#000000</color>
+
+    <!-- Material 3 - White Theme (Light) Colors -->
+    <color name="md_theme_white_primary">#1976D2</color>
+    <color name="md_theme_white_onPrimary">#FFFFFF</color>
+    <color name="md_theme_white_primaryContainer">#BBDEFB</color>
+    <color name="md_theme_white_onPrimaryContainer">#0D47A1</color>
+    <color name="md_theme_white_secondary">#388E3C</color>
+    <color name="md_theme_white_onSecondary">#FFFFFF</color>
+    <color name="md_theme_white_secondaryContainer">#C8E6C9</color>
+    <color name="md_theme_white_onSecondaryContainer">#1B5E20</color>
+    <color name="md_theme_white_tertiary">#F57C00</color>
+    <color name="md_theme_white_onTertiary">#FFFFFF</color>
+    <color name="md_theme_white_tertiaryContainer">#FFE0B2</color>
+    <color name="md_theme_white_onTertiaryContainer">#E65100</color>
+    <color name="md_theme_white_error">#B00020</color>
+    <color name="md_theme_white_errorContainer">#FDECEA</color>
+    <color name="md_theme_white_onError">#FFFFFF</color>
+    <color name="md_theme_white_onErrorContainer">#370B1E</color>
+    <color name="md_theme_white_background">#FAFAFA</color>
+    <color name="md_theme_white_onBackground">#1A1C1E</color>
+    <color name="md_theme_white_surface">#FFFFFF</color>
+    <color name="md_theme_white_onSurface">#1A1C1E</color>
+    <color name="md_theme_white_surfaceVariant">#E0E0E0</color>
+    <color name="md_theme_white_onSurfaceVariant">#424242</color>
+    <color name="md_theme_white_outline">#757575</color>
+    <color name="md_theme_white_inverseOnSurface">#F5F5F5</color>
+    <color name="md_theme_white_inverseSurface">#303030</color>
+    <color name="md_theme_white_inversePrimary">#82B1FF</color>
+    <color name="md_theme_white_shadow">#000000</color>
+    <color name="md_theme_white_surfaceTint">#1976D2</color>
+    <color name="md_theme_white_outlineVariant">#BDBDBD</color>
+    <color name="md_theme_white_scrim">#000000</color>
+
+    <!-- Hardcoded colors from Kotlin code - Chart colors -->
+    <color name="chart_green">#4CAF50</color>
+    <color name="chart_red">#F44336</color>
+    <color name="chart_purple">#673AB7</color>
+    <color name="chart_yellow">#FDD835</color>
+    <color name="chart_grey">#9E9E9E</color>
+    <color name="chart_blue">#2196F3</color>
+    <color name="chart_bright_yellow">#FAFA00</color>
+    <color name="chart_light_blue">#E1F5FE</color>
+    <color name="chart_lime">#AAE157</color>
+    <color name="chart_orange">#FF9800</color>
+    <color name="chart_cyan">#22FFCB</color>
+    <color name="chart_brown">#795548</color>
+    <color name="chart_teal">#009688</color>
 
 </resources>
\ No newline at end of file
diff --git a/wows/src/main/res/values/themes_material3.xml b/wows/src/main/res/values/themes_material3.xml
new file mode 100644
index 0000000..96f7d31
--- /dev/null
+++ b/wows/src/main/res/values/themes_material3.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Material 3 - Navy Theme (Ocean) -->
+    <style name="Theme.CA.Material3.Navy" parent="Theme.Material3.Dark">
+        <!-- Primary colors -->
+        <item name="colorPrimary">@color/md_theme_navy_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_navy_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_navy_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_navy_onPrimaryContainer</item>
+
+        <!-- Secondary colors -->
+        <item name="colorSecondary">@color/md_theme_navy_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_navy_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_navy_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_navy_onSecondaryContainer</item>
+
+        <!-- Tertiary colors -->
+        <item name="colorTertiary">@color/md_theme_navy_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_navy_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_navy_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_navy_onTertiaryContainer</item>
+
+        <!-- Error colors -->
+        <item name="colorError">@color/md_theme_navy_error</item>
+        <item name="colorErrorContainer">@color/md_theme_navy_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_navy_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_navy_onErrorContainer</item>
+
+        <!-- Background colors -->
+        <item name="android:colorBackground">@color/md_theme_navy_background</item>
+        <item name="colorOnBackground">@color/md_theme_navy_onBackground</item>
+
+        <!-- Surface colors -->
+        <item name="colorSurface">@color/md_theme_navy_surface</item>
+        <item name="colorOnSurface">@color/md_theme_navy_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_navy_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_navy_onSurfaceVariant</item>
+
+        <!-- Outline colors -->
+        <item name="colorOutline">@color/md_theme_navy_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_navy_outlineVariant</item>
+
+        <!-- Other colors -->
+        <item name="colorSurfaceInverse">@color/md_theme_navy_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_navy_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_navy_inversePrimary</item>
+
+        <!-- Additional attributes -->
+        <item name="android:windowBackground">@drawable/background</item>
+        <item name="android:textColorPrimary">@color/material_text_primary</item>
+        <item name="android:textColorSecondary">@color/material_text_secondary</item>
+
+        <!-- MaterialDrawer specific values -->
+        <item name="material_drawer_background">@color/material_drawer_background</item>
+        <item name="material_drawer_primary_text">@color/top_background</item>
+        <item name="material_drawer_primary_icon">@color/top_background</item>
+        <item name="material_drawer_secondary_text">@color/top_background</item>
+        <item name="material_drawer_hint_text">@color/top_background</item>
+        <item name="material_drawer_divider">@color/material_divider_color</item>
+        <item name="material_drawer_selected">@color/material_drawer_selected</item>
+        <item name="material_drawer_selected_text">@color/bottom_background</item>
+        <item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
+    </style>
+
+    <!-- Material 3 - Black Theme (Pure Dark) -->
+    <style name="Theme.CA.Material3.Black" parent="Theme.Material3.Dark">
+        <!-- Primary colors -->
+        <item name="colorPrimary">@color/md_theme_black_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_black_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_black_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_black_onPrimaryContainer</item>
+
+        <!-- Secondary colors -->
+        <item name="colorSecondary">@color/md_theme_black_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_black_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_black_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_black_onSecondaryContainer</item>
+
+        <!-- Tertiary colors -->
+        <item name="colorTertiary">@color/md_theme_black_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_black_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_black_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_black_onTertiaryContainer</item>
+
+        <!-- Error colors -->
+        <item name="colorError">@color/md_theme_black_error</item>
+        <item name="colorErrorContainer">@color/md_theme_black_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_black_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_black_onErrorContainer</item>
+
+        <!-- Background colors -->
+        <item name="android:colorBackground">@color/md_theme_black_background</item>
+        <item name="colorOnBackground">@color/md_theme_black_onBackground</item>
+
+        <!-- Surface colors -->
+        <item name="colorSurface">@color/md_theme_black_surface</item>
+        <item name="colorOnSurface">@color/md_theme_black_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_black_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_black_onSurfaceVariant</item>
+
+        <!-- Outline colors -->
+        <item name="colorOutline">@color/md_theme_black_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_black_outlineVariant</item>
+
+        <!-- Other colors -->
+        <item name="colorSurfaceInverse">@color/md_theme_black_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_black_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_black_inversePrimary</item>
+
+        <!-- Additional attributes -->
+        <item name="android:windowBackground">@color/material_background_dark</item>
+        <item name="android:textColorPrimary">@color/material_text_primary</item>
+        <item name="android:textColorSecondary">@color/material_text_secondary</item>
+
+        <!-- MaterialDrawer specific values -->
+        <item name="material_drawer_background">@color/material_drawer_dark_background</item>
+        <item name="material_drawer_primary_text">@color/material_drawer_dark_primary_text</item>
+        <item name="material_drawer_primary_icon">@color/material_drawer_dark_primary_icon</item>
+        <item name="material_drawer_secondary_text">@color/material_drawer_dark_secondary_text</item>
+        <item name="material_drawer_hint_text">@color/material_drawer_dark_hint_text</item>
+        <item name="material_drawer_divider">@color/material_drawer_dark_divider</item>
+        <item name="material_drawer_selected">@color/material_drawer_dark_selected</item>
+        <item name="material_drawer_selected_text">@color/material_primary</item>
+        <item name="material_drawer_header_selection_text">@color/material_drawer_dark_header_selection_text</item>
+    </style>
+
+    <!-- Material 3 - White Theme (Light) -->
+    <style name="Theme.CA.Material3.White" parent="Theme.Material3.Light">
+        <!-- Primary colors -->
+        <item name="colorPrimary">@color/md_theme_white_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_white_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_white_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_white_onPrimaryContainer</item>
+
+        <!-- Secondary colors -->
+        <item name="colorSecondary">@color/md_theme_white_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_white_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_white_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_white_onSecondaryContainer</item>
+
+        <!-- Tertiary colors -->
+        <item name="colorTertiary">@color/md_theme_white_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_white_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_white_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_white_onTertiaryContainer</item>
+
+        <!-- Error colors -->
+        <item name="colorError">@color/md_theme_white_error</item>
+        <item name="colorErrorContainer">@color/md_theme_white_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_white_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_white_onErrorContainer</item>
+
+        <!-- Background colors -->
+        <item name="android:colorBackground">@color/md_theme_white_background</item>
+        <item name="colorOnBackground">@color/md_theme_white_onBackground</item>
+
+        <!-- Surface colors -->
+        <item name="colorSurface">@color/md_theme_white_surface</item>
+        <item name="colorOnSurface">@color/md_theme_white_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_white_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_white_onSurfaceVariant</item>
+
+        <!-- Outline colors -->
+        <item name="colorOutline">@color/md_theme_white_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_white_outlineVariant</item>
+
+        <!-- Other colors -->
+        <item name="colorSurfaceInverse">@color/md_theme_white_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_white_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_white_inversePrimary</item>
+
+        <!-- Additional attributes -->
+        <item name="android:windowBackground">@color/white</item>
+        <item name="android:textColorPrimary">@color/black</item>
+        <item name="android:textColorSecondary">@color/black_transparent</item>
+
+        <!-- MaterialDrawer specific values -->
+        <item name="material_drawer_background">@color/material_drawer_background</item>
+        <item name="material_drawer_primary_text">@color/top_background</item>
+        <item name="material_drawer_primary_icon">@color/top_background</item>
+        <item name="material_drawer_secondary_text">@color/top_background</item>
+        <item name="material_drawer_hint_text">@color/top_background</item>
+        <item name="material_drawer_divider">@color/material_divider_color</item>
+        <item name="material_drawer_selected">@color/material_drawer_selected</item>
+        <item name="material_drawer_selected_text">@color/bottom_background</item>
+        <item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
+    </style>
+
+</resources>

From 9d9e8ecc8736bcfb5cf8d9190a24c34a6a1e7d03 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 22:54:39 +0000
Subject: [PATCH 04/19] Migrate existing themes to Material 3 and extract
 progress bar colors

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/res/drawable/progress_bar.xml | 16 ++++----
 wows/src/main/res/values/colors.xml         | 10 +++++
 wows/src/main/res/values/styles_ca.xml      | 44 +++++++++++++++++++--
 3 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/wows/src/main/res/drawable/progress_bar.xml b/wows/src/main/res/drawable/progress_bar.xml
index 5415970..1df3520 100644
--- a/wows/src/main/res/drawable/progress_bar.xml
+++ b/wows/src/main/res/drawable/progress_bar.xml
@@ -5,10 +5,10 @@
             <corners android:radius="0dip" />
             <gradient
                 android:angle="270"
-                android:centerColor="#ff5a5d5a"
+                android:centerColor="@color/progress_bg_center"
                 android:centerY="0.75"
-                android:endColor="#ff747674"
-                android:startColor="#ff9d9e9d" />
+                android:endColor="@color/progress_bg_end"
+                android:startColor="@color/progress_bg_start" />
         </shape>
     </item>
 
@@ -18,10 +18,10 @@
                 <corners android:radius="0dip" />
                 <gradient
                     android:angle="270"
-                    android:centerColor="#80ffb600"
+                    android:centerColor="@color/progress_secondary_center"
                     android:centerY="0.75"
-                    android:endColor="#a0ffcb00"
-                    android:startColor="#80ffd300" />
+                    android:endColor="@color/progress_secondary_end"
+                    android:startColor="@color/progress_secondary_start" />
             </shape>
         </clip>
     </item>
@@ -31,8 +31,8 @@
                 <corners android:radius="0dip" />
                 <gradient
                     android:angle="270"
-                    android:endColor="#43A047"
-                    android:startColor="#4CAF50" />
+                    android:endColor="@color/progress_end"
+                    android:startColor="@color/progress_start" />
             </shape>
         </clip>
     </item>
diff --git a/wows/src/main/res/values/colors.xml b/wows/src/main/res/values/colors.xml
index ad37b92..b492ac5 100644
--- a/wows/src/main/res/values/colors.xml
+++ b/wows/src/main/res/values/colors.xml
@@ -191,4 +191,14 @@
     <color name="chart_brown">#795548</color>
     <color name="chart_teal">#009688</color>
 
+    <!-- Progress bar colors -->
+    <color name="progress_bg_start">#ff9d9e9d</color>
+    <color name="progress_bg_center">#ff5a5d5a</color>
+    <color name="progress_bg_end">#ff747674</color>
+    <color name="progress_secondary_start">#80ffd300</color>
+    <color name="progress_secondary_center">#80ffb600</color>
+    <color name="progress_secondary_end">#a0ffcb00</color>
+    <color name="progress_start">#4CAF50</color>
+    <color name="progress_end">#43A047</color>
+
 </resources>
\ No newline at end of file
diff --git a/wows/src/main/res/values/styles_ca.xml b/wows/src/main/res/values/styles_ca.xml
index fca7776..64b057a 100644
--- a/wows/src/main/res/values/styles_ca.xml
+++ b/wows/src/main/res/values/styles_ca.xml
@@ -19,11 +19,29 @@
 <resources>
 
     <!-- OCEAN THEME-->
-    <style name="Theme.CA.Material.Ocean" parent="MaterialDrawerTheme">
-        <item name="colorPrimary">@color/transparent</item>
+    <style name="Theme.CA.Material.Ocean" parent="Theme.Material3.Dark">
+        <!-- Material 3 Primary colors -->
+        <item name="colorPrimary">@color/md_theme_navy_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_navy_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_navy_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_navy_onPrimaryContainer</item>
+        
+        <!-- Legacy Material 2 compatibility -->
         <item name="colorPrimaryDark">@color/material_primary_dark</item>
         <item name="colorAccent">@color/material_accent</item>
 
+        <!-- Material 3 Secondary colors -->
+        <item name="colorSecondary">@color/md_theme_navy_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_navy_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_navy_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_navy_onSecondaryContainer</item>
+
+        <!-- Material 3 Surface colors -->
+        <item name="colorSurface">@color/md_theme_navy_surface</item>
+        <item name="colorOnSurface">@color/md_theme_navy_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_navy_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_navy_onSurfaceVariant</item>
+
         <item name="android:windowBackground">@drawable/background</item>
         <item name="android:textColorPrimary">@color/material_text_primary</item>
         <item name="android:textColorSecondary">@color/material_text_secondary</item>
@@ -111,11 +129,29 @@
     <!--</style>-->
 
     <!-- DARK THEME-->
-    <style name="Theme.CA.Material.Dark" parent="MaterialDrawerTheme">
-        <item name="colorPrimary">@color/material_action_bar_dark</item>
+    <style name="Theme.CA.Material.Dark" parent="Theme.Material3.Dark">
+        <!-- Material 3 Primary colors -->
+        <item name="colorPrimary">@color/md_theme_black_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_black_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_black_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_black_onPrimaryContainer</item>
+        
+        <!-- Legacy Material 2 compatibility -->
         <item name="colorPrimaryDark">@color/material_primary_dark</item>
         <item name="colorAccent">@color/material_accent</item>
 
+        <!-- Material 3 Secondary colors -->
+        <item name="colorSecondary">@color/md_theme_black_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_black_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_black_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_black_onSecondaryContainer</item>
+
+        <!-- Material 3 Surface colors -->
+        <item name="colorSurface">@color/md_theme_black_surface</item>
+        <item name="colorOnSurface">@color/md_theme_black_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_black_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_black_onSurfaceVariant</item>
+
         <item name="android:windowBackground">@color/material_background_dark</item>
         <item name="android:textColorPrimary">@color/material_text_primary</item>
         <item name="android:textColorSecondary">@color/material_text_secondary</item>

From b9daf3818b2f45b5d93c7be6fffd120a8226cd18 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 22:57:09 +0000
Subject: [PATCH 05/19] Address code review - add semantic color aliases for
 drawer text

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/res/values/colors.xml           |  4 ++++
 wows/src/main/res/values/styles_ca.xml        | 10 +++++-----
 wows/src/main/res/values/themes_material3.xml | 20 +++++++++----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/wows/src/main/res/values/colors.xml b/wows/src/main/res/values/colors.xml
index b492ac5..def9a12 100644
--- a/wows/src/main/res/values/colors.xml
+++ b/wows/src/main/res/values/colors.xml
@@ -24,6 +24,10 @@
     <color name="top_background">#FF3E95DC</color>
     <color name="bottom_background">#FF163F6E</color>
 
+    <!-- Semantic color aliases for MaterialDrawer -->
+    <color name="drawer_text_primary">@color/top_background</color>
+    <color name="drawer_text_selected">@color/bottom_background</color>
+
     <color name="black">#000000</color>
     <color name="white">#FFFFFF</color>
     <color name="transparent">#00000000</color>
diff --git a/wows/src/main/res/values/styles_ca.xml b/wows/src/main/res/values/styles_ca.xml
index 64b057a..41dc986 100644
--- a/wows/src/main/res/values/styles_ca.xml
+++ b/wows/src/main/res/values/styles_ca.xml
@@ -69,13 +69,13 @@
 
         <!-- MaterialDrawer specific values -->
         <item name="material_drawer_background">@color/material_drawer_background</item>
-        <item name="material_drawer_primary_text">@color/top_background</item>
-        <item name="material_drawer_primary_icon">@color/top_background</item>
-        <item name="material_drawer_secondary_text">@color/top_background</item>
-        <item name="material_drawer_hint_text">@color/top_background</item>
+        <item name="material_drawer_primary_text">@color/drawer_text_primary</item>
+        <item name="material_drawer_primary_icon">@color/drawer_text_primary</item>
+        <item name="material_drawer_secondary_text">@color/drawer_text_primary</item>
+        <item name="material_drawer_hint_text">@color/drawer_text_primary</item>
         <item name="material_drawer_divider">@color/material_divider_color</item>
         <item name="material_drawer_selected">@color/material_drawer_selected</item>
-        <item name="material_drawer_selected_text">@color/bottom_background</item>
+        <item name="material_drawer_selected_text">@color/drawer_text_selected</item>
         <item name="material_drawer_header_selection_text">
             @color/material_drawer_header_selection_text
         </item>
diff --git a/wows/src/main/res/values/themes_material3.xml b/wows/src/main/res/values/themes_material3.xml
index 96f7d31..8274958 100644
--- a/wows/src/main/res/values/themes_material3.xml
+++ b/wows/src/main/res/values/themes_material3.xml
@@ -53,13 +53,13 @@
 
         <!-- MaterialDrawer specific values -->
         <item name="material_drawer_background">@color/material_drawer_background</item>
-        <item name="material_drawer_primary_text">@color/top_background</item>
-        <item name="material_drawer_primary_icon">@color/top_background</item>
-        <item name="material_drawer_secondary_text">@color/top_background</item>
-        <item name="material_drawer_hint_text">@color/top_background</item>
+        <item name="material_drawer_primary_text">@color/drawer_text_primary</item>
+        <item name="material_drawer_primary_icon">@color/drawer_text_primary</item>
+        <item name="material_drawer_secondary_text">@color/drawer_text_primary</item>
+        <item name="material_drawer_hint_text">@color/drawer_text_primary</item>
         <item name="material_drawer_divider">@color/material_divider_color</item>
         <item name="material_drawer_selected">@color/material_drawer_selected</item>
-        <item name="material_drawer_selected_text">@color/bottom_background</item>
+        <item name="material_drawer_selected_text">@color/drawer_text_selected</item>
         <item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
     </style>
 
@@ -177,13 +177,13 @@
 
         <!-- MaterialDrawer specific values -->
         <item name="material_drawer_background">@color/material_drawer_background</item>
-        <item name="material_drawer_primary_text">@color/top_background</item>
-        <item name="material_drawer_primary_icon">@color/top_background</item>
-        <item name="material_drawer_secondary_text">@color/top_background</item>
-        <item name="material_drawer_hint_text">@color/top_background</item>
+        <item name="material_drawer_primary_text">@color/drawer_text_primary</item>
+        <item name="material_drawer_primary_icon">@color/drawer_text_primary</item>
+        <item name="material_drawer_secondary_text">@color/drawer_text_primary</item>
+        <item name="material_drawer_hint_text">@color/drawer_text_primary</item>
         <item name="material_drawer_divider">@color/material_divider_color</item>
         <item name="material_drawer_selected">@color/material_drawer_selected</item>
-        <item name="material_drawer_selected_text">@color/bottom_background</item>
+        <item name="material_drawer_selected_text">@color/drawer_text_selected</item>
         <item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
     </style>
 

From 3ca7acb92fc1e65d4a2f67ae7d4e091e76b543e3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:08:43 +0000
Subject: [PATCH 06/19] Fix ActionBar conflict - use NoActionBar variants for
 Material 3 themes

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/res/values/styles_ca.xml        | 4 ++--
 wows/src/main/res/values/themes_material3.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wows/src/main/res/values/styles_ca.xml b/wows/src/main/res/values/styles_ca.xml
index 41dc986..8c40bf1 100644
--- a/wows/src/main/res/values/styles_ca.xml
+++ b/wows/src/main/res/values/styles_ca.xml
@@ -19,7 +19,7 @@
 <resources>
 
     <!-- OCEAN THEME-->
-    <style name="Theme.CA.Material.Ocean" parent="Theme.Material3.Dark">
+    <style name="Theme.CA.Material.Ocean" parent="Theme.Material3.Dark.NoActionBar">
         <!-- Material 3 Primary colors -->
         <item name="colorPrimary">@color/md_theme_navy_primary</item>
         <item name="colorOnPrimary">@color/md_theme_navy_onPrimary</item>
@@ -129,7 +129,7 @@
     <!--</style>-->
 
     <!-- DARK THEME-->
-    <style name="Theme.CA.Material.Dark" parent="Theme.Material3.Dark">
+    <style name="Theme.CA.Material.Dark" parent="Theme.Material3.Dark.NoActionBar">
         <!-- Material 3 Primary colors -->
         <item name="colorPrimary">@color/md_theme_black_primary</item>
         <item name="colorOnPrimary">@color/md_theme_black_onPrimary</item>
diff --git a/wows/src/main/res/values/themes_material3.xml b/wows/src/main/res/values/themes_material3.xml
index 8274958..e1b0e0d 100644
--- a/wows/src/main/res/values/themes_material3.xml
+++ b/wows/src/main/res/values/themes_material3.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <!-- Material 3 - Navy Theme (Ocean) -->
-    <style name="Theme.CA.Material3.Navy" parent="Theme.Material3.Dark">
+    <style name="Theme.CA.Material3.Navy" parent="Theme.Material3.Dark.NoActionBar">
         <!-- Primary colors -->
         <item name="colorPrimary">@color/md_theme_navy_primary</item>
         <item name="colorOnPrimary">@color/md_theme_navy_onPrimary</item>
@@ -64,7 +64,7 @@
     </style>
 
     <!-- Material 3 - Black Theme (Pure Dark) -->
-    <style name="Theme.CA.Material3.Black" parent="Theme.Material3.Dark">
+    <style name="Theme.CA.Material3.Black" parent="Theme.Material3.Dark.NoActionBar">
         <!-- Primary colors -->
         <item name="colorPrimary">@color/md_theme_black_primary</item>
         <item name="colorOnPrimary">@color/md_theme_black_onPrimary</item>
@@ -126,7 +126,7 @@
     </style>
 
     <!-- Material 3 - White Theme (Light) -->
-    <style name="Theme.CA.Material3.White" parent="Theme.Material3.Light">
+    <style name="Theme.CA.Material3.White" parent="Theme.Material3.Light.NoActionBar">
         <!-- Primary colors -->
         <item name="colorPrimary">@color/md_theme_white_primary</item>
         <item name="colorOnPrimary">@color/md_theme_white_onPrimary</item>

From 03708255e862c12df62a4e42b3c2b9d9cd41fe1b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:15:05 +0000
Subject: [PATCH 07/19] Enable Edge-to-Edge support with transparent status and
 navigation bars

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 .../java/com/half/wowsca/ui/CABaseActivity.kt | 10 +++++++
 wows/src/main/res/values/styles_ca.xml        | 21 ++++++++++++--
 wows/src/main/res/values/themes_material3.xml | 29 +++++++++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
index 9a927a9..e65d7a7 100644
--- a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
@@ -1,8 +1,14 @@
 package com.half.wowsca.ui
 
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
+import android.view.View
+import android.view.WindowInsetsController
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.FragmentManager
 import com.half.wowsca.CAApp.Companion.getAppLanguage
 import com.half.wowsca.CAApp.Companion.isDarkTheme
@@ -26,6 +32,10 @@ open class CABaseActivity : SwipeBackBaseActivity() {
     //    protected TextView tvKarma;
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        
+        // Enable Edge-to-Edge
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        
         setTheme(this)
         val current = getAppLanguage(applicationContext)
         val myLocale = Locale(current)
diff --git a/wows/src/main/res/values/styles_ca.xml b/wows/src/main/res/values/styles_ca.xml
index 8c40bf1..5db2172 100644
--- a/wows/src/main/res/values/styles_ca.xml
+++ b/wows/src/main/res/values/styles_ca.xml
@@ -51,7 +51,16 @@
 
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyle</item>
         <item name="colorButtonNormal">@color/material_button_color</item>
-        <item name="android:windowIsTranslucent">true</item>
+        
+        <!-- Edge-to-Edge Support -->
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">true</item>
+        
         <item name="android:windowActionBarOverlay">true</item>
         <!-- Support library compatibility -->
         <item name="windowActionBarOverlay">true</item>
@@ -161,7 +170,15 @@
 
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
         <item name="colorButtonNormal">@color/material_button_color</item>
-        <item name="android:windowIsTranslucent">true</item>
+        
+        <!-- Edge-to-Edge Support -->
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">true</item>
 
         <!--<item name="android:windowActionBarOverlay">true</item>-->
         <!--&lt;!&ndash; Support library compatibility &ndash;&gt;-->
diff --git a/wows/src/main/res/values/themes_material3.xml b/wows/src/main/res/values/themes_material3.xml
index e1b0e0d..f8fae3d 100644
--- a/wows/src/main/res/values/themes_material3.xml
+++ b/wows/src/main/res/values/themes_material3.xml
@@ -51,6 +51,15 @@
         <item name="android:textColorPrimary">@color/material_text_primary</item>
         <item name="android:textColorSecondary">@color/material_text_secondary</item>
 
+        <!-- Edge-to-Edge Support -->
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">true</item>
+
         <!-- MaterialDrawer specific values -->
         <item name="material_drawer_background">@color/material_drawer_background</item>
         <item name="material_drawer_primary_text">@color/drawer_text_primary</item>
@@ -113,6 +122,15 @@
         <item name="android:textColorPrimary">@color/material_text_primary</item>
         <item name="android:textColorSecondary">@color/material_text_secondary</item>
 
+        <!-- Edge-to-Edge Support -->
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">true</item>
+
         <!-- MaterialDrawer specific values -->
         <item name="material_drawer_background">@color/material_drawer_dark_background</item>
         <item name="material_drawer_primary_text">@color/material_drawer_dark_primary_text</item>
@@ -175,6 +193,17 @@
         <item name="android:textColorPrimary">@color/black</item>
         <item name="android:textColorSecondary">@color/black_transparent</item>
 
+        <!-- Edge-to-Edge Support -->
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:enforceStatusBarContrast">true</item>
+        <item name="android:enforceNavigationBarContrast">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+
         <!-- MaterialDrawer specific values -->
         <item name="material_drawer_background">@color/material_drawer_background</item>
         <item name="material_drawer_primary_text">@color/drawer_text_primary</item>

From e44348126e1b861eaa61e8ea9334094a93882192 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:15:46 +0000
Subject: [PATCH 08/19] Clean up unused imports in CABaseActivity

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
index e65d7a7..63a7cbd 100644
--- a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
@@ -1,14 +1,9 @@
 package com.half.wowsca.ui
 
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
-import android.view.View
-import android.view.WindowInsetsController
 import androidx.appcompat.widget.Toolbar
-import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.FragmentManager
 import com.half.wowsca.CAApp.Companion.getAppLanguage
 import com.half.wowsca.CAApp.Companion.isDarkTheme

From 4a7d5d8e9237e8b16250b5e820ee328924ad3d16 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:16:25 +0000
Subject: [PATCH 09/19] Remove trailing whitespace for cleaner formatting

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 .../main/java/com/half/wowsca/ui/CABaseActivity.kt |  4 ++--
 wows/src/main/res/values/styles_ca.xml             | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
index 63a7cbd..bcc0de5 100644
--- a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
@@ -27,10 +27,10 @@ open class CABaseActivity : SwipeBackBaseActivity() {
     //    protected TextView tvKarma;
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         // Enable Edge-to-Edge
         WindowCompat.setDecorFitsSystemWindows(window, false)
-        
+
         setTheme(this)
         val current = getAppLanguage(applicationContext)
         val myLocale = Locale(current)
diff --git a/wows/src/main/res/values/styles_ca.xml b/wows/src/main/res/values/styles_ca.xml
index 5db2172..e79a5dc 100644
--- a/wows/src/main/res/values/styles_ca.xml
+++ b/wows/src/main/res/values/styles_ca.xml
@@ -6,9 +6,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
         <item name="colorOnPrimary">@color/md_theme_navy_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_navy_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/md_theme_navy_onPrimaryContainer</item>
-        
+
         <!-- Legacy Material 2 compatibility -->
         <item name="colorPrimaryDark">@color/material_primary_dark</item>
         <item name="colorAccent">@color/material_accent</item>
@@ -51,7 +51,7 @@
 
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyle</item>
         <item name="colorButtonNormal">@color/material_button_color</item>
-        
+
         <!-- Edge-to-Edge Support -->
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
@@ -60,7 +60,7 @@
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:enforceStatusBarContrast">false</item>
         <item name="android:enforceNavigationBarContrast">true</item>
-        
+
         <item name="android:windowActionBarOverlay">true</item>
         <!-- Support library compatibility -->
         <item name="windowActionBarOverlay">true</item>
@@ -144,7 +144,7 @@
         <item name="colorOnPrimary">@color/md_theme_black_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_black_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/md_theme_black_onPrimaryContainer</item>
-        
+
         <!-- Legacy Material 2 compatibility -->
         <item name="colorPrimaryDark">@color/material_primary_dark</item>
         <item name="colorAccent">@color/material_accent</item>
@@ -170,7 +170,7 @@
 
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
         <item name="colorButtonNormal">@color/material_button_color</item>
-        
+
         <!-- Edge-to-Edge Support -->
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>

From 40d7389b26eef9c3512d7eb4a65482ca563cd8ce Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:24:01 +0000
Subject: [PATCH 10/19] Implement dynamic colors with system theme
 auto-detection

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/java/com/half/wowsca/CAApp.kt   | 45 ++++++++++++++-----
 wows/src/main/res/values/styles_ca.xml        |  6 ++-
 wows/src/main/res/values/themes_material3.xml |  6 ++-
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/CAApp.kt b/wows/src/main/java/com/half/wowsca/CAApp.kt
index 3e208e4..5c307d3 100644
--- a/wows/src/main/java/com/half/wowsca/CAApp.kt
+++ b/wows/src/main/java/com/half/wowsca/CAApp.kt
@@ -87,30 +87,55 @@ class CAApp : Application() {
 
         @JvmStatic
         fun setTheme(act: FragmentActivity) {
-            val theme = getTheme(act)
-            if (theme == "ocean") { //dark theme
+            // For Android 12+ (API 31+), use dynamic colors with system theme detection
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                // Use system theme (light or dark) with dynamic colors
+                val isSystemDark = (act.resources.configuration.uiMode and 
+                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
+                    android.content.res.Configuration.UI_MODE_NIGHT_YES
+                
+                if (isSystemDark) {
+                    act.setTheme(R.style.Theme_CA_Material_Dark)
+                } else {
+                    act.setTheme(R.style.Theme_CA_Material3_White)
+                }
+            } else {
+                // For older Android versions, use navy (ocean) theme as fallback
                 act.setTheme(R.style.Theme_CA_Material_Ocean)
-            } else if (theme == "dark") {
-                act.setTheme(R.style.Theme_CA_Material_Dark)
             }
         }
 
         @JvmStatic
         fun isOceanTheme(ctx: Context?): Boolean {
-            val theme = getTheme(ctx)
-            return theme == "ocean"
+            // Ocean theme is only used on older Android versions
+            return android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.S
         }
 
         @JvmStatic
         fun isDarkTheme(ctx: Context?): Boolean {
-            val theme = getTheme(ctx)
-            return theme == "dark"
+            if (ctx == null) return true
+            // For Android 12+, check system theme
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                return (ctx.resources.configuration.uiMode and 
+                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
+                    android.content.res.Configuration.UI_MODE_NIGHT_YES
+            }
+            // For older versions, navy theme is considered dark
+            return true
         }
 
         @JvmStatic
         fun getTheme(ctx: Context?): String? {
-            val prefs = Prefs(ctx)
-            return prefs.getString(SettingActivity.THEME_CHOICE, "ocean")
+            if (ctx == null) return "ocean"
+            // For Android 12+, return based on system theme
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                val isSystemDark = (ctx.resources.configuration.uiMode and 
+                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
+                    android.content.res.Configuration.UI_MODE_NIGHT_YES
+                return if (isSystemDark) "dark" else "light"
+            }
+            // For older versions, always use ocean
+            return "ocean"
         }
 
         @JvmStatic
diff --git a/wows/src/main/res/values/styles_ca.xml b/wows/src/main/res/values/styles_ca.xml
index e79a5dc..67b8636 100644
--- a/wows/src/main/res/values/styles_ca.xml
+++ b/wows/src/main/res/values/styles_ca.xml
@@ -137,8 +137,10 @@
     <!--</item>-->
     <!--</style>-->
 
-    <!-- DARK THEME-->
-    <style name="Theme.CA.Material.Dark" parent="Theme.Material3.Dark.NoActionBar">
+    <!-- DARK THEME - Material 3 with Dynamic Colors -->
+    <style name="Theme.CA.Material.Dark" parent="Theme.Material3.DynamicColors.Dark.NoActionBar">
+        <!-- Dynamic colors will be used on Android 12+, fallback colors below for older versions -->
+        
         <!-- Material 3 Primary colors -->
         <item name="colorPrimary">@color/md_theme_black_primary</item>
         <item name="colorOnPrimary">@color/md_theme_black_onPrimary</item>
diff --git a/wows/src/main/res/values/themes_material3.xml b/wows/src/main/res/values/themes_material3.xml
index f8fae3d..5412db6 100644
--- a/wows/src/main/res/values/themes_material3.xml
+++ b/wows/src/main/res/values/themes_material3.xml
@@ -143,8 +143,10 @@
         <item name="material_drawer_header_selection_text">@color/material_drawer_dark_header_selection_text</item>
     </style>
 
-    <!-- Material 3 - White Theme (Light) -->
-    <style name="Theme.CA.Material3.White" parent="Theme.Material3.Light.NoActionBar">
+    <!-- Material 3 - White Theme (Light) with Dynamic Colors -->
+    <style name="Theme.CA.Material3.White" parent="Theme.Material3.DynamicColors.Light.NoActionBar">
+        <!-- Dynamic colors will be used on Android 12+, fallback colors below for older versions -->
+        
         <!-- Primary colors -->
         <item name="colorPrimary">@color/md_theme_white_primary</item>
         <item name="colorOnPrimary">@color/md_theme_white_onPrimary</item>

From 848c23b01b2ebf54d621074445ac506f334c5b9d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:25:26 +0000
Subject: [PATCH 11/19] Add Edge-to-Edge window insets handling for proper
 padding

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 .../java/com/half/wowsca/ui/CABaseActivity.kt | 38 +++++++++++++++++++
 .../java/com/half/wowsca/ui/MainActivity.kt   |  7 ++++
 .../java/com/half/wowsca/ui/SplashActivity.kt | 15 ++++++++
 3 files changed, 60 insertions(+)

diff --git a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
index bcc0de5..cc74984 100644
--- a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
@@ -49,6 +49,44 @@ open class CABaseActivity : SwipeBackBaseActivity() {
             R.style.WoWSCAThemeToolbarDarkOverflow
     }
 
+    /**
+     * Apply window insets to a toolbar to handle Edge-to-Edge properly.
+     * Call this after setting the toolbar in your activity.
+     */
+    protected fun applyEdgeToEdgeInsets() {
+        mToolbar?.let { toolbar ->
+            androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(toolbar) { view, windowInsets ->
+                val insets = windowInsets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+                view.setPadding(
+                    view.paddingLeft,
+                    insets.top,
+                    view.paddingRight,
+                    view.paddingBottom
+                )
+                windowInsets
+            }
+        }
+    }
+
+    /**
+     * Apply window insets to the container/content view to handle Edge-to-Edge properly.
+     * @param containerView The main content view that should respect navigation bar insets
+     */
+    protected fun applyEdgeToEdgeInsetsToContainer(containerView: android.view.View?) {
+        containerView?.let { view ->
+            androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
+                val insets = windowInsets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+                v.setPadding(
+                    v.paddingLeft,
+                    v.paddingTop,
+                    v.paddingRight,
+                    insets.bottom
+                )
+                windowInsets
+            }
+        }
+    }
+
     protected fun initBackStackListener() {
         backStackListener = FragmentManager.OnBackStackChangedListener {
             invalidateOptionsMenu()
diff --git a/wows/src/main/java/com/half/wowsca/ui/MainActivity.kt b/wows/src/main/java/com/half/wowsca/ui/MainActivity.kt
index 930bdc9..985ab11 100644
--- a/wows/src/main/java/com/half/wowsca/ui/MainActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/MainActivity.kt
@@ -77,6 +77,13 @@ class MainActivity : CABaseActivity(), ICaptain {
 //        tvKarma = (TextView) findViewById(R.id.toolbar_text);
         setSupportActionBar(mToolbar)
 
+        // Apply Edge-to-Edge insets to toolbar
+        applyEdgeToEdgeInsets()
+
+        // Apply Edge-to-Edge insets to container for navigation bar
+        val container = findViewById<View>(R.id.container)
+        applyEdgeToEdgeInsetsToContainer(container)
+
         setUpDrawer()
 
         initBackStackListener()
diff --git a/wows/src/main/java/com/half/wowsca/ui/SplashActivity.kt b/wows/src/main/java/com/half/wowsca/ui/SplashActivity.kt
index 606e2a6..23076b7 100644
--- a/wows/src/main/java/com/half/wowsca/ui/SplashActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/SplashActivity.kt
@@ -66,6 +66,21 @@ class SplashActivity : CABaseActivity() {
         iv = findViewById<View>(R.id.imageView) as ImageView?
         Picasso.get().load(R.drawable.web_hi_res_512).into(iv)
 
+        // Apply Edge-to-Edge insets to root layout
+        val rootView = findViewById<View>(android.R.id.content)
+        rootView?.let { view ->
+            androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
+                val insets = windowInsets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+                v.setPadding(
+                    insets.left,
+                    insets.top,
+                    insets.right,
+                    insets.bottom
+                )
+                windowInsets
+            }
+        }
+
         swipeBackLayout!!.setEnableGesture(false)
     }
 

From 220af1e60eb111cc596ab45a66cffd1efb365274 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:27:00 +0000
Subject: [PATCH 12/19] Address code review - extract helper method and
 preserve original padding

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/java/com/half/wowsca/CAApp.kt   | 24 ++++++++--------
 .../java/com/half/wowsca/ui/CABaseActivity.kt | 28 +++++++++++++------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/CAApp.kt b/wows/src/main/java/com/half/wowsca/CAApp.kt
index 5c307d3..1c9d2a5 100644
--- a/wows/src/main/java/com/half/wowsca/CAApp.kt
+++ b/wows/src/main/java/com/half/wowsca/CAApp.kt
@@ -90,11 +90,7 @@ class CAApp : Application() {
             // For Android 12+ (API 31+), use dynamic colors with system theme detection
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
                 // Use system theme (light or dark) with dynamic colors
-                val isSystemDark = (act.resources.configuration.uiMode and 
-                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
-                    android.content.res.Configuration.UI_MODE_NIGHT_YES
-                
-                if (isSystemDark) {
+                if (isSystemInDarkMode(act)) {
                     act.setTheme(R.style.Theme_CA_Material_Dark)
                 } else {
                     act.setTheme(R.style.Theme_CA_Material3_White)
@@ -105,6 +101,15 @@ class CAApp : Application() {
             }
         }
 
+        /**
+         * Helper method to check if system is in dark mode
+         */
+        private fun isSystemInDarkMode(ctx: Context): Boolean {
+            return (ctx.resources.configuration.uiMode and 
+                android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
+                android.content.res.Configuration.UI_MODE_NIGHT_YES
+        }
+
         @JvmStatic
         fun isOceanTheme(ctx: Context?): Boolean {
             // Ocean theme is only used on older Android versions
@@ -116,9 +121,7 @@ class CAApp : Application() {
             if (ctx == null) return true
             // For Android 12+, check system theme
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                return (ctx.resources.configuration.uiMode and 
-                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
-                    android.content.res.Configuration.UI_MODE_NIGHT_YES
+                return isSystemInDarkMode(ctx)
             }
             // For older versions, navy theme is considered dark
             return true
@@ -129,10 +132,7 @@ class CAApp : Application() {
             if (ctx == null) return "ocean"
             // For Android 12+, return based on system theme
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                val isSystemDark = (ctx.resources.configuration.uiMode and 
-                    android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
-                    android.content.res.Configuration.UI_MODE_NIGHT_YES
-                return if (isSystemDark) "dark" else "light"
+                return if (isSystemInDarkMode(ctx)) "dark" else "light"
             }
             // For older versions, always use ocean
             return "ocean"
diff --git a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
index cc74984..a486ea0 100644
--- a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
@@ -55,13 +55,19 @@ open class CABaseActivity : SwipeBackBaseActivity() {
      */
     protected fun applyEdgeToEdgeInsets() {
         mToolbar?.let { toolbar ->
+            // Capture original padding
+            val originalPaddingLeft = toolbar.paddingLeft
+            val originalPaddingTop = toolbar.paddingTop
+            val originalPaddingRight = toolbar.paddingRight
+            val originalPaddingBottom = toolbar.paddingBottom
+            
             androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(toolbar) { view, windowInsets ->
                 val insets = windowInsets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
                 view.setPadding(
-                    view.paddingLeft,
-                    insets.top,
-                    view.paddingRight,
-                    view.paddingBottom
+                    originalPaddingLeft + insets.left,
+                    originalPaddingTop + insets.top,
+                    originalPaddingRight + insets.right,
+                    originalPaddingBottom
                 )
                 windowInsets
             }
@@ -74,13 +80,19 @@ open class CABaseActivity : SwipeBackBaseActivity() {
      */
     protected fun applyEdgeToEdgeInsetsToContainer(containerView: android.view.View?) {
         containerView?.let { view ->
+            // Capture original padding
+            val originalPaddingLeft = view.paddingLeft
+            val originalPaddingTop = view.paddingTop
+            val originalPaddingRight = view.paddingRight
+            val originalPaddingBottom = view.paddingBottom
+            
             androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
                 val insets = windowInsets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
                 v.setPadding(
-                    v.paddingLeft,
-                    v.paddingTop,
-                    v.paddingRight,
-                    insets.bottom
+                    originalPaddingLeft + insets.left,
+                    originalPaddingTop,
+                    originalPaddingRight + insets.right,
+                    originalPaddingBottom + insets.bottom
                 )
                 windowInsets
             }

From f87fd508d767b3063ad758f858fb5680111cefd9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:41:02 +0000
Subject: [PATCH 13/19] Remove theme selector from Settings and apply
 Edge-to-Edge to more activities

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt   | 5 +++++
 wows/src/main/java/com/half/wowsca/ui/SettingActivity.kt  | 8 +++++++-
 .../com/half/wowsca/ui/viewcaptain/ViewCaptainActivity.kt | 5 +++++
 wows/src/main/res/layout/activity_setting.xml             | 4 +++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt b/wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt
index f09359a..3a6c67b 100644
--- a/wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt
@@ -95,6 +95,11 @@ class SearchActivity : CABaseActivity() {
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         supportActionBar!!.setHomeButtonEnabled(true)
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val container = findViewById<View>(R.id.search_container)
+        applyEdgeToEdgeInsetsToContainer(container)
+
         etSearch = findViewById<View>(R.id.search_et) as EditText?
         delete = findViewById<View>(R.id.search_et_delete)
         sServers = findViewById<View>(R.id.search_server_spinner) as Spinner?
diff --git a/wows/src/main/java/com/half/wowsca/ui/SettingActivity.kt b/wows/src/main/java/com/half/wowsca/ui/SettingActivity.kt
index 7ade37a..0acc987 100644
--- a/wows/src/main/java/com/half/wowsca/ui/SettingActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/SettingActivity.kt
@@ -128,6 +128,11 @@ class SettingActivity : CABaseActivity() {
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         supportActionBar!!.setHomeButtonEnabled(true)
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val scrollView = findViewById<View>(R.id.settings_scroll_view)
+        applyEdgeToEdgeInsetsToContainer(scrollView)
+
         aColorblind = findViewById<View>(R.id.settings_colorblind_area)
         cbColorblind = findViewById<View>(R.id.settings_colorblind_checkbox) as CheckBox?
 
@@ -189,7 +194,8 @@ class SettingActivity : CABaseActivity() {
 
         initServerLangauge()
 
-        initTheme()
+        // Theme selection removed - now uses system auto-detect (Android 12+) or navy fallback
+        // initTheme()
 
         initServer()
 
diff --git a/wows/src/main/java/com/half/wowsca/ui/viewcaptain/ViewCaptainActivity.kt b/wows/src/main/java/com/half/wowsca/ui/viewcaptain/ViewCaptainActivity.kt
index 1d06df1..3734a36 100644
--- a/wows/src/main/java/com/half/wowsca/ui/viewcaptain/ViewCaptainActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/viewcaptain/ViewCaptainActivity.kt
@@ -80,6 +80,11 @@ class ViewCaptainActivity : CABaseActivity(), ICaptain {
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         supportActionBar!!.setHomeButtonEnabled(true)
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val container = findViewById<View>(R.id.container)
+        applyEdgeToEdgeInsetsToContainer(container)
+
         initBackStackListener()
         swipeBackLayout!!.setEdgeTrackingEnabled(SwipeBackLayout.EDGE_LEFT)
     }
diff --git a/wows/src/main/res/layout/activity_setting.xml b/wows/src/main/res/layout/activity_setting.xml
index 939bf04..a223ae3 100644
--- a/wows/src/main/res/layout/activity_setting.xml
+++ b/wows/src/main/res/layout/activity_setting.xml
@@ -17,6 +17,7 @@
     </androidx.appcompat.widget.Toolbar>
 
     <ScrollView
+        android:id="@+id/settings_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -41,7 +42,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:layout_marginTop="10dp"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="0dip"

From a72517d33bf99b53ad99f3c9308bc3c8625df453 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:43:04 +0000
Subject: [PATCH 14/19] Add theme-aware color support for charts and icons

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 .../java/com/half/wowsca/ui/CABaseActivity.kt | 23 +++++++++++++++++++
 wows/src/main/res/values-night/colors.xml     | 13 +++++++++++
 wows/src/main/res/values/colors.xml           |  5 ++++
 3 files changed, 41 insertions(+)
 create mode 100644 wows/src/main/res/values-night/colors.xml

diff --git a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
index a486ea0..273bf78 100644
--- a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
@@ -99,6 +99,29 @@ open class CABaseActivity : SwipeBackBaseActivity() {
         }
     }
 
+    /**
+     * Get theme-aware text color for UI elements (charts, icons, etc.)
+     * Returns appropriate color based on current theme (light or dark)
+     */
+    protected fun getThemeAwareTextColor(): Int {
+        return if (isDarkTheme(applicationContext)) {
+            androidx.core.content.ContextCompat.getColor(applicationContext, R.color.material_text_primary)
+        } else {
+            androidx.core.content.ContextCompat.getColor(applicationContext, R.color.black)
+        }
+    }
+
+    /**
+     * Get theme-aware secondary text color for UI elements
+     */
+    protected fun getThemeAwareSecondaryTextColor(): Int {
+        return if (isDarkTheme(applicationContext)) {
+            androidx.core.content.ContextCompat.getColor(applicationContext, R.color.material_text_secondary)
+        } else {
+            androidx.core.content.ContextCompat.getColor(applicationContext, R.color.black_transparent)
+        }
+    }
+
     protected fun initBackStackListener() {
         backStackListener = FragmentManager.OnBackStackChangedListener {
             invalidateOptionsMenu()
diff --git a/wows/src/main/res/values-night/colors.xml b/wows/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..bbf53d5
--- /dev/null
+++ b/wows/src/main/res/values-night/colors.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Night mode (dark theme) specific colors -->
+    <!-- These colors ensure proper visibility in dark mode -->
+
+    <!-- Text colors for dark mode -->
+    <color name="chart_text_color">@color/material_text_primary</color>
+    <color name="chart_secondary_text_color">@color/material_text_secondary</color>
+
+    <!-- Ensure white text is visible on dark backgrounds -->
+    <color name="icon_tint_color">@color/material_text_primary</color>
+
+</resources>
diff --git a/wows/src/main/res/values/colors.xml b/wows/src/main/res/values/colors.xml
index def9a12..4da0b6d 100644
--- a/wows/src/main/res/values/colors.xml
+++ b/wows/src/main/res/values/colors.xml
@@ -205,4 +205,9 @@
     <color name="progress_start">#4CAF50</color>
     <color name="progress_end">#43A047</color>
 
+    <!-- Theme-aware colors (light mode defaults) -->
+    <color name="chart_text_color">@color/black</color>
+    <color name="chart_secondary_text_color">@color/black_transparent</color>
+    <color name="icon_tint_color">@color/black</color>
+
 </resources>
\ No newline at end of file

From 0750426fe346a9416bfa52732dd06a225b6bac6b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 06:43:55 +0000
Subject: [PATCH 15/19] Remove unnecessary helper methods - use resource
 qualifiers instead

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 .../java/com/half/wowsca/ui/CABaseActivity.kt | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
index 273bf78..a486ea0 100644
--- a/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/CABaseActivity.kt
@@ -99,29 +99,6 @@ open class CABaseActivity : SwipeBackBaseActivity() {
         }
     }
 
-    /**
-     * Get theme-aware text color for UI elements (charts, icons, etc.)
-     * Returns appropriate color based on current theme (light or dark)
-     */
-    protected fun getThemeAwareTextColor(): Int {
-        return if (isDarkTheme(applicationContext)) {
-            androidx.core.content.ContextCompat.getColor(applicationContext, R.color.material_text_primary)
-        } else {
-            androidx.core.content.ContextCompat.getColor(applicationContext, R.color.black)
-        }
-    }
-
-    /**
-     * Get theme-aware secondary text color for UI elements
-     */
-    protected fun getThemeAwareSecondaryTextColor(): Int {
-        return if (isDarkTheme(applicationContext)) {
-            androidx.core.content.ContextCompat.getColor(applicationContext, R.color.material_text_secondary)
-        } else {
-            androidx.core.content.ContextCompat.getColor(applicationContext, R.color.black_transparent)
-        }
-    }
-
     protected fun initBackStackListener() {
         backStackListener = FragmentManager.OnBackStackChangedListener {
             invalidateOptionsMenu()

From 584ee38f087d214abe584be4c78c3f1eaa5d65a3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 08:01:34 +0000
Subject: [PATCH 16/19] Fix search_container reference error by adding proper
 ID to layout

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt | 2 +-
 wows/src/main/res/layout/activity_search.xml            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt b/wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt
index 3a6c67b..f724c13 100644
--- a/wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/SearchActivity.kt
@@ -97,7 +97,7 @@ class SearchActivity : CABaseActivity() {
 
         // Apply Edge-to-Edge insets
         applyEdgeToEdgeInsets()
-        val container = findViewById<View>(R.id.search_container)
+        val container = findViewById<View>(R.id.search_content_container)
         applyEdgeToEdgeInsetsToContainer(container)
 
         etSearch = findViewById<View>(R.id.search_et) as EditText?
diff --git a/wows/src/main/res/layout/activity_search.xml b/wows/src/main/res/layout/activity_search.xml
index 23ed2e8..94e8b4f 100644
--- a/wows/src/main/res/layout/activity_search.xml
+++ b/wows/src/main/res/layout/activity_search.xml
@@ -60,6 +60,7 @@
     </androidx.appcompat.widget.Toolbar>
 
     <RelativeLayout
+        android:id="@+id/search_content_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/toolbar">

From 342a2a926615a305bff962b086860a711195ae37 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 08:14:08 +0000
Subject: [PATCH 17/19] Apply Edge-to-Edge support to all remaining activities

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 .../main/java/com/half/wowsca/ui/AuthenticationActivity.kt  | 5 +++++
 .../src/main/java/com/half/wowsca/ui/InformationActivity.kt | 6 ++++++
 wows/src/main/java/com/half/wowsca/ui/ResourcesActivity.kt  | 5 +++++
 .../main/java/com/half/wowsca/ui/compare/CompareActivity.kt | 5 +++++
 .../java/com/half/wowsca/ui/compare/ShipCompareActivity.kt  | 5 +++++
 .../wowsca/ui/encyclopedia/EncyclopediaTabbedActivity.kt    | 5 +++++
 .../com/half/wowsca/ui/encyclopedia/ShipProfileActivity.kt  | 5 +++++
 wows/src/main/res/layout/activity_auth.xml                  | 1 +
 wows/src/main/res/layout/activity_compare_ships.xml         | 1 +
 wows/src/main/res/layout/activity_encyclopedia.xml          | 1 +
 wows/src/main/res/layout/activity_information.xml           | 1 +
 wows/src/main/res/layout/activity_resources.xml             | 1 +
 12 files changed, 41 insertions(+)

diff --git a/wows/src/main/java/com/half/wowsca/ui/AuthenticationActivity.kt b/wows/src/main/java/com/half/wowsca/ui/AuthenticationActivity.kt
index 4079133..6dd6fcd 100644
--- a/wows/src/main/java/com/half/wowsca/ui/AuthenticationActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/AuthenticationActivity.kt
@@ -42,6 +42,11 @@ class AuthenticationActivity : CABaseActivity() {
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         title = getString(R.string.login)
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val container = findViewById<View>(R.id.auth_container)
+        applyEdgeToEdgeInsetsToContainer(container)
+
         swipeBackLayout!!.setEdgeTrackingEnabled(SwipeBackLayout.EDGE_LEFT)
     }
 
diff --git a/wows/src/main/java/com/half/wowsca/ui/InformationActivity.kt b/wows/src/main/java/com/half/wowsca/ui/InformationActivity.kt
index 819eca8..2965f27 100644
--- a/wows/src/main/java/com/half/wowsca/ui/InformationActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/InformationActivity.kt
@@ -18,6 +18,12 @@ class InformationActivity : CABaseActivity() {
         setSupportActionBar(bar)
 
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val scrollView = findViewById<View>(R.id.info_scroll_view)
+        applyEdgeToEdgeInsetsToContainer(scrollView)
+
         swipeBackLayout!!.setEdgeTrackingEnabled(SwipeBackLayout.EDGE_LEFT)
     }
 
diff --git a/wows/src/main/java/com/half/wowsca/ui/ResourcesActivity.kt b/wows/src/main/java/com/half/wowsca/ui/ResourcesActivity.kt
index c66581e..3c6f26d 100644
--- a/wows/src/main/java/com/half/wowsca/ui/ResourcesActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/ResourcesActivity.kt
@@ -102,6 +102,11 @@ class ResourcesActivity : CABaseActivity() {
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         supportActionBar!!.setHomeButtonEnabled(true)
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val container = findViewById<View>(R.id.resources_main_container)
+        applyEdgeToEdgeInsetsToContainer(container)
+
         if (!TextUtils.isEmpty(type)) {
             if (type == EXTRA_WEBSITES_TOOLS) {
                 title = getString(R.string.resources_websites)
diff --git a/wows/src/main/java/com/half/wowsca/ui/compare/CompareActivity.kt b/wows/src/main/java/com/half/wowsca/ui/compare/CompareActivity.kt
index a8c254f..79bb33d 100644
--- a/wows/src/main/java/com/half/wowsca/ui/compare/CompareActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/compare/CompareActivity.kt
@@ -63,6 +63,11 @@ class CompareActivity : CABaseActivity() {
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         supportActionBar!!.setHomeButtonEnabled(true)
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val scrollView = findViewById<View>(R.id.compare_scroll)
+        applyEdgeToEdgeInsetsToContainer(scrollView)
+
         container = findViewById<View>(R.id.compare_container) as LinearLayout?
         progressBar = findViewById<View>(R.id.compare_progress)
         tvErrorText = findViewById<View>(R.id.compare_middle_text) as TextView?
diff --git a/wows/src/main/java/com/half/wowsca/ui/compare/ShipCompareActivity.kt b/wows/src/main/java/com/half/wowsca/ui/compare/ShipCompareActivity.kt
index d69e970..56149fc 100644
--- a/wows/src/main/java/com/half/wowsca/ui/compare/ShipCompareActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/compare/ShipCompareActivity.kt
@@ -52,6 +52,11 @@ class ShipCompareActivity : CABaseActivity() {
         supportActionBar!!.setHomeButtonEnabled(true)
         supportActionBar!!.setTitle(R.string.ship_compare_title)
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val container = findViewById<View>(R.id.ship_compare_container)
+        applyEdgeToEdgeInsetsToContainer(container)
+
         progress = findViewById<View>(R.id.activity_compare_ships_progress)
         pagerTabs = findViewById<View>(R.id.ship_compare_pager_tab) as SlidingTabLayout?
         mViewPager = findViewById<View>(R.id.ship_compare_tabbed_pager) as ViewPager?
diff --git a/wows/src/main/java/com/half/wowsca/ui/encyclopedia/EncyclopediaTabbedActivity.kt b/wows/src/main/java/com/half/wowsca/ui/encyclopedia/EncyclopediaTabbedActivity.kt
index e16aa7b..20ceb32 100644
--- a/wows/src/main/java/com/half/wowsca/ui/encyclopedia/EncyclopediaTabbedActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/encyclopedia/EncyclopediaTabbedActivity.kt
@@ -49,6 +49,11 @@ class EncyclopediaTabbedActivity : CABaseActivity() {
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         supportActionBar!!.setHomeButtonEnabled(true)
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val container = findViewById<View>(R.id.encyclopedia_container)
+        applyEdgeToEdgeInsetsToContainer(container)
+
         mViewPager = findViewById<View>(R.id.encyclopedia_pager) as ViewPager?
         pager = ShipopediaPager(supportFragmentManager)
         val iconResourceArray = arrayOf(
diff --git a/wows/src/main/java/com/half/wowsca/ui/encyclopedia/ShipProfileActivity.kt b/wows/src/main/java/com/half/wowsca/ui/encyclopedia/ShipProfileActivity.kt
index e07c285..ea1712b 100644
--- a/wows/src/main/java/com/half/wowsca/ui/encyclopedia/ShipProfileActivity.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/encyclopedia/ShipProfileActivity.kt
@@ -160,6 +160,11 @@ class ShipProfileActivity : CABaseActivity() {
         supportActionBar!!.setHomeButtonEnabled(true)
         title = ""
 
+        // Apply Edge-to-Edge insets
+        applyEdgeToEdgeInsets()
+        val scrollView = findViewById<View>(R.id.encyclopedia_scroll)
+        applyEdgeToEdgeInsetsToContainer(scrollView)
+
         scroll = findViewById<View>(R.id.encyclopedia_scroll) as ScrollView?
 
         progress = findViewById<View>(R.id.encyclopedia_progress)
diff --git a/wows/src/main/res/layout/activity_auth.xml b/wows/src/main/res/layout/activity_auth.xml
index 163cc41..ba94d82 100644
--- a/wows/src/main/res/layout/activity_auth.xml
+++ b/wows/src/main/res/layout/activity_auth.xml
@@ -17,6 +17,7 @@
     </androidx.appcompat.widget.Toolbar>
 
     <FrameLayout
+        android:id="@+id/auth_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/wows/src/main/res/layout/activity_compare_ships.xml b/wows/src/main/res/layout/activity_compare_ships.xml
index e1d79a3..73f8de1 100644
--- a/wows/src/main/res/layout/activity_compare_ships.xml
+++ b/wows/src/main/res/layout/activity_compare_ships.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ship_compare_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/wows/src/main/res/layout/activity_encyclopedia.xml b/wows/src/main/res/layout/activity_encyclopedia.xml
index effb942..76bcd0c 100644
--- a/wows/src/main/res/layout/activity_encyclopedia.xml
+++ b/wows/src/main/res/layout/activity_encyclopedia.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/encyclopedia_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/wows/src/main/res/layout/activity_information.xml b/wows/src/main/res/layout/activity_information.xml
index 91d788c..c3c20fc 100644
--- a/wows/src/main/res/layout/activity_information.xml
+++ b/wows/src/main/res/layout/activity_information.xml
@@ -15,6 +15,7 @@
         android:minHeight="?attr/actionBarSize"></androidx.appcompat.widget.Toolbar>
 
     <ScrollView
+        android:id="@+id/info_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/wows/src/main/res/layout/activity_resources.xml b/wows/src/main/res/layout/activity_resources.xml
index 565358f..3d2279e 100644
--- a/wows/src/main/res/layout/activity_resources.xml
+++ b/wows/src/main/res/layout/activity_resources.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/resources_main_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">

From 442b8f9248fe0eed706144d1dfc5f3405464eda1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 08:14:51 +0000
Subject: [PATCH 18/19] Apply dynamic theme-aware icon tinting

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 .../com/half/wowsca/ui/encyclopedia/tabs/FlagsFragment.kt  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/ui/encyclopedia/tabs/FlagsFragment.kt b/wows/src/main/java/com/half/wowsca/ui/encyclopedia/tabs/FlagsFragment.kt
index b638e8d..945e3c2 100644
--- a/wows/src/main/java/com/half/wowsca/ui/encyclopedia/tabs/FlagsFragment.kt
+++ b/wows/src/main/java/com/half/wowsca/ui/encyclopedia/tabs/FlagsFragment.kt
@@ -94,11 +94,12 @@ class FlagsFragment : CAFragment() {
                 }
             }
             val d = ContextCompat.getDrawable(requireContext(), R.drawable.ic_flags)
-            if (!isDarkTheme(context)) d!!.setColorFilter(
+            // Apply theme-aware icon tint
+            d!!.setColorFilter(
                 ContextCompat.getColor(
                     requireContext(),
-                    R.color.top_background
-                ), PorterDuff.Mode.MULTIPLY
+                    R.color.icon_tint_color
+                ), PorterDuff.Mode.SRC_IN
             )
             createGeneralAlert(activity, item.name, sb.toString(), getString(R.string.dismiss), d)
         } else {

From 1245f864ceeb33485125ef4d18afcf747e380cc9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 08:21:57 +0000
Subject: [PATCH 19/19] Fix Material 3 DayNight theme implementation for proper
 dynamic colors

Co-authored-by: HenryQuan <6754708+HenryQuan@users.noreply.github.com>
---
 wows/src/main/java/com/half/wowsca/CAApp.kt | 53 +++++++--------------
 wows/src/main/res/values/styles_ca.xml      | 30 ++----------
 2 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/wows/src/main/java/com/half/wowsca/CAApp.kt b/wows/src/main/java/com/half/wowsca/CAApp.kt
index 1c9d2a5..b92893f 100644
--- a/wows/src/main/java/com/half/wowsca/CAApp.kt
+++ b/wows/src/main/java/com/half/wowsca/CAApp.kt
@@ -87,55 +87,36 @@ class CAApp : Application() {
 
         @JvmStatic
         fun setTheme(act: FragmentActivity) {
-            // For Android 12+ (API 31+), use dynamic colors with system theme detection
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                // Use system theme (light or dark) with dynamic colors
-                if (isSystemInDarkMode(act)) {
-                    act.setTheme(R.style.Theme_CA_Material_Dark)
-                } else {
-                    act.setTheme(R.style.Theme_CA_Material3_White)
-                }
-            } else {
-                // For older Android versions, use navy (ocean) theme as fallback
-                act.setTheme(R.style.Theme_CA_Material_Ocean)
-            }
+            // Use single Material 3 DayNight theme with dynamic colors
+            // The system automatically handles:
+            // - Light/dark mode based on system settings
+            // - Dynamic colors on Android 12+ (Material You)
+            // - Fallback colors on older Android versions
+            act.setTheme(R.style.Theme_CA_Material_Dark)
         }
-
-        /**
-         * Helper method to check if system is in dark mode
-         */
-        private fun isSystemInDarkMode(ctx: Context): Boolean {
-            return (ctx.resources.configuration.uiMode and 
-                android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
-                android.content.res.Configuration.UI_MODE_NIGHT_YES
+            }
         }
 
-        @JvmStatic
+                @JvmStatic
         fun isOceanTheme(ctx: Context?): Boolean {
-            // Ocean theme is only used on older Android versions
-            return android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.S
+            // Ocean theme is no longer used - we use Material 3 DayNight theme
+            return false
         }
 
         @JvmStatic
         fun isDarkTheme(ctx: Context?): Boolean {
             if (ctx == null) return true
-            // For Android 12+, check system theme
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                return isSystemInDarkMode(ctx)
-            }
-            // For older versions, navy theme is considered dark
-            return true
+            // Check if system is in dark mode
+            return (ctx.resources.configuration.uiMode and 
+                android.content.res.Configuration.UI_MODE_NIGHT_MASK) == 
+                android.content.res.Configuration.UI_MODE_NIGHT_YES
         }
 
         @JvmStatic
         fun getTheme(ctx: Context?): String? {
-            if (ctx == null) return "ocean"
-            // For Android 12+, return based on system theme
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                return if (isSystemInDarkMode(ctx)) "dark" else "light"
-            }
-            // For older versions, always use ocean
-            return "ocean"
+            if (ctx == null) return "dark"
+            // Return based on system theme
+            return if (isDarkTheme(ctx)) "dark" else "light"
         }
 
         @JvmStatic
diff --git a/wows/src/main/res/values/styles_ca.xml b/wows/src/main/res/values/styles_ca.xml
index 67b8636..8db6873 100644
--- a/wows/src/main/res/values/styles_ca.xml
+++ b/wows/src/main/res/values/styles_ca.xml
@@ -138,31 +138,15 @@
     <!--</style>-->
 
     <!-- DARK THEME - Material 3 with Dynamic Colors -->
-    <style name="Theme.CA.Material.Dark" parent="Theme.Material3.DynamicColors.Dark.NoActionBar">
-        <!-- Dynamic colors will be used on Android 12+, fallback colors below for older versions -->
-        
-        <!-- Material 3 Primary colors -->
-        <item name="colorPrimary">@color/md_theme_black_primary</item>
-        <item name="colorOnPrimary">@color/md_theme_black_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_black_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_black_onPrimaryContainer</item>
+    <style name="Theme.CA.Material.Dark" parent="Theme.Material3.DynamicColors.DayNight.NoActionBar">
+        <!-- DO NOT override colorPrimary, colorSecondary, etc. when using DynamicColors parent -->
+        <!-- The system will provide dynamic colors on Android 12+ -->
+        <!-- On older versions, Material3 provides sensible defaults -->
 
-        <!-- Legacy Material 2 compatibility -->
+        <!-- Legacy Material 2 compatibility - only for specific components that need it -->
         <item name="colorPrimaryDark">@color/material_primary_dark</item>
         <item name="colorAccent">@color/material_accent</item>
 
-        <!-- Material 3 Secondary colors -->
-        <item name="colorSecondary">@color/md_theme_black_secondary</item>
-        <item name="colorOnSecondary">@color/md_theme_black_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_black_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_black_onSecondaryContainer</item>
-
-        <!-- Material 3 Surface colors -->
-        <item name="colorSurface">@color/md_theme_black_surface</item>
-        <item name="colorOnSurface">@color/md_theme_black_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_theme_black_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_theme_black_onSurfaceVariant</item>
-
         <item name="android:windowBackground">@color/material_background_dark</item>
         <item name="android:textColorPrimary">@color/material_text_primary</item>
         <item name="android:textColorSecondary">@color/material_text_secondary</item>
@@ -182,10 +166,6 @@
         <item name="android:enforceStatusBarContrast">false</item>
         <item name="android:enforceNavigationBarContrast">true</item>
 
-        <!--<item name="android:windowActionBarOverlay">true</item>-->
-        <!--&lt;!&ndash; Support library compatibility &ndash;&gt;-->
-        <!--<item name="windowActionBarOverlay">true</item>-->
-
         <item name="popupMenuStyle">@style/WoWSCAThemeToolbarDarkOverflow</item>
         <item name="android:popupMenuStyle">@style/WoWSCAThemeToolbarDarkOverflow</item>
         <item name="android:popupBackground">@color/material_action_bar_dark</item>