diff --git a/build.gradle b/build.gradle
index 8c8158dce..0808a3daf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
propMinSdkVersion = 21
propTargetSdkVersion = propCompileSdkVersion
propVersionCode = 1
- propVersionName = '5.33.19'
+ propVersionName = '5.33.20'
kotlin_version = '1.4.21'
}
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
index 4c734d889..6e26aa83a 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
@@ -1001,12 +1001,12 @@ fun Activity.showPickSecondsDialog(curSeconds: Int, isSnoozePicker: Boolean = fa
}
}
- if(showDuringDayOption) {
- items.add(RadioItem(-3, getString(R.string.during_day_at_x)))
- }
-
items.add(RadioItem(-2, getString(R.string.custom)))
+ if (showDuringDayOption) {
+ items.add(RadioItem(-3, getString(R.string.during_day_at_hh_mm)))
+ }
+
RadioGroupDialog(this, items, selectedIndex, showOKButton = isSnoozePicker, cancelCallback = cancelCallback) {
when (it) {
-2 -> {
@@ -1016,8 +1016,8 @@ fun Activity.showPickSecondsDialog(curSeconds: Int, isSnoozePicker: Boolean = fa
}
-3 -> {
TimePickerDialog(this, getDialogTheme(),
- {view, hourOfDay, minute -> callback(hourOfDay * -3600 + minute * -60)},
- curSeconds / 3600, curSeconds % 3600, baseConfig.use24HourFormat).show()
+ { view, hourOfDay, minute -> callback(hourOfDay * -3600 + minute * -60) },
+ curSeconds / 3600, curSeconds % 3600, baseConfig.use24HourFormat).show()
}
else -> {
callback(it as Int)
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt
index 2b8588815..cd8cf3e9d 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt
@@ -50,7 +50,6 @@ import com.simplemobiletools.commons.models.AlarmSound
import com.simplemobiletools.commons.models.BlockedNumber
import com.simplemobiletools.commons.models.SharedTheme
import com.simplemobiletools.commons.views.*
-import org.joda.time.LocalTime
import java.io.File
import java.text.SimpleDateFormat
import java.util.*
@@ -566,7 +565,7 @@ fun Context.getFormattedSeconds(seconds: Int, showBefore: Boolean = true) = when
0 -> getString(R.string.at_start)
else -> {
when {
- seconds < 0 && seconds > -60*60*24 -> {
+ seconds < 0 && seconds > -60 * 60 * 24 -> {
val minutes = -seconds / 60
getString(R.string.during_day_at).format(minutes / 60, minutes % 60)
}
diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml
index d5604cc3f..f54a77429 100644
--- a/commons/src/main/res/values-ar/strings.xml
+++ b/commons/src/main/res/values-ar/strings.xml
@@ -483,6 +483,8 @@
الأصوات الخاصة بك
إضافة صوت جديد
لا يوجد صوت
+ During the day at hh:mm
+ During the day at %02d:%02d
الإعدادات
diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml
index cef33490c..e7b061245 100644
--- a/commons/src/main/res/values-az/strings.xml
+++ b/commons/src/main/res/values-az/strings.xml
@@ -485,6 +485,8 @@
Sizin səsləriniz
Yeni səs əlavə et
Səs yoxdur
+ During the day at hh:mm
+ During the day at %02d:%02d
Parametrlər
diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml
index e531a6591..ab0b2ddb1 100644
--- a/commons/src/main/res/values-br/strings.xml
+++ b/commons/src/main/res/values-br/strings.xml
@@ -485,6 +485,8 @@
Your sounds
Add a new sound
No sound
+ During the day at hh:mm
+ During the day at %02d:%02d
Settings
diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml
index 790f1adb0..a0f8d30f6 100644
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@@ -485,6 +485,8 @@
Els teus sons
Afegeix un so nou
Sense so
+ During the day at hh:mm
+ During the day at %02d:%02d
Ajustaments
diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml
index 12bbf99b8..23aafe049 100644
--- a/commons/src/main/res/values-cs/strings.xml
+++ b/commons/src/main/res/values-cs/strings.xml
@@ -518,6 +518,8 @@
Vaše zvuky
Přidat nový zvuk
Žádný zvuk
+ During the day at hh:mm
+ During the day at %02d:%02d
Nastavení
diff --git a/commons/src/main/res/values-cy/strings.xml b/commons/src/main/res/values-cy/strings.xml
index 0684bbfec..96a8f1704 100644
--- a/commons/src/main/res/values-cy/strings.xml
+++ b/commons/src/main/res/values-cy/strings.xml
@@ -609,6 +609,8 @@
Dy synau di
Ychwanegu sŵn newydd
Dim sŵn
+ During the day at hh:mm
+ During the day at %02d:%02d
Gosodiadau
diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml
index bfc89f560..75ce9fc39 100644
--- a/commons/src/main/res/values-da/strings.xml
+++ b/commons/src/main/res/values-da/strings.xml
@@ -485,6 +485,8 @@
Dine lyde
Tilføj en ny lyd
Ingen lyd
+ During the day at hh:mm
+ During the day at %02d:%02d
Indstillinger
diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml
index 715da983e..fdb8e1819 100644
--- a/commons/src/main/res/values-de/strings.xml
+++ b/commons/src/main/res/values-de/strings.xml
@@ -485,6 +485,8 @@
Deine Töne
Neuen Ton hinzufügen
Stumm
+ During the day at hh:mm
+ During the day at %02d:%02d
Einstellungen
diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml
index 2ff4edc9c..e559ac33d 100644
--- a/commons/src/main/res/values-el/strings.xml
+++ b/commons/src/main/res/values-el/strings.xml
@@ -485,6 +485,8 @@
Οι ήχοι σας
Προσθέστε νέο ήχο
Χωρίς ήχο
+ During the day at hh:mm
+ During the day at %02d:%02d
Ρυθμίσεις
diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml
index f353b1c64..3abf1f949 100644
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@@ -485,6 +485,8 @@
Tus sonidos
Agrega un nuevo sonido
Sin sonido
+ During the day at hh:mm
+ During the day at %02d:%02d
Ajustes
diff --git a/commons/src/main/res/values-eu/strings.xml b/commons/src/main/res/values-eu/strings.xml
index 625572535..335bed9a9 100644
--- a/commons/src/main/res/values-eu/strings.xml
+++ b/commons/src/main/res/values-eu/strings.xml
@@ -485,6 +485,8 @@
Zure soinuak
Gehitu soinu berria
Soinurik ez
+ During the day at hh:mm
+ During the day at %02d:%02d
Ezarpenak
diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml
index e43fedf20..aab5c76a3 100644
--- a/commons/src/main/res/values-fi/strings.xml
+++ b/commons/src/main/res/values-fi/strings.xml
@@ -485,6 +485,8 @@
Omat äänet
Lisää uusi ääni
Ei ääntä
+ During the day at hh:mm
+ During the day at %02d:%02d
Asetukset
diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml
index c83f0c341..5f71f0414 100644
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@@ -487,6 +487,8 @@
Vos sonneries
Ajouter une nouvelle sonnerie
Aucune sonnerie
+ During the day at hh:mm
+ During the day at %02d:%02d
Paramètres
diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml
index 666b86e85..b70acc8fa 100644
--- a/commons/src/main/res/values-gl/strings.xml
+++ b/commons/src/main/res/values-gl/strings.xml
@@ -485,6 +485,8 @@
Os teus sons
Engadir un novo son
Silencio
+ During the day at hh:mm
+ During the day at %02d:%02d
Axustes
diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml
index f35bef831..311a0e6eb 100644
--- a/commons/src/main/res/values-hi-rIN/strings.xml
+++ b/commons/src/main/res/values-hi-rIN/strings.xml
@@ -485,6 +485,8 @@
Your sounds
Add a new sound
No sound
+ During the day at hh:mm
+ During the day at %02d:%02d
Settings
diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml
index ed177120a..ccb01f01c 100644
--- a/commons/src/main/res/values-hr/strings.xml
+++ b/commons/src/main/res/values-hr/strings.xml
@@ -516,6 +516,8 @@
Vaši zvukovi
Dodaj novi zvuk
Nema zvuka
+ During the day at hh:mm
+ During the day at %02d:%02d
Postavke
diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml
index e5ad156a7..aaf4876a8 100644
--- a/commons/src/main/res/values-hu/strings.xml
+++ b/commons/src/main/res/values-hu/strings.xml
@@ -484,6 +484,8 @@
Saját hangok
Új hang hozzáadása
Nincs hang
+ During the day at hh:mm
+ During the day at %02d:%02d
Beállítások
diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml
index f6c60af32..44d8f65a5 100644
--- a/commons/src/main/res/values-id/strings.xml
+++ b/commons/src/main/res/values-id/strings.xml
@@ -453,6 +453,8 @@
Suara khusus
Tambah suara baru
Tidak ada suara
+ During the day at hh:mm
+ During the day at %02d:%02d
Pengaturan
diff --git a/commons/src/main/res/values-in/strings.xml b/commons/src/main/res/values-in/strings.xml
index f6c60af32..44d8f65a5 100644
--- a/commons/src/main/res/values-in/strings.xml
+++ b/commons/src/main/res/values-in/strings.xml
@@ -453,6 +453,8 @@
Suara khusus
Tambah suara baru
Tidak ada suara
+ During the day at hh:mm
+ During the day at %02d:%02d
Pengaturan
diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml
index 741671101..37eb24ab9 100644
--- a/commons/src/main/res/values-it/strings.xml
+++ b/commons/src/main/res/values-it/strings.xml
@@ -485,6 +485,8 @@
I propri suoni
Aggiungi un nuovo suono
Nessun suono
+ During the day at hh:mm
+ During the day at %02d:%02d
Impostazioni
diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml
index a5a6034d9..624b0f66a 100644
--- a/commons/src/main/res/values-iw/strings.xml
+++ b/commons/src/main/res/values-iw/strings.xml
@@ -485,6 +485,8 @@
הצלילים שלך
הוספת צליל
No sound
+ During the day at hh:mm
+ During the day at %02d:%02d
הגדרות
diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml
index dd5c28653..4d6d4d9f4 100644
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@@ -452,6 +452,8 @@
選択したサウンド
新しいサウンドを追加
サウンドなし
+ During the day at hh:mm
+ During the day at %02d:%02d
設定
diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml
index 5fe7b256d..b3a3f34b9 100644
--- a/commons/src/main/res/values-ko-rKR/strings.xml
+++ b/commons/src/main/res/values-ko-rKR/strings.xml
@@ -451,6 +451,8 @@
사용자 소리
소리 추가
소리 없음
+ During the day at hh:mm
+ During the day at %02d:%02d
설정
diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml
index d60ed9787..c242cb192 100644
--- a/commons/src/main/res/values-lt/strings.xml
+++ b/commons/src/main/res/values-lt/strings.xml
@@ -509,6 +509,8 @@
Jūsų garsai
Pridėti naują garsą
Nėra garso
+ During the day at hh:mm
+ During the day at %02d:%02d
Nustatymai
diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml
index be00107fd..5200faf71 100644
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@@ -485,6 +485,8 @@
Dine lyder
Legg til en ny lyd
Ingen lyd
+ During the day at hh:mm
+ During the day at %02d:%02d
Innstillinger
diff --git a/commons/src/main/res/values-ne/strings.xml b/commons/src/main/res/values-ne/strings.xml
index 610c69a52..ed3c7c337 100644
--- a/commons/src/main/res/values-ne/strings.xml
+++ b/commons/src/main/res/values-ne/strings.xml
@@ -485,6 +485,8 @@
Your sounds
Add a new sound
No sound
+ During the day at hh:mm
+ During the day at %02d:%02d
Settings
diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml
index b0109aab9..640b529c1 100644
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@@ -485,6 +485,8 @@
Eigen geluiden
Nieuw geluid toevoegen
Geen geluid
+ During the day at hh:mm
+ During the day at %02d:%02d
Instellingen
diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml
index f2f388d10..c2a48e3f0 100644
--- a/commons/src/main/res/values-no/strings.xml
+++ b/commons/src/main/res/values-no/strings.xml
@@ -485,6 +485,8 @@
Your sounds
Add a new sound
No sound
+ During the day at hh:mm
+ During the day at %02d:%02d
Innstillinger
diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml
index 8ed5c45d8..03c05eef6 100644
--- a/commons/src/main/res/values-pl/strings.xml
+++ b/commons/src/main/res/values-pl/strings.xml
@@ -511,6 +511,8 @@
Dźwięki użytkownika
Dodaj nowy dźwięk
Brak dźwięku
+ During the day at hh:mm
+ During the day at %02d:%02d
Ustawienia
diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml
index 59078bd34..624cf7509 100644
--- a/commons/src/main/res/values-pt-rBR/strings.xml
+++ b/commons/src/main/res/values-pt-rBR/strings.xml
@@ -485,6 +485,8 @@
Seus sons
Adicionar um novo som
Sem som
+ During the day at hh:mm
+ During the day at %02d:%02d
Configurações
diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml
index c5b1e2814..02f1f332e 100644
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@@ -485,6 +485,8 @@
Meus sons
Adicionar um novo som
Sem som
+ During the day at hh:mm
+ During the day at %02d:%02d
Definições
diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml
index 3b570469a..cc810660d 100644
--- a/commons/src/main/res/values-ru/strings.xml
+++ b/commons/src/main/res/values-ru/strings.xml
@@ -518,6 +518,8 @@
Свои звуки
Добавить новый звук
Без звука
+ During the day at hh:mm
+ During the day at %02d:%02d
Настройки
diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml
index 821d920c3..622b34ebf 100644
--- a/commons/src/main/res/values-sk/strings.xml
+++ b/commons/src/main/res/values-sk/strings.xml
@@ -518,6 +518,8 @@
Vaše zvuky
Pridať nový zvuk
Žiadny zvuk
+ Počas dňa o hh:mm
+ Počas dňa o %02d:%02d
Nastavenia
diff --git a/commons/src/main/res/values-sl/strings.xml b/commons/src/main/res/values-sl/strings.xml
index fe1ebb4cf..f7576f3db 100644
--- a/commons/src/main/res/values-sl/strings.xml
+++ b/commons/src/main/res/values-sl/strings.xml
@@ -548,6 +548,8 @@
Vaši zvoki
Dodaj nov zvok
Brez zvoka
+ During the day at hh:mm
+ During the day at %02d:%02d
Nastavitve
diff --git a/commons/src/main/res/values-sr/strings.xml b/commons/src/main/res/values-sr/strings.xml
index 66d143bfc..30b758d13 100644
--- a/commons/src/main/res/values-sr/strings.xml
+++ b/commons/src/main/res/values-sr/strings.xml
@@ -484,6 +484,8 @@
Ваши звукови
Додај нови звук
Без звука
+ During the day at hh:mm
+ During the day at %02d:%02d
Подешавања
diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml
index bddcab61f..922ccb19c 100644
--- a/commons/src/main/res/values-sv/strings.xml
+++ b/commons/src/main/res/values-sv/strings.xml
@@ -485,6 +485,8 @@
Dina ljud
Lägg till ett nytt ljud
Inget ljud
+ During the day at hh:mm
+ During the day at %02d:%02d
Inställningar
diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml
index 441d46f7b..0b4d58d24 100644
--- a/commons/src/main/res/values-tr/strings.xml
+++ b/commons/src/main/res/values-tr/strings.xml
@@ -485,6 +485,8 @@
Sesleriniz
Yeni bir ses ekle
Ses yok
+ During the day at hh:mm
+ During the day at %02d:%02d
Ayarlar
diff --git a/commons/src/main/res/values-uk/strings.xml b/commons/src/main/res/values-uk/strings.xml
index e1287d955..ca260c292 100644
--- a/commons/src/main/res/values-uk/strings.xml
+++ b/commons/src/main/res/values-uk/strings.xml
@@ -485,6 +485,8 @@
Ваші звуки
Додати новий звук
Без звуку
+ During the day at hh:mm
+ During the day at %02d:%02d
Налаштування
diff --git a/commons/src/main/res/values-vi/strings.xml b/commons/src/main/res/values-vi/strings.xml
index 53c2fcf73..d2bee486c 100644
--- a/commons/src/main/res/values-vi/strings.xml
+++ b/commons/src/main/res/values-vi/strings.xml
@@ -485,6 +485,8 @@
Âm báo của bạn
Thêm một âm báo mới
Không có âm báo
+ During the day at hh:mm
+ During the day at %02d:%02d
Cài đặt
diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml
index a2aa04ebb..cfee6dc0f 100644
--- a/commons/src/main/res/values-zh-rCN/strings.xml
+++ b/commons/src/main/res/values-zh-rCN/strings.xml
@@ -453,6 +453,8 @@
您的铃声
添加新的铃声
无铃声
+ During the day at hh:mm
+ During the day at %02d:%02d
设置
diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml
index 2ff24277d..90b060452 100644
--- a/commons/src/main/res/values-zh-rTW/strings.xml
+++ b/commons/src/main/res/values-zh-rTW/strings.xml
@@ -453,6 +453,8 @@
你的音效
添加新的音效
無音效
+ During the day at hh:mm
+ During the day at %02d:%02d
設定
diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml
index c29edaf2e..f5aecc580 100644
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@@ -485,7 +485,7 @@
Your sounds
Add a new sound
No sound
- During the day at XX:XX
+ During the day at hh:mm
During the day at %02d:%02d