From 6f928bdeb35b1740ddeaccaa6c42a593ac9f999e Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 9 Sep 2016 19:27:44 +0200 Subject: [PATCH] add a checkbox for setting Sunday as the first day of the week --- .../simplemobiletools/calendar/Config.java | 8 ++++++ .../simplemobiletools/calendar/Constants.java | 1 + .../calendar/activities/SettingsActivity.java | 12 +++++++++ app/src/main/res/layout/activity_settings.xml | 26 +++++++++++++++++++ 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-sv/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 9 files changed, 52 insertions(+) diff --git a/app/src/main/java/com/simplemobiletools/calendar/Config.java b/app/src/main/java/com/simplemobiletools/calendar/Config.java index 8079ff542..9fa80da7e 100644 --- a/app/src/main/java/com/simplemobiletools/calendar/Config.java +++ b/app/src/main/java/com/simplemobiletools/calendar/Config.java @@ -29,4 +29,12 @@ public class Config { public void setIsDarkTheme(boolean isDarkTheme) { mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply(); } + + public boolean getIsSundayFirst() { + return mPrefs.getBoolean(Constants.SUNDAY_FIRST, false); + } + + public void setIsSundayFirst(boolean sundayFirst) { + mPrefs.edit().putBoolean(Constants.SUNDAY_FIRST, sundayFirst).apply(); + } } diff --git a/app/src/main/java/com/simplemobiletools/calendar/Constants.java b/app/src/main/java/com/simplemobiletools/calendar/Constants.java index 16a5c82d8..a9275db50 100644 --- a/app/src/main/java/com/simplemobiletools/calendar/Constants.java +++ b/app/src/main/java/com/simplemobiletools/calendar/Constants.java @@ -11,6 +11,7 @@ public class Constants { public static final String PREFS_KEY = "Calendar"; 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 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 240f51720..d8af95e05 100644 --- a/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java +++ b/app/src/main/java/com/simplemobiletools/calendar/activities/SettingsActivity.java @@ -13,6 +13,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; private static Config mConfig; @@ -24,12 +25,17 @@ public class SettingsActivity extends SimpleActivity { ButterKnife.bind(this); setupDarkTheme(); + setupSundayFirst(); } private void setupDarkTheme() { mDarkThemeSwitch.setChecked(mConfig.getIsDarkTheme()); } + private void setupSundayFirst() { + mSundayFirstSwitch.setChecked(mConfig.getIsSundayFirst()); + } + @OnClick(R.id.settings_dark_theme_holder) public void handleDarkTheme() { mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked()); @@ -37,6 +43,12 @@ public class SettingsActivity extends SimpleActivity { restartActivity(); } + @OnClick(R.id.settings_sunday_first_holder) + public void handleSundayFirst() { + mSundayFirstSwitch.setChecked(!mSundayFirstSwitch.isChecked()); + mConfig.setIsSundayFirst(mSundayFirstSwitch.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 7c4901f84..4ebee2ad1 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -36,5 +36,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 761e6e2a3..4d906f11a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -44,6 +44,7 @@ Einstellungen Dunkles Thema + Sunday as first day 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 b4f67201b..f498bec58 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -44,6 +44,7 @@ Impostazioni Tema scuro + Sunday as first day 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 fcbeb36bf..56bfed067 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -44,6 +44,7 @@ 設定 ダークテーマ + Sunday as first day このアプリは、私の人生を容易にするために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。 diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 9c9622c0c..d10cf7132 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -44,6 +44,7 @@ Inställningar Mörkt tema + Sunday as first day 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 8ac12f16a..f19f3a9fd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,6 +45,7 @@ Settings Dark theme + Sunday as first day This app uses the following third party libraries to make my life easier. Thank you.