From 9572033ece15407f3a32acebe72a3ee56cf76eab Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 30 Jun 2014 11:08:53 +0200
Subject: Resort themes.xml, remove unused attributes

---
 main/res/values/attrs.xml  |  3 ---
 main/res/values/themes.xml | 30 ++++++++++++------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'main/res')

diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml
index be33f09..d4050c9 100644
--- a/main/res/values/attrs.xml
+++ b/main/res/values/attrs.xml
@@ -24,9 +24,6 @@
     <attr name="input" format="integer" />
     <attr name="inventory" format="integer" />
     <attr name="favorite" format="integer" />
-    <attr name="favorite_r" format="integer" />
-    <attr name="favorite_o" format="integer" />
-    <attr name="favorite_g" format="integer" />
     <attr name="close" format="integer" />
     <attr name="log_img_icon" format="integer" />
     <attr name="actionbar_compass" format="integer" />
diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml
index 6c76a8b..440eee4 100644
--- a/main/res/values/themes.xml
+++ b/main/res/values/themes.xml
@@ -52,16 +52,8 @@
 
    </style>
 
-    <style name="cgeo" parent="cgeo.base">
-        <item name="actionBarStyle">@style/cgeo.ActionBarStyle</item>
-        <item name="android:actionBarStyle"  tools:ignore="NewApi">@style/cgeo.ActionBarStyle</item>
-    </style>
-
-
-
-
-    <!-- Identical to cgeo aside from different parent style -->
-    <style name="cgeo_light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+    <!-- Identical to cgeo.base aside from different parent style and bug fixes-->
+    <style name="cgeo.base.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>
@@ -79,10 +71,18 @@
         <item name="button_color_disabled">@color/button_disabled</item>
     </style>
 
+    <style name="cgeo" parent="cgeo.base">
+        <item name="actionBarStyle">@style/cgeo.ActionBarStyle</item>
+        <item name="android:actionBarStyle"  tools:ignore="NewApi">@style/cgeo.ActionBarStyle</item>
+    </style>
 
+    <style name="cgeo_light" parent="cgeo.base.light">
+        <item name="actionBarStyle">@style/cgeo.ActionBarStyle</item>
+        <item name="android:actionBarStyle"  tools:ignore="NewApi">@style/cgeo.ActionBarStyle</item>
+    </style>
 
-    <style name="dark" parent="cgeo">
 
+    <style name="dark" parent="cgeo">
         <!-- own values: colors -->
         <item name="text_color">@color/text_dark</item>
         <item name="text_color_headline">@color/text_headline_dark</item>
@@ -98,9 +98,6 @@
         <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>
@@ -128,9 +125,6 @@
         <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>
@@ -189,5 +183,5 @@
         <item name="settings_sdcard">@drawable/settings_sdcard_black</item>
         <item name="settings_info_icon">@drawable/settings_info_icon_black</item>
     </style>
-    
+
 </resources>
\ No newline at end of file
-- 
cgit v1.1


From d49ee4dcc0143cc3573f4c57823468cd7d20a983 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 1 Jul 2014 16:30:01 +0200
Subject: More theme fixes

- Fix theme usage of CgeoMap (cgeo light/dark theme instead of holo)
- Make progress a bit larger again (32dp instead of 16dp), still smaller than Holo default (48dp)
- Make also navigation transparent in main screen
- Fix some activities not using dark ActionBar in light theme (e.g. CacheDetails)
---
 main/res/values-v14/themes.xml |  8 +++++---
 main/res/values/themes.xml     | 26 +++++++++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'main/res')

diff --git a/main/res/values-v14/themes.xml b/main/res/values-v14/themes.xml
index 1c45e26..022e72b 100644
--- a/main/res/values-v14/themes.xml
+++ b/main/res/values-v14/themes.xml
@@ -2,8 +2,10 @@
 <resources>
     <!-- Holo Style is only available for ICS+ -->
 
-    <style name="cgeo.ActionBarStyle" parent="Widget.AppCompat.Base.ActionBar">
-        <item name="android:indeterminateProgressStyle">@android:style/Widget.Holo.ProgressBar.Small</item>
+    <style name="cgeo.Widget.AppCompat.Base.ProgressBar.Medium" parent="android:Widget.Holo.ProgressBar">
+        <item name="android:minWidth">32dip</item>
+        <item name="android:maxWidth">32dip</item>
+        <item name="android:minHeight">32dip</item>
+        <item name="android:maxHeight">32dip</item>
     </style>
-
 </resources>
\ No newline at end of file
diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml
index 440eee4..9445a03 100644
--- a/main/res/values/themes.xml
+++ b/main/res/values/themes.xml
@@ -18,7 +18,10 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="actionBarStyle">@style/cgeo_main.ActionBarStyle</item>
 
-   </style>
+        <!-- KitKat's transperent navigation -->
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowTranslucentNavigation" tools:ignore="NewApi">true</item>
+    </style>
 
 
     <style name="cgeo_main" parent="cgeo_main.base">
@@ -26,15 +29,23 @@
         <item name="android:actionBarStyle" tools:ignore="NewApi">@style/cgeo_main.ActionBarStyle</item>
     </style>
 
-    <style name="cgeo.Widget.AppCompat.Base.ProgressBar.Small" parent="android:Widget.ProgressBar.Small">
-        <item name="background">@color/just_white</item>
+    <style name="cgeo.Widget.AppCompat.Base.ProgressBar.Medium" parent="android:Widget.ProgressBar">
+        <item name="android:minWidth">32dip</item>
+        <item name="android:maxWidth">32dip</item>
+        <item name="android:minHeight">32dip</item>
+        <item name="android:maxHeight">32dip</item>
     </style>
 
 
     <style name="cgeo.ActionBarStyle" parent="Widget.AppCompat.Base.ActionBar">
-        <item name="indeterminateProgressStyle">@style/cgeo.Widget.AppCompat.Base.ProgressBar.Small</item>
-        <item name="android:indeterminateProgressStyle" tools:ignore="NewApi">@style/cgeo.Widget.AppCompat.Base.ProgressBar.Small</item>
+        <item name="indeterminateProgressStyle">@style/cgeo.Widget.AppCompat.Base.ProgressBar.Medium</item>
+        <item name="android:indeterminateProgressStyle" tools:ignore="NewApi">@style/cgeo.Widget.AppCompat.Base.ProgressBar.Medium</item>
+    </style>
+
 
+    <style name="cgeo.ActionBarStyle.Light.Inverse" parent="Widget.AppCompat.Light.Base.ActionBar.Solid.Inverse">
+        <item name="indeterminateProgressStyle">@style/cgeo.Widget.AppCompat.Base.ProgressBar.Medium</item>
+        <item name="android:indeterminateProgressStyle" tools:ignore="NewApi">@style/cgeo.Widget.AppCompat.Base.ProgressBar.Medium</item>
     </style>
 
    <style name="cgeo.base" parent="@style/Theme.AppCompat">
@@ -77,8 +88,8 @@
     </style>
 
     <style name="cgeo_light" parent="cgeo.base.light">
-        <item name="actionBarStyle">@style/cgeo.ActionBarStyle</item>
-        <item name="android:actionBarStyle"  tools:ignore="NewApi">@style/cgeo.ActionBarStyle</item>
+        <item name="actionBarStyle">@style/cgeo.ActionBarStyle.Light.Inverse</item>
+        <item name="android:actionBarStyle"  tools:ignore="NewApi">@style/cgeo.ActionBarStyle.Light.Inverse</item>
     </style>
 
 
@@ -148,6 +159,7 @@
         <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="cgeo.Translucent.Light">
-- 
cgit v1.1


From e1dc029646f3ad0a4ca1c6f7a0792c508822710d Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 1 Jul 2014 17:51:43 +0200
Subject: Add non appcompat entries for MapsActivity, which uses native
 ActionBar

---
 main/res/menu/map_activity.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'main/res')

diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml
index 4c1dfd7..754a9e1 100644
--- a/main/res/menu/map_activity.xml
+++ b/main/res/menu/map_activity.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
-
     <item
         android:id="@+id/menu_toggle_mypos"
         android:icon="@drawable/ic_menu_myposition"
@@ -12,6 +11,7 @@
         android:id="@+id/menu_select_mapview"
         android:icon="@drawable/ic_menu_mapmode"
         android:title="@string/map_view_map"
+        android:showAsAction="ifRoom|withText"
         cgeo:showAsAction="ifRoom|withText">
         <menu>
             <group
@@ -20,22 +20,27 @@
             </group>
         </menu>
     </item>
+
+
     <item
         android:id="@+id/menu_map_live"
         android:icon="@drawable/ic_menu_refresh"
         android:title="@string/map_live_disable"
+        android:showAsAction="ifRoom|withText"
         cgeo:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_store_caches"
         android:icon="@drawable/ic_menu_set_as"
         android:title="@string/caches_store_offline"
+        android:showAsAction="ifRoom|withText"
         cgeo:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/submenu_modes"
         android:icon="@drawable/ic_menu_mark"
         android:title="@string/map_modes"
+        android:showAsAction="ifRoom|withText"
         cgeo:showAsAction="ifRoom|withText">
         <menu>
             <item
@@ -65,6 +70,7 @@
         android:id="@+id/menu_theme_mode"
         android:icon="@drawable/ic_menu_preferences"
         android:title="@string/map_theme_select"
+        android:showAsAction="ifRoom|withText"
         cgeo:showAsAction="ifRoom|withText">
     </item>
     <item
-- 
cgit v1.1


From 0ca0984ff20316298ba87ce200e888df2991611c Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 1 Jul 2014 22:36:16 +0200
Subject: Fix light coordinates popup screen, HOLO is API 11+, not API 14+

---
 main/res/values-v11/themes.xml | 22 ++++++++++++++++++++++
 main/res/values-v14/themes.xml | 11 -----------
 main/res/values/themes.xml     | 33 +++++++++++++++++++++++++--------
 3 files changed, 47 insertions(+), 19 deletions(-)
 create mode 100644 main/res/values-v11/themes.xml
 delete mode 100644 main/res/values-v14/themes.xml

(limited to 'main/res')

diff --git a/main/res/values-v11/themes.xml b/main/res/values-v11/themes.xml
new file mode 100644
index 0000000..585f669
--- /dev/null
+++ b/main/res/values-v11/themes.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Holo Style is only available for ICS+ -->
+
+    <style name="cgeo.Widget.AppCompat.Base.ProgressBar.Medium" parent="android:Widget.Holo.ProgressBar">
+        <item name="android:minWidth">32dip</item>
+        <item name="android:maxWidth">32dip</item>
+        <item name="android:minHeight">32dip</item>
+        <item name="android:maxHeight">32dip</item>
+    </style>
+
+    <style name="cgeo_light" parent="cgeo.base.light">
+        <item name="actionBarStyle">@style/cgeo.ActionBarStyle.Light.Inverse</item>
+        <item name="android:actionBarStyle" >@style/cgeo.ActionBarStyle.Light.Inverse</item>
+    </style>
+
+    <style name="cgeo" parent="cgeo.base">
+        <item name="android:actionBarStyle">@style/cgeo.ActionBarStyle</item>
+    </style>
+
+
+</resources>
\ No newline at end of file
diff --git a/main/res/values-v14/themes.xml b/main/res/values-v14/themes.xml
deleted file mode 100644
index 022e72b..0000000
--- a/main/res/values-v14/themes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Holo Style is only available for ICS+ -->
-
-    <style name="cgeo.Widget.AppCompat.Base.ProgressBar.Medium" parent="android:Widget.Holo.ProgressBar">
-        <item name="android:minWidth">32dip</item>
-        <item name="android:maxWidth">32dip</item>
-        <item name="android:minHeight">32dip</item>
-        <item name="android:maxHeight">32dip</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml
index 9445a03..749cd48 100644
--- a/main/res/values/themes.xml
+++ b/main/res/values/themes.xml
@@ -49,18 +49,16 @@
     </style>
 
    <style name="cgeo.base" parent="@style/Theme.AppCompat">
-
-
        <item name="android:buttonStyle">@style/button</item>
        <item name="android:editTextStyle">@style/edittext</item>
        <item name="android:windowContentOverlay">@null</item>
+       <item name="actionBarStyle">@style/cgeo.ActionBarStyle</item>
 
         <!-- own values: colors -->
         <item name="just_color">@color/just_black</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>
-
    </style>
 
     <!-- Identical to cgeo.base aside from different parent style and bug fixes-->
@@ -74,25 +72,45 @@
         <item name="android:buttonStyle">@style/button</item>
         <item name="android:editTextStyle">@style/edittext</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="actionBarStyle">@style/cgeo.ActionBarStyle.Light.Inverse</item>
 
         <!-- own values: colors -->
         <item name="just_color">@color/just_black</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>
+
     </style>
 
     <style name="cgeo" parent="cgeo.base">
-        <item name="actionBarStyle">@style/cgeo.ActionBarStyle</item>
-        <item name="android:actionBarStyle"  tools:ignore="NewApi">@style/cgeo.ActionBarStyle</item>
     </style>
 
     <style name="cgeo_light" parent="cgeo.base.light">
-        <item name="actionBarStyle">@style/cgeo.ActionBarStyle.Light.Inverse</item>
-        <item name="android:actionBarStyle"  tools:ignore="NewApi">@style/cgeo.ActionBarStyle.Light.Inverse</item>
+
+    </style>
+
+    <!-- Gingerbreads' Dialog style without the colors but with white backgound -->
+    <style name="DialogWindowTitle">
+        <item name="android:maxLines">1</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
+    </style>
+
+    <style name="DialogFixGingerbread">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowTitleStyle">@style/DialogWindowTitle</item>
+        <item name="android:windowIsFloating">true</item>
+
+        <item name="android:windowBackground">@color/just_white</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     </style>
 
 
+
+
     <style name="dark" parent="cgeo">
         <!-- own values: colors -->
         <item name="text_color">@color/text_dark</item>
@@ -121,7 +139,6 @@
     <style name="light" parent="cgeo_light">
 
         <!-- 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>
-- 
cgit v1.1