From 1030bc67cb58cb178509e0ec87e2a21b0a9938ea Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Tue, 2 Feb 2021 10:29:14 +0200
Subject: [PATCH] Fix #10665 Slope and Hillshade maps separated in the OsmAnd
 storage overview

---
 OsmAnd/res/layout/data_storage_memory_used_item.xml   | 11 ++++++++---
 OsmAnd/res/values/strings.xml                         |  1 +
 OsmAnd/res/xml/data_storage.xml                       |  2 +-
 .../plus/settings/datastorage/DataStorageHelper.java  |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout/data_storage_memory_used_item.xml b/OsmAnd/res/layout/data_storage_memory_used_item.xml
index 0edf24f056..72f49226e8 100644
--- a/OsmAnd/res/layout/data_storage_memory_used_item.xml
+++ b/OsmAnd/res/layout/data_storage_memory_used_item.xml
@@ -9,7 +9,8 @@
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="@dimen/card_row_min_height">
+		android:layout_height="wrap_content"
+		android:minHeight="@dimen/card_row_min_height">
 
 		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@android:id/icon"
@@ -31,11 +32,15 @@
 			android:layout_gravity="center_vertical"
 			android:layout_weight="1"
 			android:paddingLeft="@dimen/content_padding"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingRight="0dp"
+			android:paddingEnd="0dp"
+			android:paddingTop="@dimen/content_padding_half"
+			android:paddingBottom="@dimen/content_padding_half"
 			android:textColor="?android:textColorPrimary"
 			android:textSize="@dimen/default_desc_text_size"
 			osmand:typeface="@string/font_roboto_regular"
-			tools:text="Internal application memory"
-			android:paddingStart="@dimen/content_padding" />
+			tools:text="Internal application memory" />
 
 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/memory"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 2c3358dda4..3ecf1ade26 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,6 +12,7 @@
 
 -->
 
+    <string name="hillshade_slope_contour_lines">Hillshade / Slope / Contour lines</string>
     <string name="toast_select_edits_for_upload">Select edits for upload</string>
     <string name="uploaded_count">Uploaded %1$d of %2$d</string>
     <string name="uploading_count">Uploading %1$d of %2$d</string>
diff --git a/OsmAnd/res/xml/data_storage.xml b/OsmAnd/res/xml/data_storage.xml
index 95168ac3ce..173907c8b0 100644
--- a/OsmAnd/res/xml/data_storage.xml
+++ b/OsmAnd/res/xml/data_storage.xml
@@ -17,7 +17,7 @@
 		android:key="terrain_memory_used"
 		android:layout="@layout/data_storage_memory_used_item"
 		android:icon="@drawable/ic_map"
-		android:title="@string/contour_lines_and_hillshade"/>
+		android:title="@string/hillshade_slope_contour_lines"/>
 	
 	<Preference
 		android:key="tracks_memory_used"
diff --git a/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java
index b97da17a4c..ecc0f04842 100644
--- a/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java
+++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java
@@ -195,7 +195,7 @@ public class DataStorageHelper {
 				.setDirectories(
 						createDirectory(SRTM_INDEX_DIR, true, EXTENSIONS, true),
 						createDirectory(TILES_INDEX_DIR, false, PREFIX, false))
-				.setPrefixes("Hillshade")
+				.setPrefixes("Hillshade", "Slope")
 				.createItem();
 		memoryItems.add(terrainMemory);