From a8fa5fd8699b7c457ae701beea55270c82f873a7 Mon Sep 17 00:00:00 2001 From: Floens Date: Sun, 3 Apr 2016 14:40:46 +0200 Subject: [PATCH] Update watch background timeout description --- .../floens/chan/ui/controller/WatchSettingsController.java | 7 ++++++- .../java/org/floens/chan/ui/settings/ListSettingView.java | 4 ++-- Clover/app/src/main/res/values/strings.xml | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java index ed4ce149..6a5dc899 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java @@ -110,7 +110,12 @@ public class WatchSettingsController extends SettingsController implements Compo String name = context.getResources().getQuantityString(R.plurals.minutes, timeouts[i], timeouts[i]); timeoutsItems[i] = new ListSettingView.Item(name, String.valueOf(timeouts[i] * 60)); } - backgroundTimeout = settings.add(new ListSettingView(this, ChanSettings.watchBackgroundTimeout, R.string.setting_watch_background_timeout, timeoutsItems)); + backgroundTimeout = settings.add(new ListSettingView(this, ChanSettings.watchBackgroundTimeout, R.string.setting_watch_background_timeout, timeoutsItems) { + @Override + public String getBottomDescription() { + return getString(R.string.setting_watch_background_timeout_description) + "\n\n" + items.get(selected).name; + } + }); notifyMode = settings.add(new ListSettingView(this, ChanSettings.watchNotifyMode, R.string.setting_watch_notify_mode, context.getResources().getStringArray(R.array.setting_watch_notify_modes), new String[]{"all", "quotes"})); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/settings/ListSettingView.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/ListSettingView.java index 3d13f16a..d9325a8d 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/settings/ListSettingView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/ListSettingView.java @@ -34,9 +34,9 @@ import static org.floens.chan.utils.AndroidUtils.dp; public class ListSettingView extends SettingView implements FloatingMenu.FloatingMenuCallback, View.OnClickListener { public final List items; - private Setting setting; + public int selected; - private int selected; + private Setting setting; public ListSettingView(SettingsController settingsController, Setting setting, int name, String[] itemNames, String[] keys) { this(settingsController, setting, getString(name), itemNames, keys); diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 9878aa16..afada23e 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -399,7 +399,8 @@ along with this program. If not, see . Off Enable in the background Watch pins when Clover is in the background - Time between loads in background + Minimum time between loads in background + Minimum time between loads, with exponential backoff Notify about All posts