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

Merge pull request #8074 from osmandapp/download_string_fix

Browse source 
changed "Downloading" string impl and removed several excess ellipsis
This commit is contained in:
vshcherb 2019-12-11 17:12:09 +01:00 committed by GitHub
commit 22be792a53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
Thx - Hardy Thx - Hardy
--> -->
<string name="shared_string_downloading_formatted">Downloading %s</string>
<string name="distance_and_address">%1$s • %2$s</string> <string name="distance_and_address">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string> <string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Personal</string> <string name="personal_category_name">Personal</string>

2
OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java
View file

@ -123,7 +123,7 @@ public class DownloadTilesDialog {
} }
final ProgressDialog progressDlg = new ProgressDialog(ctx); final ProgressDialog progressDlg = new ProgressDialog(ctx);
progressDlg.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); progressDlg.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
progressDlg.setMessage(ctx.getString(R.string.shared_string_downloading) + ctx.getString(R.string.shared_string_ellipsis)); progressDlg.setMessage(ctx.getString(R.string.shared_string_downloading));
progressDlg.setCancelable(true); progressDlg.setCancelable(true);
progressDlg.setMax(numberTiles); progressDlg.setMax(numberTiles);
progressDlg.setOnCancelListener(new DialogInterface.OnCancelListener(){ progressDlg.setOnCancelListener(new DialogInterface.OnCancelListener(){

3
OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java
View file

@ -263,13 +263,12 @@ public class DownloadFileHelper {
mb = 1; mb = 1;
} }
StringBuilder taskName = new StringBuilder(); StringBuilder taskName = new StringBuilder();
taskName.append(ctx.getString(R.string.shared_string_downloading)).append(": ");
//+ de.baseName /*+ " " + mb + " MB"*/; //+ de.baseName /*+ " " + mb + " MB"*/;
taskName.append(FileNameTranslationHelper.getFileName(ctx, ctx.getRegions(), de.baseName)); taskName.append(FileNameTranslationHelper.getFileName(ctx, ctx.getRegions(), de.baseName));
if (de.type != null) { if (de.type != null) {
taskName.append(" ").append(de.type.getString(ctx)); taskName.append(" ").append(de.type.getString(ctx));
} }
progress.startTask(taskName.toString(), len / 1024); progress.startTask(String.format(ctx.getString(R.string.shared_string_downloading_formatted), taskName.toString()), len / 1024);
if (!de.zipStream) { if (!de.zipStream) {
copyFile(de, progress, fin, len, fin, de.fileToDownload); copyFile(de, progress, fin, len, fin, de.fileToDownload);
} else if(de.urlToDownload.contains(".gz")) { } else if(de.urlToDownload.contains(".gz")) {

2
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -447,7 +447,7 @@ public class DownloadIndexesThread {
mainView.setKeepScreenOn(true); mainView.setKeepScreenOn(true);
} }
} }
startTask(ctx.getString(R.string.shared_string_downloading) + ctx.getString(R.string.shared_string_ellipsis), -1); startTask(ctx.getString(R.string.shared_string_downloading), -1);
downloadHasStarted(); downloadHasStarted();
} }

2
OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
View file

@ -109,7 +109,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
@NonNull @NonNull
private String getTitle(boolean loading) { private String getTitle(boolean loading) {
if (loading) { if (loading) {
return app.getString(R.string.shared_string_downloading) + "..."; return app.getString(R.string.shared_string_downloading);
} }
return app.getString(download ? R.string.download_file : R.string.update_is_available); return app.getString(download ? R.string.download_file : R.string.update_is_available);
} }