From f9de3b095ced49ad5ae483ec42c19c40a8320ce0 Mon Sep 17 00:00:00 2001 From: Phillip Dykman Date: Thu, 28 Nov 2019 20:53:54 -0800 Subject: [PATCH] Make result strings be result dynamic --- .../java/org/transdroid/core/gui/DetailsActivity.java | 10 ++++++++-- app/src/main/res/values-ru/strings.xml | 6 ++++++ app/src/main/res/values/strings.xml | 8 ++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java b/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java index 448a9c25..c67d1f13 100644 --- a/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java @@ -284,9 +284,12 @@ public class DetailsActivity extends AppCompatActivity implements TorrentTasksEx @Override public void toggleSequentialDownload(Torrent torrent, boolean sequentialState) { torrent.mimicSequentialDownload(sequentialState); + String onState = getString(R.string.result_togglesequential_onstate); + String offState = getString(R.string.result_togglesequential_offstate); + String stateString = sequentialState ? onState : offState; DaemonTaskResult result = ToggleSequentialDownloadTask.create(currentConnection, torrent).execute(log); if (result instanceof DaemonTaskSuccessResult) { - onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_togglesequential)); + onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_togglesequential, torrent.getName(), stateString)); } else { onCommunicationError((DaemonTaskFailureResult) result, false); } @@ -296,9 +299,12 @@ public class DetailsActivity extends AppCompatActivity implements TorrentTasksEx @Override public void toggleFirstLastPieceDownload(Torrent torrent, boolean firstLastPieceState) { torrent.mimicFirstLastPieceDownload(firstLastPieceState); + String onState = getString(R.string.result_togglefirstlastpiece_onstate); + String offState = getString(R.string.result_togglefirstlastpiece_offstate); + String stateString = firstLastPieceState ? onState : offState; DaemonTaskResult result = ToggleFirstLastPieceDownloadTask.create(currentConnection, torrent).execute(log); if (result instanceof DaemonTaskSuccessResult) { - onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_togglefirstlastpiece)); + onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_togglefirstlastpiece, torrent.getName(), stateString)); } else { onCommunicationError((DaemonTaskFailureResult) result, false); } diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5840d258..cb9edf92 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -170,6 +170,12 @@ Трекеры обновлены Метка установлена ​​в \'%1$s\' Метка удалена + %1$s скачивается %2$s + последовательно + обычным образом + %1$s имеет %2$s + приоритет первого и последнего куска + обычый приоритет кусков Изменено последовательное скачивание торрента Изменен приоритет скачивания начала и конца торрента Проверка данных %1$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e11907ce..949b2e56 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -178,8 +178,12 @@ Trackers updated Label set to \'%1$s\' Label removed - Toggled sequential download mode - Toggled first and last piece priority + %1$s is downloading %2$s + normally + sequentially + %1$s has %2$s + first and last piece priority + normal piece priority Checking %1$s data Torrent moved to \'%1$s\' File priorities updated