From e9d7f143376b81a9f60578c96a55b49c73f0b8c1 Mon Sep 17 00:00:00 2001
From: bekuno <>
Date: Sat, 7 Mar 2020 13:54:45 +0100
Subject: [PATCH] set text color for menus

fix #66

- remove theme definitions for api 11 an 14, merge them in the default configuration files (we are on min sdk 16)
- add text color definitions
- define the default text color (white) fo the AppTheme
---
 src/main/res/values-v11/styles_theme.xml | 11 -----------
 src/main/res/values-v11/themes.xml       |  5 -----
 src/main/res/values-v14/styles_theme.xml |  9 ---------
 src/main/res/values/colors.xml           |  2 ++
 src/main/res/values/styles_theme.xml     |  8 ++++----
 src/main/res/values/themes.xml           |  2 +-
 6 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 src/main/res/values-v11/styles_theme.xml
 delete mode 100644 src/main/res/values-v11/themes.xml
 delete mode 100644 src/main/res/values-v14/styles_theme.xml

diff --git a/src/main/res/values-v11/styles_theme.xml b/src/main/res/values-v11/styles_theme.xml
deleted file mode 100644
index 2dae2a203..000000000
--- a/src/main/res/values-v11/styles_theme.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- cannot use .NoActionBar theme directly - http://code.google.com/p/android/issues/detail?id=15862 -->
-    <style name="AppTheme" parent="android:Theme.Holo.Light">
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <style name="ThemeSettings" parent="android:Theme.Holo.Light" />
-</resources>
diff --git a/src/main/res/values-v11/themes.xml b/src/main/res/values-v11/themes.xml
deleted file mode 100644
index 413cc3e58..000000000
--- a/src/main/res/values-v11/themes.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Mapsforge" parent="@android:style/Theme.Holo" />
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-v14/styles_theme.xml b/src/main/res/values-v14/styles_theme.xml
deleted file mode 100644
index 71b6097be..000000000
--- a/src/main/res/values-v14/styles_theme.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="AppTheme" parent="@android:style/Theme.Holo.Light.NoActionBar">
-        <item name="android:windowAnimationStyle">@null</item>
-    </style>
-
-    <style name="ThemeSettings" parent="@android:style/Theme.Holo.Light.DarkActionBar" />
-</resources>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index eea2c7ff4..db6f04124 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -19,4 +19,6 @@
     <color name="title_separator">#40ffffff</color>
     <color name="title_separator_dark">#40000000</color>
     <color name="btn_disabled">#80aaaaaa</color>
+    <color name="text_dark">#FFFFFFFF</color>
+    <color name="text_light">#FF000000</color>
 </resources>
diff --git a/src/main/res/values/styles_theme.xml b/src/main/res/values/styles_theme.xml
index f304549e7..eb09632c1 100644
--- a/src/main/res/values/styles_theme.xml
+++ b/src/main/res/values/styles_theme.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="AppTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="AppTheme" parent="@android:style/Theme.Holo.Light.NoActionBar">
         <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:textColor">@color/text_dark</item>
     </style>
 
-    <style name="ThemeSettings" parent="android:Theme" />
-
-</resources>
\ No newline at end of file
+    <style name="ThemeSettings" parent="@android:style/Theme.Holo.Light.DarkActionBar" />
+</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 09aeb8ff0..413cc3e58 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Mapsforge" parent="@android:style/Theme.NoTitleBar" />
+    <style name="Mapsforge" parent="@android:style/Theme.Holo" />
 </resources>
\ No newline at end of file