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

Data storage folder show second slash "/" for path goes to the second line.

Browse source
This commit is contained in:
androiddevkotlin 2021-03-30 23:53:18 +03:00
parent e880f99a25
commit 1ce5313dfd
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -234,7 +234,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
ivIcon.setImageDrawable(icon); ivIcon.setImageDrawable(icon);
if (currentKey.equals(MANUALLY_SPECIFIED)) { if (currentKey.equals(MANUALLY_SPECIFIED)) {
tvSummary.setText(item.getDirectory()); setFormattedPath(item, tvSummary);
secondPart.setVisibility(View.GONE); secondPart.setVisibility(View.GONE);
tvAdditionalDescription.setVisibility(View.GONE); tvAdditionalDescription.setVisibility(View.GONE);
divider.setVisibility(View.GONE); divider.setVisibility(View.GONE);
@ -252,15 +252,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)) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
BidiFormatter rtlFormatter = BidiFormatter.getInstance();
tvAdditionalDescription.setText(rtlFormatter.unicodeWrap(item.getDirectory()));
} else {
tvAdditionalDescription.setText(String.format("\u200E%s", item.getDirectory()));
}
} else { } else {
tvAdditionalDescription.setText(item.getDirectory()); setFormattedPath(item, tvAdditionalDescription);
} }
} }
} }
@ -310,6 +303,15 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
} }
} }
private void setFormattedPath(StorageItem item, TextView tvAdditionalDescription) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
BidiFormatter pathRtlFormatter = BidiFormatter.getInstance();
tvAdditionalDescription.setText(pathRtlFormatter.unicodeWrap(item.getDirectory()));
} else {
tvAdditionalDescription.setText(String.format("\u200E%s", item.getDirectory()));
}
}
@Override @Override
public void onDestroy() { public void onDestroy() {
if (!activity.isChangingConfigurations()) { if (!activity.isChangingConfigurations()) {