From c72280f55ece31736109b96be3c83c3a72b83486 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 30 Jan 2015 15:44:59 +0200
Subject: [PATCH] CheckBox style will be applied only for settings

---
 OsmAnd/res/values/styles.xml                   | 18 ++++++++++++------
 .../src/net/osmand/plus/OsmandApplication.java |  6 +-----
 .../ActionBarPreferenceActivity.java           | 12 ++++++++++--
 .../plus/activities/SettingsBaseActivity.java  |  3 +--
 .../activities/SettingsGeneralActivity.java    |  1 -
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 5ecbc39c4a..8735c935c9 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -64,6 +64,17 @@
 		<item name="windowActionBarOverlay">true</item>
     </style>
 
+	<style name="SettingsLightTheme" parent="Theme.AppCompat.Light">
+		<item name="android:listChoiceIndicatorMultiple">@drawable/check_light</item>
+		<item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
+		<item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
+	</style>
+
+	<style name="SettingsDarkTheme" parent="Theme.AppCompat">
+		<item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
+		<item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
+		<item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item>
+	</style>
 
     <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
         <item name="expandable_category_color">@color/group_background</item>
@@ -79,21 +90,18 @@
         <item name="pstsTextColor">@color/color_white</item>
         <item name="android:actionModeBackground">@color/actionbar_light_color</item>
         <item name="actionModeBackground">@color/actionbar_light_color</item>
-        <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
 		<item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
 		<item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
 		<item name="android:actionModeStyle">@style/WhiteActionMode</item>
 		<item name="actionModeStyle">@style/WhiteActionMode</item>
 		<item name="android:actionMenuTextColor">@color/color_white</item>
 		<item name="actionMenuTextColor">@color/color_white</item>
+		<item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
 		<item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
-		<item name="android:listChoiceIndicatorMultiple">@drawable/check_light</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
         <item name="reset_image">@drawable/ic_action_delete_dark</item> <!--  @drawable/a_1_navigation_cancel_dark -->
-		<!--<item name="android:actionDropDownStyle">@style/Widget.DarkActionSpinner</item>-->
-		<!--<item name="actionDropDownStyle">@style/Widget.DarkActionSpinner</item>-->
         <item name="expandable_category_color">?android:attr/colorBackground</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="bottomToolBarColor">@color/tool_bar_color_dark</item>
@@ -106,7 +114,6 @@
         <item name="actionModeBackground">@color/actionbar_dark_color</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
-		<item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -142,7 +149,6 @@
 
 	<style name="Widget.DarkActionSpinner" parent="@style/Widget.AppCompat.Spinner.DropDown.ActionBar">
 		<item name="android:popupBackground">@color/actionbar_dark_color</item>
-		<item name="android:textColor">@color/color_white</item>
 	</style>
 
 	<style name="Widget.LightSpinner" parent="@style/Widget.AppCompat.Spinner.DropDown.ActionBar">
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 004059eb17..169f323c1b 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -810,11 +810,7 @@ public class OsmandApplication extends Application {
 			if (c instanceof ActionBarActivity) {
 				ab = ((ActionBarActivity) c).getSupportActionBar();
 			}
-//			else if (c instanceof SherlockListActivity) {
-//				ab = ((SherlockListActivity) c).getSupportActionBar();
-//			} else if (c instanceof Expandable) {
-//				ab = ((SherlockExpandableListActivity) c).getSupportActionBar();
-//			}
+
 			if (ab != null) {
 				BitmapDrawable bg = (BitmapDrawable) getResources().getDrawable(R.drawable.bg_striped);
 				bg.setTileModeXY(TileMode.REPEAT, TileMode.REPEAT);
diff --git a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
index 087d0983e0..f20197f260 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
@@ -1,9 +1,7 @@
 package net.osmand.plus.activities;
 
 import android.app.Activity;
-import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
@@ -16,6 +14,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Spinner;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 
 public abstract class ActionBarPreferenceActivity extends PreferenceActivity {
@@ -29,6 +28,15 @@ public abstract class ActionBarPreferenceActivity extends PreferenceActivity {
 	@SuppressWarnings("deprecation")
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
+		//settings needed it's own theme because of check boxes not styled properly
+		OsmandSettings settings = ((OsmandApplication)getApplication()).getSettings();
+		int t = R.style.SettingsLightTheme;
+		if (settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_DARK_THEME) {
+			t = R.style.SettingsDarkTheme;
+		} else if (settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME) {
+			t = R.style.SettingsLightTheme;
+		}
+		setTheme(t);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.preference_activity);
 		toolbar = (Toolbar) findViewById(R.id.toolbar);
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
index 82d8cee0c4..02ad61d277 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
@@ -304,10 +304,9 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 	@SuppressWarnings("deprecation")
 	@Override
     public void onCreate(Bundle savedInstanceState) {
-		((OsmandApplication) getApplication()).applyTheme(this);
 		super.onCreate(savedInstanceState);
 		getToolbar().setTitle(R.string.settings_activity);
-		settings = getMyApplication().getSettings();
+
 		
 		if (profileSettings) {
 			modes.clear();
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index c7f905863d..a06f28c4d8 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -64,7 +64,6 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 	private ListPreference drivingRegionPreference;
 
 
-
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		((OsmandApplication) getApplication()).applyTheme(this);