Merge pull request #1 from SimpleMobileTools/master

Bertsio berria

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

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