Issue-1339

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

@@ -4,13 +4,14 @@ import android.content.Context
 import com.futsch1.medtimer.R
 
 enum class IntervalUnit {
-    MINUTES, HOURS, DAYS
+    MINUTES, HOURS, DAYS, MONTHS
 }
 
 private fun getMinutes(unit: IntervalUnit, value: Int) = when (unit) {
     IntervalUnit.MINUTES -> value
     IntervalUnit.HOURS -> value * 60
     IntervalUnit.DAYS -> value * 60 * 24
+    IntervalUnit.MONTHS -> value * 60 * 24 * 31
 }
 
 class Interval(var minutesValue: Int, var maxMinutesValue: Int = MAX_INTERVAL_MINUTES) {
@@ -21,6 +22,7 @@ class Interval(var minutesValue: Int, var maxMinutesValue: Int = MAX_INTERVAL_MI
 
     fun getUnit(): IntervalUnit {
         return when {
+            minutesValue % (60 * 24 * 31) == 0 -> IntervalUnit.MONTHS
             minutesValue % (60 * 24) == 0 -> IntervalUnit.DAYS
             minutesValue % 60 == 0 -> IntervalUnit.HOURS
             else -> IntervalUnit.MINUTES
@@ -32,6 +34,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.MONTHS -> minutesValue / (60 * 24 * 31)
         }
     }
 
@@ -40,6 +43,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.MONTHS -> minutesValue / (60 * 24 * 31)
         }
     }
 
@@ -65,6 +69,6 @@ class Interval(var minutesValue: Int, var maxMinutesValue: Int = MAX_INTERVAL_MI
     }
 
     companion object {
-        const val MAX_INTERVAL_MINUTES = 31 * 60 * 24
+        const val MAX_INTERVAL_MINUTES = 60 * 24 * 31 * 12
     }
 }

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.MONTHS -> timeEditLayout.context.getString(R.string.months_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.MONTHS
     }
 }

app/src/main/java/com/futsch1/medtimer/reminders/scheduling/Scheduling.kt

@@ -69,7 +69,7 @@ abstract class SchedulingBase(
     }
 
     protected fun getNextNotRemindedDay(start: Long = 0): Instant? {
-        for (day in start..31) {
+        for (day in start..(31 * 12)) {
             val day = today() + day
             if (!isRaisedOn(day)) {
                 return localDateToReminderInstant(LocalDate.ofEpochDay(day))

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

@@ -182,6 +182,15 @@
         <item quantity="other">يوم</item>
     </plurals>
     <string name="days_string">أيام</string>
+    <plurals name="months">
+        <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="months_string">Months</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="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_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="months">
+        <item quantity="one">???</item>
+        <item quantity="few">???</item>
+        <item quantity="many">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</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="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</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

@@ -150,17 +150,22 @@
         <item quantity="one">Minute</item>
         <item quantity="other">Minuten</item>
     </plurals>
+    <string name="minutes_string">Minuten</string>
     <plurals name="hours">
         <item quantity="one">Stunde</item>
         <item quantity="other">Stunden</item>
     </plurals>
+    <string name="hours_string">Stunden</string>
     <plurals name="days">
         <item quantity="one">Tag</item>
         <item quantity="other">Tage</item>
     </plurals>
-    <string name="minutes_string">Minuten</string>
-    <string name="hours_string">Stunden</string>
     <string name="days_string">Tage</string>
+    <plurals name="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</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="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_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

@@ -153,19 +153,25 @@
         <item quantity="other">minutos</item>
         <item quantity="many">minutos</item>
     </plurals>
+    <string name="minutes_string">Minutos</string>
     <plurals name="hours">
         <item quantity="one">hora</item>
         <item quantity="other">horas</item>
         <item quantity="many">horas</item>
     </plurals>
+    <string name="hours_string">Horas</string>
     <plurals name="days">
         <item quantity="one">día</item>
         <item quantity="other">días</item>
         <item quantity="many">días</item>
     </plurals>
-    <string name="minutes_string">Minutos</string>
-    <string name="hours_string">Horas</string>
     <string name="days_string">Días</string>
+        <plurals name="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+        <item quantity="many">???</item>
+    </plurals>
+    <string name="months_string">???</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="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</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

@@ -153,19 +153,25 @@
         <item quantity="other">minute</item>
         <item quantity="many">minutes</item>
     </plurals>
+    <string name="minutes_string">Minutes</string>
     <plurals name="hours">
         <item quantity="one" ns0:ignore="ImpliedQuantity">heure</item>
         <item quantity="other">heures</item>
         <item quantity="many">heures</item>
     </plurals>
+    <string name="hours_string">Heures</string>
     <plurals name="days">
         <item quantity="one" ns0:ignore="ImpliedQuantity">jour</item>
         <item quantity="other">jours</item>
         <item quantity="many">jours</item>
     </plurals>
-    <string name="minutes_string">Minutes</string>
-    <string name="hours_string">Heures</string>
     <string name="days_string">Jours</string>
+    <plurals name="months">
+        <item quantity="one" ns0:ignore="ImpliedQuantity">???</item>
+        <item quantity="other">???</item>
+        <item quantity="many">???</item>
+    </plurals>
+    <string name="months_string">???</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="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</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="months">
+        <item quantity="one" tools:ignore="ImpliedQuantity">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</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

@@ -153,19 +153,25 @@
         <item quantity="other">minuti</item>
         <item quantity="many">minuti</item>
     </plurals>
+    <string name="minutes_string">Minuti</string>
     <plurals name="hours">
         <item quantity="one">ora</item>
         <item quantity="other">ore</item>
         <item quantity="many">ore</item>
     </plurals>
+    <string name="hours_string">Ore</string>
     <plurals name="days">
         <item quantity="one">giorno</item>
         <item quantity="other">giorni</item>
         <item quantity="many">giorni</item>
     </plurals>
-    <string name="minutes_string">Minuti</string>
-    <string name="hours_string">Ore</string>
     <string name="days_string">Giorni</string>
+    <plurals name="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+        <item quantity="many">???</item>
+    </plurals>
+    <string name="months_string">???</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="months">
+        <item quantity="one">???</item>
+        <item quantity="two">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_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

@@ -150,17 +150,22 @@
         <item quantity="one">minuut</item>
         <item quantity="other">minuten</item>
     </plurals>
+    <string name="minutes_string">Minuten</string>
     <plurals name="hours">
         <item quantity="one">uur</item>
         <item quantity="other">uren</item>
     </plurals>
+    <string name="hours_string">Uren</string>
     <plurals name="days">
         <item quantity="one">dag</item>
         <item quantity="other">dagen</item>
     </plurals>
-    <string name="minutes_string">Minuten</string>
-    <string name="hours_string">Uren</string>
     <string name="days_string">Dagen</string>
+    <plurals name="months">
+        <item quantity="one">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</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

@@ -113,8 +113,6 @@
     <string name="add_linked_reminder">Dodaj przypomnienie o następnej dawce</string>
     <string name="linked_reminder_delay">Opóźnienie kolejnej dawki</string>
     <string name="delay">Opóźnienie</string>
-    <string name="minutes_string">Minut</string>
-    <string name="hours_string">Godzin</string>
     <string name="create_reminder">Utwórz przypomnienie</string>
     <string name="every_interval">Co %s</string>
     <string name="always_below_threshold">Zawsze, gdy poniżej progu</string>
@@ -172,7 +170,6 @@
     <string name="next_month">Następny miesiąc</string>
     <string name="minutes_1">1 minuta</string>
     <string name="advanced_settings">Zaawansowane</string>
-    <string name="days_string">Dni</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>
@@ -194,18 +191,28 @@
         <item quantity="many">minut</item>
         <item quantity="other">minut</item>
     </plurals>
+    <string name="minutes_string">Minut</string>
     <plurals name="hours">
         <item quantity="one">godzina</item>
         <item quantity="few">godziny</item>
         <item quantity="many">godzin</item>
         <item quantity="other">godzin</item>
     </plurals>
+    <string name="hours_string">Godzin</string>
     <plurals name="days">
         <item quantity="one">dzień</item>
         <item quantity="few">dni</item>
         <item quantity="many">dni</item>
         <item quantity="other">dni</item>
     </plurals>
+    <string name="days_string">Dni</string>
+    <plurals name="months">
+        <item quantity="one">???</item>
+        <item quantity="few">???</item>
+        <item quantity="many">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</string>
     <string name="use_relative_date_time">Względna data/godzina</string>
     <string name="invalid_amount">Pole musi zawierać liczbę, aby włączyć śledzenie zapasów leków dla tego przypomnienia.</string>
     <string name="sticky_on_lockscreen">Stałe przypomnienia na ekranie blokady</string>

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

@@ -135,6 +135,13 @@
         <item quantity="many">dias</item>
         <item quantity="other">dias</item>
     </plurals>
+    <string name="days_string">Dias</string>
+    <plurals name="months">
+        <item quantity="one" tools:ignore="ImpliedQuantity">???</item>
+        <item quantity="many">???</item>
+        <item quantity="other">???</item>
+    </plurals>
+    <string name="months_string">???</string>
     <string name="interval">Intervalo</string>
     <string name="interval_start_processed">O intervalo começa ao marcar como tomado ou pulado</string>
     <string name="every_interval">Cada %s</string>
@@ -192,7 +199,6 @@
     <string name="sticky_on_lockscreen_summary">Os lembretes não podem ser dispensados na tela de bloqueio, apenas na gaveta de notificações\nObservação: alguns smartwatches podem não mostrar mais notificações</string>
     <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>
     <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>