From 57bac37943496188078dd73ceaffa2efb45ff162 Mon Sep 17 00:00:00 2001 From: MadWasp79 Date: Wed, 11 Dec 2019 18:09:46 +0200 Subject: [PATCH] changed "Downloading" string impl and removed several excess ellipsis --- OsmAnd/res/values/strings.xml | 1 + OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java | 2 +- OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java | 3 +-- OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java | 2 +- .../explore/travelcards/TravelDownloadUpdateCard.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index e3aa45cb6a..45afa56cc2 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,7 @@ Thx - Hardy --> + Downloading %s %1$s • %2$s %1$s, %2$s Personal diff --git a/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java b/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java index 89035e5255..2ae1a58de7 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java +++ b/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java @@ -123,7 +123,7 @@ public class DownloadTilesDialog { } final ProgressDialog progressDlg = new ProgressDialog(ctx); 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.setMax(numberTiles); progressDlg.setOnCancelListener(new DialogInterface.OnCancelListener(){ diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java b/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java index 2aef38aa1f..36d2f21b85 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java @@ -263,13 +263,12 @@ public class DownloadFileHelper { mb = 1; } StringBuilder taskName = new StringBuilder(); - taskName.append(ctx.getString(R.string.shared_string_downloading)).append(": "); //+ de.baseName /*+ " " + mb + " MB"*/; taskName.append(FileNameTranslationHelper.getFileName(ctx, ctx.getRegions(), de.baseName)); if (de.type != null) { 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) { copyFile(de, progress, fin, len, fin, de.fileToDownload); } else if(de.urlToDownload.contains(".gz")) { diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java index e5db04a370..18f06cc21e 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java @@ -447,7 +447,7 @@ public class DownloadIndexesThread { 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(); } diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java index 9a3f67781b..5c24f944f3 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java @@ -109,7 +109,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard { @NonNull private String getTitle(boolean 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); }