diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/drawable-hdpi/actionbar_dark_bg_main.9.png | bin | 0 -> 2875 bytes | |||
| -rw-r--r-- | main/res/drawable-mdpi/actionbar_dark_bg_main.9.png | bin | 0 -> 2862 bytes | |||
| -rw-r--r-- | main/res/drawable-xhdpi/actionbar_dark_bg_main.9.png | bin | 0 -> 2889 bytes | |||
| -rw-r--r-- | main/res/drawable-xxhdpi/actionbar_dark_bg_main.9.png | bin | 0 -> 2953 bytes | |||
| -rw-r--r-- | main/res/values-v14/themes.xml | 9 | ||||
| -rw-r--r-- | main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | main/res/values/styles.xml | 14 | ||||
| -rw-r--r-- | main/res/values/themes.xml | 40 |
8 files changed, 44 insertions, 20 deletions
diff --git a/main/res/drawable-hdpi/actionbar_dark_bg_main.9.png b/main/res/drawable-hdpi/actionbar_dark_bg_main.9.png Binary files differnew file mode 100644 index 0000000..0ea8768 --- /dev/null +++ b/main/res/drawable-hdpi/actionbar_dark_bg_main.9.png diff --git a/main/res/drawable-mdpi/actionbar_dark_bg_main.9.png b/main/res/drawable-mdpi/actionbar_dark_bg_main.9.png Binary files differnew file mode 100644 index 0000000..e66d2a7 --- /dev/null +++ b/main/res/drawable-mdpi/actionbar_dark_bg_main.9.png diff --git a/main/res/drawable-xhdpi/actionbar_dark_bg_main.9.png b/main/res/drawable-xhdpi/actionbar_dark_bg_main.9.png Binary files differnew file mode 100644 index 0000000..4fb69c9 --- /dev/null +++ b/main/res/drawable-xhdpi/actionbar_dark_bg_main.9.png diff --git a/main/res/drawable-xxhdpi/actionbar_dark_bg_main.9.png b/main/res/drawable-xxhdpi/actionbar_dark_bg_main.9.png Binary files differnew file mode 100644 index 0000000..38b7fce --- /dev/null +++ b/main/res/drawable-xxhdpi/actionbar_dark_bg_main.9.png diff --git a/main/res/values-v14/themes.xml b/main/res/values-v14/themes.xml new file mode 100644 index 0000000..1c45e26 --- /dev/null +++ b/main/res/values-v14/themes.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<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> + +</resources>
\ No newline at end of file diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml index 30d00df..0e85c36 100644 --- a/main/res/values/colors.xml +++ b/main/res/values/colors.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources> - <color name="background_main_transparent">#D0000000</color> <color name="just_white">#FFFFFFFF</color> <color name="just_black">#FF000000</color> <color name="background_dark">#FF000000</color> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index ffcb6aa..ccb3416 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -54,16 +54,6 @@ <item name="android:gravity">center</item> </style> - <style name="action_bar_icon_cgeo"> - <item name="android:layout_width">@dimen/actionbar_height</item> - <item name="android:layout_height">@dimen/actionbar_height</item> - <item name="android:padding">4dip</item> - <item name="android:scaleType">center</item> - <item name="android:focusable">true</item> - <item name="android:src">@drawable/actionbar_cgeo</item> - <item name="android:background">@drawable/actionbar_button</item> - </style> - <style name="action_bar_action"> <item name="android:layout_width">@dimen/actionbar_height</item> <item name="android:layout_height">@dimen/actionbar_height</item> @@ -102,10 +92,6 @@ <item name="android:text">c:geo</item> </style> - <style name="actionbar_myposition"> - <item name="android:button">@drawable/ic_menu_myposition</item> - </style> - <!-- button: full width --> <style name="button_full" parent="button"> <item name="android:layout_width">fill_parent</item> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index 82a4422..6c76a8b 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -1,21 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> + + <style name="cgeo_main.ActionBarStyle" parent="cgeo.ActionBarStyle"> + <item name="android:background">@drawable/actionbar_dark_bg_main</item> + <item name="background">@drawable/actionbar_dark_bg_main</item> + </style> - <style name="cgeo_main" parent="@style/Theme.AppCompat"> + <style name="cgeo_main.base" parent="@style/Theme.AppCompat"> <!-- copy the style elements of the Wallpaper theme since AppCombat has no Wallpaper theme --> - <item name="android:windowBackground">@color/background_main_transparent</item> + <item name="android:windowBackground">@android:color/transparent</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:windowShowWallpaper">true</item> - <!-- system elements --> <item name="android:windowContentOverlay">@null</item> + <item name="actionBarStyle">@style/cgeo_main.ActionBarStyle</item> </style> - <style name="cgeo" parent="@style/Theme.AppCompat"> + + <style name="cgeo_main" parent="cgeo_main.base"> + <item name="actionBarStyle">@style/cgeo_main.ActionBarStyle</item> + <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> + + + <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> + + </style> + + <style name="cgeo.base" parent="@style/Theme.AppCompat"> <item name="android:buttonStyle">@style/button</item> @@ -27,9 +49,17 @@ <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> + + <!-- Identical to cgeo aside from different parent style --> <style name="cgeo_light" parent="@style/Theme.AppCompat.Light.DarkActionBar"> |
