diff --git a/app/src/main/java/com/futsch1/medtimer/helpers/Interval.kt b/app/src/main/java/com/futsch1/medtimer/helpers/Interval.kt
index c8346cc6f..5e31e3315 100644
--- a/app/src/main/java/com/futsch1/medtimer/helpers/Interval.kt
+++ b/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
}
}
diff --git a/app/src/main/java/com/futsch1/medtimer/medicine/editors/IntervalEditor.kt b/app/src/main/java/com/futsch1/medtimer/medicine/editors/IntervalEditor.kt
index 64a996238..27c65bb8f 100644
--- a/app/src/main/java/com/futsch1/medtimer/medicine/editors/IntervalEditor.kt
+++ b/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
}
}
diff --git a/app/src/main/res/layout/dialog_new_reminder.xml b/app/src/main/res/layout/dialog_new_reminder.xml
index eb8f97cfd..c85ba22f3 100644
--- a/app/src/main/res/layout/dialog_new_reminder.xml
+++ b/app/src/main/res/layout/dialog_new_reminder.xml
@@ -69,7 +69,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a8a951dec..74e5a92ee 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -182,6 +182,15 @@
- يوم
أيام
+
+ - أسبوع
+ - أسبوع
+ - أسبوعان
+ - أسابيع
+ - أسبوعاً
+ - أسبوع
+
+ أسابيع
أنشئ تذكير
الفاصل الزمني
وقت بداية الفاصل الزمني
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index e57c1b2a9..3e9904cb7 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -160,6 +160,11 @@
- дни
Дни
+
+ - седмица
+ - седмици
+
+ Седмици
Създаване на напомняне
Интервал
Начало на интервала
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2b3d114bb..c318dd05a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -172,6 +172,13 @@
- dní
Dny
+
+ - týden
+ - týdny
+ - týdnů
+ - týdnů
+
+ Týdny
Vytvořit připomenutí
Interval
Čas začátku intervalu
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index e733b3004..5c6d8f91b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -156,6 +156,11 @@
- dage
Dage
+
+ - uge
+ - uger
+
+ Uger
Opret påmindelse
Interval
Interval starttid
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e9102af9c..82cce7a92 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -161,6 +161,11 @@
Minuten
Stunden
Tage
+
+ - Woche
+ - Wochen
+
+ Wochen
Erinnerung erstellen
Interval
Startzeit des Intervalls
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 7784cad36..dfc5376a3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -161,6 +161,11 @@
- ημέρες
Ημέρες
+
+ - εβδομάδα
+ - εβδομάδες
+
+ Εβδομάδες
Δημιουργία υπενθύμισης
Χρονικό διάστημα
Ώρα έναρξης χρονικού διαστήματος
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d3edde9b4..b5c3689de 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -166,6 +166,12 @@
Minutos
Horas
Días
+
+ - semana
+ - semanas
+ - semanas
+
+ Semanas
Crear recordatorio
Intervalo
Hora de inicio del intervalo
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3b814f472..49c3ff2c3 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -162,6 +162,11 @@
- päivää
Päivää
+
+ - viikko
+ - viikkoa
+
+ Viikkoa
Luo muistutus
Väliaika
Väliajan aloitusaika
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8e955b8be..c2705f9bc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -166,6 +166,12 @@
Minutes
Heures
Jours
+
+ - semaine
+ - semaines
+ - semaines
+
+ Semaines
Créer un rappel
Intervalle
Heure de début de l\'intervalle
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d14906494..c746ace35 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -162,6 +162,11 @@
- nap
Nap
+
+ - hét
+ - hét
+
+ Hét
Emlékeztető létrehozása
Ismétlési idő
Ismétlés kezdete
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 68cb37acb..816f4f7a2 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -162,6 +162,11 @@
- dagar
Dagar
+
+ - vika
+ - vikur
+
+ Vikur
Búa til áminningu
Tímabil
Byrjun tímabils
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 449622ac7..deb1bfc1b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -166,6 +166,12 @@
Minuti
Ore
Giorni
+
+ - settimana
+ - settimane
+ - settimane
+
+ Settimane
Crea il promemoria
Intervallo
Orario di inizio dell\'intervallo
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index b3b548ebe..88f2babe8 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -163,6 +163,12 @@
- ימים
ימים
+
+ - שבוע
+ - שבועיים
+ - שבועות
+
+ שבועות
צרו תזכורת
מחזור
זמן תחילת מחזור
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c090fe699..b08f4bf8e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -161,6 +161,11 @@
Minuten
Uren
Dagen
+
+ - week
+ - weken
+
+ Weken
Herinnering maken
Interval
Starttijd interval
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0763b71b1..b1be44e87 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -176,6 +176,13 @@
1 minuta
Zaawansowane
Dni
+
+ - tydzień
+ - tygodnie
+ - tygodni
+ - tygodnia
+
+ Tygodnie
Codziennie
Przypomnienia cykliczne
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.
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 03205821a..bb8411acb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -196,6 +196,12 @@
O valor deve conter um número para permitir o monitoramento do estoque de medicamentos para este lembrete.
Nunca
Dias
+
+ - semana
+ - semanas
+ - semanas
+
+ Semanas
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.
Número de repetições
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\").
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 5393ab81b..1e89b64d3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -196,6 +196,12 @@
O valor deve conter um número para permitir o monitoramento do estoque de medicamentos para este lembrete.
Nunca
Dias
+
+ - semana
+ - semanas
+ - semanas
+
+ Semanas
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.
Número de repetições
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\").
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ee77ee4cf..c5857574d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -168,6 +168,12 @@
Минуты
Часы
Дни
+
+ - неделя
+ - недели
+ - недель
+
+ Недели
Создать напоминание
Интервал
Время начала интервала
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 0ad3de20a..9e295a225 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -164,6 +164,11 @@
- dagar
Dagar
+
+ - vecka
+ - veckor
+
+ Veckor
Skapa påminnelse
Intervall
Starttid för intervall
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 91230793a..55abdbac4 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -149,6 +149,11 @@
Minutes
மணிகள்
நாட்கள்
+
+ - வாரம்
+ - வாரங்கள்
+
+ வாரங்கள்
நினைவூட்டலை உருவாக்கவும்
இடைவேளை
இடைவெளி தொடக்க நேரம்
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1a8311586..0f844ebd7 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -161,6 +161,11 @@
Dakika
Saatler
Günler
+
+ - hafta
+ - hafta
+
+ Haftalar
Hatırlatma oluşturun
Aralık
Aralık başlangıç zamanı
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5b1cc2a71..05bf0dae5 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -147,6 +147,13 @@
Хвилини
Години
Дні
+
+ - тиждень
+ - тижні
+ - тижні
+ - тижнів
+
+ Тижні
Створити нагадування
Інтервал
Початок інтервалу
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3c7c8b1f7..9eaceaaec 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -156,6 +156,10 @@
分钟
小时
天
+
+ - 周
+
+ 周
创建提醒
间隔
间隔提醒起始时间
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c55fdf73e..a207ab539 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -156,6 +156,10 @@
時間型提醒
間隔型提醒
天
+
+ - 週
+
+ 週
建立提醒
間隔
間隔開始時間
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 12d4f54d0..25da02038 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -170,6 +170,11 @@
- days
Days
+
+ - week
+ - weeks
+
+ Weeks
Create reminder
Interval
Interval start time
diff --git a/app/src/test/java/com/futsch1/medtimer/IntervalTest.kt b/app/src/test/java/com/futsch1/medtimer/IntervalTest.kt
index 7d8f01858..d1123cb46 100644
--- a/app/src/test/java/com/futsch1/medtimer/IntervalTest.kt
+++ b/app/src/test/java/com/futsch1/medtimer/IntervalTest.kt
@@ -53,6 +53,15 @@ class IntervalTest {
assertEquals(1, interval.getValue(IntervalUnit.DAYS))
}
+ @Test
+ fun testWeeksConstructor() {
+ val interval = Interval(2, IntervalUnit.WEEKS)
+ assertEquals(2 * 7 * 24 * 60, interval.minutesValue)
+ assertEquals(IntervalUnit.WEEKS, interval.getUnit())
+ assertEquals(2, interval.getValue())
+ assertEquals(14, interval.getValue(IntervalUnit.DAYS))
+ }
+
@Test
fun testToString() {
var interval = Interval(60)