Merge pull request #2 from SimpleMobileTools/master

fetch latets version

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)*
 ----------------------------
 

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
@@ -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'

app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt

@@ -88,6 +88,8 @@ class EventActivity : SimpleActivity() {
     private var mSelectedContacts = ArrayList<Attendee>()
     private var mStoredEventTypes = ArrayList<EventType>()
     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

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) {

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)
     }
 

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)
         }

app/src/main/res/values-eu/strings.xml

@@ -246,45 +246,45 @@
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
-    <string name="app_title">Simple Calendar Pro - Gertaerak &amp; Abisuak</string>
+    <string name="app_title">Simple Calendar Pro - Gertaerak eta abisuak</string>
     <!-- Short description has to have less than 80 chars -->
-    <string name="app_short_description">Simple mobile 2020 calendar. Schedule planner &amp; appointment reminder for any day</string>
+    <string name="app_short_description">Egutegi sinplea. Edozein egunetarako agenda antolatzailea eta hitzordu-abisuak</string>
     <string name="app_long_description">
-        Simple Calendar Pro is a fully customizable, offline calendar designed to do exactly what a calendar should do. <b>No complicated features, unnecessary permissions and no ads!</b>
+        Simple Calendar Pro guztiz pertsonalizatu daitekeen lineaz kanpoko egutegia da, egutegi batek egin beharko lukeena egiteko diseinatua. <b>Eginbide korapilatsurik, beharrezkoa ez den baimenik eta iragarkirik ez!</b>
 
-        Whether you’re organizing single or recurring events, birthdays, anniversaries, business meetings, appointments or anything else, Simple Calendar Pro makes it <b>easy to stay organized</b>. With an incredible variety of <b>customization options</b> 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 <b>erraza da antolatzea</b>. Eskaintzen dituen <b>pertsonalizazio-aukera</b> guztiekin gertaera-abisuak, jakinarazpen soinuak, egutegi-widgetak eta aplikazioaren estiloa pertsonalizatu dezakezu.
 
-        Daily, weekly and monthly views make checking your upcoming events &amp; appointments a breeze. You can even view everything as a simple list of events rather than in calendar view, so you <b>know exactly what’s coming up in your life and when. </b>
+        Eguneko, asteko eta hilabeteko ikuspegiek erraz egiten dute hurrengo gertaerak eta hitzorduak begiratzea. Gertaeren zerrenda sinplean ere bistaratu dezakezu guztia, egutegi-ikuspegian bistaratu ordez, <b>zure bizitzan zer eta noiz gertatuko den</b> jakin dezazun.
 
         ----------------------------------------------------------
-        <b>Simple Calendar Pro – Features &amp; Benefits</b>
+        <b>Simple Calendar Pro – Eginbideak eta abantailak</b>
         ----------------------------------------------------------
 
-        ✔️ No ads or annoying popups
-        ✔️ No internet access needed, giving you more privacy &amp; security
-        ✔️ Only the bare minimum permissions required
-        ✔️ Emphasis on simplicity – does what a calendar needs to do!
-        ✔️ Open source
-        ✔️ Fully customizable themes &amp; 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 &amp; event views on the calendar
-        ✔️ Supports exporting &amp; importing events via .ics files
-        ✔️ Set multiple event reminders, customize event reminder sound and vibration
-        ✔️ Snooze option for reminders
-        ✔️ Easily add holidays, birthdays, anniversaries &amp; 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 &amp; 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!
 
-        <b>Check out the full suite of Simple Tools here:</b>
+        <b>Ikusi Simple Tools-en sorta osoa hemen:</b>
         https://www.simplemobiletools.com
 
-        <b>Standalone website of Simple Calendar Pro:</b>
+        <b>Simple Calendar Pro-ren webgune autonomoa:</b>
         https://www.simplemobiletools.com/calendar
 
         <b>Facebook:</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"
 

fastlane/metadata/android/en-US/changelogs/180.txt

@@ -0,0 +1,2 @@
+ * Fixed some weekly view related glitches
+ * Added some stability and translation improvements

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