From ea553717d8f1c94bd5e5f03ac406b6c3636e5fe7 Mon Sep 17 00:00:00 2001
From: androiddevkotlin <64539346+androiddevkotlin@users.noreply.github.com>
Date: Mon, 19 Apr 2021 15:05:33 +0300
Subject: [PATCH] Small fixes UI

---
 .../layout/list_item_icon_and_download.xml    | 10 ++---
 .../res/layout/preference_category_title.xml  | 37 +++++++++++++++++++
 .../layout/preference_category_with_descr.xml |  2 +-
 OsmAnd/res/xml/voice_announces.xml            | 10 ++---
 .../VoiceLanguageBottomSheetFragment.java     |  4 +-
 5 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 OsmAnd/res/layout/preference_category_title.xml

diff --git a/OsmAnd/res/layout/list_item_icon_and_download.xml b/OsmAnd/res/layout/list_item_icon_and_download.xml
index eab556dd26..30648adf68 100644
--- a/OsmAnd/res/layout/list_item_icon_and_download.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_download.xml
@@ -83,11 +83,11 @@
                     android:id="@+id/compound_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/title_padding"
-                    android:layout_marginRight="@dimen/title_padding"
                     android:layout_gravity="center_vertical"
                     android:scaleType="center"
                     android:background="@null"
+                    android:layout_marginEnd="@dimen/dashFavDirectionSize"
+                    android:layout_marginRight="@dimen/dashFavDirectionSize"
                     android:clickable="false"
                     android:focusable="false"
                     android:visibility="gone"
@@ -96,11 +96,9 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/secondary_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/list_item_height"
+                    android:layout_height="@dimen/list_item_height"
                     android:scaleType="center"
-                    android:layout_marginEnd="@dimen/title_padding"
-                    android:layout_marginRight="@dimen/title_padding"
                     android:layout_gravity="center_vertical"
                     android:visibility="gone"
                     tools:src="@drawable/ic_action_import"
diff --git a/OsmAnd/res/layout/preference_category_title.xml b/OsmAnd/res/layout/preference_category_title.xml
new file mode 100644
index 0000000000..a4d7eaae8d
--- /dev/null
+++ b/OsmAnd/res/layout/preference_category_title.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/card_row_min_height"
+	android:background="?attr/list_background_color"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_cancel_button_height"
+	android:orientation="horizontal">
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@android:id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@android:id/title"
+		android:layout_width="0dp"
+		android:layout_weight="1"
+		android:layout_height="wrap_content"
+		android:textColor="@color/preference_category_title"
+		android:layout_gravity="center_vertical|start"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_medium"
+		tools:text="@string/plugin_settings"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingStart="@dimen/content_padding" />
+	
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/preference_category_with_descr.xml b/OsmAnd/res/layout/preference_category_with_descr.xml
index c4ed864a71..8d316d54a5 100644
--- a/OsmAnd/res/layout/preference_category_with_descr.xml
+++ b/OsmAnd/res/layout/preference_category_with_descr.xml
@@ -6,7 +6,7 @@
 	android:layout_height="wrap_content"
 	android:background="?attr/list_background_color"
 	android:gravity="center_vertical"
-	android:minHeight="@dimen/bottom_sheet_list_item_height"
+	android:minHeight="@dimen/bottom_sheet_cancel_button_height_small"
 	android:orientation="horizontal">
 
 	<androidx.appcompat.widget.AppCompatImageView
diff --git a/OsmAnd/res/xml/voice_announces.xml b/OsmAnd/res/xml/voice_announces.xml
index aac1a6d6f6..998ed9d345 100644
--- a/OsmAnd/res/xml/voice_announces.xml
+++ b/OsmAnd/res/xml/voice_announces.xml
@@ -25,7 +25,7 @@
 
 	<PreferenceCategory
 		android:key="announce_header"
-		android:layout="@layout/preference_category_with_descr"
+		android:layout="@layout/preference_category_title"
 		android:title="@string/accessibility_announce" />
 
 	<SwitchPreferenceCompat
@@ -78,7 +78,7 @@
 
 	<PreferenceCategory
 		android:key="user_points_header"
-		android:layout="@layout/preference_category_with_descr"
+		android:layout="@layout/preference_category_title"
 		android:title="@string/user_points" />
 
 	<SwitchPreferenceCompat
@@ -103,7 +103,7 @@
 
 	<PreferenceCategory
 		android:key="speed_limit_header"
-		android:layout="@layout/preference_category_with_descr"
+		android:layout="@layout/preference_category_title"
 		android:title="@string/speak_speed_limit" />
 
 	<SwitchPreferenceCompat
@@ -123,7 +123,7 @@
 
 	<PreferenceCategory
 		android:key="options_header"
-		android:layout="@layout/preference_category_with_descr"
+		android:layout="@layout/preference_category_title"
 		android:title="@string/shared_string_options" />
 
 	<net.osmand.plus.settings.preferences.ListPreferenceEx
@@ -143,7 +143,7 @@
 
 	<PreferenceCategory
 		android:key="output_header"
-		android:layout="@layout/preference_category_with_descr"
+		android:layout="@layout/preference_category_title"
 		android:title="@string/output" />
 
 </PreferenceScreen>
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceLanguageBottomSheetFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceLanguageBottomSheetFragment.java
index 9273bcd089..cf9f163e02 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceLanguageBottomSheetFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceLanguageBottomSheetFragment.java
@@ -162,6 +162,7 @@ public class VoiceLanguageBottomSheetFragment extends MenuBottomSheetDialogFragm
 		LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
 		BaseBottomSheetItem titleItem = new BottomSheetItemWithDescription.Builder()
 				.setDescription(getString(R.string.language_description))
+				.setDescriptionColorId(nightMode ? R.color.text_color_primary_dark : R.color.text_color_primary_light)
 				.setTitle(getString(R.string.shared_string_language))
 				.setLayoutId(R.layout.bottom_sheet_item_title_with_description)
 				.create();
@@ -253,9 +254,8 @@ public class VoiceLanguageBottomSheetFragment extends MenuBottomSheetDialogFragm
 			int position = isDefault ? DEFAULT_LANGUAGE_POSITION : -1;
 
 			final ImageView secondaryIcon = view.findViewById(R.id.secondary_icon);
-			int color = ContextCompat.getColor(context, nightMode ? R.color.wikivoyage_active_dark : R.color.wikivoyage_active_light);
 			int activeColorResId = nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light;
-			secondaryIcon.setColorFilter(color, android.graphics.PorterDuff.Mode.MULTIPLY);
+			secondaryIcon.setColorFilter(ContextCompat.getColor(context, activeColorResId));
 
 			final ProgressBar progressBar = view.findViewById(R.id.ProgressBar);
 			final TextView textDescription = view.findViewById(R.id.description);