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

Import header, storage path replace in UI display

Browse source
This commit is contained in:
androiddevkotlin 2021-03-29 13:39:36 +03:00
parent ae858ede93
commit 78175e8a1c
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/main/java/com/jwetherell/openmap/common/MGRSPoint.java
View file

@ -699,8 +699,8 @@ public class MGRSPoint extends ZonedUTMPoint {
String zero = ""; String zero = "";
} }
all.add(String.format(java.util.Locale.US,"%0" + accuracy + "d", roundedEasting)); all.add(String.format(Locale.US,"%0" + accuracy + "d", roundedEasting));
all.add(String.format(java.util.Locale.US,"%0" + accuracy + "d", roundedNorthing)); all.add(String.format(Locale.US,"%0" + accuracy + "d", roundedNorthing));
break; break;
} }
} }

5
OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageFragment.java
View file

@ -46,6 +46,7 @@ import java.util.ArrayList;
import static net.osmand.plus.settings.datastorage.DataStorageHelper.INTERNAL_STORAGE; import static net.osmand.plus.settings.datastorage.DataStorageHelper.INTERNAL_STORAGE;
import static net.osmand.plus.settings.datastorage.DataStorageHelper.MANUALLY_SPECIFIED; import static net.osmand.plus.settings.datastorage.DataStorageHelper.MANUALLY_SPECIFIED;
import static net.osmand.plus.settings.datastorage.DataStorageHelper.OTHER_MEMORY; import static net.osmand.plus.settings.datastorage.DataStorageHelper.OTHER_MEMORY;
import static net.osmand.plus.settings.datastorage.DataStorageHelper.SHARED_STORAGE;
import static net.osmand.plus.settings.datastorage.DataStorageHelper.TILES_MEMORY; import static net.osmand.plus.settings.datastorage.DataStorageHelper.TILES_MEMORY;
import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.CHOSEN_DIRECTORY; import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.CHOSEN_DIRECTORY;
import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.MOVE_DATA; import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.MOVE_DATA;
@ -226,7 +227,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
int defaultIconColor = isNightMode() ? R.color.icon_color_default_dark : R.color.icon_color_default_light; int defaultIconColor = isNightMode() ? R.color.icon_color_default_dark : R.color.icon_color_default_light;
int chosenIconColor = isNightMode() ? R.color.icon_color_osmand_dark : R.color.icon_color_osmand_light; int chosenIconColor = isNightMode() ? R.color.icon_color_osmand_dark : R.color.icon_color_osmand_light;
Drawable icon = app.getUIUtilities().getIcon(item.getIconResId(), Drawable icon = app.getUIUtilities().getIcon(item.getIconResId(),
isCurrent ? chosenIconColor : defaultIconColor); isCurrent ? chosenIconColor : defaultIconColor);
ivIcon.setImageDrawable(icon); ivIcon.setImageDrawable(icon);
@ -249,6 +250,8 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
} }
if (currentKey.equals(INTERNAL_STORAGE)) { if (currentKey.equals(INTERNAL_STORAGE)) {
tvAdditionalDescription.setText(item.getDescription()); tvAdditionalDescription.setText(item.getDescription());
} else if(currentKey.equals(SHARED_STORAGE)){
tvAdditionalDescription.setText(String.format("\u200E%s", item.getDirectory()));
} else { } else {
tvAdditionalDescription.setText(item.getDirectory()); tvAdditionalDescription.setText(item.getDirectory());
} }

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

@ -106,7 +106,7 @@ public class DataStorageHelper {
//shared storage //shared storage
dir = settings.getDefaultInternalStorage(); dir = settings.getDefaultInternalStorage();
path = "\u200e" + dir.getAbsolutePath(); path = dir.getAbsolutePath();
iconId = R.drawable.ic_action_phone; iconId = R.drawable.ic_action_phone;
StorageItem sharedStorageItem = StorageItem.builder() StorageItem sharedStorageItem = StorageItem.builder()