From 1409b0a1807dc0b86a1f7cd6ae6ed743a9a91b3c Mon Sep 17 00:00:00 2001
From: Gonzalo Pesquero <gpesquero@yahoo.es>
Date: Sat, 30 Mar 2024 13:14:47 +0100
Subject: [PATCH] [android] Revert change color for disabled texts (PR #7721)

Signed-off-by: Gonzalo Pesquero <gpesquero@yahoo.es>
---
 android/app/src/main/res/color/text_color_primary.xml     | 5 -----
 .../app/src/main/res/color/text_color_primary_dark.xml    | 5 -----
 android/app/src/main/res/color/text_color_secondary.xml   | 5 -----
 .../app/src/main/res/color/text_color_secondary_dark.xml  | 5 -----
 android/app/src/main/res/values/themes-base.xml           | 8 ++++----
 5 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 android/app/src/main/res/color/text_color_primary.xml
 delete mode 100644 android/app/src/main/res/color/text_color_primary_dark.xml
 delete mode 100644 android/app/src/main/res/color/text_color_secondary.xml
 delete mode 100644 android/app/src/main/res/color/text_color_secondary_dark.xml

diff --git a/android/app/src/main/res/color/text_color_primary.xml b/android/app/src/main/res/color/text_color_primary.xml
deleted file mode 100644
index 4b5e2b9c34..0000000000
--- a/android/app/src/main/res/color/text_color_primary.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/text_dark_subtitle" />
-  <item android:color="@color/text_dark" />
-</selector>
\ No newline at end of file
diff --git a/android/app/src/main/res/color/text_color_primary_dark.xml b/android/app/src/main/res/color/text_color_primary_dark.xml
deleted file mode 100644
index dbb93ac9df..0000000000
--- a/android/app/src/main/res/color/text_color_primary_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/text_light_subtitle" />
-  <item android:color="@color/text_light" />
-</selector>
\ No newline at end of file
diff --git a/android/app/src/main/res/color/text_color_secondary.xml b/android/app/src/main/res/color/text_color_secondary.xml
deleted file mode 100644
index 1db0701715..0000000000
--- a/android/app/src/main/res/color/text_color_secondary.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/text_dark_hint" />
-  <item android:color="@color/text_dark_subtitle" />
-</selector>
\ No newline at end of file
diff --git a/android/app/src/main/res/color/text_color_secondary_dark.xml b/android/app/src/main/res/color/text_color_secondary_dark.xml
deleted file mode 100644
index 5d7a837879..0000000000
--- a/android/app/src/main/res/color/text_color_secondary_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/text_light_hint" />
-  <item android:color="@color/text_light_subtitle" />
-</selector>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml
index b37d787af6..deb612c1a5 100644
--- a/android/app/src/main/res/values/themes-base.xml
+++ b/android/app/src/main/res/values/themes-base.xml
@@ -9,9 +9,9 @@
     <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
     <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
 
-    <item name="android:textColorPrimary">@color/text_color_primary</item>
+    <item name="android:textColorPrimary">@color/text_dark</item>
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
-    <item name="android:textColorSecondary">@color/text_color_secondary</item>
+    <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
     <item name="android:windowBackground">?windowBackgroundForced</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
@@ -142,9 +142,9 @@
     <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
     <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
 
-    <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
+    <item name="android:textColorPrimary">@color/text_light</item>
     <item name="android:textColorPrimaryInverse">@color/text_dark</item>
-    <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
+    <item name="android:textColorSecondary">@color/text_light_subtitle</item>
     <item name="android:windowBackground">?windowBackgroundForced</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>