From d49ee4dcc0143cc3573f4c57823468cd7d20a983 Mon Sep 17 00:00:00 2001 From: Arne Schwabe 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/src/cgeo/geocaching/maps/CGeoMap.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index d0a9e5e..e0366c4 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -483,10 +483,8 @@ public class CGeoMap extends AbstractMap implements ViewFactory { // set layout - //ActivityMixin.setTheme(activity); - // TODO: set a proper theme + ActivityMixin.setTheme(activity); if (Build.VERSION.SDK_INT > Build.VERSION_CODES.HONEYCOMB) { - activity.setTheme(android.R.style.Theme_Holo); activity.getActionBar().setDisplayHomeAsUpEnabled(true); } activity.setContentView(mapProvider.getMapLayoutId()); -- cgit v1.1 From 36f0362d1e920c04ee264f70a907805dae9dcdd4 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 1 Jul 2014 16:35:37 +0200 Subject: ActionBarCompat unfortunately does not fix light theme in dialog (revert change introduced by action bar commit) --- main/src/cgeo/geocaching/activity/ActivityMixin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java index e2181d0..769082d 100644 --- a/main/src/cgeo/geocaching/activity/ActivityMixin.java +++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java @@ -8,6 +8,8 @@ import org.eclipse.jdt.annotation.NonNull; import android.app.Activity; import android.content.Intent; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; import android.support.v4.app.ActivityCompat; import android.support.v4.app.NavUtils; import android.support.v4.app.TaskStackBuilder; @@ -52,8 +54,7 @@ public final class ActivityMixin { public static int getDialogTheme() { // Light theme dialogs don't work on Android Api < 11 - // The compat theme should fix this - if (Settings.isLightSkin()) { + if (Settings.isLightSkin() && VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) { return R.style.popup_light; } return R.style.popup_dark; -- cgit v1.1 From 0ca0984ff20316298ba87ce200e888df2991611c Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 1 Jul 2014 22:36:16 +0200 Subject: Fix light coordinates popup screen, HOLO is API 11+, not API 14+ --- main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'main/src') 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 -- cgit v1.1