diff --git a/app/build.gradle b/app/build.gradle index 06398e4ec..901ab77f6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,10 +46,10 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.14.1' + implementation 'com.simplemobiletools:commons:3.14.13' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' - implementation 'com.android.support:multidex:1.0.2' + implementation 'com.android.support:multidex:1.0.3' implementation 'com.google.code.gson:gson:2.8.2' debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt index 754900f6b..85465d277 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -19,6 +19,7 @@ import com.simplemobiletools.calendar.models.CalDAVCalendar import com.simplemobiletools.calendar.models.Event import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.RadioItem import kotlinx.android.synthetic.main.activity_event.* import org.joda.time.DateTime @@ -347,7 +348,7 @@ class EventActivity : SimpleActivity() { private fun checkRepetitionRuleText() { if (mRepeatInterval.isXWeeklyRepetition()) { - event_repetition_rule.text = if (mRepeatRule == EVERY_DAY) getString(R.string.every_day) else getSelectedDaysString() + event_repetition_rule.text = if (mRepeatRule == EVERY_DAY_BIT) getString(R.string.every_day) else getSelectedDaysString(mRepeatRule) } else if (mRepeatInterval.isXMonthlyRepetition()) { val repeatString = if (mRepeatRule == REPEAT_MONTH_ORDER_WEEKDAY_USE_LAST || mRepeatRule == REPEAT_MONTH_ORDER_WEEKDAY) R.string.repeat else R.string.repeat_on @@ -357,26 +358,6 @@ class EventActivity : SimpleActivity() { } } - private fun getSelectedDaysString(): String { - var days = "" - if (mRepeatRule and MONDAY != 0) - days += "${getString(R.string.monday).substringTo(3)}, " - if (mRepeatRule and TUESDAY != 0) - days += "${getString(R.string.tuesday).substringTo(3)}, " - if (mRepeatRule and WEDNESDAY != 0) - days += "${getString(R.string.wednesday).substringTo(3)}, " - if (mRepeatRule and THURSDAY != 0) - days += "${getString(R.string.thursday).substringTo(3)}, " - if (mRepeatRule and FRIDAY != 0) - days += "${getString(R.string.friday).substringTo(3)}, " - if (mRepeatRule and SATURDAY != 0) - days += "${getString(R.string.saturday).substringTo(3)}, " - if (mRepeatRule and SUNDAY != 0) - days += "${getString(R.string.sunday).substringTo(3)}, " - - return days.trim().trimEnd(',') - } - private fun getMonthlyRepetitionRuleText() = when (mRepeatRule) { REPEAT_MONTH_SAME_DAY -> getString(R.string.the_same_day) REPEAT_MONTH_LAST_DAY -> getString(R.string.the_last_day) @@ -786,7 +767,7 @@ class EventActivity : SimpleActivity() { private fun checkRepeatRule() { if (mRepeatInterval.isXWeeklyRepetition()) { val day = mRepeatRule - if (day == MONDAY || day == TUESDAY || day == WEDNESDAY || day == THURSDAY || day == FRIDAY || day == SATURDAY || day == SUNDAY) { + if (day == MONDAY_BIT || day == TUESDAY_BIT || day == WEDNESDAY_BIT || day == THURSDAY_BIT || day == FRIDAY_BIT || day == SATURDAY_BIT || day == SUNDAY_BIT) { setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt()) } } else if (mRepeatInterval.isXMonthlyRepetition()) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt index 625697409..733ae78c8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt @@ -43,7 +43,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r override fun getSelectableItemCount() = events.size - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int) = createViewHolder(R.layout.event_item_day_view, parent) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.event_item_day_view, parent) override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) { val event = events[position] diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt index a46a99ff6..df29b56fc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt @@ -56,7 +56,7 @@ class EventListAdapter(activity: SimpleActivity, val listItems: ArrayList(7) for (i in 0..6) { val pow = Math.pow(2.0, i.toDouble()).toInt() @@ -39,8 +38,8 @@ class RepeatRuleWeeklyDialog(val activity: Activity, val curRepeatRule: Int, val .setPositiveButton(R.string.ok, { dialog, which -> callback(getRepeatRuleSum()) }) .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this) - } + activity.setupDialogStuff(view, this) + } } private fun getRepeatRuleSum(): Int { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/String.kt index cdf1bd431..c7da55791 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/String.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/String.kt @@ -1,10 +1,3 @@ package com.simplemobiletools.calendar.extensions -fun String.substringTo(cnt: Int): String { - return if (isEmpty()) { - "" - } else - substring(0, Math.min(length, cnt)) -} - fun String.getMonthCode() = if (length == 8) substring(0, 6) else "" diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt index 05c3cc6b7..42e0d0bc9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.calendar.helpers import android.content.Context import android.media.RingtoneManager -import android.text.format.DateFormat import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.extensions.scheduleCalDAVSync import com.simplemobiletools.commons.helpers.BaseConfig @@ -13,20 +12,6 @@ class Config(context: Context) : BaseConfig(context) { fun newInstance(context: Context) = Config(context) } - var isSundayFirst: Boolean - get() { - val isSundayFirst = Calendar.getInstance(Locale.getDefault()).firstDayOfWeek == Calendar.SUNDAY - return prefs.getBoolean(SUNDAY_FIRST, isSundayFirst) - } - set(sundayFirst) = prefs.edit().putBoolean(SUNDAY_FIRST, sundayFirst).apply() - - var use24hourFormat: Boolean - get() { - val use24hourFormat = DateFormat.is24HourFormat(context) - return prefs.getBoolean(USE_24_HOUR_FORMAT, use24hourFormat) - } - set(use24hourFormat) = prefs.edit().putBoolean(USE_24_HOUR_FORMAT, use24hourFormat).apply() - var displayWeekNumbers: Boolean get() = prefs.getBoolean(WEEK_NUMBERS, false) set(displayWeekNumbers) = prefs.edit().putBoolean(WEEK_NUMBERS, displayWeekNumbers).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt index 42b5ca8fa..cd85943dc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt @@ -35,8 +35,6 @@ const val DAY_SECONDS = 24 * 60 * 60 const val WEEK_SECONDS = 7 * DAY_SECONDS // Shared Preferences -const val USE_24_HOUR_FORMAT = "use_24_hour_format" -const val SUNDAY_FIRST = "sunday_first" const val WEEK_NUMBERS = "week_numbers" const val START_WEEKLY_AT = "start_weekly_at" const val END_WEEKLY_AT = "end_weekly_at" @@ -59,15 +57,6 @@ const val USE_SAME_SNOOZE = "use_same_snooze" val letterIDs = intArrayOf(R.string.sunday_letter, R.string.monday_letter, R.string.tuesday_letter, R.string.wednesday_letter, R.string.thursday_letter, R.string.friday_letter, R.string.saturday_letter) -// repeat_rule for weekly repetition -const val MONDAY = 1 -const val TUESDAY = 2 -const val WEDNESDAY = 4 -const val THURSDAY = 8 -const val FRIDAY = 16 -const val SATURDAY = 32 -const val SUNDAY = 64 -const val EVERY_DAY = 127 // repeat_rule for monthly repetition const val REPEAT_MONTH_SAME_DAY = 1 // ie 25th every month diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt index 990437a19..8d518c150 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt @@ -5,6 +5,7 @@ import com.simplemobiletools.calendar.extensions.isXWeeklyRepetition import com.simplemobiletools.calendar.extensions.seconds import com.simplemobiletools.calendar.models.Event import com.simplemobiletools.calendar.models.RepeatRule +import com.simplemobiletools.commons.helpers.* import org.joda.time.DateTimeZone import org.joda.time.format.DateTimeFormat @@ -61,19 +62,19 @@ class Parser { private fun handleRepeatRule(value: String): Int { var newRepeatRule = 0 if (value.contains(MO)) - newRepeatRule = newRepeatRule or MONDAY + newRepeatRule = newRepeatRule or MONDAY_BIT if (value.contains(TU)) - newRepeatRule = newRepeatRule or TUESDAY + newRepeatRule = newRepeatRule or TUESDAY_BIT if (value.contains(WE)) - newRepeatRule = newRepeatRule or WEDNESDAY + newRepeatRule = newRepeatRule or WEDNESDAY_BIT if (value.contains(TH)) - newRepeatRule = newRepeatRule or THURSDAY + newRepeatRule = newRepeatRule or THURSDAY_BIT if (value.contains(FR)) - newRepeatRule = newRepeatRule or FRIDAY + newRepeatRule = newRepeatRule or FRIDAY_BIT if (value.contains(SA)) - newRepeatRule = newRepeatRule or SATURDAY + newRepeatRule = newRepeatRule or SATURDAY_BIT if (value.contains(SU)) - newRepeatRule = newRepeatRule or SUNDAY + newRepeatRule = newRepeatRule or SUNDAY_BIT return newRepeatRule } @@ -148,19 +149,19 @@ class Parser { private fun getByDayString(rule: Int): String { var result = "" - if (rule and MONDAY != 0) + if (rule and MONDAY_BIT != 0) result += "$MO," - if (rule and TUESDAY != 0) + if (rule and TUESDAY_BIT != 0) result += "$TU," - if (rule and WEDNESDAY != 0) + if (rule and WEDNESDAY_BIT != 0) result += "$WE," - if (rule and THURSDAY != 0) + if (rule and THURSDAY_BIT != 0) result += "$TH," - if (rule and FRIDAY != 0) + if (rule and FRIDAY_BIT != 0) result += "$FR," - if (rule and SATURDAY != 0) + if (rule and SATURDAY_BIT != 0) result += "$SA," - if (rule and SUNDAY != 0) + if (rule and SUNDAY_BIT != 0) result += "$SU," return result.trimEnd(',') } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 7b8d15575..fc69d28ca 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -97,7 +97,7 @@ android:clickable="false" android:paddingLeft="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin" - android:text="@string/use_24_hour_format"/> + android:text="@string/use_24_hour_time_format"/> diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index a2ce9bae5..db8972b95 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -10,7 +10,6 @@ Roll darvoudoù een War a-seblant n\'ho peus darvoud ebet da zont. Gallout a rit ouzhpennañ reoù gant an afell \"Mui\" en traoñ. - Munudoù Mont da hiziv Daleañ @@ -179,8 +178,6 @@ Merañ an doareoù darvoudoù - Arverañ ar mentrezh 24eur - Disul eo an devezh kentañ Kregiñ an devezh da Echuiñ an devezh da Diskouez niverennoù ar sizhun @@ -194,7 +191,6 @@ Skrammañ darvoudoù an amzer tremenet Always use same snooze interval Daleañ an adc\'halv eus - Widjetoù Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 89fdd136a..19ba6ed0b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -10,7 +10,6 @@ Jednoduchý seznam událostí Nemáte žádné nadcházející události. Přidejte událost tlačítkem Plus dole. - Detaily Přejít na dnešek Snooze @@ -186,8 +185,6 @@ Správa typů událostí - 24h formát - Neděle jako první den Počátek dne v Konec dne v Zobrazovat číslo týdne @@ -201,7 +198,6 @@ Zobrazit minulé události Always use same snooze interval Odložit připomenutí pomocí funkce Snooze by - Widgety Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c4247878f..adeb68300 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -10,7 +10,6 @@ Begivenhedsliste Du ser ikke ud til at have nogen forestående begivenheder. Du kan tilføje nogle med plus-knappen nederst. - Detaljeret Gå til i dag Snooze @@ -179,8 +178,6 @@ Håndter begivenhedstyper - Anvend 24-timersformat - Søndag som første dag Start dagen kl. Slut dagen kl. Vis ugenumre @@ -194,7 +191,6 @@ Vis overståede begivenheder Brug altid samme snooze-tid Udsæt påmindelsen med en snooze på - Widgets Erstat beskrivelse med sted Slet alle begivenheder Er du sikker på at du vil slette alle begivenheder? Dine begivenhedstyper og andre indstillinger vil forblive intakte. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6a0044d76..2990b4e0e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -10,7 +10,6 @@ Schlichte Terminliste Keine anstehenden Termine Du kannst neue Termine mit dem Hinzufügen Button unten rechts erstellen. - Details Gehe zu Heute Snooze @@ -179,8 +178,6 @@ Verwalte Termin-Typen - Verwende 24 Stunden Format - Sonntag als erster Wochentag Wochenansicht beginnt am Wochenansicht endet am Zeige Kalenderwoche an @@ -194,7 +191,6 @@ Vergangene Termine anzeigen Immer dasselbe Snooze-Intervall nutzen Erinnerung mit Snooze verschieben um - Widgets Ersetze Terminbeschreibung mit Ort Alle Termine löschen Bist du sicher, dass du alle Termine löschen willst? Deine Termintypen und Einstellungen bleiben erhalten. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 419e392a2..8806686e8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -10,7 +10,6 @@ Lista de eventos sencilla Parece que no tienes ningún evento próximo. Puede añadir eventos con el botón Más en la parte inferior. - Detalles Ir al día de hoy Snooze @@ -179,8 +178,6 @@ Gestionar tipos de eventos - Usar formato de 24 horas - Domingo como primer día de la semana El día en la vista semanal comienza a las El día en la vista semanal finaliza a las Mostrar los números de la semana @@ -194,7 +191,6 @@ Mostrar eventos pasados Always use same snooze interval Retrasar recordatorio durante - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index dcf2d3a5d..792a2ead1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -10,7 +10,6 @@ Liste simple d\'événements Il semblerait que vous n\'ayez aucun événement à venir. Vous pouvez ajouter des événements avec le bouton + en bas. - Détails Aller à aujourd\'hui Sommeiller @@ -27,7 +26,7 @@ Événement ajouté avec succès Événement ajouté avec succès Filtrer les événements par type - S'il vous plaît remplir un emplacement pour être affiché sur une carte + S\'il vous plaît remplir un emplacement pour être affiché sur une carte Répétition @@ -106,7 +105,7 @@ Anniversaires Ajouter des anniversaires de contact - Aucun anniversaire n'a été trouvé + Aucun anniversaire n\'a été trouvé Anniversaires ajoutés avec succès @@ -119,7 +118,7 @@ heures jours Ajouter un autre rappel - Rappels d'événements + Rappels d\'événements %d minute avant @@ -179,8 +178,6 @@ Gestion des types d\'événements - Utiliser le format 24 heures - Dimanche en premier jour Jour de début de la vue hebdomadaire Jour de fin de la vue hebdomadaire Afficher les numéros de semaine @@ -194,10 +191,9 @@ Afficher les événements du passé Toujours utiliser le même intervalle de répétition Reporter le rappel avec Snooze de - Widgets - Remplacer la description de l'événement par l'emplacement + Remplacer la description de l\'événement par l\'emplacement Supprimer tous les événements - Êtes-vous sûr de vouloir supprimer tous les événements? Cela laissera vos types d'événements et autres paramètres intacts. + Êtes-vous sûr de vouloir supprimer tous les événements? Cela laissera vos types d\'événements et autres paramètres intacts. CalDAV diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 376bd2171..cf35c8ed2 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -10,7 +10,6 @@ Lista de eventos simple Semella que non ten ningún evento próximo. Pode engadir algún co botón Máis na parte inferior. - Detalle Ir ao día de hoxe Retrasar @@ -179,8 +178,6 @@ Xestionar tipos de eventos - Usar formato de 24 horas - Domingo como primero día da semana Na vista xeral o día comeza as O día na vista semanal remata as Mostrar os números da semana @@ -194,7 +191,6 @@ Mostrar eventos do pasado Always use same snooze interval Retrasar recordatorio con Snooze - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 84c7d6436..1cfb462da 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -10,7 +10,6 @@ सरल इवेंट सूची Seems like you don\'t have any upcoming events. You can add some with the Plus button at the bottom. - विवरण Go to today Snooze @@ -180,8 +179,6 @@ Manage event types - Use 24-hour format - रविवार पहला दिन हैं Start day at End day at सफ्ताह क्रमांक दिखाए @@ -195,7 +192,6 @@ Display events from the past Always use same snooze interval Postpone reminder with Snooze by - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4f45e1428..2b3e56604 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -10,7 +10,6 @@ Egyszerű bejegyzéslista Seems like you don\'t have any upcoming events. You can add some with the Plus button at the bottom. - Részletek Go to today Snooze @@ -179,8 +178,6 @@ Manage event types - Use 24-hour format - Vasárnap a hét első napja Start day at End day at Hetek sorszámának mutatása @@ -194,7 +191,6 @@ Display events from the past Always use same snooze interval Postpone reminder with Snooze by - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 617fc9e70..cd7b96470 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -10,7 +10,6 @@ Simple event list Seems like you don\'t have any upcoming events. You can add some with the Plus button at the bottom. - Dettagli Go to today Snooze @@ -179,8 +178,6 @@ Manage event types - Use 24-hour format - Sunday as first day Start day at End day at Show week numbers @@ -194,7 +191,6 @@ Display events from the past Always use same snooze interval Postpone reminder with Snooze by - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 785d8074b..42b6363e5 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -10,7 +10,6 @@ רשימת אירועים פשוטה נראה שאין לך אירועים בזמן הקרוב. ניתן להוסיף אירועים בעזרת כפתור הפלוס למטה. - פרטים Go to today Snooze @@ -180,8 +179,6 @@ Manage event types - Use 24-hour format - יום א\' בתור היום הראשון בשבוע התחלת תצפית שבועית בשעה התחלת תצפית שבועית בשעה הצגת מספרי השבועות בתצפית חודשית @@ -195,7 +192,6 @@ Display events from the past Always use same snooze interval Postpone reminder with Snooze by - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fb0bdee9f..853e285fd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -10,7 +10,6 @@ シンプル イベント リスト Seems like you don\'t have any upcoming events. You can add some with the Plus button at the bottom. - 詳細 Go to today Snooze @@ -179,8 +178,6 @@ Manage event types - Use 24-hour format - 日曜日が最初 Start day at End day at 週番号を表示 @@ -194,7 +191,6 @@ Display events from the past Always use same snooze interval Postpone reminder with Snooze by - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3edf82c1b..c564a44a0 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -10,7 +10,6 @@ 간단한 이벤트 목록 다가올 이벤트가 없는 것 같습니다. 아래의 더하기 버튼을 눌러 추가할 수 있습니다. - 상세 오늘로 이동 스누즈 @@ -179,8 +178,6 @@ 이벤트 유형 관리 - 24시간 형식 사용 - 일요일부터 시작 시간 종료 시간 주 번호 표시 @@ -194,7 +191,6 @@ 과거의 이벤트 표시 Always use same snooze interval 스누즈 알림 시간 - 위젯 Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b652a697d..fd477a2db 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -10,7 +10,6 @@ Enkel hendelsesliste Ser ut som du ikke har noen kommende hendelser. Du kan legge til noen med Pluss-knappen nederst. - Detaljer Gå til idag Snooze @@ -179,8 +178,6 @@ Behandle hendelsestyper - Bruk 24-timers format - Søndag som første ukedag Start dag kl. Avslutt dag kl. Vis ukenummer @@ -194,7 +191,6 @@ Vis hendelser fra fortiden Bruk alltid samme intervall for Snooze Utsett påminnelser med Snooze - Moduler Erstatt hendelsesbeskrivelse med sted Slett alle hendelser Er du sikker på at du vil slette alle hendelser? Dine hendelsestyper og andre innstillinger blir beholdt. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 608794715..3ccf0b48e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -10,7 +10,6 @@ Lijst Niets gepland. Gebruik de plus-knop om iets te plannen. - Details Naar vandaag Uitstellen @@ -179,8 +178,6 @@ Afspraaktypes beheren - 24-uursformaat gebruiken - Zondag als eerste dag van de week Dag starten om Dag beëindigen om Weeknummers tonen @@ -194,7 +191,6 @@ Afgelopen afspraken tonen Altijd dezelfde interval voor uitstellen gebruiken Herinnering uitstellen met - Widgets Beschrijving vervangen door locatie van afspraken Alle afspraken verwijderen Alle afspraken verwijderen? Afspraaktypes en andere instellingen blijven behouden. diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 1ef8f8265..34b5b5a9a 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -10,7 +10,6 @@ Enkel hendelsesliste Ser ut som du ikke har noen kommende hendelser. Du kan legge til noen med Pluss-knappen nederst. - Detaljer Gå til idag Snooze @@ -179,8 +178,6 @@ Behandle hendelsestyper - Bruk 24-timers format - Søndag som første ukedag Start dag kl. Avslutt dag kl. Vis ukenummer @@ -194,7 +191,6 @@ Vis hendelser fra fortiden Always use same snooze interval Utsett påminnelser med Snooze med - Moduler Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 024bac60c..58443d011 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -10,7 +10,6 @@ Prosta lista zdarzeń Wygląda na to, że nie masz żadnych nadchodzących wydarzeń. Możesz je dodawać za pomocą przycisku \"+\" znajdującego na dole. - Szczegóły Przejdź do dnia dzisiejszego Drzemka @@ -184,8 +183,6 @@ Zarządzaj typami wydarzeń - Używaj 24-godzinnego formatu czasu - Niedziela jako pierwszy dzień tygodnia Początek dnia Koniec dnia Pokazuj numery tygodnia @@ -199,7 +196,6 @@ Pokazuj wydarzenia z przeszłości    Zawsze używaj tego samego przedziału przypomnienia Opóźnij przypomnienie o - Widżety    Zamieniaj opis wydarzenia na lokalizację    Usuń wszystkie wydarzenia    Czy na pewno mam usunąć wszystkie wydarzenia? Nie naruszy to typów wydarzeń i innych ustawień. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 490ad0138..f547e5475 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -10,7 +10,6 @@ Lista de eventos Parece que você não tem eventos próximos. Pode-se adicionar um evento através do botão existente na base da tela. - Detalhes Ir para hoje Snooze @@ -179,8 +178,6 @@ Gerenciar tipos de eventos - Usar formato 24 horas - Domingo como primeiro dia Iniciar vista semanal em Terminar vista semanal em Mostrar número das semanas @@ -194,7 +191,6 @@ Display events from the past Always use same snooze interval Postpone reminder with Snooze by - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 5ec792bdc..02bf636d3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -10,7 +10,6 @@ Lista de eventos Parece que você não tem eventos para breve. Pode adicionar um evento através do botão existente na base do ecrã. - Detalhes Ir para hoje Snooze @@ -179,8 +178,6 @@ Gerir tipos de eventos - Usar formato 24 horas - Domingo como primeiro dia Iniciar vista semanal em Terminar vista semanal em Mostrar número das semanas @@ -194,7 +191,6 @@ Mostrar eventos passados Usar sempre o mesmo intervalo para snooze Adiar lembrete com a opção Snooze - Widgets Substituir descrição pela localização do evento Apagar todos os eventos Tem a certeza de que deseja apagar todos os eventos? Esta ação não afeta os tipos de eventos nem as outras definições. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4d2e838d8..2bfd1a4cf 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -10,7 +10,6 @@ Простой список событий Похоже, у вас нет предстоящих событий. Вы можете их добавить, нажав на кнопку с плюсом внизу. - Подробности Сегодня Отложить @@ -193,8 +192,6 @@ Управление типами событий - Использовать 24-часовой формат - Воскресенье - начало недели Начало дня (неделя) Окончание дня (неделя) Отображать номера недель @@ -208,7 +205,6 @@ Показывать прошедшие события Всегда использовать один и тот же интервал повтора Отложить напоминание на - Виджеты Заменить описание события местоположением Удалить все события Вы действительно хотите удалить все события? Это не затронет ваши типы событий и другие настройки. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 5e41f004c..384f434ed 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -10,7 +10,6 @@ Jednoduchý zoznam Nemáte žiadne naplánované udalosti. Viete ich pridať pomocou tlačidla Plus v pravom dolnom rohu. - Detaily Prejsť na dnešok Odložiť @@ -186,8 +185,6 @@ Spravovať typy udalostí - Použiť 24 hodinový formát - Začať týždeň nedeľou Začať deň o Ukončiť deň o Zobraziť čísla týždňov @@ -201,7 +198,6 @@ Zobraziť minulé udalosti spred Použiť stále rovnaký odklad s Odložiť Posunúť pripomienku s Odložiť o - Widgety Nahradiť popis udalosti miestom Odstrániť všetky udalosti Ste si istý, že chcete odstrániť všetky udalosti? Všetky typy udalostí a nastavenia ostanú nedotknuté. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 41e97ac90..dcd72995b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -10,7 +10,6 @@ Händelselista Det ser ut som att du inte har några kommande händelser. Du kan lägga till händelser via plus-knappen som du ser längst ner. - Detaljer Gå till idag Snooza @@ -179,8 +178,6 @@ Hantera händelsetyper - Använd 24-timmarsformat - Söndag är första dagen Starta veckovydagen vid Sluta veckovydagen vid Visa veckonumret i månadsvyn @@ -194,7 +191,6 @@ Visa tidigare händelser Använd alltid samma snooze-intervall Skjut upp påminnelse med Snooza - Widgetar Ersätt händelsebeskrivning med plats Ta bort alla händelser Är du säker på att du vill ta bort alla händelser? Dina händelsetyper och andra inställningar påverkas inte av borttagningen. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9b6de1e3d..da0854b7f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -10,7 +10,6 @@ Basit durum listesi Gelecekteki etkinliğiniz yok gibi görünüyor. Artı düğmesinin alt kısmında bazılarını ekleyebilirsiniz. - Ayrıntı Bugüne git Snooze @@ -179,8 +178,6 @@ Olay türlerini yönet - 24 saat formatını kullan - Pazar günü ilk gün olarak Haftalık görüntüleme gününü şu saatte başlatın Haftalık görüntüleme gününü bitiştir Aylık görünümde hafta sayılarını göster @@ -194,7 +191,6 @@ Display events from the past Always use same snooze interval Postpone reminder with Snooze by - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4abd0812e..849bf23a8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,7 +10,6 @@ Simple event list Seems like you don\'t have any upcoming events. You can add some with the Plus button at the bottom. - Details Go to today Snooze @@ -179,8 +178,6 @@ Manage event types - Use 24-hour format - Sunday as first day Start day at End day at Show week numbers @@ -194,7 +191,6 @@ Display events from the past Always use same snooze interval Postpone reminder with Snooze by - Widgets Replace event description with location Delete all events Are you sure you want to delete all events? This will leave your event types and other settings intact. diff --git a/build.gradle b/build.gradle index 66c86d612..f056ba19c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.21' + ext.kotlin_version = '1.2.30' repositories { jcenter()