From 4ce94d57d56c64f698d59a04b8bcb0ed48d314d4 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 17 Jan 2026 12:15:16 +0100
Subject: [PATCH] [android] Update colors used in the editor

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout/fragment_editor.xml           | 2 +-
 android/app/src/main/res/layout/fragment_phone.xml            | 2 +-
 android/app/src/main/res/layout/fragment_timetable.xml        | 4 ++--
 .../app/src/main/res/layout/fragment_timetable_advanced.xml   | 2 +-
 android/app/src/main/res/layout/fragment_timetable_simple.xml | 2 +-
 android/app/src/main/res/layout/localized_name.xml            | 2 --
 android/app/src/main/res/values-night/colors.xml              | 2 --
 android/app/src/main/res/values/colors.xml                    | 2 --
 android/app/src/main/res/values/styles-editor.xml             | 2 +-
 9 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml
index fa913e98f..febe29992 100644
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml
index 77636250e..f0bfa39b8 100644
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="@color/bg_editor"
+        android:background="?colorSurfaceContainerLow"
         android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/android/app/src/main/res/layout/fragment_timetable.xml b/android/app/src/main/res/layout/fragment_timetable.xml
index 0dd8ac169..d4427020f 100644
--- a/android/app/src/main/res/layout/fragment_timetable.xml
+++ b/android/app/src/main/res/layout/fragment_timetable.xml
@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,7 +19,7 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="@color/bg_editor"/>
+    android:background="?colorSurfaceContainerLow"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"
diff --git a/android/app/src/main/res/layout/fragment_timetable_advanced.xml b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
index 51514a767..606ea1d41 100644
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor">
+  android:background="?colorSurfaceContainerLow">
 
   <LinearLayout
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/fragment_timetable_simple.xml b/android/app/src/main/res/layout/fragment_timetable_simple.xml
index 60b198a99..0d7eca993 100644
--- a/android/app/src/main/res/layout/fragment_timetable_simple.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_simple.xml
@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor"
+  android:background="?colorSurfaceContainerLow"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>
diff --git a/android/app/src/main/res/layout/localized_name.xml b/android/app/src/main/res/layout/localized_name.xml
index 3f45c124c..8fda4ae71 100644
--- a/android/app/src/main/res/layout/localized_name.xml
+++ b/android/app/src/main/res/layout/localized_name.xml
@@ -7,7 +7,6 @@
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base"
-  android:background="@color/fg_editor"
   android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
@@ -25,7 +24,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/fg_editor"
     android:scrollbars="vertical"/>
 
   <com.google.android.material.button.MaterialButton
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index d7ea723a6..7f7af0456 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -16,8 +16,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
   <color name="bg_app">#10140F</color>
-  <color name="bg_editor">#161b14</color>
-  <color name="fg_editor">#282e25</color>
 
   <color name="bg_menu">#CC2D3237</color>
 
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 5998dc52a..67ece1c6d 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -65,8 +65,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
   <color name="bg_app">@android:color/white</color>
-  <color name="bg_editor">#ebefe4</color>
-  <color name="fg_editor">#f9faf2</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>
diff --git a/android/app/src/main/res/values/styles-editor.xml b/android/app/src/main/res/values/styles-editor.xml
index ab77e8cd4..8d4da3382 100644
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -89,7 +89,7 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">@color/fg_editor</item>
+    <item name="cardBackgroundColor">?appBackground</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>