drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-25 15:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Display size for region on second download screen as well

Browse Source 
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond
2025-05-29 01:30:58 +01:00
parent 1475a7890a
commit 1a034aa179
49 changed files with 150 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
View File

@@ -110,17 +110,17 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
return;
}
int status = MapManager.nativeGetStatus(mCurrentCountry);
CountryItem item = CountryItem.fill(mCurrentCountry);
String fileSizeString = StringUtils.getFileSizeString(getApplicationContext(), item.totalSize);
if (status != CountryItem.STATUS_DONE)
if (item.status != CountryItem.STATUS_DONE)
{
String name = getFormattedCountryName(mCurrentCountry);
UiUtils.show(mChbDownloadCountry);
String checkBoxText;
if (status == CountryItem.STATUS_UPDATABLE)
checkBoxText = String.format(getString(R.string.update_country_ask), name);
if (item.status == CountryItem.STATUS_UPDATABLE)
checkBoxText = String.format(getString(R.string.update_country_ask), item.name, fileSizeString);
else
checkBoxText = String.format(getString(R.string.download_country_ask), name);
checkBoxText = String.format(getString(R.string.download_country_ask), item.name, fileSizeString);
mChbDownloadCountry.setText(checkBoxText);
}
@@ -129,18 +129,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
}
};
private String getFormattedCountryName(String mCurrentCountry) {
String name = MapManager.nativeGetName(mCurrentCountry);
CountryItem country = CountryItem.fill(mCurrentCountry);
String sizeText = StringUtils.getFileSizeString(DownloadResourcesLegacyActivity.this, country.totalSize);
if (!TextUtils.isEmpty(sizeText)) {
name = name + " (" + sizeText + ")";
}
return name;
}
private final Listener mResourcesDownloadListener = new Listener()
{
@Override
@@ -395,9 +383,10 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
if (mCurrentCountry != null && mChbDownloadCountry.isChecked())
{
CountryItem item = CountryItem.fill(mCurrentCountry);
UiUtils.hide(mChbDownloadCountry);
mTvMessage.setText(getString(R.string.downloading_country_can_proceed, item.name));
CountryItem item = CountryItem.fill(mCurrentCountry);
String fileSizeString = StringUtils.getFileSizeString(this, item.totalSize);
mTvMessage.setText(getString(R.string.downloading_country_can_proceed, item.name, fileSizeString));
mProgress.setMax((int)item.totalSize);
mProgress.setProgressCompat(0, true);