Merge pull request #3867 from schwabe/theme_cleanup

Theme cleanup

2 files changed, 12 insertions, 74 deletions

diff --git a/main/res/layout/cachelist_spinneritem.xml b/main/res/layout/cachelist_spinneritem.xml
index c8a589f..58e070e 100644
--- a/main/res/layout/cachelist_spinneritem.xml
+++ b/main/res/layout/cachelist_spinneritem.xml
@@ -5,18 +5,18 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="?attr/dropdownListPreferredItemHeight"
     android:minHeight="?attr/dropdownListPreferredItemHeight"
-    style="?attr/spinnerDropDownItemStyle"
     android:layout_gravity="left|center_vertical"
+    style="?attr/spinnerDropDownItemStyle"
     >
 
 
     <TextView
         android:id="@android:id/text1"
-        android:textAppearance="?android:attr/textAppearanceMedium"
         tools:text="This is the title"
         android:singleLine="true"
         android:ellipsize="marquee"
         android:layout_width="match_parent"
+        style="?attr/titleTextStyle"
         android:layout_height="wrap_content" />
 
 
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:singleLine="true"
         android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
+        style="?attr/subtitleTextStyle"
         tools:text="This is the subtitle"
         android:id="@android:id/text2" />
 
diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml
index c5bdae1..7928e80 100644
--- a/main/res/values/themes.xml
+++ b/main/res/values/themes.xml
@@ -33,6 +33,10 @@
     <!-- Identical to cgeo aside from different parent style -->
     <style name="cgeo_light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
 
+        <!-- For some reason we get the non inversed texts here (bug in abc?), explicitly set text styles -->
+        <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse</item>
+        <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse</item>
+
 
         <item name="android:buttonStyle">@style/button</item>
         <item name="android:editTextStyle">@style/edittext</item>
@@ -79,7 +83,7 @@
     <style name="light" parent="cgeo_light">
 
         <!-- own values: colors -->
-        <item name="android:windowBackground">@color/just_white</item>
+        <item name="android:windowBackground">@color/just_white</item> 
         <item name="text_color">@color/text_light</item>
         <item name="text_color_headline">@color/text_headline_light</item>
         <item name="text_color_grey">@color/text_grey_light</item>
@@ -107,7 +111,7 @@
     </style>
 
     
-    <style name="Theme.AppCompat.Translucent.Light" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="cgeo.Translucent.Light" parent="light">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
@@ -115,87 +119,21 @@
     </style>
 
 
-    <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat">
+    <style name="cgeo.Translucent" parent="dark">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
-    <style name="cgeo_popup" parent="Theme.AppCompat.Translucent.Light">
-        <!-- system elements -->
-        <item name="android:buttonStyle">@style/button</item>
-        <item name="android:editTextStyle">@style/edittext</item>
+    <style name="cgeo_popup" parent="cgeo.Translucent.Light">
         <item name="android:windowNoTitle">true</item>
      </style>
 
-    <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. -->
-    <style name="popup_dark" parent="Theme.AppCompat.Translucent">
-        <!-- system elements -->
-        <item name="android:buttonStyle">@style/button</item>
-        <item name="android:editTextStyle">@style/edittext</item>
-        <item name="android:windowNoTitle">true</item>
-
-        <!-- own values: colors -->
-        <item name="just_color">@color/just_black</item>
-        <item name="text_color">@color/text_dark</item>
-        <item name="text_color_headline">@color/text_headline_dark</item>
-        <item name="text_color_grey">@color/text_grey_dark</item>
-        <item name="text_color_hint">@color/text_hint_dark</item>
-        <item name="text_color_link">@color/link</item>
-        <item name="button_color_enabled">@color/button_enabled</item>
-        <item name="button_color_disabled">@color/button_disabled</item>
-        <item name="background_color">@color/background_dark</item>
-        <item name="background_color_notice">@color/background_dark_notice</item>
-        <item name="background_color_transparent">@color/background_dark_transparent</item>
-        <item name="separator_color">@color/separator_dark</item>
-
-        <!-- own values: drawables -->
-        <item name="button">@drawable/action_button_dark</item>
-        <item name="input">@drawable/input_bcg_dark</item>
-        <item name="inventory">@drawable/inventory_background_dark</item>
-        <item name="favorite">@drawable/favorite_background_dark</item>
-        <item name="favorite_r">@drawable/favorite_background_red_dark</item>
-        <item name="favorite_o">@drawable/favorite_background_orange_dark</item>
-        <item name="favorite_g">@drawable/favorite_background_green_dark</item>
-        <item name="close">@drawable/map_close_dark</item>
-        <item name="log_img_icon">@drawable/log_img_dark</item>
-        <item name="actionbar_compass">@drawable/actionbar_compass_dark</item>
-        <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large</item>
-
-        <!-- own values: other -->
-        <item name="compass">0</item>
+    <style name="popup_dark" parent="cgeo.Translucent">
     </style>
 
-    <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. -->
     <style name="popup_light" parent="cgeo_popup">
-
-        <!-- own values: colors -->
-        <item name="android:windowBackground">@color/just_white</item>
-        <item name="text_color">@color/text_light</item>
-        <item name="text_color_headline">@color/text_headline_light</item>
-        <item name="text_color_grey">@color/text_grey_light</item>
-        <item name="text_color_hint">@color/text_hint_light</item>
-        <item name="background_color">@color/background_light</item>
-        <item name="background_color_notice">@color/background_light_notice</item>
-        <item name="background_color_transparent">@color/background_light_transparent</item>
-        <item name="separator_color">@color/separator_light</item>
-
-        <!-- own values: drawables -->
-        <item name="button">@drawable/action_button_light</item>
-        <item name="input">@drawable/input_bcg_light</item>
-        <item name="inventory">@drawable/inventory_background_light</item>
-        <item name="favorite">@drawable/favorite_background_light</item>
-        <item name="favorite_r">@drawable/favorite_background_red_light</item>
-        <item name="favorite_o">@drawable/favorite_background_orange_light</item>
-        <item name="favorite_g">@drawable/favorite_background_green_light</item>
-        <item name="close">@drawable/map_close_light</item>
-        <item name="log_img_icon">@drawable/log_img_light</item>
-        <item name="actionbar_compass">@drawable/actionbar_compass_light</item>
-        <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large.Inverse</item>
-
-        <!-- own values: other -->
-        <item name="compass">1</item>
     </style>
     
     <style name="settings" parent="@style/Theme.AppCompat">