From 3ff61c7206a45faf4716e0de7561c58e298754f4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 8 Aug 2020 18:07:45 +0200 Subject: [PATCH 1/9] updating commons, gradle and a missed changelog file --- app/build.gradle | 2 +- build.gradle | 2 +- fastlane/metadata/android/en-US/changelogs/180.txt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/180.txt diff --git a/app/build.gradle b/app/build.gradle index 8ca4cd209..592bea61a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,7 +64,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.29.7' + implementation 'com.simplemobiletools:commons:5.29.20' implementation 'joda-time:joda-time:2.10.1' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6' diff --git a/build.gradle b/build.gradle index f8d8b6768..f46f027b9 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "de.timfreiheit.resourceplaceholders:placeholders:0.3" diff --git a/fastlane/metadata/android/en-US/changelogs/180.txt b/fastlane/metadata/android/en-US/changelogs/180.txt new file mode 100644 index 000000000..8b561cae2 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/180.txt @@ -0,0 +1,2 @@ + * Fixed some weekly view related glitches + * Added some stability and translation improvements From 7ceb9dc46340f4d18cac85523d58b919ebd72640 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 8 Aug 2020 20:22:50 +0200 Subject: [PATCH 2/9] show the Save/Discard dialog properly at repeating events --- .../calendar/pro/activities/EventActivity.kt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt index 43ab9c5f4..050228825 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt @@ -88,6 +88,8 @@ class EventActivity : SimpleActivity() { private var mSelectedContacts = ArrayList() private var mStoredEventTypes = ArrayList() private var mOriginalTimeZone = DateTimeZone.getDefault().id + private var mOriginalStartTS = 0L + private var mOriginalEndTS = 0L private lateinit var mEventStartDateTime: DateTime private lateinit var mEventEndDateTime: DateTime @@ -278,17 +280,22 @@ class EventActivity : SimpleActivity() { newEndTS = second } + val hasTimeChanged = if (mOriginalStartTS == 0L) { + mEvent.startTS != newStartTS || mEvent.endTS != newEndTS + } else { + mOriginalStartTS != newStartTS || mOriginalEndTS != newEndTS + } + val reminders = getReminders() if (event_title.value != mEvent.title || event_location.value != mEvent.location || event_description.value != mEvent.description || - newStartTS != mEvent.startTS || - newEndTS != mEvent.endTS || event_time_zone.text != mEvent.getTimeZoneString() || reminders != mEvent.getReminders() || mRepeatInterval != mEvent.repeatInterval || mRepeatRule != mEvent.repeatRule || - mEventTypeId != mEvent.eventType) { + mEventTypeId != mEvent.eventType || + hasTimeChanged) { return true } @@ -401,6 +408,9 @@ class EventActivity : SimpleActivity() { private fun setupEditEvent() { val realStart = if (mEventOccurrenceTS == 0L) mEvent.startTS else mEventOccurrenceTS val duration = mEvent.endTS - mEvent.startTS + mOriginalStartTS = realStart + mOriginalEndTS = realStart + duration + window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN) updateActionBarTitle(getString(R.string.edit_event)) mOriginalTimeZone = mEvent.timeZone From 0544bc9227739e34ff0e7298d6ff5c1f6d0f95c7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 8 Aug 2020 20:35:28 +0200 Subject: [PATCH 3/9] fix #1182, open the daily view from the monthly widget, if clicked on day --- .../calendar/pro/helpers/MyWidgetMonthlyProvider.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt index d1a5138ba..ebda2b729 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt @@ -60,6 +60,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() { private fun setupDayOpenIntent(context: Context, views: RemoteViews, id: Int, dayCode: String) { (context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)).apply { putExtra(DAY_CODE, dayCode) + putExtra(VIEW_TO_OPEN, DAILY_VIEW) val pendingIntent = PendingIntent.getActivity(context, Integer.parseInt(dayCode), this, 0) views.setOnClickPendingIntent(id, pendingIntent) } From a12fd75a1eea673d88cf55790e42117a7d51694b Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 8 Aug 2020 21:16:44 +0200 Subject: [PATCH 4/9] fix #1176, always measure top height at the weekly view --- .../simplemobiletools/calendar/pro/fragments/WeekFragment.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt index 880bd8299..3443ec758 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt @@ -482,10 +482,7 @@ class WeekFragment : Fragment(), WeeklyCalendar { } } - if (!hadAllDayEvent) { - checkTopHolderHeight() - } - + checkTopHolderHeight() addCurrentTimeIndicator(minuteHeight) } From 67e8abb1f714b0d5185882dbb503cb7a136d2fd4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 8 Aug 2020 21:28:38 +0200 Subject: [PATCH 5/9] fix #1175, go back to search results at pressing Back --- .../calendar/pro/activities/MainActivity.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index a1e5d2c3f..991223ecf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -146,7 +146,10 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { search_holder.background = ColorDrawable(config.backgroundColor) checkSwipeRefreshAvailability() checkShortcuts() - invalidateOptionsMenu() + + if (!mIsSearchOpen) { + invalidateOptionsMenu() + } } override fun onPause() { @@ -154,11 +157,6 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { storeStateVariables() } - override fun onStop() { - super.onStop() - closeSearch() - } - override fun onDestroy() { super.onDestroy() if (!isChangingConfigurations) { From e5e83a5a4d011b8c60f8f7de75d4350d7c53275a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 8 Aug 2020 22:25:34 +0200 Subject: [PATCH 6/9] update version to 6.10.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 592bea61a..fc60d8548 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { applicationId "com.simplemobiletools.calendar.pro" minSdkVersion 21 targetSdkVersion 29 - versionCode 180 - versionName "6.9.7" + versionCode 181 + versionName "6.10.0" multiDexEnabled true setProperty("archivesBaseName", "calendar") vectorDrawables.useSupportLibrary = true From f61335439f633f541fb0e786e4faf609a8c01a94 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 8 Aug 2020 22:25:42 +0200 Subject: [PATCH 7/9] updating changelog --- CHANGELOG.md | 7 +++++++ fastlane/metadata/android/en-US/changelogs/181.txt | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/181.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a2af96f9..f67ee99c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========== +Version 6.10.0 *(2020-08-08)* +---------------------------- + + * Open the daily view at clicking on a day at the monthly widget + * Go back to the search results at opening an event and using Back + * Added some translation, stability and UX improvements + Version 6.9.7 *(2020-07-06)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/181.txt b/fastlane/metadata/android/en-US/changelogs/181.txt new file mode 100644 index 000000000..2f0d00c0d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/181.txt @@ -0,0 +1,3 @@ + * Open the daily view at clicking on a day at the monthly widget + * Go back to the search results at opening an event and using Back + * Added some translation, stability and UX improvements From c36cfeb8177906ea1e6bb8b94e1a3d529c4d4464 Mon Sep 17 00:00:00 2001 From: Enara Larraitz Date: Fri, 21 Aug 2020 20:20:05 +0200 Subject: [PATCH 8/9] Description translated --- app/src/main/res/values-eu/strings.xml | 54 +++++++++++++------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 3f23f59ab..5ade51616 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -246,45 +246,45 @@ - Simple Calendar Pro - Gertaerak & Abisuak + Simple Calendar Pro - Gertaerak eta abisuak - Simple mobile 2020 calendar. Schedule planner & appointment reminder for any day + Egutegi sinplea. Agenda antolatzailea eta hitzorduetarako abisuak edozein egunetarako - Simple Calendar Pro is a fully customizable, offline calendar designed to do exactly what a calendar should do. No complicated features, unnecessary permissions and no ads! + Simple Calendar Pro guztiz pertsonalizatu daitekeen lineaz kanpoko egutegia da, egutegi batek egin beharko lukeena egiteko diseinatua. Eginbide korapilatsurik, beharrezkoa ez den baimenik eta iragarkirik ez! - Whether you’re organizing single or recurring events, birthdays, anniversaries, business meetings, appointments or anything else, Simple Calendar Pro makes it easy to stay organized. With an incredible variety of customization options you can customize event reminders, notification sounds, calendar widgets and how the app looks. + Gertaerak, urtebetetzeak, urteurrenak, negozio-bilerak, hitzorduak edo dena delakoa antolatu behar baduzu ere, Simple Calendar Pro-rekin erraza da antolatzea. Eskaintzen dituen pertsonalizazio-aukera guztiekin gertaera-abisuak, jakinarazpen soinuak, egutegi-widgetak eta aplikazioaren estiloa pertsonalizatu dezakezu. - Daily, weekly and monthly views make checking your upcoming events & appointments a breeze. You can even view everything as a simple list of events rather than in calendar view, so you know exactly what’s coming up in your life and when. + Eguneko, asteko eta hilabeteko ikuspegiek erraz egiten dute hurrengo gertaerak eta hitzorduak begiratzea. Gertaeren zerrenda sinplean ere bistaratu dezakezu guztia, egutegi-ikuspegian bistaratu ordez, zure bizitzan zer eta noiz gertatuko den jakin dezazun. ---------------------------------------------------------- - Simple Calendar Pro – Features & Benefits + Simple Calendar Pro – Eginbideak eta abantailak ---------------------------------------------------------- - ✔️ No ads or annoying popups - ✔️ No internet access needed, giving you more privacy & security - ✔️ Only the bare minimum permissions required - ✔️ Emphasis on simplicity – does what a calendar needs to do! - ✔️ Open source - ✔️ Fully customizable themes & calendar / event widgets - ✔️ Translated into 29 languages - ✔️ Export settings to .txt files to import to another device - ✔️ CalDAV calendar sync supported to sync events across devices - ✔️ Daily, weekly, monthly, yearly & event views on the calendar - ✔️ Supports exporting & importing events via .ics files - ✔️ Set multiple event reminders, customize event reminder sound and vibration - ✔️ Snooze option for reminders - ✔️ Easily add holidays, birthdays, anniversaries & appointments - ✔️ Customize events – start time, duration, reminders etc - ✔️ Add event attendees to each event - ✔️ Use as a personal calendar or a business calendar - ✔️ Choose between reminders & email notifications to alert you about an event + ✔️ Iragarkirik edo laster-leiho nekagarririk ez + ✔️ Internet sarbiderik ez da behar, pribatutasun eta segurtasun handiagoa emanez + ✔️ Gutxieneko baimenak soilik eskatzen ditu + ✔️ Enfasia sinplizitatean: egutegi batek egin behar duena egiten du! + ✔️ Kode irekia + ✔️ Guztiz pertsonalizatu daitezkeen gaiak eta egutegi- edota gertaera-widgetak + ✔️ 29 hizkuntzatara itzulita + ✔️ Esportatu ezarpenak .txt fitxategietara beste gailu batean inportatzeko + ✔️ CalDAV egutegi-sinkronizazioa onartzen du, gertaerak gailu artean sinkronizatzeko + ✔️ Eguneko, asteko, hilabeteko, urteko eta gertaera-ikuspegiak egutegian + ✔️ Gertaerak .ics fitxategien bidez esportatzea eta inportatzea onartzen du + ✔️ Ezarri hainbat gertaera-abisu, pertsonalizatu gertaera-abisuaren soinua eta dardara + ✔️ Atzeratzeko aukera abisuetan + ✔️ Gehitu oporrak, urtebetetzeak, urteurrenak eta hitzortuak errazki + ✔️ Pertsonalizatu gertaerak: hasiera-ordua, iraupena, abisuak eta abar + ✔️ Gehitu parte-hartzaileak gertaera bakoitzean + ✔️ Egutegi pertsonala edo lanerako egutegi gisa erabili dezakezu + ✔️ Hautatu abisu eta eposta jakinarazpenen artean gertaera baten berri izateko - DOWNLOAD SIMPLE CALENDAR PRO – THE SIMPLE OFFLINE CALENDAR WITH NO ADS! + DESKARGATU SIMPLE CALENDAR PRO – LINEAZ KANPO ERABILI DAITEKEEN IRAGARKIRIK GABEKO EGUTEGI SINPLEA! - Check out the full suite of Simple Tools here: + Ikusi Simple Tools-en sorta osoa hemen: https://www.simplemobiletools.com - Standalone website of Simple Calendar Pro: + Simple Calendar Pro-ren webgune autonomoa: https://www.simplemobiletools.com/calendar Facebook: From 995128989b241fc52ba61100380c63120e0239cb Mon Sep 17 00:00:00 2001 From: Enara Larraitz Date: Fri, 21 Aug 2020 21:38:51 +0200 Subject: [PATCH 9/9] Short description updated --- app/src/main/res/values-eu/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 5ade51616..bc8c9933f 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -248,7 +248,7 @@ Simple Calendar Pro - Gertaerak eta abisuak - Egutegi sinplea. Agenda antolatzailea eta hitzorduetarako abisuak edozein egunetarako + Egutegi sinplea. Edozein egunetarako agenda antolatzailea eta hitzordu-abisuak Simple Calendar Pro guztiz pertsonalizatu daitekeen lineaz kanpoko egutegia da, egutegi batek egin beharko lukeena egiteko diseinatua. Eginbide korapilatsurik, beharrezkoa ez den baimenik eta iragarkirik ez!