Increase maximum interval duration to 365 days and add a "weeks" unit

app/src/main/java/com/futsch1/medtimer/helpers/Interval.kt

@@ -5,13 +5,14 @@ import com.futsch1.medtimer.R
 import com.futsch1.medtimer.model.ReminderTime
 
 enum class IntervalUnit {
-    MINUTES, HOURS, DAYS
+    MINUTES, HOURS, DAYS, WEEKS
 }
 
 private fun getMinutes(unit: IntervalUnit, value: Int) = when (unit) {
     IntervalUnit.MINUTES -> value
     IntervalUnit.HOURS -> value * 60
     IntervalUnit.DAYS -> value * 60 * 24
+    IntervalUnit.WEEKS -> value * 60 * 24 * 7
 }
 
 class Interval(var minutesValue: Int, var maxMinutesValue: Int = MAX_INTERVAL_MINUTES) {
@@ -24,6 +25,7 @@ class Interval(var minutesValue: Int, var maxMinutesValue: Int = MAX_INTERVAL_MI
 
     fun getUnit(): IntervalUnit {
         return when {
+            minutesValue % (60 * 24 * 7) == 0 -> IntervalUnit.WEEKS
             minutesValue % (60 * 24) == 0 -> IntervalUnit.DAYS
             minutesValue % 60 == 0 -> IntervalUnit.HOURS
             else -> IntervalUnit.MINUTES
@@ -35,6 +37,7 @@ class Interval(var minutesValue: Int, var maxMinutesValue: Int = MAX_INTERVAL_MI
             IntervalUnit.MINUTES -> minutesValue
             IntervalUnit.HOURS -> minutesValue / 60
             IntervalUnit.DAYS -> minutesValue / (60 * 24)
+            IntervalUnit.WEEKS -> minutesValue / (60 * 24 * 7)
         }
     }
 
@@ -43,6 +46,7 @@ class Interval(var minutesValue: Int, var maxMinutesValue: Int = MAX_INTERVAL_MI
             IntervalUnit.MINUTES -> minutesValue
             IntervalUnit.HOURS -> minutesValue / 60
             IntervalUnit.DAYS -> minutesValue / (60 * 24)
+            IntervalUnit.WEEKS -> minutesValue / (60 * 24 * 7)
         }
     }
 
@@ -63,11 +67,12 @@ class Interval(var minutesValue: Int, var maxMinutesValue: Int = MAX_INTERVAL_MI
             IntervalUnit.MINUTES -> R.plurals.minutes
             IntervalUnit.HOURS -> R.plurals.hours
             IntervalUnit.DAYS -> R.plurals.days
+            IntervalUnit.WEEKS -> R.plurals.weeks
         }
         return "$value ${context.resources.getQuantityString(textId, value)}"
     }
 
     companion object {
-        const val MAX_INTERVAL_MINUTES = 31 * 60 * 24
+        const val MAX_INTERVAL_MINUTES = 365 * 60 * 24
     }
 }

app/src/main/java/com/futsch1/medtimer/medicine/editors/IntervalEditor.kt

@@ -56,6 +56,7 @@ class IntervalEditor(
             IntervalUnit.MINUTES -> timeEditLayout.context.getString(R.string.minutes_string)
             IntervalUnit.HOURS -> timeEditLayout.context.getString(R.string.hours_string)
             IntervalUnit.DAYS -> timeEditLayout.context.getString(R.string.days_string)
+            IntervalUnit.WEEKS -> timeEditLayout.context.getString(R.string.weeks_string)
         }
     }
 
@@ -83,6 +84,7 @@ class IntervalEditor(
     private fun checkedIntervalUnit(checkedId: Int) = when (checkedId) {
         intervalUnitToggle.getChildAt(0).id -> IntervalUnit.MINUTES
         intervalUnitToggle.getChildAt(1).id -> IntervalUnit.HOURS
-        else -> IntervalUnit.DAYS
+        intervalUnitToggle.getChildAt(2).id -> IntervalUnit.DAYS
+        else -> IntervalUnit.WEEKS
     }
 }

app/src/main/res/layout/dialog_new_reminder.xml

@@ -69,7 +69,7 @@
 
             <com.google.android.material.button.MaterialButtonToggleGroup
                 android:id="@+id/intervalUnit"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:checkedButton="@id/intervalHours"
                 app:selectionRequired="true"
@@ -78,24 +78,35 @@
                 <Button
                     android:id="@+id/intervalMinutes"
                     style="?attr/materialButtonOutlinedStyle"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:text="@string/minutes_string" />
 
                 <Button
                     android:id="@+id/intervalHours"
                     style="?attr/materialButtonOutlinedStyle"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:text="@string/hours_string" />
 
                 <Button
                     android:id="@+id/intervalDays"
                     style="?attr/materialButtonOutlinedStyle"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:text="@string/days_string" />
 
+                <Button
+                    android:id="@+id/intervalWeeks"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/weeks_string" />
+
             </com.google.android.material.button.MaterialButtonToggleGroup>
 
             <RadioGroup

app/src/main/res/layout/include_edit_interval.xml

@@ -23,7 +23,7 @@
 
     <com.google.android.material.button.MaterialButtonToggleGroup
         android:id="@+id/intervalUnit"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:checkedButton="@id/intervalHours"
         app:selectionRequired="true"
@@ -32,24 +32,35 @@
         <Button
             android:id="@+id/intervalMinutes"
             style="?attr/materialButtonOutlinedStyle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:text="@string/minutes_string" />
 
         <Button
             android:id="@+id/intervalHours"
             style="?attr/materialButtonOutlinedStyle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:text="@string/hours_string" />
 
         <Button
             android:id="@+id/intervalDays"
             style="?attr/materialButtonOutlinedStyle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:text="@string/days_string" />
 
+        <Button
+            android:id="@+id/intervalWeeks"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/weeks_string" />
+
     </com.google.android.material.button.MaterialButtonToggleGroup>
 
 </LinearLayout>

app/src/main/res/values-ar/strings.xml

@@ -182,6 +182,15 @@
         <item quantity="other">يوم</item>
     </plurals>
     <string name="days_string">أيام</string>
+    <plurals name="weeks">
+        <item quantity="zero">أسبوع</item>
+        <item quantity="one">أسبوع</item>
+        <item quantity="two">أسبوعان</item>
+        <item quantity="few">أسابيع</item>
+        <item quantity="many">أسبوعاً</item>
+        <item quantity="other">أسبوع</item>
+    </plurals>
+    <string name="weeks_string">أسابيع</string>
     <string name="create_reminder">أنشئ تذكير</string>
     <string name="interval">الفاصل الزمني</string>
     <string name="interval_start_time">وقت بداية الفاصل الزمني</string>

app/src/main/res/values-bg/strings.xml

@@ -160,6 +160,11 @@
         <item quantity="other">дни</item>
     </plurals>
     <string name="days_string">Дни</string>
+    <plurals name="weeks">
+        <item quantity="one">седмица</item>
+        <item quantity="other">седмици</item>
+    </plurals>
+    <string name="weeks_string">Седмици</string>
     <string name="create_reminder">Създаване на напомняне</string>
     <string name="interval">Интервал</string>
     <string name="interval_start_time">Начало на интервала</string>

app/src/main/res/values-cs/strings.xml

@@ -172,6 +172,13 @@
         <item quantity="other">dní</item>
     </plurals>
     <string name="days_string">Dny</string>
+    <plurals name="weeks">
+        <item quantity="one">týden</item>
+        <item quantity="few">týdny</item>
+        <item quantity="many">týdnů</item>
+        <item quantity="other">týdnů</item>
+    </plurals>
+    <string name="weeks_string">Týdny</string>
     <string name="create_reminder">Vytvořit připomenutí</string>
     <string name="interval">Interval</string>
     <string name="interval_start_time">Čas začátku intervalu</string>

app/src/main/res/values-da/strings.xml

@@ -156,6 +156,11 @@
         <item quantity="other">dage</item>
     </plurals>
     <string name="days_string">Dage</string>
+    <plurals name="weeks">
+        <item quantity="one">uge</item>
+        <item quantity="other">uger</item>
+    </plurals>
+    <string name="weeks_string">Uger</string>
     <string name="create_reminder">Opret påmindelse</string>
     <string name="interval">Interval</string>
     <string name="interval_start_time">Interval starttid</string>

app/src/main/res/values-de/strings.xml

@@ -161,6 +161,11 @@
     <string name="minutes_string">Minuten</string>
     <string name="hours_string">Stunden</string>
     <string name="days_string">Tage</string>
+    <plurals name="weeks">
+        <item quantity="one">Woche</item>
+        <item quantity="other">Wochen</item>
+    </plurals>
+    <string name="weeks_string">Wochen</string>
     <string name="create_reminder">Erinnerung erstellen</string>
     <string name="interval">Interval</string>
     <string name="interval_start_time">Startzeit des Intervalls</string>

app/src/main/res/values-el/strings.xml

@@ -161,6 +161,11 @@
         <item quantity="other">ημέρες</item>
     </plurals>
     <string name="days_string">Ημέρες</string>
+    <plurals name="weeks">
+        <item quantity="one">εβδομάδα</item>
+        <item quantity="other">εβδομάδες</item>
+    </plurals>
+    <string name="weeks_string">Εβδομάδες</string>
     <string name="create_reminder">Δημιουργία υπενθύμισης</string>
     <string name="interval">Χρονικό διάστημα</string>
     <string name="interval_start_time">Ώρα έναρξης χρονικού διαστήματος</string>

app/src/main/res/values-es/strings.xml

@@ -166,6 +166,12 @@
     <string name="minutes_string">Minutos</string>
     <string name="hours_string">Horas</string>
     <string name="days_string">Días</string>
+    <plurals name="weeks">
+        <item quantity="one">semana</item>
+        <item quantity="other">semanas</item>
+        <item quantity="many">semanas</item>
+    </plurals>
+    <string name="weeks_string">Semanas</string>
     <string name="create_reminder">Crear recordatorio</string>
     <string name="interval">Intervalo</string>
     <string name="interval_start_time">Hora de inicio del intervalo</string>

app/src/main/res/values-fi/strings.xml

@@ -162,6 +162,11 @@
         <item quantity="other">päivää</item>
     </plurals>
     <string name="days_string">Päivää</string>
+    <plurals name="weeks">
+        <item quantity="one">viikko</item>
+        <item quantity="other">viikkoa</item>
+    </plurals>
+    <string name="weeks_string">Viikkoa</string>
     <string name="create_reminder">Luo muistutus</string>
     <string name="interval">Väliaika</string>
     <string name="interval_start_time">Väliajan aloitusaika</string>

app/src/main/res/values-fr/strings.xml

@@ -166,6 +166,12 @@
     <string name="minutes_string">Minutes</string>
     <string name="hours_string">Heures</string>
     <string name="days_string">Jours</string>
+    <plurals name="weeks">
+        <item quantity="one" ns0:ignore="ImpliedQuantity">semaine</item>
+        <item quantity="other">semaines</item>
+        <item quantity="many">semaines</item>
+    </plurals>
+    <string name="weeks_string">Semaines</string>
     <string name="create_reminder">Créer un rappel</string>
     <string name="interval">Intervalle</string>
     <string name="interval_start_time">Heure de début de l\'intervalle</string>

app/src/main/res/values-hu/strings.xml

@@ -162,6 +162,11 @@
         <item quantity="other">nap</item>
     </plurals>
     <string name="days_string">Nap</string>
+    <plurals name="weeks">
+        <item quantity="one">hét</item>
+        <item quantity="other">hét</item>
+    </plurals>
+    <string name="weeks_string">Hét</string>
     <string name="create_reminder">Emlékeztető létrehozása</string>
     <string name="interval">Ismétlési idő</string>
     <string name="interval_start_time">Ismétlés kezdete</string>

app/src/main/res/values-is/strings.xml

@@ -162,6 +162,11 @@
         <item quantity="other">dagar</item>
     </plurals>
     <string name="days_string">Dagar</string>
+    <plurals name="weeks">
+        <item quantity="one" tools:ignore="ImpliedQuantity">vika</item>
+        <item quantity="other">vikur</item>
+    </plurals>
+    <string name="weeks_string">Vikur</string>
     <string name="create_reminder">Búa til áminningu</string>
     <string name="interval">Tímabil</string>
     <string name="interval_start_time">Byrjun tímabils</string>

app/src/main/res/values-it/strings.xml

@@ -166,6 +166,12 @@
     <string name="minutes_string">Minuti</string>
     <string name="hours_string">Ore</string>
     <string name="days_string">Giorni</string>
+    <plurals name="weeks">
+        <item quantity="one">settimana</item>
+        <item quantity="other">settimane</item>
+        <item quantity="many">settimane</item>
+    </plurals>
+    <string name="weeks_string">Settimane</string>
     <string name="create_reminder">Crea il promemoria</string>
     <string name="interval">Intervallo</string>
     <string name="interval_start_time">Orario di inizio dell\'intervallo</string>

app/src/main/res/values-iw/strings.xml

@@ -163,6 +163,12 @@
         <item quantity="other">ימים</item>
     </plurals>
     <string name="days_string">ימים</string>
+    <plurals name="weeks">
+        <item quantity="one">שבוע</item>
+        <item quantity="two">שבועיים</item>
+        <item quantity="other">שבועות</item>
+    </plurals>
+    <string name="weeks_string">שבועות</string>
     <string name="create_reminder">צרו תזכורת</string>
     <string name="interval">מחזור</string>
     <string name="interval_start_time">זמן תחילת מחזור</string>

app/src/main/res/values-nl/strings.xml

@@ -161,6 +161,11 @@
     <string name="minutes_string">Minuten</string>
     <string name="hours_string">Uren</string>
     <string name="days_string">Dagen</string>
+    <plurals name="weeks">
+        <item quantity="one">week</item>
+        <item quantity="other">weken</item>
+    </plurals>
+    <string name="weeks_string">Weken</string>
     <string name="create_reminder">Herinnering maken</string>
     <string name="interval">Interval</string>
     <string name="interval_start_time">Starttijd interval</string>

app/src/main/res/values-pl/strings.xml

@@ -176,6 +176,13 @@
     <string name="minutes_1">1 minuta</string>
     <string name="advanced_settings">Zaawansowane</string>
     <string name="days_string">Dni</string>
+    <plurals name="weeks">
+        <item quantity="one">tydzień</item>
+        <item quantity="few">tygodnie</item>
+        <item quantity="many">tygodni</item>
+        <item quantity="other">tygodnia</item>
+    </plurals>
+    <string name="weeks_string">Tygodnie</string>
     <string name="every_day">Codziennie</string>
     <string name="cycle_reminder">Przypomnienia cykliczne</string>
     <string name="intro_analysis_description">Aplikacja przechowuje wszystkie zdarzenia przypominające. Możesz analizować swoje poprzednie dawki na ekranie analizy i eksportować historię za pomocą menu kebab (trzy kropki). Historia zostanie zachowana, nawet jeśli leki lub przypomnienia zostaną usunięte lub przemianowane.</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -196,6 +196,12 @@
     <string name="invalid_amount">O valor deve conter um número para permitir o monitoramento do estoque de medicamentos para este lembrete.</string>
     <string name="never">Nunca</string>
     <string name="days_string">Dias</string>
+    <plurals name="weeks">
+        <item quantity="one" tools:ignore="ImpliedQuantity">semana</item>
+        <item quantity="many">semanas</item>
+        <item quantity="other">semanas</item>
+    </plurals>
+    <string name="weeks_string">Semanas</string>
     <string name="intro_welcome_description">O MedTimer é um aplicativo de lembrete de medicamentos gratuito e de código aberto com foco na privacidade.\n\nEle requer permissão de exibir notificações para criar lembretes de medicamentos.</string>
     <string name="number_of_repetitions">Número de repetições</string>
     <string name="intro_notification_description">Quando o horário de um lembrete chegar, uma notificação aparecerá oferecendo-lhe a opção de marcar a dose como tomada (clicando no botão \"TOMADO\"), pular (descartando a notificação) ou ser lembrado novamente após algum tempo (\"ADIAR\").</string>

app/src/main/res/values-pt/strings.xml

@@ -196,6 +196,12 @@
     <string name="invalid_amount">O valor deve conter um número para permitir o monitoramento do estoque de medicamentos para este lembrete.</string>
     <string name="never">Nunca</string>
     <string name="days_string">Dias</string>
+    <plurals name="weeks">
+        <item quantity="one" tools:ignore="ImpliedQuantity">semana</item>
+        <item quantity="many">semanas</item>
+        <item quantity="other">semanas</item>
+    </plurals>
+    <string name="weeks_string">Semanas</string>
     <string name="intro_welcome_description">O MedTimer é um aplicativo de lembrete de medicamentos gratuito e de código aberto com foco na privacidade.\n\nEle requer permissão de exibir notificações para criar lembretes de medicamentos.</string>
     <string name="number_of_repetitions">Número de repetições</string>
     <string name="intro_notification_description">Quando o horário de um lembrete chegar, uma notificação aparecerá oferecendo-lhe a opção de marcar a dose como tomada (clicando no botão \"TOMADO\"), pular (descartando a notificação) ou ser lembrado novamente após algum tempo (\"ADIAR\").</string>

app/src/main/res/values-ru/strings.xml

@@ -168,6 +168,12 @@
     <string name="minutes_string">Минуты</string>
     <string name="hours_string">Часы</string>
     <string name="days_string">Дни</string>
+    <plurals name="weeks">
+        <item quantity="one" ns0:ignore="ImpliedQuantity">неделя</item>
+        <item quantity="few">недели</item>
+        <item quantity="many">недель</item>
+    </plurals>
+    <string name="weeks_string">Недели</string>
     <string name="create_reminder">Создать напоминание</string>
     <string name="interval">Интервал</string>
     <string name="interval_start_time">Время начала интервала</string>