adding some things related to setting reminders during the day
This commit is contained in:
parent
7cd52d8524
commit
6a85665dc3
45 changed files with 91 additions and 10 deletions
|
@ -6,7 +6,7 @@ buildscript {
|
|||
propMinSdkVersion = 21
|
||||
propTargetSdkVersion = propCompileSdkVersion
|
||||
propVersionCode = 1
|
||||
propVersionName = '5.33.19'
|
||||
propVersionName = '5.33.20'
|
||||
kotlin_version = '1.4.21'
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -483,6 +483,8 @@
|
|||
<string name="your_sounds">الأصوات الخاصة بك</string>
|
||||
<string name="add_new_sound">إضافة صوت جديد</string>
|
||||
<string name="no_sound">لا يوجد صوت</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">الإعدادات</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Sizin səsləriniz</string>
|
||||
<string name="add_new_sound">Yeni səs əlavə et</string>
|
||||
<string name="no_sound">Səs yoxdur</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Parametrlər</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Your sounds</string>
|
||||
<string name="add_new_sound">Add a new sound</string>
|
||||
<string name="no_sound">No sound</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Settings</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Els teus sons</string>
|
||||
<string name="add_new_sound">Afegeix un so nou</string>
|
||||
<string name="no_sound">Sense so</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Ajustaments</string>
|
||||
|
|
|
@ -518,6 +518,8 @@
|
|||
<string name="your_sounds">Vaše zvuky</string>
|
||||
<string name="add_new_sound">Přidat nový zvuk</string>
|
||||
<string name="no_sound">Žádný zvuk</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Nastavení</string>
|
||||
|
|
|
@ -609,6 +609,8 @@
|
|||
<string name="your_sounds">Dy synau di</string>
|
||||
<string name="add_new_sound">Ychwanegu sŵn newydd</string>
|
||||
<string name="no_sound">Dim sŵn</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Gosodiadau</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Dine lyde</string>
|
||||
<string name="add_new_sound">Tilføj en ny lyd</string>
|
||||
<string name="no_sound">Ingen lyd</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Indstillinger</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Deine Töne</string>
|
||||
<string name="add_new_sound">Neuen Ton hinzufügen</string>
|
||||
<string name="no_sound">Stumm</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Einstellungen</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Οι ήχοι σας</string>
|
||||
<string name="add_new_sound">Προσθέστε νέο ήχο</string>
|
||||
<string name="no_sound">Χωρίς ήχο</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Ρυθμίσεις</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Tus sonidos</string>
|
||||
<string name="add_new_sound">Agrega un nuevo sonido</string>
|
||||
<string name="no_sound">Sin sonido</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Ajustes</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Zure soinuak</string>
|
||||
<string name="add_new_sound">Gehitu soinu berria</string>
|
||||
<string name="no_sound">Soinurik ez</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Ezarpenak</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Omat äänet</string>
|
||||
<string name="add_new_sound">Lisää uusi ääni</string>
|
||||
<string name="no_sound">Ei ääntä</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Asetukset</string>
|
||||
|
|
|
@ -487,6 +487,8 @@
|
|||
<string name="your_sounds">Vos sonneries</string>
|
||||
<string name="add_new_sound">Ajouter une nouvelle sonnerie</string>
|
||||
<string name="no_sound">Aucune sonnerie</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Paramètres</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Os teus sons</string>
|
||||
<string name="add_new_sound">Engadir un novo son</string>
|
||||
<string name="no_sound">Silencio</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Axustes</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Your sounds</string>
|
||||
<string name="add_new_sound">Add a new sound</string>
|
||||
<string name="no_sound">No sound</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Settings</string>
|
||||
|
|
|
@ -516,6 +516,8 @@
|
|||
<string name="your_sounds">Vaši zvukovi</string>
|
||||
<string name="add_new_sound">Dodaj novi zvuk</string>
|
||||
<string name="no_sound">Nema zvuka</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Postavke</string>
|
||||
|
|
|
@ -484,6 +484,8 @@
|
|||
<string name="your_sounds">Saját hangok</string>
|
||||
<string name="add_new_sound">Új hang hozzáadása</string>
|
||||
<string name="no_sound">Nincs hang</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Beállítások</string>
|
||||
|
|
|
@ -453,6 +453,8 @@
|
|||
<string name="your_sounds">Suara khusus</string>
|
||||
<string name="add_new_sound">Tambah suara baru</string>
|
||||
<string name="no_sound">Tidak ada suara</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Pengaturan</string>
|
||||
|
|
|
@ -453,6 +453,8 @@
|
|||
<string name="your_sounds">Suara khusus</string>
|
||||
<string name="add_new_sound">Tambah suara baru</string>
|
||||
<string name="no_sound">Tidak ada suara</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Pengaturan</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">I propri suoni</string>
|
||||
<string name="add_new_sound">Aggiungi un nuovo suono</string>
|
||||
<string name="no_sound">Nessun suono</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Impostazioni</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">הצלילים שלך</string>
|
||||
<string name="add_new_sound">הוספת צליל</string>
|
||||
<string name="no_sound">No sound</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">הגדרות</string>
|
||||
|
|
|
@ -452,6 +452,8 @@
|
|||
<string name="your_sounds">選択したサウンド</string>
|
||||
<string name="add_new_sound">新しいサウンドを追加</string>
|
||||
<string name="no_sound">サウンドなし</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">設定</string>
|
||||
|
|
|
@ -451,6 +451,8 @@
|
|||
<string name="your_sounds">사용자 소리</string>
|
||||
<string name="add_new_sound">소리 추가</string>
|
||||
<string name="no_sound">소리 없음</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">설정</string>
|
||||
|
|
|
@ -509,6 +509,8 @@
|
|||
<string name="your_sounds">Jūsų garsai</string>
|
||||
<string name="add_new_sound">Pridėti naują garsą</string>
|
||||
<string name="no_sound">Nėra garso</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Nustatymai</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Dine lyder</string>
|
||||
<string name="add_new_sound">Legg til en ny lyd</string>
|
||||
<string name="no_sound">Ingen lyd</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Innstillinger</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Your sounds</string>
|
||||
<string name="add_new_sound">Add a new sound</string>
|
||||
<string name="no_sound">No sound</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Settings</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Eigen geluiden</string>
|
||||
<string name="add_new_sound">Nieuw geluid toevoegen</string>
|
||||
<string name="no_sound">Geen geluid</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Instellingen</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Your sounds</string>
|
||||
<string name="add_new_sound">Add a new sound</string>
|
||||
<string name="no_sound">No sound</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Innstillinger</string>
|
||||
|
|
|
@ -511,6 +511,8 @@
|
|||
<string name="your_sounds">Dźwięki użytkownika</string>
|
||||
<string name="add_new_sound">Dodaj nowy dźwięk</string>
|
||||
<string name="no_sound">Brak dźwięku</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Ustawienia</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Seus sons</string>
|
||||
<string name="add_new_sound">Adicionar um novo som</string>
|
||||
<string name="no_sound">Sem som</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Configurações</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Meus sons</string>
|
||||
<string name="add_new_sound">Adicionar um novo som</string>
|
||||
<string name="no_sound">Sem som</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Definições</string>
|
||||
|
|
|
@ -518,6 +518,8 @@
|
|||
<string name="your_sounds">Свои звуки</string>
|
||||
<string name="add_new_sound">Добавить новый звук</string>
|
||||
<string name="no_sound">Без звука</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Настройки</string>
|
||||
|
|
|
@ -518,6 +518,8 @@
|
|||
<string name="your_sounds">Vaše zvuky</string>
|
||||
<string name="add_new_sound">Pridať nový zvuk</string>
|
||||
<string name="no_sound">Žiadny zvuk</string>
|
||||
<string name="during_day_at_hh_mm">Počas dňa o hh:mm</string>
|
||||
<string name="during_day_at">Počas dňa o %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Nastavenia</string>
|
||||
|
|
|
@ -548,6 +548,8 @@
|
|||
<string name="your_sounds">Vaši zvoki</string>
|
||||
<string name="add_new_sound">Dodaj nov zvok</string>
|
||||
<string name="no_sound">Brez zvoka</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Nastavitve</string>
|
||||
|
|
|
@ -484,6 +484,8 @@
|
|||
<string name="your_sounds">Ваши звукови</string>
|
||||
<string name="add_new_sound">Додај нови звук</string>
|
||||
<string name="no_sound">Без звука</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Подешавања</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Dina ljud</string>
|
||||
<string name="add_new_sound">Lägg till ett nytt ljud</string>
|
||||
<string name="no_sound">Inget ljud</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Inställningar</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Sesleriniz</string>
|
||||
<string name="add_new_sound">Yeni bir ses ekle</string>
|
||||
<string name="no_sound">Ses yok</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Ayarlar</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Ваші звуки</string>
|
||||
<string name="add_new_sound">Додати новий звук</string>
|
||||
<string name="no_sound">Без звуку</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Налаштування</string>
|
||||
|
|
|
@ -485,6 +485,8 @@
|
|||
<string name="your_sounds">Âm báo của bạn</string>
|
||||
<string name="add_new_sound">Thêm một âm báo mới</string>
|
||||
<string name="no_sound">Không có âm báo</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">Cài đặt</string>
|
||||
|
|
|
@ -453,6 +453,8 @@
|
|||
<string name="your_sounds">您的铃声</string>
|
||||
<string name="add_new_sound">添加新的铃声</string>
|
||||
<string name="no_sound">无铃声</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">设置</string>
|
||||
|
|
|
@ -453,6 +453,8 @@
|
|||
<string name="your_sounds">你的音效</string>
|
||||
<string name="add_new_sound">添加新的音效</string>
|
||||
<string name="no_sound">無音效</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="settings">設定</string>
|
||||
|
|
|
@ -485,7 +485,7 @@
|
|||
<string name="your_sounds">Your sounds</string>
|
||||
<string name="add_new_sound">Add a new sound</string>
|
||||
<string name="no_sound">No sound</string>
|
||||
<string name="during_day_at_x">During the day at XX:XX</string>
|
||||
<string name="during_day_at_hh_mm">During the day at hh:mm</string>
|
||||
<string name="during_day_at">During the day at %02d:%02d</string>
|
||||
|
||||
<!-- Settings -->
|
||||
|
|
Loading…
Reference in a new issue