Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #10665 Slope and Hillshade maps separated in the OsmAnd storage overview

Browse source
This commit is contained in:
nazar-kutz 2021-02-02 10:29:14 +02:00
parent bba9ed1f26
commit 1030bc67cb
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/res/layout/data_storage_memory_used_item.xml
View file

@ -9,7 +9,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" 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 <androidx.appcompat.widget.AppCompatImageView
android:id="@android:id/icon" android:id="@android:id/icon"
@ -31,11 +32,15 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="1" android:layout_weight="1"
android:paddingLeft="@dimen/content_padding" 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:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_regular" osmand:typeface="@string/font_roboto_regular"
tools:text="Internal application memory" tools:text="Internal application memory" />
android:paddingStart="@dimen/content_padding" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/memory" android:id="@+id/memory"

1
OsmAnd/res/values/strings.xml
View file

@ -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="toast_select_edits_for_upload">Select edits for upload</string>
<string name="uploaded_count">Uploaded %1$d of %2$d</string> <string name="uploaded_count">Uploaded %1$d of %2$d</string>
<string name="uploading_count">Uploading %1$d of %2$d</string> <string name="uploading_count">Uploading %1$d of %2$d</string>

2
OsmAnd/res/xml/data_storage.xml
View file

@ -17,7 +17,7 @@
android:key="terrain_memory_used" android:key="terrain_memory_used"
android:layout="@layout/data_storage_memory_used_item" android:layout="@layout/data_storage_memory_used_item"
android:icon="@drawable/ic_map" android:icon="@drawable/ic_map"
android:title="@string/contour_lines_and_hillshade"/> android:title="@string/hillshade_slope_contour_lines"/>
<Preference <Preference
android:key="tracks_memory_used" android:key="tracks_memory_used"

2
OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java
View file

@ -195,7 +195,7 @@ public class DataStorageHelper {
.setDirectories( .setDirectories(
createDirectory(SRTM_INDEX_DIR, true, EXTENSIONS, true), createDirectory(SRTM_INDEX_DIR, true, EXTENSIONS, true),
createDirectory(TILES_INDEX_DIR, false, PREFIX, false)) createDirectory(TILES_INDEX_DIR, false, PREFIX, false))
.setPrefixes("Hillshade") .setPrefixes("Hillshade", "Slope")
.createItem(); .createItem();
memoryItems.add(terrainMemory); memoryItems.add(terrainMemory);