diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-07-01 16:30:01 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-07-01 16:30:49 +0200 |
| commit | d49ee4dcc0143cc3573f4c57823468cd7d20a983 (patch) | |
| tree | 63849d43834e99a7eb0c7ba67da5d13846ee3d8e /main/res | |
| parent | 9572033ece15407f3a32acebe72a3ee56cf76eab (diff) | |
| download | cgeo-d49ee4dcc0143cc3573f4c57823468cd7d20a983.zip cgeo-d49ee4dcc0143cc3573f4c57823468cd7d20a983.tar.gz cgeo-d49ee4dcc0143cc3573f4c57823468cd7d20a983.tar.bz2 | |
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)
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/values-v14/themes.xml | 8 | ||||
| -rw-r--r-- | main/res/values/themes.xml | 26 |
2 files changed, 24 insertions, 10 deletions
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"> |