From db4dec3c56332a013bc9b67d459088ac1ce7bad0 Mon Sep 17 00:00:00 2001
From: Chumva <faiver.unknown@gmail.com>
Date: Mon, 28 Oct 2019 16:02:14 +0200
Subject: [PATCH] Fix preferences toolbar size and icons color

---
 .../res/layout/global_preference_toolbar.xml   |  9 +++++----
 .../global_preferences_toolbar_with_switch.xml |  3 +--
 .../res/layout/profile_preference_toolbar.xml  |  3 +--
 .../layout/profile_preference_toolbar_big.xml  |  3 +--
 .../profile_preference_toolbar_with_switch.xml |  3 +--
 .../GeneralProfileSettingsFragment.java        | 18 +++++++++---------
 .../plus/settings/MainSettingsFragment.java    |  2 +-
 .../plus/settings/RouteParametersFragment.java |  4 ++--
 .../settings/VehicleParametersFragment.java    |  6 +++---
 9 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/OsmAnd/res/layout/global_preference_toolbar.xml b/OsmAnd/res/layout/global_preference_toolbar.xml
index 9f14b4c110..961d6c2a7e 100644
--- a/OsmAnd/res/layout/global_preference_toolbar.xml
+++ b/OsmAnd/res/layout/global_preference_toolbar.xml
@@ -4,14 +4,16 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/toolbar"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/toolbar_height"
+	android:layout_height="wrap_content"
 	android:background="?attr/actionModeBackground"
+	android:minHeight="@dimen/toolbar_height"
 	app:contentInsetLeft="0dp"
 	app:contentInsetStart="0dp">
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content"
+		android:gravity="center_vertical">
 
 		<ImageButton
 			android:id="@+id/close_button"
@@ -24,8 +26,7 @@
 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/toolbar_title"
 			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:gravity="center_vertical"
+			android:layout_height="wrap_content"
 			android:paddingLeft="@dimen/content_padding"
 			android:paddingRight="@dimen/content_padding"
 			android:textColor="?attr/app_bar_primary_item_color"
diff --git a/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml b/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
index 7c3e09ef55..f7fcab13d7 100644
--- a/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
+++ b/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
@@ -32,8 +32,7 @@
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/toolbar_title"
 				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:gravity="center_vertical"
+				android:layout_height="wrap_content"
 				android:paddingLeft="@dimen/content_padding"
 				android:paddingRight="@dimen/content_padding"
 				android:textColor="?attr/app_bar_primary_item_color"
diff --git a/OsmAnd/res/layout/profile_preference_toolbar.xml b/OsmAnd/res/layout/profile_preference_toolbar.xml
index 9850799fc7..125581fdb7 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar.xml
@@ -28,9 +28,8 @@
 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/toolbar_title"
 			android:layout_width="0dp"
-			android:layout_height="match_parent"
+			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:gravity="center_vertical"
 			android:letterSpacing="@dimen/text_button_letter_spacing"
 			android:paddingLeft="@dimen/content_padding"
 			android:paddingRight="@dimen/content_padding"
diff --git a/OsmAnd/res/layout/profile_preference_toolbar_big.xml b/OsmAnd/res/layout/profile_preference_toolbar_big.xml
index e848d676d5..31ff26ef3f 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar_big.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_big.xml
@@ -33,9 +33,8 @@
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/toolbar_title"
 				android:layout_width="0dp"
-				android:layout_height="match_parent"
+				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:gravity="center_vertical"
 				android:letterSpacing="@dimen/text_button_letter_spacing"
 				android:paddingLeft="@dimen/content_padding"
 				android:paddingRight="@dimen/content_padding"
diff --git a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
index 9e06bb7350..e98e25ba7f 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
@@ -33,9 +33,8 @@
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/toolbar_title"
 				android:layout_width="0dp"
-				android:layout_height="match_parent"
+				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:gravity="center_vertical"
 				android:letterSpacing="@dimen/text_button_letter_spacing"
 				android:paddingLeft="@dimen/content_padding"
 				android:paddingRight="@dimen/content_padding"
diff --git a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java
index 63781d62d7..4f77a9e285 100644
--- a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java
@@ -123,7 +123,7 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 	}
 
 	private Drawable getOsmandThemeIcon() {
-		return getIcon(settings.isLightContent() ? R.drawable.ic_action_sun : R.drawable.ic_action_moon);
+		return getContentIcon(settings.isLightContent() ? R.drawable.ic_action_sun : R.drawable.ic_action_moon);
 	}
 
 	private void setupRotateMapPref() {
@@ -136,11 +136,11 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 	private Drawable getRotateMapIcon() {
 		switch (settings.ROTATE_MAP.get()) {
 			case OsmandSettings.ROTATE_MAP_NONE:
-				return getIcon(R.drawable.ic_action_direction_north);
+				return getContentIcon(R.drawable.ic_action_direction_north);
 			case OsmandSettings.ROTATE_MAP_BEARING:
-				return getIcon(R.drawable.ic_action_direction_movement);
+				return getContentIcon(R.drawable.ic_action_direction_movement);
 			default:
-				return getIcon(R.drawable.ic_action_direction_compass);
+				return getContentIcon(R.drawable.ic_action_direction_compass);
 		}
 	}
 
@@ -164,11 +164,11 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 	private Drawable getMapScreenOrientationIcon() {
 		switch (settings.MAP_SCREEN_ORIENTATION.get()) {
 			case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
-				return getIcon(R.drawable.ic_action_phone_portrait_orientation);
+				return getContentIcon(R.drawable.ic_action_phone_portrait_orientation);
 			case ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE:
-				return getIcon(R.drawable.ic_action_phone_landscape_orientation);
+				return getContentIcon(R.drawable.ic_action_phone_landscape_orientation);
 			default:
-				return getIcon(R.drawable.ic_action_phone_device_orientation);
+				return getContentIcon(R.drawable.ic_action_phone_device_orientation);
 		}
 	}
 
@@ -191,7 +191,7 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 		ListPreferenceEx unitsOfLength = (ListPreferenceEx) findPreference(settings.METRIC_SYSTEM.getId());
 		unitsOfLength.setEntries(entries);
 		unitsOfLength.setEntryValues(entryValues);
-		unitsOfLength.setIcon(getIcon(R.drawable.ic_action_ruler_unit));
+		unitsOfLength.setIcon(getContentIcon(R.drawable.ic_action_ruler_unit));
 	}
 
 	private void setupCoordinatesFormatPref() {
@@ -221,7 +221,7 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 		ListPreferenceEx angularUnits = (ListPreferenceEx) findPreference(settings.ANGULAR_UNITS.getId());
 		angularUnits.setEntries(entries);
 		angularUnits.setEntryValues(entryValues);
-		angularUnits.setIcon(getIcon(R.drawable.ic_action_angular_unit));
+		angularUnits.setIcon(getContentIcon(R.drawable.ic_action_angular_unit));
 	}
 
 	private void setupSpeedSystemPref() {
diff --git a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
index 027da24688..e57607fffd 100644
--- a/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/MainSettingsFragment.java
@@ -62,7 +62,7 @@ public class MainSettingsFragment extends BaseSettingsFragment {
 
 	private void setupManageProfilesPref() {
 		Preference manageProfiles = findPreference("manage_profiles");
-		manageProfiles.setIcon(getIcon(R.drawable.ic_action_manage_profiles));
+		manageProfiles.setIcon(getContentIcon(R.drawable.ic_action_manage_profiles));
 		manageProfiles.setFragment(SettingsProfileFragment.class.getName());
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
index 51e5a0bc75..d98864fdd5 100644
--- a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
@@ -284,7 +284,7 @@ public class RouteParametersFragment extends BaseSettingsFragment {
 	private Drawable getRoutingPrefIcon(String prefId) {
 		switch (prefId) {
 			case GeneralRouter.ALLOW_PRIVATE:
-				return getIcon(R.drawable.ic_action_private_access);
+				return getContentIcon(R.drawable.ic_action_private_access);
 			case GeneralRouter.USE_SHORTEST_WAY:
 				return getContentIcon(R.drawable.ic_action_fuel);
 			case AVOID_ROUTING_PARAMETER_PREFIX:
@@ -292,7 +292,7 @@ public class RouteParametersFragment extends BaseSettingsFragment {
 			case DRIVING_STYLE:
 				return getContentIcon(R.drawable.ic_action_bicycle_dark);
 			case "fast_route_mode":
-				return getIcon(R.drawable.ic_action_fastest_route);
+				return getContentIcon(R.drawable.ic_action_fastest_route);
 			case "enable_time_conditional_routing":
 				return getContentIcon(R.drawable.ic_action_road_works_dark);
 			default:
diff --git a/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java
index f3bbf37632..fdfb29d7b6 100644
--- a/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/VehicleParametersFragment.java
@@ -112,11 +112,11 @@ public class VehicleParametersFragment extends BaseSettingsFragment {
 			case GeneralRouter.DEFAULT_SPEED:
 				return getContentIcon(R.drawable.ic_action_speed);
 			case GeneralRouter.VEHICLE_HEIGHT:
-				return getIcon(R.drawable.ic_action_height_limit);
+				return getContentIcon(R.drawable.ic_action_height_limit);
 			case GeneralRouter.VEHICLE_WEIGHT:
-				return getIcon(R.drawable.ic_action_weight_limit);
+				return getContentIcon(R.drawable.ic_action_weight_limit);
 			case GeneralRouter.VEHICLE_WIDTH:
-				return getIcon(R.drawable.ic_action_width_limit);
+				return getContentIcon(R.drawable.ic_action_width_limit);
 			default:
 				return null;
 		}