Merge pull request #39 from SimpleMobileTools/master

upd
2021-04-15 12:39:58 +03:00 · 2021-04-15 12:39:58 +03:00 · 59f122d46e
commit 59f122d46e
parent 00bf881321 a8c01f99d2
53 changed files with 122 additions and 44 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,15 @@
 Changelog
 ==========

+Version 6.13.4 *(2021-04-14)*
+----------------------------
+
+ * Allow setting the current time as the default at new events
+ * Avoid showing the save/discard dialog when nothing changed at an event
+ * Make sure all private contacts birthdays and anniversaries are fetched at importing
+ * Fixed some weekly view related glitches
+ * Some stability and translation improvements
+
 Version 6.13.3 *(2021-03-22)*
 ----------------------------

--- a/app/build.gradle
+++ b/app/build.gradle
@ -17,8 +17,8 @@ android {
        applicationId "com.simplemobiletools.calendar.pro"
        minSdkVersion 21
        targetSdkVersion 30
-        versionCode 196
-        versionName "6.13.3"
+        versionCode 197
+        versionName "6.13.4"
        multiDexEnabled true
        setProperty("archivesBaseName", "calendar")
        vectorDrawables.useSupportLibrary = true
@ -63,7 +63,7 @@ android {
 }

 dependencies {
-    implementation 'com.simplemobiletools:commons:5.34.24'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:9e7ab2f67d'
    implementation 'joda-time:joda-time:2.10.3'
    implementation 'androidx.multidex:multidex:2.0.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -19,6 +19,11 @@
        android:name="android.permission.USE_FINGERPRINT"
        tools:node="remove" />

+    <queries>
+        <package android:name="com.simplemobiletools.contacts.pro.debug" />
+        <package android:name="com.simplemobiletools.contacts.pro" />
+    </queries>
+
    <uses-feature
        android:name="android.hardware.faketouch"
        android:required="false" />
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@ -84,6 +84,7 @@ class EventActivity : SimpleActivity() {
    private var mEventCalendarId = STORED_LOCALLY_ONLY
    private var mWasActivityInitialized = false
    private var mWasContactsPermissionChecked = false
+    private var mWasCalendarChanged = false
    private var mAttendees = ArrayList<Attendee>()
    private var mAttendeeAutoCompleteViews = ArrayList<MyAutoCompleteTextView>()
    private var mAvailableContacts = ArrayList<Attendee>()
@ -298,7 +299,7 @@ class EventActivity : SimpleActivity() {
            mRepeatInterval != mEvent.repeatInterval ||
            mRepeatRule != mEvent.repeatRule ||
            mEventTypeId != mEvent.eventType ||
-            mEventCalendarId != mEvent.getCalDAVCalendarId() ||
+            mWasCalendarChanged ||
            hasTimeChanged) {
            return true
        }
@ -307,7 +308,7 @@ class EventActivity : SimpleActivity() {
    }

    override fun onBackPressed() {
-        if (isEventChanged() && System.currentTimeMillis() - mLastSavePromptTS > SAVE_DISCARD_PROMPT_INTERVAL) {
+        if (System.currentTimeMillis() - mLastSavePromptTS > SAVE_DISCARD_PROMPT_INTERVAL && isEventChanged()) {
            mLastSavePromptTS = System.currentTimeMillis()
            ConfirmationAdvancedDialog(this, "", R.string.save_before_closing, R.string.save, R.string.discard) {
                if (it) {
@ -881,6 +882,7 @@ class EventActivity : SimpleActivity() {
                        mEventTypeId = config.lastUsedLocalEventTypeId
                        updateEventType()
                    }
+                    mWasCalendarChanged = true
                    mEventCalendarId = it
                    config.lastUsedCaldavCalendarId = it
                    updateCurrentCalendarInfo(getCalendarWithId(calendars, it))
@ -1238,11 +1240,7 @@ class EventActivity : SimpleActivity() {
        }

        val intent = Intent(Intent.ACTION_VIEW, uri)
-        if (intent.resolveActivity(packageManager) != null) {
-            startActivity(intent)
-        } else {
-            toast(R.string.no_app_found)
-        }
+        launchActivityIntent(intent)
    }

    private fun setupStartDate() {
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
@ -507,7 +507,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
            if (it) {
                SetRemindersDialog(this) {
                    val reminders = it
-                    val privateCursor = getMyContactsCursor()?.loadInBackground()
+                    val privateCursor = getMyContactsCursor(false, false)?.loadInBackground()

                    ensureBackgroundThread {
                        val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
@ -536,7 +536,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
            if (it) {
                SetRemindersDialog(this) {
                    val reminders = it
-                    val privateCursor = getMyContactsCursor()?.loadInBackground()
+                    val privateCursor = getMyContactsCursor(false, false)?.loadInBackground()

                    ensureBackgroundThread {
                        val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
@ -866,10 +866,14 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
                    return
                }

-                val inputStream = contentResolver.openInputStream(uri)
-                val out = FileOutputStream(tempFile)
-                inputStream!!.copyTo(out)
-                showImportEventsDialog(tempFile.absolutePath)
+                try {
+                    val inputStream = contentResolver.openInputStream(uri)
+                    val out = FileOutputStream(tempFile)
+                    inputStream!!.copyTo(out)
+                    showImportEventsDialog(tempFile.absolutePath)
+                } catch (e: Exception) {
+                    showErrorToast(e)
+                }
            }
            else -> toast(R.string.invalid_file_format)
        }
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
@ -572,13 +572,19 @@ class SettingsActivity : SimpleActivity() {
    private fun setupDefaultStartTime() {
        updateDefaultStartTimeText()
        settings_default_start_time_holder.setOnClickListener {
-            val currentDefaultTime = if (config.defaultStartTime == -1) -1 else 0
+            val currentDefaultTime = when (config.defaultStartTime) {
+                DEFAULT_START_TIME_NEXT_FULL_HOUR -> DEFAULT_START_TIME_NEXT_FULL_HOUR
+                DEFAULT_START_TIME_CURRENT_TIME -> DEFAULT_START_TIME_CURRENT_TIME
+                else -> 0
+            }
+
            val items = ArrayList<RadioItem>()
-            items.add(RadioItem(-1, getString(R.string.next_full_hour)))
+            items.add(RadioItem(DEFAULT_START_TIME_CURRENT_TIME, getString(R.string.current_time)))
+            items.add(RadioItem(DEFAULT_START_TIME_NEXT_FULL_HOUR, getString(R.string.next_full_hour)))
            items.add(RadioItem(0, getString(R.string.other_time)))

            RadioGroupDialog(this@SettingsActivity, items, currentDefaultTime) {
-                if (it as Int == -1) {
+                if (it as Int == DEFAULT_START_TIME_NEXT_FULL_HOUR || it == DEFAULT_START_TIME_CURRENT_TIME) {
                    config.defaultStartTime = it
                    updateDefaultStartTimeText()
                } else {
@ -595,12 +601,14 @@ class SettingsActivity : SimpleActivity() {
    }

    private fun updateDefaultStartTimeText() {
-        if (config.defaultStartTime == -1) {
-            settings_default_start_time.text = getString(R.string.next_full_hour)
-        } else {
-            val hours = config.defaultStartTime / 60
-            val minutes = config.defaultStartTime % 60
-            settings_default_start_time.text = String.format("%02d:%02d", hours, minutes)
+        when (config.defaultStartTime) {
+            DEFAULT_START_TIME_CURRENT_TIME -> settings_default_start_time.text = getString(R.string.current_time)
+            DEFAULT_START_TIME_NEXT_FULL_HOUR -> settings_default_start_time.text = getString(R.string.next_full_hour)
+            else -> {
+                val hours = config.defaultStartTime / 60
+                val minutes = config.defaultStartTime % 60
+                settings_default_start_time.text = String.format("%02d:%02d", hours, minutes)
+            }
        }
    }

--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
@ -350,16 +350,21 @@ fun Context.getNewEventTimestampFromCode(dayCode: String, allowChangingDay: Bool
        newDateTime = newDateTime.minusDays(1)
    }

-    return if (defaultStartTime == -1) {
-        newDateTime.seconds()
-    } else {
-        val hours = defaultStartTime / 60
-        val minutes = defaultStartTime % 60
-        dateTime = Formatter.getLocalDateTimeFromCode(dayCode).withHourOfDay(hours).withMinuteOfHour(minutes)
-        newDateTime = dateTime
+    return when (defaultStartTime) {
+        DEFAULT_START_TIME_CURRENT_TIME -> {
+            val currMinutes = calendar.get(Calendar.MINUTE)
+            dateTime.withMinuteOfHour(currMinutes).seconds()
+        }
+        DEFAULT_START_TIME_NEXT_FULL_HOUR -> newDateTime.seconds()
+        else -> {
+            val hours = defaultStartTime / 60
+            val minutes = defaultStartTime % 60
+            dateTime = Formatter.getLocalDateTimeFromCode(dayCode).withHourOfDay(hours).withMinuteOfHour(minutes)
+            newDateTime = dateTime

-        // make sure the date doesn't change
-        newDateTime.withDate(dateTime.year, dateTime.monthOfYear, dateTime.dayOfMonth).seconds()
+            // make sure the date doesn't change
+            newDateTime.withDate(dateTime.year, dateTime.monthOfYear, dateTime.dayOfMonth).seconds()
+        }
    }
 }

--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Range.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Range.kt
@ -2,4 +2,4 @@ package com.simplemobiletools.calendar.pro.extensions

 import android.util.Range

-fun Range<Int>.touch(other: Range<Int>) = (upper > other.lower && lower < other.upper) || (other.upper > lower && other.lower < upper)
+fun Range<Int>.touch(other: Range<Int>) = (upper >= other.lower && lower <= other.upper) || (other.upper >= lower && other.lower <= upper)
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt
@ -155,7 +155,7 @@ class Config(context: Context) : BaseConfig(context) {
        set(lastVibrateOnReminder) = prefs.edit().putBoolean(LAST_VIBRATE_ON_REMINDER, lastVibrateOnReminder).apply()

    var defaultStartTime: Int
-        get() = prefs.getInt(DEFAULT_START_TIME, -1)
+        get() = prefs.getInt(DEFAULT_START_TIME, DEFAULT_START_TIME_NEXT_FULL_HOUR)
        set(defaultStartTime) = prefs.edit().putInt(DEFAULT_START_TIME, defaultStartTime).apply()

    var defaultDuration: Int
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
@ -34,6 +34,9 @@ const val ITEM_EVENT = 0
 const val ITEM_EVENT_SIMPLE = 1
 const val ITEM_HEADER = 2

+const val DEFAULT_START_TIME_NEXT_FULL_HOUR = -1
+const val DEFAULT_START_TIME_CURRENT_TIME = -2
+
 const val DAY = 86400
 const val WEEK = 604800
 const val MONTH = 2592001    // exact value not taken into account, Joda is used for adding months and years
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">إدارة أنواع الأحداث</string>
    <string name="start_day_at">ابدأ اليوم عند</string>
    <string name="end_day_at">نهاية الحدث</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">عرض أرقام الأسبوع</string>
    <string name="vibrate">إهتزاز عند الإشعار</string>
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Hadisə tiplərini idarə et</string>
    <string name="start_day_at">Günə başla</string>
    <string name="end_day_at">Günü bitir</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Həftə günlərini göstər</string>
    <string name="vibrate">Xatırladıcı bildirişində vibrasiya et</string>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@ -166,6 +166,7 @@
    <string name="manage_event_types">ইভেন্ট টাইপ ম্যানেজ করুন</string>
    <string name="start_day_at">দিনের শুরু</string>
    <string name="end_day_at">দিনের শেষ</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">সপ্তাহের সংখ্যাগুলি দেখান</string>
    <string name="vibrate">রিমাইন্ডার নোটিফিকেশনে ভাইব্রেট করো</string>
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Merañ an doareoù darvoudoù</string>
    <string name="start_day_at">Kregiñ an devezh da</string>
    <string name="end_day_at">Echuiñ an devezh da</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Diskouez niverennoù ar sizhun</string>
    <string name="vibrate">Froumal evit ar rebuzadurioù adc\'halv</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Správa typů událostí</string>
    <string name="start_day_at">Počátek dne</string>
    <string name="end_day_at">Konec dne</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Zobrazovat čísla týdnů</string>
    <string name="vibrate">Vibrovat při připomínce</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Håndter begivenhedstyper</string>
    <string name="start_day_at">Start dagen kl.</string>
    <string name="end_day_at">Slut dagen kl.</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Tillad tilpasning af antal dage</string>
    <string name="week_numbers">Vis ugenumre</string>
    <string name="vibrate">Vibrer under påmindelser</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -6,9 +6,9 @@
    <string name="daily_view">Tagesansicht</string>
    <string name="weekly_view">Wochenansicht</string>
    <string name="monthly_view">Monatsansicht</string>
-    <string name="monthly_daily_view">Monthly + daily view</string>
+    <string name="monthly_daily_view">kompakte Monatsansicht mit Tagesliste</string>
    <string name="yearly_view">Jahresansicht</string>
-    <string name="simple_event_list">Einfache Terminliste</string>
+    <string name="simple_event_list">Terminliste</string>
    <string name="no_upcoming_events">Scheint so, als hättest du keine anstehenden Termine.</string>
    <string name="go_to_today">Springe zu Heute</string>
    <string name="go_to_date">Springe zu einem Datum</string>
@ -16,7 +16,7 @@

    <!-- Widget titles -->
    <string name="widget_monthly">Monatskalender</string>
-    <string name="widget_list">Termin-Liste</string>
+    <string name="widget_list">Terminliste</string>
    <string name="widget_todays_date">Kalender heutiges Datum</string>

    <!-- Event -->
@ -51,7 +51,7 @@
    <string name="delete_future_occurrences">Diese und zukünftige Wiederholungen löschen</string>
    <string name="delete_all_occurrences">Alle Wiederholungen löschen</string>
    <string name="update_one_only">Nur die ausgewählte Wiederholung ändern</string>
-    <string name="update_this_and_future_occurrences">Update this and all future occurrences</string>
+    <string name="update_this_and_future_occurrences">Diese und alle zukünftigen Instanzen ändern</string>
    <string name="update_all_occurrences">Alle Wiederholungen ändern</string>
    <string name="repeat_till_date">Bis zu bestimmtem Datum wiederholen</string>
    <string name="stop_repeating_after_x">Stopp nach x Wiederholungen</string>
@ -72,7 +72,7 @@
    <string name="second_m">zweiten</string>
    <string name="third_m">dritten</string>
    <string name="fourth_m">vierten</string>
-    <string name="fifth_m">fifth</string>
+    <string name="fifth_m">fünften</string>
    <string name="last_m">letzten</string>

    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
@ -83,7 +83,7 @@
    <string name="second_f">zweiten</string>
    <string name="third_f">dritten</string>
    <string name="fourth_f">vierten</string>
-    <string name="fifth_f">fifth</string>
+    <string name="fifth_f">fünften</string>
    <string name="last_f">letzten</string>

    <!-- Birthdays -->
@ -162,6 +162,7 @@
    <string name="manage_event_types">Termintypen verwalten</string>
    <string name="start_day_at">Wochenansicht beginnt um</string>
    <string name="end_day_at">Wochenansicht endet um</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Erlaube den Tageszähler anzupassen</string>
    <string name="week_numbers">Kalenderwoche anzeigen</string>
    <string name="vibrate">Vibration bei Erinnerung</string>
@ -193,7 +194,7 @@
    <string name="new_events">Neue Termine</string>
    <string name="default_start_time">Standardanfangszeit</string>
    <string name="next_full_hour">Nächste volle Stunde</string>
-    <string name="current_time">Current time</string>
+    <string name="current_time">Aktuelle Zeit</string>
    <string name="default_duration">Standarddauer</string>
    <string name="last_used_one">Zuletzt verwendete</string>
    <string name="other_time">Andere Zeit</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Διαχείριση τύπων εκδηλώσεων</string>
    <string name="start_day_at">Ημέρα έναρξης την</string>
    <string name="end_day_at">Ημέρα λήξης την</string>
+    <string name="midnight_spanning">Εμφάνιση συμβάντων μετά τα μεσάνυχτα στην επάνω γραμμή</string>
    <string name="allow_customizing_day_count">Αποδοχή προσαρμογής του αριθμού ημερών</string>
    <string name="week_numbers">Εμφάνιση αριθμών εβδομάδων</string>
    <string name="vibrate">Δόνηση στην ειδοποίηση υπενθύμισης</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Gestionar tipos de eventos</string>
    <string name="start_day_at">El día en la vista semanal comienza a las</string>
    <string name="end_day_at">El día en la vista semanal finaliza a las</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Permitir personalizar el conteo de los días</string>
    <string name="week_numbers">Mostrar los números de la semana</string>
    <string name="vibrate">Vibración en notificación de recordatorio</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Kudeatu gertaera motak</string>
    <string name="start_day_at">Eguna noiz hasi</string>
    <string name="end_day_at">Eguna noiz bukatu</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Baimendu egunen zenbaketaren pertsonalizazioa</string>
    <string name="week_numbers">Erakutsi asteen zenbakiak</string>
    <string name="vibrate">Egin dar-dar abisuen jakinarazpenetan</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Hallitse tapahtumatyyppejä</string>
    <string name="start_day_at">Päivä alkaa klo</string>
    <string name="end_day_at">Päivä loppuu klo</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Salli päivämäärän mukauttaminen</string>
    <string name="week_numbers">Näytä viikkonumero</string>
    <string name="vibrate">Värinä muistutusilmoituksen yhteydessä</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -163,6 +163,7 @@
    <string name="manage_event_types">Gestion des types d\’événements</string>
    <string name="start_day_at">Jour de début de la vue hebdomadaire</string>
    <string name="end_day_at">Jour de fin de la vue hebdomadaire</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Afficher les numéros de semaine</string>
    <string name="vibrate">Vibrer à la notification de rappel</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Xestionar tipos de eventos</string>
    <string name="start_day_at">Na vista xeral o día comeza as</string>
    <string name="end_day_at">O día na vista semanal remata as</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Mostrar os números da semana</string>
    <string name="vibrate">Vibrar coa notificación de recordatorio</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">נהל סוגי אירועים</string>
    <string name="start_day_at">שעת התחלה היום</string>
    <string name="end_day_at">שעת סיום היום</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">הצגת מספרי שבועות</string>
    <string name="vibrate">רטט בהתרעת תזכורת</string>
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Manage event types</string>
    <string name="start_day_at">Start day at</string>
    <string name="end_day_at">End day at</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">सफ्ताह क्रमांक दिखाए</string>
    <string name="vibrate">Vibrate on reminder notification</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Upravljanje vrstama događaja</string>
    <string name="start_day_at">Započni dan u</string>
    <string name="end_day_at">Završi dan u</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Pokaži tjedne brojeve</string>
    <string name="vibrate">Vibrirajte na obavijesti podsjetnika</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Manage event types</string>
    <string name="start_day_at">Start day at</string>
    <string name="end_day_at">End day at</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Hetek sorszámának mutatása</string>
    <string name="vibrate">Emlékeztetőnél rezgés</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Kelola kategori acara</string>
    <string name="start_day_at">Hari dimulai pada jam</string>
    <string name="end_day_at">Hari berakhir pada jam</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Tampilkan nomor minggu</string>
    <string name="vibrate">Getar pada notifikasi pengingat</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Kelola kategori acara</string>
    <string name="start_day_at">Hari dimulai pada jam</string>
    <string name="end_day_at">Hari berakhir pada jam</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Tampilkan nomor minggu</string>
    <string name="vibrate">Getar pada notifikasi pengingat</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Gestisci i tipi di evento</string>
    <string name="start_day_at">Il giorno inizia alle</string>
    <string name="end_day_at">Il giorno finisce alle</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Mostra numero settimane</string>
    <string name="vibrate">Vibra per le notifiche di promemoria</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">נהל סוגי אירועים</string>
    <string name="start_day_at">שעת התחלה היום</string>
    <string name="end_day_at">שעת סיום היום</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">הצגת מספרי שבועות</string>
    <string name="vibrate">רטט בהתרעת תזכורת</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">予定の種類を管理</string>
    <string name="start_day_at">Start day at</string>
    <string name="end_day_at">End day at</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">週番号を表示</string>
    <string name="vibrate">リマインダー通知で振動</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">일정 유형 관리</string>
    <string name="start_day_at">시작 시간</string>
    <string name="end_day_at">종료 시간</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">주 번호 표시</string>
    <string name="vibrate">알림 시 진동</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Tvarkyti įvykių tipus</string>
    <string name="start_day_at">Pradėti dieną nuo</string>
    <string name="end_day_at">Užbaigti dieną nuo</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Rodyti savaičių numerius</string>
    <string name="vibrate">Vibruoti per priminimo pranešimą</string>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Notikumu tipu pārvaldība</string>
    <string name="start_day_at">Sākt dienu plkst.</string>
    <string name="end_day_at">Beigt dienu plkst.</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Rādīt nedēļu kārtas skaitļus</string>
    <string name="vibrate">Atgādināt, vibrējot</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Behandle hendelsestyper</string>
    <string name="start_day_at">Start dag kl.</string>
    <string name="end_day_at">Avslutt dag kl.</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Tillat å tilpasse antall dager</string>
    <string name="week_numbers">Vis ukenummer</string>
    <string name="vibrate">Vibrer ved påminnelsesvarsel</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Afspraaktypes beheren</string>
    <string name="start_day_at">Dag starten om</string>
    <string name="end_day_at">Dag beëindigen om</string>
+    <string name="midnight_spanning">Afspraken die tot na middernacht duren bovenaan tonen</string>
    <string name="allow_customizing_day_count">Wijziging van het aantal zichtbare dagen toestaan</string>
    <string name="week_numbers">Weeknummers tonen</string>
    <string name="vibrate">Trillen bij notificaties</string>
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Behandle hendelsestyper</string>
    <string name="start_day_at">Start dag kl.</string>
    <string name="end_day_at">Avslutt dag kl.</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Vis ukenummer</string>
    <string name="vibrate">Vibrer ved påminnelsesvarsel</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Zarządzaj typami wydarzeń</string>
    <string name="start_day_at">Początek dnia</string>
    <string name="end_day_at">Koniec dnia</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Zezwól na dostosowywanie liczby dni</string>
    <string name="week_numbers">Pokazuj numery tygodnia</string>
    <string name="vibrate">Powiadamiaj wibracjami o wydarzeniu</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Gerenciar tipos de eventos</string>
    <string name="start_day_at">Iniciar vista semanal em</string>
    <string name="end_day_at">Terminar vista semanal em</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Mostrar número das semanas</string>
    <string name="vibrate">Vibrar ao notificar sobre o lembrete</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Gerir tipos de eventos</string>
    <string name="start_day_at">Iniciar vista semanal em</string>
    <string name="end_day_at">Terminar vista semanal em</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Mostrar número das semanas</string>
    <string name="vibrate">Vibrar ao notificar sobre o lembrete</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Gestionează tipurile de evenimente</string>
    <string name="start_day_at">Începe ziua la</string>
    <string name="end_day_at">Ziua se termină la</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Afișează numerele săptămânii</string>
    <string name="vibrate">Vibrați la notificarea de reamintire</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Управление типами событий</string>
    <string name="start_day_at">Начало дня (неделя)</string>
    <string name="end_day_at">Окончание дня (неделя)</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Разрешить менять количество дней</string>
    <string name="week_numbers">Показывать номера недель</string>
    <string name="vibrate">Вибрация при напоминании</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Spravovať typy udalostí</string>
    <string name="start_day_at">Začať deň o</string>
    <string name="end_day_at">Ukončiť deň o</string>
+    <string name="midnight_spanning">Zobraziť udalosti siahajúce cez polnoc na hornej lište</string>
    <string name="allow_customizing_day_count">Povoliť zmenu počtu dní</string>
    <string name="week_numbers">Zobraziť čísla týždňov</string>
    <string name="vibrate">Vibrovať pri pripomienke</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Hantera händelsetyper</string>
    <string name="start_day_at">Dagen börjar</string>
    <string name="end_day_at">Dagen slutar</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Visa veckonummer</string>
    <string name="vibrate">Vibrera vid påminnelseaviseringar</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Etkinlik türlerini yönet</string>
    <string name="start_day_at">Gün başlangıcı</string>
    <string name="end_day_at">Gün bitişi</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Gün sayısının özelleştirilmesine izin ver</string>
    <string name="week_numbers">Hafta sayılarını göster</string>
    <string name="vibrate">Hatırlatma bildiriminde titre</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Керувати типами подій</string>
    <string name="start_day_at">Огляд тижня починати</string>
    <string name="end_day_at">Огляд тижня завершувати</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Нумерувати тижні</string>
    <string name="vibrate">Вібрувати при настанні події</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -162,6 +162,7 @@
     <string name="manage_event_types">管理活动类型</string>
     <string name="start_day_at">每日开始于</string>
     <string name="end_day_at">每日结束于</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
     <string name="week_numbers">显示第几周</string>
     <string name="vibrate">提醒通知时震动</string>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">管理活動類型</string>
    <string name="start_day_at">每日開始於</string>
    <string name="end_day_at">每日結束於</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">顯示第幾週</string>
    <string name="vibrate">提醒通知時震動</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">管理活動類型</string>
    <string name="start_day_at">每日開始於</string>
    <string name="end_day_at">每日結束於</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">顯示第幾週</string>
    <string name="vibrate">提醒通知時震動</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -162,6 +162,7 @@
    <string name="manage_event_types">Manage event types</string>
    <string name="start_day_at">Start day at</string>
    <string name="end_day_at">End day at</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
    <string name="allow_customizing_day_count">Allow customizing day count</string>
    <string name="week_numbers">Show week numbers</string>
    <string name="vibrate">Vibrate on reminder notification</string>
--- 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.4.31'
+    ext.kotlin_version = '1.4.32'

    repositories {
        google()
--- a/fastlane/metadata/android/en-US/changelogs/197.txt
+++ b/fastlane/metadata/android/en-US/changelogs/197.txt
@ -0,0 +1,5 @@
+ * Allow setting the current time as the default at new events
+ * Avoid showing the save/discard dialog when nothing changed at an event
+ * Make sure all private contacts birthdays and anniversaries are fetched at importing
+ * Fixed some weekly view related glitches
+ * Some stability and translation improvements