From fde27abf117212d2903e8abb23d67a8db8c94b3a Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 12 Jul 2018 23:13:12 +0200 Subject: [PATCH 01/39] update commons to 4.4.13 --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 33 +++++++++++++------------------- build.gradle | 2 +- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d72162430..7a70833f8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.3.28' + implementation 'com.simplemobiletools:commons:4.4.13' 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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index eb59ce5f7..e0025a967 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,13 +27,7 @@ - - - - - - + android:theme="@style/SplashTheme"/> - - - - - - - - + + + + + + + Date: Thu, 12 Jul 2018 23:15:12 +0200 Subject: [PATCH 02/39] adding the Purchase Thank You button in the app settings --- .../calendar/activities/SettingsActivity.kt | 8 +++++++ app/src/main/res/layout/activity_settings.xml | 22 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt index 4e1a4b94a..3c8cfaaf2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt @@ -44,6 +44,7 @@ class SettingsActivity : SimpleActivity() { override fun onResume() { super.onResume() + setupPurchaseThankYou() setupCustomizeColors() setupUseEnglish() setupManageEventTypes() @@ -95,6 +96,13 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupPurchaseThankYou() { + settings_purchase_thank_you_holder.beVisibleIf(!isThankYouInstalled()) + settings_purchase_thank_you_holder.setOnClickListener { + launchPurchaseThankYouIntent() + } + } + private fun setupCustomizeColors() { settings_customize_colors_holder.setOnClickListener { startCustomizationActivity() diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 1fd52386b..0d9dad67c 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -11,6 +11,28 @@ android:layout_height="wrap_content" android:orientation="vertical"> + + + + + + Date: Fri, 13 Jul 2018 13:52:21 +0200 Subject: [PATCH 03/39] properly update actionbar title, with properly set text color --- app/build.gradle | 2 +- .../calendar/activities/EventActivity.kt | 4 ++-- .../simplemobiletools/calendar/activities/MainActivity.kt | 4 ++-- .../calendar/fragments/DayFragmentsHolder.kt | 3 ++- .../calendar/fragments/EventListFragment.kt | 7 ++----- .../calendar/fragments/MonthFragmentsHolder.kt | 3 ++- .../calendar/fragments/WeekFragmentsHolder.kt | 8 +++++--- .../calendar/fragments/YearFragmentsHolder.kt | 5 +++-- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7a70833f8..5674bd3bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.4.13' + implementation 'com.simplemobiletools:commons:4.4.16' 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 dae9991d6..5ef6e3fc7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -151,7 +151,7 @@ class EventActivity : SimpleActivity() { val realStart = if (mEventOccurrenceTS == 0) mEvent.startTS else mEventOccurrenceTS val duration = mEvent.endTS - mEvent.startTS window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN) - supportActionBar?.title = resources.getString(R.string.edit_event) + updateActionBarTitle(getString(R.string.edit_event)) mEventStartDateTime = Formatter.getDateTimeFromTS(realStart) mEventEndDateTime = Formatter.getDateTimeFromTS(realStart + duration) event_title.setText(mEvent.title) @@ -174,7 +174,7 @@ class EventActivity : SimpleActivity() { private fun setupNewEvent() { window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE) - supportActionBar?.title = resources.getString(R.string.new_event) + updateActionBarTitle(getString(R.string.new_event)) val isLastCaldavCalendarOK = config.caldavSync && config.getSyncedCalendarIdsAsList().contains(config.lastUsedCaldavCalendarId.toString()) mEventCalendarId = if (isLastCaldavCalendarOK) config.lastUsedCaldavCalendarId else STORED_LOCALLY_ONLY diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index dda371dd2..b252f0066 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -328,8 +328,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } private fun resetActionBarTitle() { - supportActionBar?.title = getString(R.string.app_launcher_name) - supportActionBar?.subtitle = "" + updateActionBarTitle(getString(R.string.app_launcher_name)) + updateActionBarSubtitle("") } private fun showFilterDialog() { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt index 4dbdf9cb8..28e9bf45d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt @@ -13,6 +13,7 @@ import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.helpers.DAY_CODE import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.interfaces.NavigationListener +import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.views.MyViewPager import kotlinx.android.synthetic.main.fragment_days_holder.view.* import org.joda.time.DateTime @@ -105,7 +106,7 @@ class DayFragmentsHolder : MyFragmentHolder(), NavigationListener { override fun shouldGoToTodayBeVisible() = currentDayCode != todayDayCode override fun updateActionBarTitle() { - (activity as MainActivity).supportActionBar?.title = getString(R.string.app_launcher_name) + (activity as MainActivity).updateActionBarTitle(getString(R.string.app_launcher_name)) } override fun getNewEventDayCode() = currentDayCode diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt index 7df1f88a5..b37f3f4aa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt @@ -17,10 +17,7 @@ import com.simplemobiletools.calendar.helpers.EVENT_OCCURRENCE_TS import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.models.Event import com.simplemobiletools.calendar.models.ListEvent -import com.simplemobiletools.commons.extensions.beGoneIf -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor -import com.simplemobiletools.commons.extensions.underlineText +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.MONTH_SECONDS import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener import com.simplemobiletools.commons.views.MyRecyclerView @@ -182,7 +179,7 @@ class EventListFragment : MyFragmentHolder(), RefreshRecyclerViewListener { override fun shouldGoToTodayBeVisible() = false override fun updateActionBarTitle() { - (activity as MainActivity).supportActionBar?.title = getString(R.string.app_launcher_name) + (activity as? MainActivity)?.updateActionBarTitle(getString(R.string.app_launcher_name)) } override fun getNewEventDayCode() = Formatter.getTodayCode(context!!) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt index b2d0fc1cc..22927353b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt @@ -14,6 +14,7 @@ import com.simplemobiletools.calendar.extensions.getMonthCode import com.simplemobiletools.calendar.helpers.DAY_CODE import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.interfaces.NavigationListener +import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.views.MyViewPager import kotlinx.android.synthetic.main.fragment_months_holder.view.* import org.joda.time.DateTime @@ -105,7 +106,7 @@ class MonthFragmentsHolder : MyFragmentHolder(), NavigationListener { override fun shouldGoToTodayBeVisible() = currentDayCode.getMonthCode() != todayDayCode.getMonthCode() override fun updateActionBarTitle() { - (activity as MainActivity).supportActionBar?.title = getString(R.string.app_launcher_name) + (activity as? MainActivity)?.updateActionBarTitle(getString(R.string.app_launcher_name)) } override fun getNewEventDayCode() = if (shouldGoToTodayBeVisible()) currentDayCode else todayDayCode diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt index ff1cf6fd0..a2e431d24 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt @@ -16,6 +16,8 @@ import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.helpers.WEEK_START_DATE_TIME import com.simplemobiletools.calendar.interfaces.WeekFragmentListener import com.simplemobiletools.calendar.views.MyScrollView +import com.simplemobiletools.commons.extensions.updateActionBarSubtitle +import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.helpers.WEEK_SECONDS import kotlinx.android.synthetic.main.fragment_week_holder.* import kotlinx.android.synthetic.main.fragment_week_holder.view.* @@ -112,12 +114,12 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener { if (startDateTime.year != DateTime().year) { newTitle += " - ${startDateTime.year}" } - (activity as? MainActivity)?.supportActionBar?.title = newTitle + (activity as MainActivity).updateActionBarTitle(newTitle) } else { val endMonthName = Formatter.getMonthName(context!!, endDateTime.monthOfYear) - (activity as? MainActivity)?.supportActionBar?.title = "$startMonthName - $endMonthName" + (activity as MainActivity).updateActionBarTitle("$startMonthName - $endMonthName") } - (activity as? MainActivity)?.supportActionBar?.subtitle = "${getString(R.string.week)} ${startDateTime.plusDays(3).weekOfWeekyear}" + (activity as MainActivity).updateActionBarSubtitle("${getString(R.string.week)} ${startDateTime.plusDays(3).weekOfWeekyear}") } override fun goToToday() { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt index a606fd003..5388a1f0b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt @@ -11,6 +11,7 @@ import com.simplemobiletools.calendar.activities.MainActivity import com.simplemobiletools.calendar.adapters.MyYearPagerAdapter import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.helpers.Formatter +import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.views.MyViewPager import kotlinx.android.synthetic.main.fragment_years_holder.view.* import org.joda.time.DateTime @@ -62,7 +63,7 @@ class YearFragmentsHolder : MyFragmentHolder() { } if (position < years.size) { - (activity as? MainActivity)?.supportActionBar?.title = "${getString(R.string.app_launcher_name)} - ${years[position]}" + (activity as? MainActivity)?.updateActionBarTitle("${getString(R.string.app_launcher_name)} - ${years[position]}") } } }) @@ -89,7 +90,7 @@ class YearFragmentsHolder : MyFragmentHolder() { override fun shouldGoToTodayBeVisible() = currentYear != todayYear override fun updateActionBarTitle() { - (activity as? MainActivity)?.supportActionBar?.title = "${getString(R.string.app_launcher_name)} - $currentYear" + (activity as? MainActivity)?.updateActionBarTitle("${getString(R.string.app_launcher_name)} - $currentYear") } override fun getNewEventDayCode() = Formatter.getTodayCode(context!!) From ab052278b1c4bf5a9aa21a407cc2f0440af7cadc Mon Sep 17 00:00:00 2001 From: Pierre49 <36711652+Pierre49@users.noreply.github.com> Date: Fri, 13 Jul 2018 15:35:37 +0200 Subject: [PATCH 04/39] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20cha=C3=AEnes?= =?UTF-8?q?=20fran=C3=A7aises?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values-fr/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 848c082b2..a8ec2e9e6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -44,7 +44,7 @@ L\'événement est répétable La sélection contient des événements avec répétition Supprimer seulement l\'occurrence sélectionnée - Delete this and all future occurrences + Supprimer ceci et toutes les occurrences futures Supprimer toutes les occurrences Mettre à jour seulement l\'occurrence sélectionnée Mettre à jour toutes les occurrences @@ -159,9 +159,9 @@ Boucles de rappel jusqu\'à ce qu\'il soit rejeté Diminuer l\'affichage des événements passés Evénements - Audio stream used by reminders + Flux audio utilisé par les rappels System - Alarm + Alarme Notification Ring From cb82bc66f2e9a699c19a9885228786232da638a8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 14 Jul 2018 13:54:57 +0200 Subject: [PATCH 05/39] do not ignore reminder audio stream settings on Android Oreo --- .../com/simplemobiletools/calendar/extensions/Context.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt index b07367605..8c6384a6d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt @@ -204,13 +204,12 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content: config.lastSoundUri = soundUri } - val channelId = "simple_calendar_${config.lastReminderChannel}" + val channelId = "simple_calendar_${config.lastReminderChannel}_${config.reminderAudioStream}" if (isOreoPlus()) { val audioAttributes = AudioAttributes.Builder() .setUsage(AudioAttributes.USAGE_ALARM) .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setLegacyStreamType(config.reminderAudioStream) - .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED) .build() val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager From 3270e28eed1a5972c13e2ec354b42fd01181870c Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 14 Jul 2018 17:34:11 +0200 Subject: [PATCH 06/39] fix #512, properly fetch running events and notify them only if needed --- .../com/simplemobiletools/calendar/extensions/Context.kt | 4 +++- .../kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt index 8c6384a6d..6ae42cf2e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt @@ -152,7 +152,9 @@ fun Context.getFilteredEvents(events: List): ArrayList { } fun Context.notifyRunningEvents() { - dbHelper.getRunningEvents().forEach { notifyEvent(it) } + dbHelper.getRunningEvents().filter { it.getReminders().isNotEmpty() }.forEach { + notifyEvent(it) + } } fun Context.notifyEvent(originalEvent: Event) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt index f7013eb92..72cbb5008 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt @@ -815,7 +815,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont val events = ArrayList() val ts = getNowSeconds() - val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS 0 AND $COL_START_TS != 0" + val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS NULL AND $COL_START_TS != 0" val selectionArgs = arrayOf(ts.toString(), ts.toString()) val cursor = getEventsCursor(selection, selectionArgs) events.addAll(fillEvents(cursor)) From a39ee26ff86db50c471018ff631d0c178a34388c Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 14 Jul 2018 18:18:04 +0200 Subject: [PATCH 07/39] update commons to 4.4.17 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5674bd3bd..407baccc8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.4.16' + implementation 'com.simplemobiletools:commons:4.4.17' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.3' From 33f2f6c8aa4f6f76b8ef4eb0f6de7b6495e0b90a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 14 Jul 2018 18:19:52 +0200 Subject: [PATCH 08/39] update version to 4.1.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 407baccc8..c8c7b11ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.simplemobiletools.calendar" minSdkVersion 16 targetSdkVersion 27 - versionCode 125 - versionName "4.1.1" + versionCode 126 + versionName "4.1.2" multiDexEnabled true setProperty("archivesBaseName", "calendar") } From 36379944c5486c5a4e9944249d94718064dc3fe4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 14 Jul 2018 18:19:58 +0200 Subject: [PATCH 09/39] updating changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c7957fab..5cf203c2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========== +Version 4.1.2 *(2018-07-14)* +---------------------------- + + * Made reminder sounds more reliable on Android Oreo + * Properly fetch running events at reboot, notify only if needed + * Couple UX and stability improvements + Version 4.1.1 *(2018-07-04)* ---------------------------- From 53c906ac94d2ef17e43f6c21f57da6d54321491d Mon Sep 17 00:00:00 2001 From: en2sv Date: Sun, 15 Jul 2018 20:16:21 +0200 Subject: [PATCH 10/39] Update Swedish translation --- app/src/main/res/values-sv/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 681e01706..4e894bcb4 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -44,7 +44,7 @@ Händelsen är återkommande Markeringen innehåller återkommande händelser Ta bara bort den markerade förekomsten - Delete this and all future occurrences + Ta bort denna och alla framtida förekomster Ta bort alla förekomster Uppdatera bara den markerade förekomsten Uppdatera alla förekomster @@ -143,10 +143,10 @@ Hantera händelsetyper Starta veckovydagen vid Sluta veckovydagen vid - Visa veckonumret i månadsvyn + Visa veckonummer Vibrera vid påminnelseaviseringen Påminnelseljud - Hittade ingen app som kan ställa in ljudet + Ingen app som kan ställa in en ringsignal hittades Ingen Dagen kan inte börja innan den tar slut CalDAV-synkronisering @@ -159,10 +159,10 @@ Upprepa påminnelser tills de tas bort Tona ned tidigare händelser Händelser - Audio stream used by reminders + Ljudström för påminnelser System Alarm - Notification + Avisering Ring From 6d69f7727efaab52dab44204f60fbac3869e4fe2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 16 Jul 2018 21:22:11 +0200 Subject: [PATCH 11/39] do not initially show the "Purchase Simple Thank You" button in the app settings --- app/build.gradle | 2 +- .../simplemobiletools/calendar/activities/SettingsActivity.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c8c7b11ee..a19044025 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.4.17' + implementation 'com.simplemobiletools:commons:4.4.24' 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/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt index 3c8cfaaf2..cec36f671 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt @@ -97,7 +97,7 @@ class SettingsActivity : SimpleActivity() { } private fun setupPurchaseThankYou() { - settings_purchase_thank_you_holder.beVisibleIf(!isThankYouInstalled()) + settings_purchase_thank_you_holder.beVisibleIf(config.appRunCount > 10 && !isThankYouInstalled()) settings_purchase_thank_you_holder.setOnClickListener { launchPurchaseThankYouIntent() } From d912f0a9d6ed421bacfc0475cb607498d445d149 Mon Sep 17 00:00:00 2001 From: Gozzwip <36863088+Gozzwip@users.noreply.github.com> Date: Fri, 20 Jul 2018 18:37:39 +0500 Subject: [PATCH 12/39] fixes and more translatiions --- app/src/main/res/values-az/strings.xml | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index fe41de71d..8502e3c0b 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -27,7 +27,7 @@ Hadisə uğurla yeniləndi Hadisələri yazıya görə sırala Xahiş olunur məkan parametrini doldurun ki hadisədə görünsün - An event is upcoming + Bir hadisə günü yaxınlaşır Təkrarlama @@ -44,7 +44,7 @@ Bu hadisə təkrarlanabilər Seçim təkrarlanan hadisələr ehtiva edir Yalnız seçilmiş hadisəni sil - Delete this and all future occurrences + Bunu və bütün gələcək hadisələri sil Bütün hadisələri sil Yalnız seçilmiş hadisəni yenilə Bütün hadisələri yenilə @@ -60,7 +60,7 @@ Son gün Hər ayın eyni günü təkrarla Hər ayın son günü təkrarla - Repeat on the same day every year + Hər ilin eyni gündə təkrarla Təkrarla hər Hər birinci @@ -71,7 +71,7 @@ - Repeat every + Təkrarla hər Hər birinci ikinci @@ -106,7 +106,7 @@ Keçmiş hadisələri də xaric et Hadisə tiplərini ehtiva et Fayl adı (.ics\'sız) - Override event types in the file + Faylın içərisində hadisə tiplərini üstünə yaz Başlıq @@ -135,7 +135,7 @@ Bayram əlavə et Milli bayramlar Dini bayramlar - Holidays have been successfully imported into the \"Holidays\" event type + Bayramlar uğurla \"Bayramlar\" hadisə tipinə daxil edildi Bəzi bayramları daxil etmək alınmadı Bayramları daxil etmək alınmadı @@ -155,15 +155,15 @@ Hadisə əlavəsini məkan ilə dəyiş Bütün hadisələri sil Bütün hadisələri silmək istədiyinizə əminsiniz? Bu hadisələri və parametrlərini bütövlüklə siləcək. - Show a grid - Loop reminders until dismissed - Dim past events - Events - Audio stream used by reminders - System - Alarm - Notification - Ring + Cədvəl göstər + Buraxılana qədər xatırladıcıları təkrarla + Keçmiş hadisələri qaralt + Hadisələr + Xatırladıcılar tərəfindən işlədilən səs axışı + Sistem + Zəng + Bildiriş + Zəng səsi CalDAV From 914ad716c8b39176abe75483acb6c01db5286b06 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 16:17:40 +0200 Subject: [PATCH 13/39] update commons to 4.5.20 --- app/build.gradle | 2 +- .../simplemobiletools/calendar/activities/MainActivity.kt | 5 +++-- build.gradle | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a19044025..ba33c49da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.4.24' + implementation 'com.simplemobiletools:commons:4.5.20' 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/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index b252f0066..62f1c7783 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -693,6 +693,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } private fun launchAbout() { + val licenses = LICENSE_JODA or LICENSE_STETHO or LICENSE_MULTISELECT or LICENSE_LEAK_CANARY + val faqItems = arrayListOf( FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons), FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), @@ -700,8 +702,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { FAQItem(getString(R.string.faq_1_title), getString(R.string.faq_1_text)), FAQItem(getString(R.string.faq_2_title), getString(R.string.faq_2_text))) - startAboutActivity(R.string.app_name, LICENSE_JODA or LICENSE_STETHO or LICENSE_MULTISELECT or LICENSE_LEAK_CANARY, - BuildConfig.VERSION_NAME, faqItems) + startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) } private fun searchQueryChanged(text: String) { diff --git a/build.gradle b/build.gradle index 82672aab8..52140041e 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.51' + ext.kotlin_version = '1.2.60' repositories { jcenter() From 8823f8199d84b630443c3ad21d35fcaf56d53313 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 20:29:39 +0200 Subject: [PATCH 14/39] adding a new FAQ item about silent reminders --- .../simplemobiletools/calendar/activities/MainActivity.kt | 3 ++- app/src/main/res/values-az/strings.xml | 3 +++ app/src/main/res/values-br/strings.xml | 3 +++ app/src/main/res/values-cs/strings.xml | 3 +++ app/src/main/res/values-da/strings.xml | 3 +++ app/src/main/res/values-de/strings.xml | 5 ++++- app/src/main/res/values-es/strings.xml | 3 +++ app/src/main/res/values-fr/strings.xml | 5 ++++- app/src/main/res/values-gl/strings.xml | 3 +++ app/src/main/res/values-hi-rIN/strings.xml | 3 +++ app/src/main/res/values-hr/strings.xml | 3 +++ app/src/main/res/values-hu/strings.xml | 3 +++ app/src/main/res/values-it/strings.xml | 3 +++ app/src/main/res/values-iw/strings.xml | 3 +++ app/src/main/res/values-ja/strings.xml | 3 +++ app/src/main/res/values-ko/strings.xml | 3 +++ app/src/main/res/values-lt/strings.xml | 3 +++ app/src/main/res/values-nb/strings.xml | 3 +++ app/src/main/res/values-nl/strings.xml | 3 +++ app/src/main/res/values-no/strings.xml | 3 +++ app/src/main/res/values-pl/strings.xml | 3 +++ app/src/main/res/values-pt-rBR/strings.xml | 3 +++ app/src/main/res/values-pt/strings.xml | 3 +++ app/src/main/res/values-ru/strings.xml | 3 +++ app/src/main/res/values-sk/strings.xml | 3 +++ app/src/main/res/values-sv/strings.xml | 3 +++ app/src/main/res/values-tr/strings.xml | 3 +++ app/src/main/res/values-zh-rTW/strings.xml | 3 +++ app/src/main/res/values/strings.xml | 3 +++ 29 files changed, 88 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index 62f1c7783..56a6ff23d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -700,7 +700,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons), FAQItem(getString(R.string.faq_1_title), getString(R.string.faq_1_text)), - FAQItem(getString(R.string.faq_2_title), getString(R.string.faq_2_text))) + FAQItem(getString(R.string.faq_2_title), getString(R.string.faq_2_text)), + FAQItem(getString(R.string.faq_3_title), getString(R.string.faq_3_text))) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) } diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 8502e3c0b..14104797a 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index 8156bae4c..83618c996 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index fbee096df..5a61ea6d0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3d7df8518..31aa90210 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -203,6 +203,9 @@ Kan jeg synkronisere mine begivenheder med Googles kalender elleer en anden kalender der understøtter CalDAV? Ja, klik på \"CalDAV sync\" i appens indstillinger og vælg de kalendere du vil synkronisere. Det kræver dog at du har en app til at synkronisere mellem din enhed og kalenderservere. Hvis du vil synkronisere en Googlekalender, kan deres officielle app klare det. For andre kalenderes vedkommende kan du bruge en 3. partsapp som for eksempel DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 12817e0c9..8e1cd1507 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -203,8 +203,11 @@ Du kannst in den Einstellungen -> Verwalte Termin-Typen auf den Termin-Typ gedrückt halten und über das Papierkorbsymbol löschen. Kann ich meine Termine über Google Kalender oder andere CalDAV unterstützende Dienste synchronisieren? Ja, aktiviere \"CalDAV Synchronisierung\" in den Einstellungen und wähle die Kalender aus, die du synchronisieren willst. - Jedoch benötigst du eine separate App, die die Synchronisierung zwischen Gerät und Servern handhabt. Falls du einen Google Kalender synchronisieren willst, kann die offizielle Kalender-App dies übernehmen. + Jedoch benötigst du eine separate App, die Synchronisierung zwischen Gerät und Servern handhabt. Falls du einen Google Kalender synchronisieren willst, kann die offizielle Kalender-App dies übernehmen. Für andere Kalender benötigst du einen Synchronisierungsadapter, wie z. B. DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 0c90d2834..876c67b3f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a8ec2e9e6..e3e0a7c61 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -106,7 +106,7 @@ Exporter aussi les événements passés Inclure les types d\'événement Nom de fichier (sans .ics) - Remplacer les types d'événement dans le fichier + Remplacer les types d\'événement dans le fichier Titre @@ -204,6 +204,9 @@ Puis-je synchroniser mes événements via Google Agenda, ou tout autre service proposant la synchronisation CalDAV ? Oui, il faut juste activer l\'option « Synchronisation CalDAV » dans les paramètres de l\'application puis choisir les calendriers à synchroniser. Une application tierce pour gérer la synchronisation entre votre appareil et les serveurs sera par contre nécessaire. Dans le cas d\'un calendrier Google Agenda, l\'application officielle fera l\'affaire. Pour les autres calendriers, il vous faudra une application comme DAVdroid par exemple. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 7d9fd6b46..9fe3cbec8 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 099496094..21d4adda8 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -205,6 +205,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index f493fcfc3..aab70f77a 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -204,6 +204,9 @@ Mogu li sinkronizirati događaje putem Google Kalendara ili druge usluge koje podržavaju CalDAV? Da, samo uključite \"CalDAV sinkronizacija\" u postavkama aplikacije i odaberite kalendare koje želite sinkronizirati. Međutim, potrebna je aplikacija između Vašeg uređaja i poslužitelja. U slučaju da želite sinkronizirati Google kalendar, njihova službena aplikacija Kalendar obavlja navedeni posao. Za ostale kalendare potreban Vam je aplikacija treće strane za upravljanje sinkronizacijom, na primjer DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9be022679..7c7babb7a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 586d38de9..697b993a2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 299b986f9..ccff9220b 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -205,6 +205,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 94775b2f1..0c00bf721 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 09283219e..b1fa595b2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index dda4251b3..45db7ce1d 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -204,6 +204,9 @@ Ar galiu sinchronizuoti savo įvykius per Google Kalendorių, ar kitą paslaugą palaikančią CalDAV? Taip, tiesiog pasirinkite \"CalDAV sinchronizavimas\" programėlės nustatymuose ir pasirinkite kalendorius kuriuos norite sinchronizuoti. Tačiau Jums reikės trečiosios šalies programėlės palaikančios sinchronizavimą tarp įrenginio ir serverių. Jeigu norite sinchronizuoti Google kalendorių, jų oficiali kalendoriaus programėlė atliks šį darbą. Kitiems kalenoriams Jums reikės trečiosios šalies sinchronizavimo adapterio, pavyzdžiui DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 296aec9a7..17060f4ee 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -204,6 +204,9 @@ Kan jeg synkronisere hendelsene mine via Google Kalender eller annen tjeneste som støtter CalDAV? Ja, bare aktiver \"CalDAV-synkronisering\" i innstillingene og velg kalenderne du vil synkronisere. Du trenger imidlertid program som håndterer synkroniseringen mellom enheten og serverne. Hvis du vil synkronisere en Google-kalender, vil deres offisielle kalenderapp gjøre jobben. For andre kalendere trenger du en annen synkroniseringsapp, for eksempel DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b4fd81e19..4bd3a318b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -204,6 +204,9 @@ Kan ik mijn afspraken synchroniseren met Google Calendar of een andere service die CalDAV ondersteunt? Schakel \"CalDAV-synchronisatie\" in bij Instellingen en selecteer vervolgens de agenda\'s die gesynchroniseerd moeten worden. Er is wel een app nodig die de synchronisatie tussen het apparaat en de service zelf afhandelt. Betreft het een agenda van Google Calendar, dan voldoet hun officiële app. Voor andere services zal een adapter zoals DAVdroid benodigd zijn. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 67ba1ffbc..fe2e65a6e 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 44a9faf00..1202e6fed 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -202,6 +202,9 @@    Święta dodane w ten sposób są wprowadzane do nowego typu wydarzeń - \'Święta\'. Usunąć je możesz, przechodząc do ustawień aplikacji, a następnie w sekcji \'Zarządzaj typami wydarzeń\' usunąć ową kategorię, klikając ikonę kosza.    Czy mogę zsychronizować moje wydarzenia z Kalendarzem Google lub inną usługą wspierającą CalDAV?    Tak. Wystarczy włączyć opcję \'Synchronizacja CalDAV\' w ustawieniach aplikacji i wybrać kalendarze do synchronizacji. Jeśli chcesz zsynchronizować wydarzenia z Kalendarzem Google, oficjalna aplikacja kalendarza powinna wystarczyć. W innych przypadkach potrzebna może być zewnętrzna aplikacja, np. DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 99fe522b5..10c770b15 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -204,6 +204,9 @@ Posso sincronizar meus eventos por meio do Google Agenda ou de outro serviço de suporte CalDAV? Sim, basta ativar \ "CalDAV sync \" nas configurações do aplicativo e selecionar os calendários que você deseja sincronizar. No entanto, você precisará de algum aplicativo de terceiros que manipule a sincronização entre o dispositivo e os servidores. Caso você queira sincronizar um calendário do Google, o aplicativo oficial do Google Agenda fará o trabalho. Para outros calendários, você precisará de um adaptador de sincronização de terceiros, por exemplo, o DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 4738c8f6e..a685ee20a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 45686d6fa..0c8558520 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -204,6 +204,9 @@ Можно ли синхронизировать события с помощью Календаря Google или других служб, поддерживающих CalDAV? Да, просто включите \"Cинхронизацию CalDAV\" в настройках приложения и выберите календари, которые хотите синхронизировать. Тем не менее, вам потребуется стороннее приложение, обрабатывающее синхронизацию между устройством и сервером. Если вы хотите синхронизировать Календарь Google, то их официальное приложение выполнит данную работу. Для других календарей вам понадобится сторонний инструмент синхронизации, например DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 41fa06cf4..aa342e0cc 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -204,6 +204,9 @@ Viem si zosynchronizovať udalosti pomocou Google Kalendára, alebo inej služby podporujúcej CalDAV? Áno, stačí aktivovať funkciu \"CalDAV synchronizácia\" v nastaveniach a zvoliť si správne kalendáre. Pre synchronizáciu medzi zariadením a serverom ale budete potrebovať synchronizačný adaptér od tretej strany. Ak chcete synchronizovať Google kalendár, ich oficiálna aplikácia Kalendár to spraví. Pre iné kalendáre budete potrebovať inú synchronizačnú aplikáciu, napr. DAVdroid. + Vidím vizuálnu pripomienku, ale nepočujem žiadny zvuk. Čo s tým viem spraviť? + Nie len zobrazovanie pripomienok, ale aj prehrávanie zvuku je ovplyvnené systémom. Ak nepočujete zvuk, skúste ísť do nastavení apky, použiť možnosť \"Zvukový kanál používaný pripomienkami\" a + zmeniť zvolenú hodnotu. Ak to ešte stále nebude fungovať, skúste sa pozrieť do zvukových nastavení vášho systému, či daný kanál nie je stlmený. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 4e894bcb4..1041eb3f4 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f5737e9d7..3176142cc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -203,6 +203,9 @@ Etkinliklerimi Google Takvim\'le veya CalDAV\'ı destekleyen başka bir hizmetle senkronize edebilir miyim? Evet, uygulama ayarlarından \"CalDAV senkronizasyonu\" seçeneğini işaretleyin ve senkronize etmek istediğiniz takvimleri seçin. Bununla birlikte, cihaz ve sunucular arasındaki senkronizasyonu ele alan bazı üçüncü taraf uygulamalarına ihtiyacınız olacaktır. Bu durumda bir Google takvimini senkronize etmek istiyorsanız, resmi Takvim uygulaması işi yapar. Diğer takvimler için, DAVdroid gibi üçüncü taraf senkronizasyon adaptörüne ihtiyacınız olacaktır. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1146cf505..64f5984d0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -204,6 +204,9 @@ 我可以透過Google日曆或其它支援CalDAV的服務來同步我的活動嗎? 行的，只要打開程式設定內的[CalDAV同步]，然後選擇你要同步的行事曆。然而你需要一些第三方應用程式來處理裝置和伺服器之間的同步。 如果你要同步Google日曆，他們官方的行事曆程式就能做到了。而其它行事曆，你需要有第三方同步工具才行，像是DAVdroid。 + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 40122a73f..ff32d2ea4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -204,6 +204,9 @@ Can I sync my events via Google Calendar, or other service supporting CalDAV? Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVdroid. + I see the visual reminders, but hear no audio. What can I do? + Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, + pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. From edd6bafa43443ed9ad1676d33b82449a6a75d003 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 20:43:15 +0200 Subject: [PATCH 15/39] making a context nullable --- .../com/simplemobiletools/calendar/fragments/DayFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt index 4e5e2e146..84ede6be3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt @@ -106,7 +106,7 @@ class DayFragment : Fragment() { fun updateCalendar() { val startTS = Formatter.getDayStartTS(mDayCode) val endTS = Formatter.getDayEndTS(mDayCode) - context!!.dbHelper.getEvents(startTS, endTS) { + context?.dbHelper?.getEvents(startTS, endTS) { receivedEvents(it) } } From 8c7654e918edc06d2cd48d638561d54ffb7822eb Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 21:21:29 +0200 Subject: [PATCH 16/39] fix #567, limit monthly widget month size to 1 line --- app/src/main/res/layout/top_navigation_widget.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/top_navigation_widget.xml b/app/src/main/res/layout/top_navigation_widget.xml index 727ea8020..06113029d 100644 --- a/app/src/main/res/layout/top_navigation_widget.xml +++ b/app/src/main/res/layout/top_navigation_widget.xml @@ -22,6 +22,7 @@ android:layout_toLeftOf="@+id/top_right_arrow" android:layout_toRightOf="@+id/top_left_arrow" android:gravity="center" + android:lines="1" android:paddingBottom="@dimen/medium_margin" android:paddingTop="@dimen/medium_margin" android:textSize="@dimen/month_text_size"/> From 17b47bd2d7ba79b1056bc4f7ae627daa42ff7c80 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 21:33:09 +0200 Subject: [PATCH 17/39] fix #564, increase the allowed event title to 180 characters --- .../com/simplemobiletools/calendar/helpers/CalDAVHandler.kt | 4 ++-- .../com/simplemobiletools/calendar/helpers/IcsImporter.kt | 2 +- app/src/main/res/layout/activity_event.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt index 3a12d0cfb..8c95e8904 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt @@ -245,8 +245,8 @@ class CalDAVHandler(val context: Context) { val importId = getCalDAVEventImportId(calendarId, id) val source = "$CALDAV-$calendarId" val repeatRule = Parser().parseRepeatInterval(rrule, startTS) - val event = Event(0, startTS, endTS, title, description, reminders.getOrElse(0, { -1 }), - reminders.getOrElse(1, { -1 }), reminders.getOrElse(2, { -1 }), repeatRule.repeatInterval, + val event = Event(0, startTS, endTS, title, description, reminders.getOrElse(0) { -1 }, + reminders.getOrElse(1) { -1 }, reminders.getOrElse(2) { -1 }, repeatRule.repeatInterval, importId, allDay, repeatRule.repeatLimit, repeatRule.repeatRule, eventTypeId, source = source, location = location) if (event.getIsAllDay()) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt index 1df27de0e..74b928f2c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt @@ -232,7 +232,7 @@ class IcsImporter(val activity: SimpleActivity) { return if (title.startsWith(";") && title.contains(":")) { title.substring(title.lastIndexOf(':') + 1) } else { - title.substring(1, Math.min(title.length, 80)) + title.substring(1, Math.min(title.length, 180)) } } diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml index fac0e5858..c62364dfd 100644 --- a/app/src/main/res/layout/activity_event.xml +++ b/app/src/main/res/layout/activity_event.xml @@ -21,7 +21,7 @@ android:layout_marginTop="@dimen/activity_margin" android:hint="@string/title" android:inputType="textCapSentences" - android:maxLength="80" + android:maxLength="180" android:maxLines="1" android:minEms="20" android:textCursorDrawable="@null" @@ -37,7 +37,7 @@ android:layout_toLeftOf="@+id/event_show_on_map" android:hint="@string/location" android:inputType="textCapWords" - android:maxLength="80" + android:maxLength="180" android:maxLines="1" android:minEms="20" android:textCursorDrawable="@null" From a8c2e663403d7f4033d1d751b977cba7099de886 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 22:45:49 +0200 Subject: [PATCH 18/39] fix #568, properly retain event fields on device rotation --- .../calendar/activities/EventActivity.kt | 83 +++++++++++++++++-- 1 file changed, 74 insertions(+), 9 deletions(-) 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 5ef6e3fc7..39224cbf2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -29,6 +29,17 @@ import java.util.regex.Pattern class EventActivity : SimpleActivity() { private val LAT_LON_PATTERN = "^[-+]?([1-8]?\\d(\\.\\d+)?|90(\\.0+)?)([,;])\\s*[-+]?(180(\\.0+)?|((1[0-7]\\d)|([1-9]?\\d))(\\.\\d+)?)\$" + private val START_TS = "START_TS" + private val END_TS = "END_TS" + private val REMINDER_1_MINUTES = "REMINDER_1_MINUTES" + private val REMINDER_2_MINUTES = "REMINDER_2_MINUTES" + private val REMINDER_3_MINUTES = "REMINDER_3_MINUTES" + private val REPEAT_INTERVAL = "REPEAT_INTERVAL" + private val REPEAT_LIMIT = "REPEAT_LIMIT" + private val REPEAT_RULE = "REPEAT_RULE" + private val EVENT_TYPE_ID = "EVENT_TYPE_ID" + private val EVENT_CALENDAR_ID = "EVENT_CALENDAR_ID" + private var mReminder1Minutes = 0 private var mReminder2Minutes = 0 private var mReminder3Minutes = 0 @@ -71,7 +82,9 @@ class EventActivity : SimpleActivity() { if (event != null) { mEvent = event mEventOccurrenceTS = intent.getIntExtra(EVENT_OCCURRENCE_TS, 0) - setupEditEvent() + if (savedInstanceState == null) { + setupEditEvent() + } if (intent.getBooleanExtra(IS_DUPLICATE_INTENT, false)) { mEvent.id = 0 @@ -81,15 +94,17 @@ class EventActivity : SimpleActivity() { mReminder1Minutes = config.defaultReminderMinutes mReminder2Minutes = config.defaultReminderMinutes3 mReminder3Minutes = config.defaultReminderMinutes2 - setupNewEvent() + + if (savedInstanceState == null) { + setupNewEvent() + } } - checkReminderTexts() - updateRepetitionText() - updateStartTexts() - updateEndTexts() - updateEventType() - updateCalDAVCalendar() + if (savedInstanceState == null) { + updateTexts() + updateEventType() + updateCalDAVCalendar() + } event_show_on_map.setOnClickListener { showOnMap() } event_start_date.setOnClickListener { setupStartDate() } @@ -147,6 +162,55 @@ class EventActivity : SimpleActivity() { return true } + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + outState.putInt(START_TS, mEventStartDateTime.seconds()) + outState.putInt(END_TS, mEventEndDateTime.seconds()) + + outState.putInt(REMINDER_1_MINUTES, mReminder1Minutes) + outState.putInt(REMINDER_2_MINUTES, mReminder2Minutes) + outState.putInt(REMINDER_3_MINUTES, mReminder3Minutes) + + outState.putInt(REPEAT_INTERVAL, mRepeatInterval) + outState.putInt(REPEAT_LIMIT, mRepeatLimit) + outState.putInt(REPEAT_RULE, mRepeatRule) + + outState.putInt(EVENT_TYPE_ID, mEventTypeId) + outState.putInt(EVENT_CALENDAR_ID, mEventCalendarId) + } + + override fun onRestoreInstanceState(savedInstanceState: Bundle) { + super.onRestoreInstanceState(savedInstanceState) + savedInstanceState.apply { + mEventStartDateTime = Formatter.getDateTimeFromTS(getInt(START_TS)) + mEventEndDateTime = Formatter.getDateTimeFromTS(getInt(END_TS)) + + mReminder1Minutes = getInt(REMINDER_1_MINUTES) + mReminder2Minutes = getInt(REMINDER_2_MINUTES) + mReminder3Minutes = getInt(REMINDER_3_MINUTES) + + mRepeatInterval = getInt(REPEAT_INTERVAL) + mRepeatLimit = getInt(REPEAT_LIMIT) + mRepeatRule = getInt(REPEAT_RULE) + + mEventTypeId = getInt(EVENT_TYPE_ID) + mEventCalendarId = getInt(EVENT_CALENDAR_ID) + } + + checkRepeatTexts(mRepeatInterval) + checkRepeatRule() + updateTexts() + updateEventType() + updateCalDAVCalendar() + } + + private fun updateTexts() { + updateRepetitionText() + checkReminderTexts() + updateStartTexts() + updateEndTexts() + } + private fun setupEditEvent() { val realStart = if (mEventOccurrenceTS == 0) mEvent.startTS else mEventOccurrenceTS val duration = mEvent.endTS - mEvent.startTS @@ -862,8 +926,9 @@ class EventActivity : SimpleActivity() { setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt()) } } else if (mRepeatInterval.isXMonthlyRepetition() || mRepeatInterval.isXYearlyRepetition()) { - if (mRepeatRule == REPEAT_LAST_DAY && !isLastDayOfTheMonth()) + if (mRepeatRule == REPEAT_LAST_DAY && !isLastDayOfTheMonth()) { mRepeatRule = REPEAT_SAME_DAY + } checkRepetitionRuleText() } } From 5a5beffeecca8af5547e28036f80ba2ad154e19e Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 23:00:28 +0200 Subject: [PATCH 19/39] at showing a reminder reschedule only the given event, not all --- .../calendar/receivers/NotificationReceiver.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt index 3fb716f84..93a7589b5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.os.PowerManager import com.simplemobiletools.calendar.extensions.dbHelper import com.simplemobiletools.calendar.extensions.notifyEvent -import com.simplemobiletools.calendar.extensions.scheduleAllEvents +import com.simplemobiletools.calendar.extensions.scheduleNextEventReminder import com.simplemobiletools.calendar.extensions.updateListWidget import com.simplemobiletools.calendar.helpers.EVENT_ID import com.simplemobiletools.calendar.helpers.Formatter @@ -37,6 +37,6 @@ class NotificationReceiver : BroadcastReceiver() { if (!event.ignoreEventOccurrences.contains(Formatter.getDayCodeFromTS(event.startTS).toInt())) { context.notifyEvent(event) } - context.scheduleAllEvents() + context.scheduleNextEventReminder(event, context.dbHelper) } } From cd5a3433b658c7b0d7a78d20725c36c2ab38eb51 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 23:06:56 +0200 Subject: [PATCH 20/39] move monthly fragment top layout directly in fragment_month_widget file --- .../main/res/layout/fragment_month_widget.xml | 48 ++++++++++++++++- .../main/res/layout/top_navigation_widget.xml | 54 ------------------- 2 files changed, 47 insertions(+), 55 deletions(-) delete mode 100644 app/src/main/res/layout/top_navigation_widget.xml diff --git a/app/src/main/res/layout/fragment_month_widget.xml b/app/src/main/res/layout/fragment_month_widget.xml index 6a1677961..b8cbe6fb4 100644 --- a/app/src/main/res/layout/fragment_month_widget.xml +++ b/app/src/main/res/layout/fragment_month_widget.xml @@ -7,7 +7,53 @@ android:layout_height="match_parent" android:padding="@dimen/medium_margin"> - + + + + + + + - - - - - - - - - - - From 00443afab755971a1de066d6f626b2db8ad92f4a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 23:20:22 +0200 Subject: [PATCH 21/39] add a Go To Today button at the monthly widget --- .../WidgetMonthlyConfigureActivity.kt | 2 +- .../calendar/fragments/MonthFragment.kt | 2 +- .../calendar/helpers/MonthlyCalendarImpl.kt | 4 ++-- .../calendar/helpers/MyWidgetMonthlyProvider.kt | 17 ++++++++++++++++- .../calendar/interfaces/MonthlyCalendar.kt | 3 ++- .../main/res/layout/fragment_month_widget.xml | 14 +++++++++++++- 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt index 0c3cd60a6..07bca80ff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt @@ -199,7 +199,7 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar { } } - override fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList, checkedEvents: Boolean) { + override fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList, checkedEvents: Boolean, currTargetDate: DateTime) { runOnUiThread { mDays = days top_value.text = month diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt index 2db429489..00bb4c80f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt @@ -89,7 +89,7 @@ class MonthFragment : Fragment(), MonthlyCalendar { mCalendar?.updateMonthlyCalendar(Formatter.getDateTimeFromCode(mDayCode)) } - override fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList, checkedEvents: Boolean) { + override fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList, checkedEvents: Boolean, currTargetDate: DateTime) { val newHash = month.hashCode() + days.hashCode().toLong() if ((mLastHash != 0L && !checkedEvents) || mLastHash == newHash) { return diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt index 7b4613c22..1a8fc6847 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt @@ -79,7 +79,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context) if (markDaysWithEvents) { markDaysWithEvents(days) } else { - mCallback.updateMonthlyCalendar(mContext, monthName, days, false) + mCallback.updateMonthlyCalendar(mContext, monthName, days, false, mTargetDate) } } @@ -110,7 +110,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context) days.filter { dayEvents.keys.contains(it.code) }.forEach { it.dayEvents = dayEvents[it.code]!! } - mCallback.updateMonthlyCalendar(mContext, monthName, days, true) + mCallback.updateMonthlyCalendar(mContext, monthName, days, true, mTargetDate) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt index 672b39dfa..f80f0b596 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt @@ -21,6 +21,7 @@ import org.joda.time.DateTime class MyWidgetMonthlyProvider : AppWidgetProvider() { private val PREV = "prev" private val NEXT = "next" + private val GO_TO_TODAY = "go_to_today" private val NEW_EVENT = "new_event" companion object { @@ -66,6 +67,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() { when (intent.action) { PREV -> getPrevMonth(context) NEXT -> getNextMonth(context) + GO_TO_TODAY -> goToToday(context) NEW_EVENT -> context.launchNewEventIntent() else -> super.onReceive(context, intent) } @@ -81,6 +83,11 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() { MonthlyCalendarImpl(monthlyCalendar, context).getMonth(targetDate!!) } + private fun goToToday(context: Context) { + targetDate = DateTime.now().withDayOfMonth(1) + MonthlyCalendarImpl(monthlyCalendar, context).getMonth(targetDate!!) + } + private fun updateDays(context: Context, views: RemoteViews, days: List) { val displayWeekNumbers = context.config.showWeekNumbers val textColor = context.config.widgetTextColor @@ -150,7 +157,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() { } private val monthlyCalendar = object : MonthlyCalendar { - override fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList, checkedEvents: Boolean) { + override fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList, checkedEvents: Boolean, currTargetDate: DateTime) { val largerFontSize = context.config.getFontSize() + 3f val textColor = context.config.widgetTextColor val resources = context.resources @@ -171,13 +178,21 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() { bmp = resources.getColoredBitmap(R.drawable.ic_pointer_right, textColor) views.setImageViewBitmap(R.id.top_right_arrow, bmp) + bmp = resources.getColoredBitmap(R.drawable.ic_today, textColor) + views.setImageViewBitmap(R.id.top_go_to_today, bmp) + bmp = resources.getColoredBitmap(R.drawable.ic_plus, textColor) views.setImageViewBitmap(R.id.top_new_event, bmp) + + val shouldGoToTodayBeVisible = currTargetDate.withTime(0, 0, 0, 0) != DateTime.now().withDayOfMonth(1).withTime(0, 0, 0, 0) + views.setVisibleIf(R.id.top_go_to_today, shouldGoToTodayBeVisible) + updateDayLabels(context, views, resources, textColor) updateDays(context, views, days) setupIntent(context, views, PREV, R.id.top_left_arrow) setupIntent(context, views, NEXT, R.id.top_right_arrow) + setupIntent(context, views, GO_TO_TODAY, R.id.top_go_to_today) setupIntent(context, views, NEW_EVENT, R.id.top_new_event) val monthCode = days.firstOrNull { it.code.substring(6) == "01" }?.code ?: Formatter.getTodayCode(context) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt index 1ada47f89..62e0bdbd7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt @@ -2,7 +2,8 @@ package com.simplemobiletools.calendar.interfaces import android.content.Context import com.simplemobiletools.calendar.models.DayMonthly +import org.joda.time.DateTime interface MonthlyCalendar { - fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList, checkedEvents: Boolean) + fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList, checkedEvents: Boolean, currTargetDate: DateTime) } diff --git a/app/src/main/res/layout/fragment_month_widget.xml b/app/src/main/res/layout/fragment_month_widget.xml index b8cbe6fb4..834c96a1e 100644 --- a/app/src/main/res/layout/fragment_month_widget.xml +++ b/app/src/main/res/layout/fragment_month_widget.xml @@ -38,11 +38,23 @@ android:layout_height="match_parent" android:layout_alignBottom="@+id/top_value" android:layout_alignTop="@+id/top_value" - android:layout_toLeftOf="@+id/top_new_event" + android:layout_toLeftOf="@+id/top_go_to_today" android:paddingLeft="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin" android:src="@drawable/ic_pointer_right"/> + + Date: Sun, 5 Aug 2018 23:26:42 +0200 Subject: [PATCH 22/39] catch exceptions thrown at getting event types --- .../kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt index 72cbb5008..dbd1da785 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt @@ -976,6 +976,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont eventTypes.add(eventType) } while (cursor.moveToNext()) } + } catch (ignored: Exception) { } finally { cursor?.close() } From f31c6dcb8f140d649efb661b58c6c1cdd7d605ff Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 6 Aug 2018 10:50:59 +0200 Subject: [PATCH 23/39] update version to 4.1.3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ba33c49da..5bff7d30a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.simplemobiletools.calendar" minSdkVersion 16 targetSdkVersion 27 - versionCode 126 - versionName "4.1.2" + versionCode 127 + versionName "4.1.3" multiDexEnabled true setProperty("archivesBaseName", "calendar") } From 504425b37606e3e3e33872384752bb3d2b6f8fc4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 6 Aug 2018 10:51:04 +0200 Subject: [PATCH 24/39] updating changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cf203c2d..8cbc6b096 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========== +Version 4.1.3 *(2018-08-06)* +---------------------------- + + * Added a Go To Today button at the monthly widget + * Increase the allowed length of event titles, locations, descriptions + * Couple other stability and UX improvements + Version 4.1.2 *(2018-07-14)* ---------------------------- From 7764d869c1832f066679ef9d4ba37b120a35e25f Mon Sep 17 00:00:00 2001 From: Guillaume Date: Mon, 6 Aug 2018 21:02:51 +0200 Subject: [PATCH 25/39] Dutch --- app/src/main/res/values-nl/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4bd3a318b..611b6042f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -204,9 +204,9 @@ Kan ik mijn afspraken synchroniseren met Google Calendar of een andere service die CalDAV ondersteunt? Schakel \"CalDAV-synchronisatie\" in bij Instellingen en selecteer vervolgens de agenda\'s die gesynchroniseerd moeten worden. Er is wel een app nodig die de synchronisatie tussen het apparaat en de service zelf afhandelt. Betreft het een agenda van Google Calendar, dan voldoet hun officiële app. Voor andere services zal een adapter zoals DAVdroid benodigd zijn. - I see the visual reminders, but hear no audio. What can I do? - Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, - pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. + Ik krijg wel herinneringen, maar ik hoor geen notificatiegeluid. Wat kan ik doen? + Geluiden afspelen bij een herinnering is sterk afhankelijk van het systeem. Als er geen geluid te horen is, ga dan naar instellingen en pas de optie + \"Type geluiden voor herinneringen gebruiken\" aan. Als dat niet werkt, controleer dan bij de geluidsinstellingen van Android of het volume van dit geluidstype niet te laag is ingesteld. From e5f0693432bb755a18249282c9e420a4f80a7e68 Mon Sep 17 00:00:00 2001 From: fricyo <30796677+fricyo@users.noreply.github.com> Date: Tue, 7 Aug 2018 22:34:22 +0800 Subject: [PATCH 26/39] Update Translation --- app/src/main/res/values-zh-rTW/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 64f5984d0..4b13b6550 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -204,9 +204,9 @@ 我可以透過Google日曆或其它支援CalDAV的服務來同步我的活動嗎? 行的，只要打開程式設定內的[CalDAV同步]，然後選擇你要同步的行事曆。然而你需要一些第三方應用程式來處理裝置和伺服器之間的同步。 如果你要同步Google日曆，他們官方的行事曆程式就能做到了。而其它行事曆，你需要有第三方同步工具才行，像是DAVdroid。 - I see the visual reminders, but hear no audio. What can I do? - Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, - pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. + 我看到了視覺的提醒，但沒聽到音效。我能怎麼辦? + 不只是顯示實際的提醒，播放音效也受到系統極大的影響。如果你聽不到任何聲音，試著到應用程式設定， + 按\"用於提醒的音源串流\"選項，然後更改成不同數值。如果還是沒有用，檢查你的音量設定，指定串流是不是靜音的。 From 34d05eb6f6faf11489414112916c6f8a6874cdd8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 9 Aug 2018 15:09:21 +0200 Subject: [PATCH 27/39] refresh caldav calendars even if the app is open via some intent --- .../calendar/activities/MainActivity.kt | 16 ++++++++-------- build.gradle | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index 56a6ff23d..9f27eff78 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -84,14 +84,6 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT } - if (!checkViewIntents()) { - return - } - - if (!checkOpenIntents()) { - updateViewPager() - } - if (!hasPermission(PERMISSION_WRITE_CALENDAR) || !hasPermission(PERMISSION_READ_CALENDAR)) { config.caldavSync = false } @@ -99,6 +91,14 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { if (config.caldavSync) { refreshCalDAVCalendars(false) } + + if (!checkViewIntents()) { + return + } + + if (!checkOpenIntents()) { + updateViewPager() + } } override fun onResume() { diff --git a/build.gradle b/build.gradle index 52140041e..b7a332342 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong From 81c9e82039d09e9a2d96c093e2d2e4f53d8d41c7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 9 Aug 2018 15:12:50 +0200 Subject: [PATCH 28/39] show a warning about missing widgets if the app is installed on an sd card --- .../com/simplemobiletools/calendar/activities/MainActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index 9f27eff78..3266f26d1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -99,6 +99,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { if (!checkOpenIntents()) { updateViewPager() } + + checkAppOnSDCard() } override fun onResume() { From 80c6a63331d905d2486db3d7845aa2f76bfad98b Mon Sep 17 00:00:00 2001 From: FTno <16176811+FTno@users.noreply.github.com> Date: Fri, 10 Aug 2018 14:23:40 +0200 Subject: [PATCH 29/39] Update strings.xml Norwegian (nb) translation update --- app/src/main/res/values-nb/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 17060f4ee..9044c0bcb 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -44,7 +44,7 @@ Hendelsen er repeterbar Markeringen inneholder gjentagende hendelser Slett bare den merkede forekomsten - Delete this and all future occurrences + Slett denne og alle framtidige forekomster Slett alle forekomster Oppdater bare den merkede forekomsten Oppdater alle forekomster @@ -159,11 +159,11 @@ Gjenta påminnelser inntil avvist Dim tidligere hendelser Hendelser - Audio stream used by reminders + Lydtype brukt for påminnelser System Alarm - Notification - Ring + Varsel + Ringetone CalDAV From 6108012750c769a213a9422271f690afbf85f5e1 Mon Sep 17 00:00:00 2001 From: 10cents Date: Sun, 12 Aug 2018 12:50:36 +0000 Subject: [PATCH 30/39] FAQ - New and corredted translations --- app/src/main/res/values-da/strings.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 31aa90210..7afdc5d08 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -200,12 +200,11 @@ Hvordan kan jeg fjerne helligdage der er importeret med funktionen \"Tilføj helligdage\"? Helligdage oprettet på den måde er indsat under begivenhedstypen \"Helligdage\". Gå til Indstillinger -> Håndter begivenhedstyper. Efter et par sekunders pres på en type kan du slette den ved at klikke på papirkurven. - Kan jeg synkronisere mine begivenheder med Googles kalender elleer en anden kalender der understøtter CalDAV? + Kan jeg synkronisere mine begivenheder med Googles kalender eller en anden kalender der understøtter CalDAV? Ja, klik på \"CalDAV sync\" i appens indstillinger og vælg de kalendere du vil synkronisere. Det kræver dog at du har en app til at synkronisere mellem din enhed og kalenderservere. Hvis du vil synkronisere en Googlekalender, kan deres officielle app klare det. For andre kalenderes vedkommende kan du bruge en 3. partsapp som for eksempel DAVdroid. - I see the visual reminders, but hear no audio. What can I do? - Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, - pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. + Jeg kan mine påmindelser, men der er ingen lyd på. Hvad kan jeg gøre ved det? + From 3d957fcf057a03ac31fc44672d23b97d2012a37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Sun, 12 Aug 2018 20:00:21 +0100 Subject: [PATCH 31/39] Update strings.xml --- app/src/main/res/values-pt/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a685ee20a..baf50baed 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -93,7 +93,7 @@ Lembrete - antes + Antes Adicionar outro lembrete Lembretes para eventos @@ -159,11 +159,11 @@ Mostrar lembretes até serem descartados Desvanecer eventos passados Eventos - Audio stream used by reminders - System - Alarm - Notification - Ring + Fluxo áudio a utilizar nos lembretes + Sistema + Alarmw + Notificação + Toque CalDAV From 9052b5e8611a3be084f5251cf302c62788b5735e Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 15 Aug 2018 09:00:41 +0200 Subject: [PATCH 32/39] adding greek translation --- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 232 +++++++++++++++++++++++++ 2 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/values-el/strings.xml diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7afdc5d08..339ffa3a3 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -204,7 +204,7 @@ Ja, klik på \"CalDAV sync\" i appens indstillinger og vælg de kalendere du vil synkronisere. Det kræver dog at du har en app til at synkronisere mellem din enhed og kalenderservere. Hvis du vil synkronisere en Googlekalender, kan deres officielle app klare det. For andre kalenderes vedkommende kan du bruge en 3. partsapp som for eksempel DAVdroid. Jeg kan mine påmindelser, men der er ingen lyd på. Hvad kan jeg gøre ved det? - + Såvel visning af påmindelser som afspilning af lyd til dem, er afhængig af systemet. Hvis ikke du kan høre nogen lyd, kan du prøve at gå ind i appens indstillinger. Her kan du trykke på \"Audio-stream anvendt af påmindelser\" og vælge en anden indstilling. Virker det stadig ikke skal du tjekke i dine lydindstillinger om lyden i det aktuelle valg er slået fra. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml new file mode 100644 index 000000000..15e47e82b --- /dev/null +++ b/app/src/main/res/values-el/strings.xml @@ -0,0 +1,232 @@ + + + Simple Calendar + Ημερολόγιο + Αλλαγή προβολής + Ημερήσια προβολή + Εβδομαδιαία προβολή + Μηνιαία προβολή + Ετήσια προβολή + Απλή λίστα εκδηλώσεων + Φαίνεται πως δεν έχετε επερχόμενες εκδηλώσεις. + Πηγαίνετε στο σήμερα + + + Μηνιαίο ημερολόγιο + Λίστα εκδηλώσεων ημερολογίου + + + Εκδηλώσεις + Επεξεργασία εκδηλώσεων + Νέα εκδήλωση + Δημιουργία νέας εκδήλωσης + Διπλότυπες εκδηλώσεις + Ο τίτλος δεν μπορεί να είναι κενός + Η εκδήλωση δεν μπορεί να τερματιστεί νωρίτερα από την έναρξή της + Η εκδήλωση προστέθηκε με επιτυχία + Η εκδήλωση ενημερώθηκε με επιτυχία + Φιλτράρισμα ανά τύπο + Συμπληρώστε μια τοποθεσία που θα εμφανίζεται στο χάρτη + Μια εκδήλωση είναι επερχόμενη + + + Επανάληψη + Χωρίς Επανάληψη + Καθημερινά + Εβδομαδιαία + Μηνιαία + Ετήσια + weeks + months + years + Επανάληψη μέχρι + Για πάντα + Η εκδήλωση είναι επαναλαμβανόμενη + Η επιλογή περιέχει επαναλαμβανόμενες εκδηλώσεις + Διαγράψτε μόνο το επιλεγμένο περιστατικό + Διαγράψτε αυτό και όλα τα μελλοντικά συμβάντα + Διαγράψτε όλα τα περιστατικά + Ενημέρωση μόνο του επιλεγμένου περιστατικού + Ενημέρωση όλων των περιστατικών + Επαναλάβετε μέχρι μια ημερομηνία + Επαναλάβετε x φορές + Επαναλάβετε για πάντα + times + Επανάληψη + Επανάληψη ενεργή + Κάθε μέρα + Σε επιλεγμένες μέρες + Την ίδια μέρα + Την τελευταία μέρα + Επαναλάβετε την ίδια ημέρα κάθε μήνα + Επαναλάβετε την τελευταία ημέρα του μήνα + Επαναλάβετε την τελευταία ημέρα του μήνα + Επανάληψη κάθε + Κάθε + πρώτη + δεύτερη + τρίτη + τέταρτη + τελευταία + + + + Επανάληψη κάθε + Κάθε + πρώτη + δεύτερη + τρίτη + τέταρτη + τελευταία + + + Γενέθλια + Προσθήκη γενεθλίων επαφής + Δεν βρέθηκαν γενέθλια + Τα γενέθλια προστέθηκαν με επιτυχία + + + Επέτειοι + Προσθέστε επετείους επαφής + Δεν έχουν βρεθεί επέτειοι + Οι επέτειοι προστέθηκαν με επιτυχία + + + Υπενθύμιση + πρίν + Προσθέστε μια άλλη υπενθύμιση + Υπενθυμίσεις εκδηλώσεων + + + Εισαγωγή εκδηλώσεων + Εξαγωγή εκδηλώσεων + Εισαγωγή εκδηλώσεων απο ένα .ics αρχείο + Εξαγωγή εκδηλώσεων σε ένα .ics αρχείο + Προεπιλεγμένος τύπος εκδήλωσης + Εξαγωγή προηγούμενων εκδηλώσεων επίσης + Συμπερίληψη τύπων εκδηλώσεων + Όνομα αρχείου (χωρίς .ics) + Καταργήστε τους τύπους εκδηλώσεων στο αρχείο + + + Τίτλος + Τοποθεσία + Περιγραφή + Ολοήμερα + + + Εβδομάδα + + + Τύποι εκδηλώσεων + Προσθέστε νέο τύπο + Επεξεργασία τύπου + Ο τύπος με αυτόν τον τίτλο υπάρχει ήδη + Χρώμα + Κνονική εκδήλωση + Ο προεπιλεγμένος τύπος εκδήλωσης δεν μπορεί να διαγραφεί + Επιλέξτε έναν τύπο εκδήλωσης + Μετακινήστε τις επηρεαζόμενες εκδηλώσεις στον προεπιλεγμένο τύπο + Αφαιρέστε μόνιμα τις επηρεαζόμενες εκδηλώσεις + Για να καταργήσετε ένα ημερολόγιο CalDAV, πρέπει να το αποσυγχρονίσετε + + + Αργίες + Προσθήκη αργιών + Εθνικές αργίες + Θρησκευτικές αργίες + Οι αργίες έχουν εισαχθεί επιτυχώς στον τύπο συμβάντος \"Αργίες\" + Η εισαγωγή κάποιων εκδηλώσεων απέτυχε + Η εισαγωγή αργιών απέτυχε + + + Διαχείριση τύπων εκδηλώσεων + Ημέρα έναρξης την + Ημέρα λήξης την + Εμφάνιση αριθμών εβδομάδων + Δόνηση στην ειδοποίηση υπενθύμισης + Ήχος υπενθύμισης + Δεν υπάρχει εφαρμογή που να μπορεί να βρει ήχους + Χωρίς + Η ημέρα δεν μπορεί να τελειώσει νωρίτερα από ότι ξεκινά + CalDAV sync + Λίστες εκδηλώσεων + Εμφάνιση συμβάντων από το παρελθόν + Αντικατάσταση περιγραφής εκδήλωσης με τοποθεσία + Διαγραφή όλων των εκδηλώσεων + Είστε βέβαιοι ότι θέλετε να διαγράψετε όλες τις εκδηλώσεις; Αυτό θα αφήσει τους τύπους και άλλες ρυθμίσεις ανέπαφες. + Εμφάνιση πλέγματος + Συνεχής επανάληψη μέχρι να απορριφθεί + Μείωση των περασμένων + Εκδηλώσεις + Ροή ήχου που χρησιμοποιείται από τις υπενθυμίσεις + Σύστημα + Αφύπνιση + Ειδοποίηση + Κουδούνισμα + + + CalDAV + Επιλέξτε ημερολόγια για συγχρονισμό + Διαχείριση συγχρονισμένων ημερολογίων + Αποθήκευση μόνο τοπικά + Ανανεώστε τα ημερολόγια CalDAV + Ανανεώνεται… + Ολοκλήρωση ανανέωσης + Η επεξεργασία του ημερολογίου απέτυχε + Συγχρονισμός… + Ο συγχρονισμός ολοκληρώθηκε + + + + Δευτέρα + Τρίτη + Τετάρτη + Πέμπτη + Παρασκευή + Σαββάτο + Κυριακή + + + Άσκηση + Ημέρα ποδιών + Συνάντηση με τον Γιάννη + Στον κήπο Rockstone + Βιβλιοθήκη + Μεσημεριανό με την Μαίρη + Στην πλατεία + Ωρα για καφέ + + + Πώς μπορώ να αφαιρέσω τις αργίες που εισήχθησαν μέσω του κουμπιού \"Προσθήκη αργιών\" ; + Οι αργίες που δημιουργήθηκαν με τον τρόπο αυτό εισάγονται σε ένα νέο τύπο εκδήλωσης που ονομάζεται \"Αργίες \". Μπορείτε να μεταβείτε στις Ρυθμίσεις -> Διαχείριση τύπων εκδηλώσεων, + πατώντας παρατεταμένα τον συγκεκριμένο τύπο εκδήλωσης και διαγράψτε το επιλέγοντας τον Κάδο. + Μπορώ να συγχρονίσω τα συμβάντα μου μέσω του Ημερολογίου Google ή άλλης υπηρεσίας που υποστηρίζει το CalDAV; + Ναι, απλά εναλλαγή \"CalDAV sync\" στις ρυθμίσεις της εφαρμογής και επιλέξτε τα ημερολόγια που θέλετε να συγχρονίσετε. Ωστόσο, θα χρειαστείτε κάποια εφαρμογή τρίτου μέρους που να χειρίζεται το συγχρονισμό μεταξύ της συσκευής και των διακομιστών. + Σε περίπτωση που θέλετε να συγχρονίσετε ένα ημερολόγιο Google, η επίσημη εφαρμογή Ημερολογίου θα κάνει την εργασία. Για άλλα ημερολόγια θα χρειαστείτε έναν προσαρμογέα συγχρονισμού τρίτου μέρους, για παράδειγμα DAVdroid. + Βλέπω τις οπτικές υπενθυμίσεις, αλλά δεν ακούω ήχο. Τι μπορώ να κάνω? + Όχι μόνο η εμφάνιση της πραγματικής υπενθύμισης, αλλά η αναπαραγωγή του ήχου επηρεάζεται έντονα και από το σύστημα. Εάν δεν μπορείτε να ακούσετε ήχο, δοκιμάστε να μεταβείτε στις ρυθμίσεις της εφαρμογής, + πατώντας την επιλογή "Ροή ήχου που χρησιμοποιείται από τις υπενθυμίσεις" και αλλάζοντας την σε διαφορετική τιμή. Εάν εξακολουθεί να μην λειτουργεί, ελέγξτε τις ρυθμίσεις ήχου σας, εάν η συγκεκριμένη ροή δεν είναι απενεργοποιημένη. + + + + Ένα απλό ημερολόγιο με εκδηλώσεις, προσαρμόσιμο widget και χωρίς διαφημίσεις. + + Ένα απλό ημερολόγιο με προαιρετικό συγχρονισμό CalDAV. Μπορείτε εύκολα να δημιουργήσετε επαναλαμβανόμενες εκδηλώσεις με ρυθμίσεις υπενθυμίσεων, μπορεί επίσης να εμφανίσει αριθμούς εβδομάδων. + + Περιέχει μια μηνιαία προβολή και ένα widget λίστας εκδηλώσεων, όπου μπορείτε να προσαρμόσετε το χρώμα του κειμένου, καθώς το alpha και το χρώμα του φόντου. + + Δεν περιέχει διαφημίσεις ή περιττά δικαιώματα. Έιναι όλη ανοιχτού κώδικα και παρέχει προσαρμόσιμα χρώματα για την εφαρμογή. + + Η άδεια αποθήκευσης απαιτείται μόνο για την εξαγωγή ή την εισαγωγή εκδηλώσεων από αρχεία .ics. + + Η άδεια Επαφών χρησιμοποιείται μόνο κατά την εισαγωγή γενεθλίων επαφών και επετείων. + + Αυτή η εφαρμογή είναι μέρος μιας σειράς εφαρμογών. Μπορείτε να βρείτε τις υπόλοιπες στο https://www.simplemobiletools.com + + + + From a96acd0c8bf76042763a4808961c0725b31e5381 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 15 Aug 2018 10:37:03 +0200 Subject: [PATCH 33/39] update commons to 4.6.10 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5bff7d30a..51b139cf7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:4.5.20' + implementation 'com.simplemobiletools:commons:4.6.10' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.3' From 09676cffeeb0e1231187715f66dd19aa7469f38f Mon Sep 17 00:00:00 2001 From: michaelof Date: Wed, 15 Aug 2018 18:11:45 +0200 Subject: [PATCH 34/39] Update strings.xml --- app/src/main/res/values-de/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8e1cd1507..6a42802b1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -44,7 +44,7 @@ Termin ist wiederholbar Die Auswahl enthält Ereignisse mit Wiederholungen Lösche nur die ausgewählte Wiederholung - Delete this and all future occurrences + Lösche diese und zukünftige Wiederholungen Lösche alle Wiederholungen Ändere nur die ausgewählte Wiederholung Ändere alle Wiederholungen @@ -159,10 +159,10 @@ Erinnerungen wiederholen bis sie verworfen werden Vergangene Termine ausgrauen Termine - Audio stream used by reminders + xAudiodatei für Erinnerung System Alarm - Notification + xAudiodatei für Benachrichtigung Ring From 32aed185eff2ffe99b733b3e611722d84bd8359a Mon Sep 17 00:00:00 2001 From: spkprs Date: Wed, 15 Aug 2018 19:19:20 +0300 Subject: [PATCH 35/39] Update strings.xml --- app/src/main/res/values-el/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 15e47e82b..b08de3aa2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -100,19 +100,19 @@ Εισαγωγή εκδηλώσεων Εξαγωγή εκδηλώσεων - Εισαγωγή εκδηλώσεων απο ένα .ics αρχείο - Εξαγωγή εκδηλώσεων σε ένα .ics αρχείο + Εισαγωγή απο ένα .ics αρχείο + Εξαγωγή σε ένα .ics αρχείο Προεπιλεγμένος τύπος εκδήλωσης Εξαγωγή προηγούμενων εκδηλώσεων επίσης Συμπερίληψη τύπων εκδηλώσεων Όνομα αρχείου (χωρίς .ics) - Καταργήστε τους τύπους εκδηλώσεων στο αρχείο + Κατάργηση τύπων εκδηλώσεων στο αρχείο Τίτλος Τοποθεσία Περιγραφή - Ολοήμερα + Ημερήσια Εβδομάδα @@ -123,7 +123,7 @@ Επεξεργασία τύπου Ο τύπος με αυτόν τον τίτλο υπάρχει ήδη Χρώμα - Κνονική εκδήλωση + Κανονική εκδήλωση Ο προεπιλεγμένος τύπος εκδήλωσης δεν μπορεί να διαγραφεί Επιλέξτε έναν τύπο εκδήλωσης Μετακινήστε τις επηρεαζόμενες εκδηλώσεις στον προεπιλεγμένο τύπο @@ -151,13 +151,13 @@ Η ημέρα δεν μπορεί να τελειώσει νωρίτερα από ότι ξεκινά CalDAV sync Λίστες εκδηλώσεων - Εμφάνιση συμβάντων από το παρελθόν + Εμφάνιση προηγούμενων συμβάντων Αντικατάσταση περιγραφής εκδήλωσης με τοποθεσία Διαγραφή όλων των εκδηλώσεων Είστε βέβαιοι ότι θέλετε να διαγράψετε όλες τις εκδηλώσεις; Αυτό θα αφήσει τους τύπους και άλλες ρυθμίσεις ανέπαφες. Εμφάνιση πλέγματος Συνεχής επανάληψη μέχρι να απορριφθεί - Μείωση των περασμένων + Μείωση των προηγούμενων Εκδηλώσεις Ροή ήχου που χρησιμοποιείται από τις υπενθυμίσεις Σύστημα From 320c5afca5b4cd402289fcacd0b60eec05406300 Mon Sep 17 00:00:00 2001 From: michaelof Date: Wed, 15 Aug 2018 18:55:18 +0200 Subject: [PATCH 36/39] Update strings.xml --- app/src/main/res/values-de/strings.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6a42802b1..42d5520ce 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -159,11 +159,11 @@ Erinnerungen wiederholen bis sie verworfen werden Vergangene Termine ausgrauen Termine - xAudiodatei für Erinnerung - System - Alarm - xAudiodatei für Benachrichtigung - Ring + Audio Ausgabekanal für Erinnerungen + Medien + Wecker + Benachrichtigung/string> + Klingelton CalDAV @@ -205,9 +205,9 @@ Ja, aktiviere \"CalDAV Synchronisierung\" in den Einstellungen und wähle die Kalender aus, die du synchronisieren willst. Jedoch benötigst du eine separate App, die Synchronisierung zwischen Gerät und Servern handhabt. Falls du einen Google Kalender synchronisieren willst, kann die offizielle Kalender-App dies übernehmen. Für andere Kalender benötigst du einen Synchronisierungsadapter, wie z. B. DAVdroid. - I see the visual reminders, but hear no audio. What can I do? - Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, - pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted. + Ich sehe die Erinenrungen, aber ich höre keinen Ton. Was kann ich tun? + Erinnerungen nicht nur anzeigen, sondern Töne dazu abspielen ist ebenfalls stark vom jeweiligen (Android) System abhängig. Wenn Du keine Töne hörst, versuche in den App Einstellungen, + die Option \"Audio Kanal für Erinnerungen\" anzuklicken und eine andere Option auszuwählen. Wenn das immer noch nichts ändert, prüfe Deine Lautstärkeeinstellungen. of der gewählte Kanal nicht auf lautlos steht. From 86c30d91ff53c7bc990ea93489b062ad6cf215c0 Mon Sep 17 00:00:00 2001 From: michaelof Date: Wed, 15 Aug 2018 18:58:46 +0200 Subject: [PATCH 37/39] Update strings.xml --- app/src/main/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 42d5520ce..409842a69 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -207,7 +207,7 @@ Für andere Kalender benötigst du einen Synchronisierungsadapter, wie z. B. DAVdroid. Ich sehe die Erinenrungen, aber ich höre keinen Ton. Was kann ich tun? Erinnerungen nicht nur anzeigen, sondern Töne dazu abspielen ist ebenfalls stark vom jeweiligen (Android) System abhängig. Wenn Du keine Töne hörst, versuche in den App Einstellungen, - die Option \"Audio Kanal für Erinnerungen\" anzuklicken und eine andere Option auszuwählen. Wenn das immer noch nichts ändert, prüfe Deine Lautstärkeeinstellungen. of der gewählte Kanal nicht auf lautlos steht. + die Option \"Audio Ausgabekanal für Erinnerungen\" anzuklicken und eine andere Option auszuwählen. Wenn das immer noch nichts ändert, prüfe Deine Lautstärkeeinstellungen. of der gewählte Kanal nicht auf lautlos steht. From a5d029dd24c5071a79061c292f39ed693ff7d70f Mon Sep 17 00:00:00 2001 From: Raven Date: Thu, 16 Aug 2018 12:34:38 +0200 Subject: [PATCH 38/39] =?UTF-8?q?Changed=20Mari=C3=A4=20to=20Maria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Afaik it is way more common to call it "Maria Himmelfahrt" instead of "Mariä Himmelfahrt" --- app/src/main/assets/germany.ics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/assets/germany.ics b/app/src/main/assets/germany.ics index 83ccec981..ebe687ee4 100755 --- a/app/src/main/assets/germany.ics +++ b/app/src/main/assets/germany.ics @@ -487,7 +487,7 @@ STATUS:CONFIRMED RRULE:FREQ=YEARLY;INTERVAL=1 END:VEVENT BEGIN:VEVENT -SUMMARY:Mariä Himmelfahrt +SUMMARY:Maria Himmelfahrt UID:948278340 DTSTART;VALUE=DATE:20060815 DTEND;VALUE=DATE:20060816 From 289eb9f800c4034b851dd1b367277b3eed30e78f Mon Sep 17 00:00:00 2001 From: Jesus Fuentes Date: Thu, 23 Aug 2018 08:25:54 -0500 Subject: [PATCH 39/39] Add closing string tag to app/src/main/res/values-de/strings.xml -Jesus --- app/src/main/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 409842a69..2b36a877b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -162,7 +162,7 @@ Audio Ausgabekanal für Erinnerungen Medien Wecker - Benachrichtigung/string> + Benachrichtigung Klingelton