From 5392ea00d418f939b96524aba51b442739330c0f Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 4 Oct 2016 23:44:56 +0200 Subject: [PATCH] add a setting for toggling displaying week numbers, disabled by default --- .../simplemobiletools/calendar/Config.java | 8 ++++++ .../simplemobiletools/calendar/Constants.java | 1 + .../calendar/activities/SettingsActivity.java | 12 ++++++++ app/src/main/res/layout/activity_settings.xml | 28 ++++++++++++++++++- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 10 files changed, 54 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/simplemobiletools/calendar/Config.java b/app/src/main/java/com/simplemobiletools/calendar/Config.java index 50337a99b..d0a722868 100644 --- a/app/src/main/java/com/simplemobiletools/calendar/Config.java +++ b/app/src/main/java/com/simplemobiletools/calendar/Config.java @@ -40,4 +40,12 @@ public class Config { public void setIsSundayFirst(boolean sundayFirst) { mPrefs.edit().putBoolean(Constants.SUNDAY_FIRST, sundayFirst).apply(); } + + public boolean getDisplayWeekNumbers() { + return mPrefs.getBoolean(Constants.WEEK_NUMBERS, false); + } + + public void setDisplayWeekNumbers(boolean displayWeekNumbers) { + mPrefs.edit().putBoolean(Constants.WEEK_NUMBERS, displayWeekNumbers).apply(); + } } diff --git a/app/src/main/java/com/simplemobiletools/calendar/Constants.java b/app/src/main/java/com/simplemobiletools/calendar/Constants.java index 3a48748a7..4499d6820 100644 --- a/app/src/main/java/com/simplemobiletools/calendar/Constants.java +++ b/app/src/main/java/com/simplemobiletools/calendar/Constants.java @@ -17,6 +17,7 @@ public class Constants { public static final String IS_FIRST_RUN = "is_first_run"; public static final String IS_DARK_THEME = "is_dark_theme"; public static final String SUNDAY_FIRST = "sunday_first"; + public static final String WEEK_NUMBERS = "week_numbers"; public static final String WIDGET_BG_COLOR = "widget_bg_color"; public static final String WIDGET_TEXT_COLOR = "widget_text_color"; } diff --git a/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java index d8af95e05..82816a1bd 100644 --- a/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java +++ b/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java @@ -14,6 +14,7 @@ import butterknife.OnClick; public class SettingsActivity extends SimpleActivity { @BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch; @BindView(R.id.settings_sunday_first) SwitchCompat mSundayFirstSwitch; + @BindView(R.id.settings_week_numbers) SwitchCompat mWeekNumbersSwitch; private static Config mConfig; @@ -26,6 +27,7 @@ public class SettingsActivity extends SimpleActivity { setupDarkTheme(); setupSundayFirst(); + setupWeekNumbers(); } private void setupDarkTheme() { @@ -36,6 +38,10 @@ public class SettingsActivity extends SimpleActivity { mSundayFirstSwitch.setChecked(mConfig.getIsSundayFirst()); } + private void setupWeekNumbers() { + mWeekNumbersSwitch.setChecked(mConfig.getDisplayWeekNumbers()); + } + @OnClick(R.id.settings_dark_theme_holder) public void handleDarkTheme() { mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked()); @@ -49,6 +55,12 @@ public class SettingsActivity extends SimpleActivity { mConfig.setIsSundayFirst(mSundayFirstSwitch.isChecked()); } + @OnClick(R.id.settings_week_numbers_holder) + public void handleWeekNumbers() { + mWeekNumbersSwitch.setChecked(!mWeekNumbersSwitch.isChecked()); + mConfig.setDisplayWeekNumbers(mWeekNumbersSwitch.isChecked()); + } + private void restartActivity() { TaskStackBuilder.create(getApplicationContext()).addNextIntentWithParentStack(getIntent()).startActivities(); } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 4ebee2ad1..bd1d54f7e 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,7 +1,7 @@ @@ -62,5 +62,31 @@ android:clickable="false"/> + + + + + + + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bd6ec29d1..03cb06da5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -51,6 +51,7 @@ Einstellungen Dunkles Thema Sunday as first day + Display week numbers Diese App nutzt die folgenden Drittanbieterbibliotheken, die mein Leben einfacher machen. Danke. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index eee627e10..befbd52e9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -51,6 +51,7 @@ Impostazioni Tema scuro Sunday as first day + Display week numbers Questa app usa le seguenti librerie di terze parti per semplificarmi la vita. Grazie. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f26d7637e..780a06dc3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -51,6 +51,7 @@ 設定 ダークテーマ Sunday as first day + Display week numbers このアプリは、私の人生を容易にするために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。 diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 484aa5b70..bfbd16de7 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -51,6 +51,7 @@ Definições Tema escuro Domingo como primeiro dia + Display week numbers Esta aplicação usa as seguintes bibliotecas de terceiros para facilitar a minha vida. Obrigado. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index dcdca38ab..d97ca00b0 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -51,6 +51,7 @@ Inställningar Mörkt tema Sunday as first day + Display week numbers Denna app använder följande tredjepartsbibliotek för att göra mitt liv enklare. Tack. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5fb5dfb4d..9c71800a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,6 +52,7 @@ Settings Dark theme Sunday as first day + Display week numbers This app uses the following third party libraries to make my life easier. Thank you.