diff options
| -rw-r--r-- | main/res/values-v11/themes.xml (renamed from main/res/values-v14/themes.xml) | 11 | ||||
| -rw-r--r-- | main/res/values/themes.xml | 33 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java | 5 |
3 files changed, 41 insertions, 8 deletions
diff --git a/main/res/values-v14/themes.xml b/main/res/values-v11/themes.xml index 022e72b..585f669 100644 --- a/main/res/values-v14/themes.xml +++ b/main/res/values-v11/themes.xml @@ -8,4 +8,15 @@ <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/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> diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java index 00b5abe..0ad820a 100644 --- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java +++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java @@ -3,6 +3,7 @@ package cgeo.geocaching.ui.dialog; import cgeo.geocaching.Geocache; import cgeo.geocaching.R; import cgeo.geocaching.activity.AbstractActivity; +import cgeo.geocaching.activity.ActivityMixin; import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.geopoint.GeopointFormatter; import cgeo.geocaching.sensors.IGeoData; @@ -12,6 +13,8 @@ import cgeo.geocaching.utils.EditUtils; import org.apache.commons.lang3.StringUtils; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.support.v4.app.DialogFragment; import android.text.Editable; @@ -81,6 +84,8 @@ public class CoordinatesInputDialog extends DialogFragment { if (savedInstanceState != null && savedInstanceState.getParcelable(GEOPOINT_ARG)!=null) gp = savedInstanceState.getParcelable(GEOPOINT_ARG); + if (VERSION.SDK_INT < VERSION_CODES.HONEYCOMB && Settings.isLightSkin()) + setStyle(STYLE_NORMAL, R.style.DialogFixGingerbread); } @Override |