diff --git a/app/build.gradle b/app/build.gradle index ac053d0c7..0ca0d29e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.14.17' + implementation 'com.simplemobiletools:commons:3.15.0' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.3' 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 85465d277..72564ab4a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -552,7 +552,7 @@ class EventActivity : SimpleActivity() { reminder3Minutes = reminder3 repeatInterval = mRepeatInterval importId = newImportId - flags = if (event_all_day.isChecked) (mEvent.flags or FLAG_ALL_DAY) else (mEvent.flags.removeFlag(FLAG_ALL_DAY)) + flags = if (event_all_day.isChecked) (mEvent.flags.addBit(FLAG_ALL_DAY)) else (mEvent.flags.removeBit(FLAG_ALL_DAY)) repeatLimit = if (repeatInterval == 0) 0 else mRepeatLimit repeatRule = mRepeatRule eventType = newEventType diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt index af8137022..865091359 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt @@ -69,10 +69,11 @@ class RepeatLimitTypePickerDialog(val activity: Activity, var repeatLimit: Int, R.id.repeat_type_forever -> callback(0) else -> { var count = view.repeat_type_count.value - if (count.isEmpty()) - count = "0" - else - count = "-$count" + count = if (count.isEmpty()) { + "0" + } else { + "-$count" + } callback(count.toInt()) } } diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index 346836091..16be9ac69 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -76,26 +76,6 @@ pevare diwezhañ - - %ddevezh - %da zevezhioù - - - - %dsizhun - %dsizhun - - - - %dmiz - %da vizioù - - - - %da vloavezhioù - %da vloavezhioù - - Deizioù-ha-bloaz Ouzhpennañ deizioù-ha-bloaz an darempredoù diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 509833653..57603bfd2 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -76,30 +76,6 @@ čtvrtý poslední - - %d den - %d dni - %d dní - - - - %d týden - %d týdni - %d týdnů - - - - %d měsíc - %d měsíce - %d měsíců - - - - %d rok - %d roky - %d roků - - Birthdays Add contact birthdays diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index afdbea59b..a38bd7024 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -76,26 +76,6 @@ fjerde sidste - - %d dag - %d dage - - - - %d uge - %d uger - - - - %d måned - %d måneder - - - - %d år - %d år - - Fødselsdag Tilføj dine kontakters fødselsdage diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b38a42d08..c0efb2630 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -76,26 +76,6 @@ vierten letzten - - %d Tag - %d Tage - - - - %d Woche - %d Wochen - - - - %d Monat - %d Monate - - - - %d Jahr - %d Jahre - - Geburtstage Kontaktgeburtstage hinzufügen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index fe386ef59..5790dcada 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -76,26 +76,6 @@ cuarto último - - %d día - %d días - - - - %d semana - %d semanas - - - - %d mes - %d meses - - - - %d año - %d años - - Cumpleaños Añadir cumpleaños de contactos diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0af3d6fbf..93e75def7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -76,26 +76,6 @@ quatrième dernier - - %d jour - %d jours - - - - %d semaine - %d semaines - - - - %d mois - %d mois - - - - %d an - %d ans - - Anniversaires Ajouter les anniversaires des contacts diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index c157f7172..0e1e59b8a 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -76,26 +76,6 @@ cuarto último - - %d día - %d días - - - - %d semana - %d semanas - - - - %d mes - %d meses - - - - %d ano - %d anos - - Cumpleanos Engadir cumpleanos de contactos diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 39a18b410..eaa677aef 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -77,26 +77,6 @@ fourth last - - %d day - %d days - - - - %d week - %d weeks - - - - %d month - %d months - - - - %d year - %d years - - Birthdays Add contact birthdays diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 617efbc06..fe41682c8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -76,26 +76,6 @@ fourth last - - %d day - %d days - - - - %d week - %d weeks - - - - %d month - %d months - - - - %d year - %d years - - Birthdays Add contact birthdays diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8411729f0..d9c409bf2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -76,26 +76,6 @@ fourth last - - %d day - %d days - - - - %d week - %d weeks - - - - %d month - %d months - - - - %d year - %d years - - Birthdays Add contact birthdays diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 715f0fe7b..5f9eaaf70 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -77,26 +77,6 @@ fourth last - - %d day - %d days - - - - %d week - %d weeks - - - - %d month - %d months - - - - %d year - %d years - - Birthdays Add contact birthdays diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 75b4b649f..f2dcb4337 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -76,26 +76,6 @@ fourth last - - %d day - %d days - - - - %d week - %d weeks - - - - %d month - %d months - - - - %d year - %d years - - Birthdays Add contact birthdays diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3bbd3985a..b5a074ff0 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -76,26 +76,6 @@ fourth last - - %d day - %d days - - - - %d week - %d weeks - - - - %d month - %d months - - - - %d year - %d years - - 생일 연락처의 생일 추가 diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index bb0311dbf..0d61af57e 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -76,26 +76,6 @@ fjerde siste - - %d dag - %d dager - - - - %d uke - %d uker - - - - %d måned - %d måneder - - - - %d år - %d år - - Bursdager Legg til kontaktbursdager diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f7e5fccb1..91b44597e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -76,26 +76,6 @@ vierde laatste - - %d dag - %d dagen - - - - %d week - %d weken - - - - %d maand - %d maanden - - - - %d jaar - %d jaren - - Verjaardagen Verjaardagen van contacten toevoegen diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 789deb3f1..ce61211f5 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -76,26 +76,6 @@ fjerde siste - - %d dag - %d dager - - - - %d uke - %d uker - - - - %d måned - %d måneder - - - - %d år - %d år - - Bursdager Legg til kontaktbursdager diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index aa4beda1b..7730fcc0d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -76,29 +76,6 @@ czwarty(ą) ostatni(ą) - - %d dzień - %d dni - - - - %d tydzień - %d tygodnie - %d tygodni - - - - %d miesiąc - %d miesiące - %d miesięcy - - - - %d rok - %d lata - %d lat - - Urodziny Dodaj urodziny kontaktów diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c524fd04c..fc8765cfc 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -76,26 +76,6 @@ fourth last - - %d dia - %d dias - - - - %d semana - %d semanas - - - - %d mês - %d meses - - - - %d ano - %d anos - - Birthdays Add contact birthdays diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index ac60ab687..5cab54f3e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -76,26 +76,6 @@ quarto último - - %d dia - %d dias - - - - %d semana - %d semanas - - - - %d mês - %d meses - - - - %d ano - %d anos - - Data de nascimento Adicionar data de nascimento dos contactos diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e21cdc604..4e674f2a8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -76,34 +76,6 @@ четвёртый последний - - %d день - %d дня - %d дней - %d дня(-ей) - - - - %d неделя - %d недели - %d недель - %d недели(-ль) - - - - %d месяц - %d месяца - %d месяцев - %d месяца(-ев) - - - - %d год - %d года - %d лет - %d года(лет) - - Дни рождения Добавить дни рождения контактов diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 6ff373db9..d63b3b710 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -76,30 +76,6 @@ štvrtú poslednú - - %d deň - %d dni - %d dní - - - - %d týždeň - %d týždne - %d týždňov - - - - %d mesiac - %d mesiace - %d mesiacov - - - - %d rok - %d roky - %d rokov - - Narodeniny Pridať narodeniny kontaktov diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 272a77955..b16b3f501 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -76,26 +76,6 @@ fjärde sista - - %d dag - %d dagar - - - - %d vecka - %d veckor - - - - %d månad - %d månader - - - - %d år - %d år - - Födelsedagar Lägg till kontakters födelsedagar diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ff7fabe84..6ec5894a4 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -76,26 +76,6 @@ dördüncü son - - %d gün - günler %d - - - - %d hafta - haftalar %d - - - - %d ay - aylar %d - - - - %d yıl - yıllar %d - - Birthdays Add contact birthdays diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 75be31965..454db1cd9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,26 +76,6 @@ fourth last - - %d day - %d days - - - - %d week - %d weeks - - - - %d month - %d months - - - - %d year - %d years - - Birthdays Add contact birthdays