From 9dffd1cd74bd7d436eed5483fbb8606fcdceb981 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 15 Apr 2017 18:58:01 +0200
Subject: [PATCH] allow changing the default daily repetition in settings

---
 .../calendar/activities/EventActivity.kt      |  2 +-
 .../calendar/activities/SettingsActivity.kt   | 17 +++++++++
 .../calendar/helpers/Config.kt                |  4 +++
 .../calendar/helpers/Constants.kt             |  1 +
 app/src/main/res/layout/activity_settings.xml | 35 +++++++++++++++++++
 app/src/main/res/values-de/strings.xml        |  1 +
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values-hi-rIN/strings.xml    |  1 +
 app/src/main/res/values-hu/strings.xml        |  1 +
 app/src/main/res/values-it/strings.xml        |  1 +
 app/src/main/res/values-iw/strings.xml        |  1 +
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values-pt-rBR/strings.xml    |  1 +
 app/src/main/res/values-pt/strings.xml        |  1 +
 app/src/main/res/values-ru/strings.xml        |  1 +
 app/src/main/res/values-sk/strings.xml        |  1 +
 app/src/main/res/values-sv/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 19 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index a840d5a97..98bc1c5eb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -153,7 +153,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
         checkRepeatTexts(interval)
 
         if (mRepeatInterval == DAY) {
-            setRepeatRule(EVERY_DAY)
+            setRepeatRule(config.defaultDailyRepetition)
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
index f7e7cc8a2..a3839863f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
@@ -7,9 +7,11 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Parcelable
 import com.simplemobiletools.calendar.R
+import com.simplemobiletools.calendar.dialogs.RepeatRuleDailyDialog
 import com.simplemobiletools.calendar.extensions.config
 import com.simplemobiletools.calendar.extensions.dbHelper
 import com.simplemobiletools.calendar.extensions.getReminderText
+import com.simplemobiletools.calendar.helpers.EVERY_DAY
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.extensions.updateTextColors
@@ -50,6 +52,7 @@ class SettingsActivity : SimpleActivity() {
         setupWeeklyEnd()
         setupVibrate()
         setupReminderSound()
+        setupDailyRepetition()
         setupEventReminder()
         updateTextColors(settings_holder)
         checkPrimaryColor()
@@ -184,6 +187,20 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupDailyRepetition() {
+        updateDailyRepetitionText()
+        settings_default_daily_repetition_holder.setOnClickListener {
+            RepeatRuleDailyDialog(this, config.defaultDailyRepetition) {
+                config.defaultDailyRepetition = it
+                updateDailyRepetitionText()
+            }
+        }
+    }
+
+    private fun updateDailyRepetitionText() {
+        settings_default_daily_repetition.text = getString(if (config.defaultDailyRepetition == EVERY_DAY) R.string.every_day else R.string.selected_days)
+    }
+
     private fun setupEventReminder() {
         var reminderMinutes = config.defaultReminderMinutes
         settings_default_reminder.text = getReminderText(reminderMinutes)
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
index cb4fdeef5..8bef4cc15 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
@@ -49,6 +49,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getInt(VIEW, MONTHLY_VIEW)
         set(view) = prefs.edit().putInt(VIEW, view).apply()
 
+    var defaultDailyRepetition: Int
+        get() = prefs.getInt(DAILY_REPETITION, EVERY_DAY)
+        set(dailyRepetition) = prefs.edit().putInt(DAILY_REPETITION, dailyRepetition).apply()
+
     var defaultReminderMinutes: Int
         get() = prefs.getInt(REMINDER_MINUTES, 10)
         set(mins) = prefs.edit().putInt(REMINDER_MINUTES, mins).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
index 415f9dfd2..8ee4ed75f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
@@ -39,6 +39,7 @@ val END_WEEKLY_AT = "end_weekly_at"
 val VIBRATE = "vibrate"
 val REMINDER_SOUND = "reminder_sound"
 val VIEW = "view"
+val DAILY_REPETITION = "daily_repetition"
 val REMINDER_MINUTES = "reminder_minutes"
 val DISPLAY_EVENT_TYPES = "display_event_types"
 val GOOGLE_SYNC = "google_sync"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 780d94fce..80c7704ed 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -255,6 +255,41 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_default_daily_repetition_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:paddingBottom="@dimen/bigger_margin"
+            android:paddingLeft="@dimen/activity_margin"
+            android:paddingRight="@dimen/activity_margin"
+            android:paddingTop="@dimen/bigger_margin">
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_default_daily_repetition_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/settings_default_daily_repetition"
+                android:layout_toStartOf="@+id/settings_default_daily_repetition"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingRight="@dimen/medium_margin"
+                android:text="@string/default_daily_repetition"/>
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_default_daily_repetition"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="@dimen/small_margin"
+                android:layout_marginRight="@dimen/small_margin"
+                android:background="@null"
+                android:clickable="false"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_default_reminder_holder"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 48254cd5d..42c0e6788 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Widerholung</string>
     <string name="every_day">Täglich</string>
     <string name="selected_days">an ausgewählten Tagen</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">jeden Monat am selben Tag</string>
     <string name="on_the_last_day">am letzten Tag des Monat</string>
     <string name="every_m">jeden</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 82881b9f7..06432c177 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4764c6d14..b7bf2ee0d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index c18a89b45..2215ed8b6 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 58d830e11..17bdf84fb 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 232414baa..9b0a45fa3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 40a0357ea..66b4360bf 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9fa77ee19..94a90fd35 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 66cd70397..622796956 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 35f0fc1f4..1df85f606 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e312b4b13..97a9823a0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index cf0dea2f0..3366264f3 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Opakovať</string>
     <string name="every_day">Každý deň</string>
     <string name="selected_days">Vo vybraných dňoch</string>
+    <string name="default_daily_repetition">Predvolené denné opakovanie</string>
     <string name="on_the_same_day">Každý mesiac v rovnaký deň</string>
     <string name="on_the_last_day">Posledný deň v mesiaci</string>
     <string name="every_m">Každý</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 15f75b655..bcfb57557 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 44dc6b06c..f815e2694 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,7 @@
     <string name="repeat">Repeat</string>
     <string name="every_day">Every day</string>
     <string name="selected_days">On selected days</string>
+    <string name="default_daily_repetition">Default daily repetition</string>
     <string name="on_the_same_day">On the same day every month</string>
     <string name="on_the_last_day">On the last day of the month</string>
     <string name="every_m">Every</string>