diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
index 1d65e48dd..5086ab014 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
@@ -268,7 +268,14 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
viewBinding.exportProgressTotal.setText("" + trackExportTotalCount);
viewBinding.exportProgressBar.setProgress((int) ((float) done / (float) trackExportTotalCount * 100f));
- viewBinding.exportProgressSummary.setText(getString(R.string.export_progress_review, getTotalDone(), trackExportSuccessCount, trackExportOverwrittenCount, trackExportSkippedCount, trackExportErrorCount));
+ viewBinding.exportProgressSummaryNew.setText(String.valueOf(trackExportSuccessCount));
+ viewBinding.exportProgressSummaryOverwrite.setText(String.valueOf(trackExportOverwrittenCount));
+ viewBinding.exportProgressSummarySkip.setText(String.valueOf(trackExportSkippedCount));
+ viewBinding.exportProgressSummaryErrors.setText(String.valueOf(trackExportErrorCount));
+ viewBinding.exportProgressSummaryNewGroup.setVisibility(trackExportSuccessCount > 0 ? View.VISIBLE : View.GONE);
+ viewBinding.exportProgressSummaryOverwriteGroup.setVisibility(trackExportOverwrittenCount > 0 ? View.VISIBLE : View.GONE);
+ viewBinding.exportProgressSummarySkipGroup.setVisibility(trackExportSkippedCount > 0 ? View.VISIBLE : View.GONE);
+ viewBinding.exportProgressSummaryErrorsGroup.setVisibility(trackExportErrorCount > 0 ? View.VISIBLE : View.GONE);
}
private void onExportCompleted(Track.Id trackId) {
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
index 4f26cc9ab..8bc83ef39 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
@@ -127,7 +127,9 @@ public class ImportActivity extends FragmentActivity {
private void initViews() {
viewBinding.importProgressDone.setText("0");
viewBinding.importProgressTotal.setText("0");
- viewBinding.importProgressSummary.setText(getString(R.string.import_progress_review, 0, 0, 0, 0));
+ viewBinding.importProgressSummaryOk.setText("0");
+ viewBinding.importProgressSummaryExists.setText("0");
+ viewBinding.importProgressSummaryErrors.setText("0");
}
private int getTotalDone() {
@@ -141,7 +143,12 @@ public class ImportActivity extends FragmentActivity {
viewBinding.importProgressTotal.setText("" + summary.getTotalCount());
viewBinding.importProgressBar.setProgress((int) ((float) done / (float) summary.getTotalCount() * 100f));
- viewBinding.importProgressSummary.setText(getString(R.string.import_progress_review, getTotalDone(), summary.getSuccessCount(), summary.getExistsCount(), summary.getErrorCount()));
+ viewBinding.importProgressSummaryOk.setText(String.valueOf(summary.getSuccessCount()));
+ viewBinding.importProgressSummaryExists.setText(String.valueOf(summary.getExistsCount()));
+ viewBinding.importProgressSummaryErrors.setText(String.valueOf(summary.getErrorCount()));
+ viewBinding.importProgressSummaryOkGroup.setVisibility(summary.getSuccessCount() > 0 ? View.VISIBLE : View.GONE);
+ viewBinding.importProgressSummaryExistsGroup.setVisibility(summary.getExistsCount() > 0 ? View.VISIBLE : View.GONE);
+ viewBinding.importProgressSummaryErrorsGroup.setVisibility(summary.getErrorCount() > 0 ? View.VISIBLE : View.GONE);
if (done == summary.getTotalCount()) {
onImportEnded();
diff --git a/src/main/res/layout/export_activity.xml b/src/main/res/layout/export_activity.xml
index f9be645dd..71fb1f1d2 100644
--- a/src/main/res/layout/export_activity.xml
+++ b/src/main/res/layout/export_activity.xml
@@ -21,9 +21,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/res/layout/import_activity.xml b/src/main/res/layout/import_activity.xml
index dcaa8d0cc..4d92031dd 100644
--- a/src/main/res/layout/import_activity.xml
+++ b/src/main/res/layout/import_activity.xml
@@ -19,9 +19,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ tools:text="Import progress alert message" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 94cc7a045..a80889b76 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -221,13 +221,10 @@ limitations under the License.
The track %1$s already exists at the destination directory.
do it for all conflicts
Tracks not exported
-
- Total exported tracks: %1$d\n
- - New tracks exported: %2$d\n
- - Tracks overwritten: %3$d\n
- - Tracks skipped: %4$d\n
- - Errors: %5$d
-
+ New tracks exported
+ Tracks overwritten
+ Tracks skipped
+ Errors
%1$d files
@@ -304,12 +301,9 @@ limitations under the License.
All %1$s
Import from external storage
Imported %1$s from %2$s
-
- Total imported files: %1$d\n
- - Files imported: %2$d\n
- - Already exists: %3$d\n
- - Errors: %4$d
-
+ Files imported
+ Already exists
+ Errors
Unable to insert a marker. No GPS signal. Try again.
A marker was inserted
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 47d719547..129a12707 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -241,5 +241,21 @@ limitations under the License.
- wrap_content
+
+
+
+