Merge branch 'master' into master

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 ==========
 
+Version 6.2.2 *(2019-01-25)*
+----------------------------
+
+ * Fixed some CalDAV sync glitches
+ * Increase the visibility of dimmed events on the monthly view
+
 Version 6.2.1 *(2019-01-08)*
 ----------------------------
 

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.simplemobiletools.calendar.pro"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 141
+        versionCode 142
-        versionName "6.2.1"
+        versionName "6.2.2"
         multiDexEnabled true
         setProperty("archivesBaseName", "calendar")
     }
@@ -52,7 +52,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.6.6'
+    implementation 'com.simplemobiletools:commons:5.6.17'
     implementation 'joda-time:joda-time:2.10.1'
     implementation 'androidx.multidex:multidex:2.0.1'
 

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

@@ -5,6 +5,8 @@ import com.simplemobiletools.calendar.pro.helpers.*
 import com.simplemobiletools.commons.activities.BaseSplashActivity
 
 class SplashActivity : BaseSplashActivity() {
+    override fun getAppPackageName() = packageName
+
     override fun initActivity() {
         when {
             intent.extras?.containsKey(DAY_CODE) == true -> Intent(this, MainActivity::class.java).apply {

app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/EventListFragment.kt

@@ -102,6 +102,10 @@ class EventListFragment : MyFragmentHolder(), RefreshRecyclerViewListener {
         val listItems = context!!.getEventListItems(mEvents)
 
         activity?.runOnUiThread {
+            if (activity == null) {
+                return@runOnUiThread
+            }
+
             val currAdapter = mView.calendar_events_list.adapter
             if (currAdapter == null || forceRecreation) {
                 EventListAdapter(activity as SimpleActivity, listItems, true, this, mView.calendar_events_list) {

app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHelper.kt

@@ -17,6 +17,8 @@ import com.simplemobiletools.calendar.pro.objects.States.isUpdatingCalDAV
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.PERMISSION_READ_CALENDAR
 import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CALENDAR
+import org.joda.time.DateTimeZone
+import org.joda.time.format.DateTimeFormat
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -195,8 +197,8 @@ class CalDAVHelper(val context: Context) {
                     val id = cursor.getLongValue(CalendarContract.Events._ID)
                     val title = cursor.getStringValue(CalendarContract.Events.TITLE) ?: ""
                     val description = cursor.getStringValue(CalendarContract.Events.DESCRIPTION) ?: ""
-                    val startTS = cursor.getLongValue(CalendarContract.Events.DTSTART) / 1000L
+                    var startTS = cursor.getLongValue(CalendarContract.Events.DTSTART)
-                    var endTS = cursor.getLongValue(CalendarContract.Events.DTEND) / 1000L
+                    var endTS = cursor.getLongValue(CalendarContract.Events.DTEND)
                     val allDay = cursor.getIntValue(CalendarContract.Events.ALL_DAY)
                     val rrule = cursor.getStringValue(CalendarContract.Events.RRULE) ?: ""
                     val location = cursor.getStringValue(CalendarContract.Events.EVENT_LOCATION) ?: ""
@@ -204,6 +206,14 @@ class CalDAVHelper(val context: Context) {
                     val originalInstanceTime = cursor.getLongValue(CalendarContract.Events.ORIGINAL_INSTANCE_TIME)
                     val reminders = getCalDAVEventReminders(id)
 
+                    if (startTS.toString().length == 13) {
+                        startTS /= 1000L
+                    }
+
+                    if (endTS.toString().length == 13) {
+                        endTS /= 1000L
+                    }
+
                     if (endTS == 0L) {
                         val duration = cursor.getStringValue(CalendarContract.Events.DURATION) ?: ""
                         endTS = startTS + Parser().parseDurationSeconds(duration)
@@ -237,6 +247,7 @@ class CalDAVHelper(val context: Context) {
                             eventsHelper.insertEvent(parentEvent, false, false)
 
                             event.parentId = parentEvent.id!!
+                            event.addRepetitionException(originalDayCode)
                             eventsHelper.insertEvent(event, false, false)
                             continue
                         }
@@ -244,12 +255,21 @@ class CalDAVHelper(val context: Context) {
 
                     // some calendars add repeatable event exceptions with using the "exdate" field, not by creating a child event that is an exception
                     val exdate = cursor.getStringValue(CalendarContract.Events.EXDATE) ?: ""
-                    if (exdate.isNotEmpty() && exdate.length > 8) {
+                    if (exdate.length > 8) {
                         val dates = exdate.split(",")
                         dates.forEach {
+                            if (it.endsWith("Z")) {
+                                // convert for example "20190216T230000Z" to "20190217000000" in Slovakia in a weird way
+                                val formatter = DateTimeFormat.forPattern("yyyyMMdd'T'HHmmss'Z'")
+                                val offset = DateTimeZone.getDefault().getOffset(System.currentTimeMillis())
+                                val dt = formatter.parseDateTime(it).plusMillis(offset)
+                                val daycode = Formatter.getDayCodeFromDateTime(dt)
+                                event.repetitionExceptions.add(daycode)
+                            } else {
                                 event.repetitionExceptions.add(it.substring(0, 8))
                             }
                         }
+                    }
 
                     if (importIdsMap.containsKey(event.importId)) {
                         val existingEvent = importIdsMap[importId]

app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt

@@ -14,6 +14,7 @@ import com.simplemobiletools.calendar.pro.extensions.config
 import com.simplemobiletools.calendar.pro.extensions.seconds
 import com.simplemobiletools.calendar.pro.helpers.Formatter
 import com.simplemobiletools.calendar.pro.helpers.LOW_ALPHA
+import com.simplemobiletools.calendar.pro.helpers.MEDIUM_ALPHA
 import com.simplemobiletools.calendar.pro.models.DayMonthly
 import com.simplemobiletools.calendar.pro.models.Event
 import com.simplemobiletools.calendar.pro.models.MonthViewEvent
@@ -257,7 +258,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
         }
 
         if (!startDay.isThisMonth) {
-            paintColor = paintColor.adjustAlpha(LOW_ALPHA)
+            paintColor = paintColor.adjustAlpha(MEDIUM_ALPHA)
         }
 
         return getColoredPaint(paintColor)
@@ -272,7 +273,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
     private fun getEventBackgroundColor(event: MonthViewEvent, startDay: DayMonthly, endDay: DayMonthly): Paint {
         var paintColor = event.color
         if ((!startDay.isThisMonth && !endDay.isThisMonth) || (dimPastEvents && event.isPastEvent)) {
-            paintColor = paintColor.adjustAlpha(LOW_ALPHA)
+            paintColor = paintColor.adjustAlpha(MEDIUM_ALPHA)
         }
 
         return getColoredPaint(paintColor)
@@ -281,7 +282,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
     private fun getEventTitlePaint(event: MonthViewEvent, startDay: DayMonthly, endDay: DayMonthly): Paint {
         var paintColor = event.color.getContrastColor()
         if ((!startDay.isThisMonth && !endDay.isThisMonth) || (dimPastEvents && event.isPastEvent)) {
-            paintColor = paintColor.adjustAlpha(LOW_ALPHA)
+            paintColor = paintColor.adjustAlpha(MEDIUM_ALPHA)
         }
 
         val curPaint = Paint(eventTitlePaint)
@@ -293,7 +294,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
         val curPaint = Paint(paint)
         var paintColor = primaryColor
         if (!day.isThisMonth) {
-            paintColor = paintColor.adjustAlpha(LOW_ALPHA)
+            paintColor = paintColor.adjustAlpha(MEDIUM_ALPHA)
         }
         curPaint.color = paintColor
         return curPaint

app/src/main/res/layout-land/fragment_year.xml

@@ -40,8 +40,8 @@
             android:id="@+id/month_2_holder"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/yearly_padding_half"
+            android:layout_marginStart="@dimen/yearly_padding_half"
-            android:layout_marginRight="@dimen/yearly_padding_half"
+            android:layout_marginEnd="@dimen/yearly_padding_half"
             android:layout_weight="1">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -123,8 +123,8 @@
             android:id="@+id/month_5_holder"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/yearly_padding_half"
+            android:layout_marginStart="@dimen/yearly_padding_half"
-            android:layout_marginRight="@dimen/yearly_padding_half"
+            android:layout_marginEnd="@dimen/yearly_padding_half"
             android:layout_weight="1">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -203,8 +203,8 @@
             android:id="@+id/month_8_holder"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/yearly_padding_half"
+            android:layout_marginStart="@dimen/yearly_padding_half"
-            android:layout_marginRight="@dimen/yearly_padding_half"
+            android:layout_marginEnd="@dimen/yearly_padding_half"
             android:layout_weight="1">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -286,8 +286,8 @@
             android:id="@+id/month_11_holder"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/yearly_padding_half"
+            android:layout_marginStart="@dimen/yearly_padding_half"
-            android:layout_marginRight="@dimen/yearly_padding_half"
+            android:layout_marginEnd="@dimen/yearly_padding_half"
             android:layout_weight="1">
 
             <com.simplemobiletools.commons.views.MyTextView

app/src/main/res/layout/activity_event.xml

@@ -16,9 +16,9 @@
             android:id="@+id/event_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/activity_margin"
+            android:layout_marginStart="@dimen/activity_margin"
             android:layout_marginTop="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
+            android:layout_marginEnd="@dimen/activity_margin"
             android:hint="@string/title"
             android:inputType="textCapSentences"
             android:maxLength="180"
@@ -54,8 +54,8 @@
             android:layout_marginEnd="@dimen/activity_margin"
             android:layout_marginRight="@dimen/activity_margin"
             android:background="?attr/selectableItemBackgroundBorderless"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
-            android:paddingRight="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
             android:src="@drawable/ic_place"/>
 
         <com.simplemobiletools.commons.views.MyEditText
@@ -63,9 +63,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_location"
-            android:layout_marginLeft="@dimen/activity_margin"
+            android:layout_marginStart="@dimen/activity_margin"
             android:layout_marginTop="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
+            android:layout_marginEnd="@dimen/activity_margin"
             android:autoLink="all"
             android:gravity="top"
             android:hint="@string/description"
@@ -402,7 +402,7 @@
                 android:layout_toStartOf="@+id/event_caldav_calendar_color"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:paddingBottom="@dimen/medium_margin"
                 android:textSize="@dimen/meta_text_size"
                 tools:text="hello@simplemobiletools.com"/>
@@ -458,8 +458,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/small_margin"
-                android:layout_marginLeft="@dimen/small_margin"
+                android:layout_marginEnd="@dimen/medium_margin"
-                android:layout_marginRight="@dimen/medium_margin"
                 android:layout_toStartOf="@+id/event_type_color"
                 android:paddingTop="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"

app/src/main/res/layout/activity_main.xml

@@ -44,8 +44,8 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/activity_margin"
             android:gravity="center"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:text="@string/no_items_found"
             android:textSize="@dimen/bigger_text_size"/>
 
@@ -57,8 +57,8 @@
             android:layout_centerHorizontal="true"
             android:gravity="center"
             android:paddingBottom="@dimen/medium_margin"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingTop="@dimen/medium_margin"
             android:text="@string/type_2_characters"
             android:textSize="@dimen/bigger_text_size"/>

app/src/main/res/layout/activity_settings.xml

@@ -17,9 +17,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -39,9 +39,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -61,9 +61,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -84,9 +84,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -107,9 +107,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -148,9 +148,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -171,9 +171,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -194,9 +194,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -206,8 +206,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_reminder_sound"
                 android:layout_toLeftOf="@+id/settings_reminder_sound"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/reminder_sound"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -228,9 +228,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -240,8 +240,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_reminder_audio_stream"
                 android:layout_toLeftOf="@+id/settings_reminder_audio_stream"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/reminder_stream"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -263,9 +263,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -286,9 +286,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -298,8 +298,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_snooze_time"
                 android:layout_toLeftOf="@+id/settings_snooze_time"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/snooze_time"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -321,9 +321,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -344,9 +344,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -356,8 +356,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_default_reminder_1"
                 android:layout_toLeftOf="@+id/settings_default_reminder_1"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/default_reminder_1"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -379,9 +379,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -391,8 +391,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_default_reminder_2"
                 android:layout_toLeftOf="@+id/settings_default_reminder_2"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/default_reminder_2"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -414,9 +414,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -426,8 +426,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_default_reminder_3"
                 android:layout_toLeftOf="@+id/settings_default_reminder_3"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/default_reminder_3"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -467,9 +467,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -490,9 +490,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -512,9 +512,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin"
             android:visibility="gone">
 
@@ -523,8 +523,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/manage_synced_calendars"/>
 
         </RelativeLayout>
@@ -553,9 +553,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -565,8 +565,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_start_weekly_at"
                 android:layout_toLeftOf="@+id/settings_start_weekly_at"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/start_day_at"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -587,9 +587,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -599,8 +599,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_end_weekly_at"
                 android:layout_toLeftOf="@+id/settings_end_weekly_at"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/end_day_at"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -640,9 +640,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -662,9 +662,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -703,9 +703,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -725,9 +725,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -737,8 +737,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_display_past_events"
                 android:layout_toLeftOf="@+id/settings_display_past_events"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/display_past_events"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -777,9 +777,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -789,8 +789,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_font_size"
                 android:layout_toLeftOf="@+id/settings_font_size"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/font_size"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -811,9 +811,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -823,8 +823,8 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/settings_list_widget_view_to_open"
                 android:layout_toLeftOf="@+id/settings_list_widget_view_to_open"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/view_to_open_from_widget"/>
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -845,9 +845,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -885,9 +885,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
@@ -907,9 +907,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin"
             android:paddingTop="@dimen/bigger_margin"
-            android:paddingRight="@dimen/normal_margin"
+            android:paddingEnd="@dimen/normal_margin"
             android:paddingBottom="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -917,8 +917,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
                 android:text="@string/delete_all_events"/>
 
         </RelativeLayout>

app/src/main/res/layout/day_monthly_event_view.xml

@@ -10,8 +10,8 @@
     android:gravity="start"
     android:hyphenationFrequency="none"
     android:maxLines="1"
-    android:paddingLeft="@dimen/tiny_margin"
+    android:paddingStart="@dimen/tiny_margin"
-    android:paddingRight="@dimen/tiny_margin"
+    android:paddingEnd="@dimen/tiny_margin"
     android:textSize="@dimen/day_monthly_text_size"
     tools:targetApi="m"
     tools:text="1"/>

app/src/main/res/layout/day_monthly_number_view.xml

@@ -5,12 +5,12 @@
     android:id="@+id/day_monthly_number_id"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/tiny_margin"
+    android:layout_marginStart="@dimen/tiny_margin"
-    android:layout_marginRight="@dimen/tiny_margin"
+    android:layout_marginEnd="@dimen/tiny_margin"
     android:ellipsize="none"
     android:gravity="center_horizontal"
     android:maxLines="1"
-    android:paddingLeft="@dimen/tiny_margin"
+    android:paddingStart="@dimen/tiny_margin"
-    android:paddingRight="@dimen/tiny_margin"
+    android:paddingEnd="@dimen/tiny_margin"
     android:textSize="@dimen/normal_text_size"
     tools:text="1"/>

app/src/main/res/layout/dialog_custom_event_repeat_interval.xml

@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin">
 
         <com.simplemobiletools.commons.views.MyEditText

app/src/main/res/layout/dialog_delete_event.xml

@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/big_margin"
+    android:paddingStart="@dimen/big_margin"
-    android:paddingRight="@dimen/big_margin"
+    android:paddingEnd="@dimen/big_margin"
     android:paddingTop="@dimen/big_margin">
 
     <com.simplemobiletools.commons.views.MyTextView

app/src/main/res/layout/dialog_edit_repeating_event.xml

@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/big_margin"
+    android:paddingStart="@dimen/big_margin"
-    android:paddingRight="@dimen/big_margin"
+    android:paddingEnd="@dimen/big_margin"
     android:paddingTop="@dimen/big_margin">
 
     <com.simplemobiletools.commons.views.MyTextView

app/src/main/res/layout/dialog_event_type.xml

@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_margin"
+    android:paddingStart="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin"
+    android:paddingEnd="@dimen/activity_margin"
     android:paddingTop="@dimen/activity_margin">
 
     <com.simplemobiletools.commons.views.MyTextView

app/src/main/res/layout/dialog_export_events.xml

@@ -11,9 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
         android:paddingTop="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin">
+        android:paddingEnd="@dimen/activity_margin">
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/export_events_folder_label"
@@ -26,10 +26,10 @@
             android:id="@+id/export_events_folder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/activity_margin"
+            android:layout_marginStart="@dimen/activity_margin"
             android:layout_marginBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/small_margin"
-            android:paddingRight="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"/>
 
         <com.simplemobiletools.commons.views.MyTextView
@@ -43,10 +43,10 @@
             android:id="@+id/export_events_filename"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/activity_margin"
+            android:layout_marginStart="@dimen/activity_margin"
             android:layout_marginBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/normal_margin"
-            android:paddingRight="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
             android:textSize="@dimen/normal_text_size"/>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox

app/src/main/res/layout/dialog_import_events.xml

@@ -7,13 +7,13 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingTop="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin">
+    android:paddingEnd="@dimen/activity_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/import_events_event_type_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:text="@string/default_event_type"
         android:textSize="@dimen/smaller_text_size"/>
 
@@ -21,7 +21,7 @@
         android:id="@+id/import_event_type_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:background="?attr/selectableItemBackground"
         android:padding="@dimen/small_margin">
 
@@ -30,9 +30,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/import_event_type_color"
+            android:layout_toStartOf="@+id/import_event_type_color"
-            android:paddingLeft="@dimen/medium_margin"
+            android:paddingStart="@dimen/medium_margin"
-            android:paddingRight="@dimen/medium_margin"
+            android:paddingEnd="@dimen/medium_margin"
             tools:text="@string/regular_event"/>
 
         <ImageView
@@ -51,7 +51,7 @@
         android:id="@+id/import_events_checkbox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/normal_margin"
+        android:layout_marginStart="@dimen/normal_margin"
         android:paddingTop="@dimen/activity_margin"
         android:paddingBottom="@dimen/activity_margin"
         android:text="@string/override_event_types"/>

app/src/main/res/layout/dialog_select_event_type_color.xml

@@ -15,9 +15,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/big_margin"
+            android:paddingStart="@dimen/big_margin"
             android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/activity_margin"
             android:text="@string/select_a_different_caldav_color"
             android:textSize="@dimen/normal_text_size"/>
@@ -35,9 +35,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/dialog_select_event_type_other_divider"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
             android:paddingTop="@dimen/normal_margin"
-            android:paddingRight="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/normal_margin"/>
     </RelativeLayout>
 </ScrollView>

app/src/main/res/layout/dialog_select_radio_group.xml

@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="@dimen/normal_margin"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:paddingTop="@dimen/normal_margin"/>
 
 </ScrollView>

app/src/main/res/layout/dialog_vertical_linear_layout.xml

@@ -5,6 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_margin"
+    android:paddingStart="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin"
+    android:paddingEnd="@dimen/activity_margin"
     android:paddingTop="@dimen/activity_margin"/>

app/src/main/res/layout/event_list_item_widget.xml

@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/event_item_end"
         android:layout_alignTop="@+id/event_item_start"
-        android:layout_marginRight="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
         android:background="@drawable/event_list_color_bar"
         android:paddingBottom="@dimen/tiny_margin"
         android:paddingTop="@dimen/tiny_margin"/>
@@ -22,7 +22,7 @@
         android:id="@+id/event_item_start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/event_item_color_bar"
+        android:layout_toEndOf="@+id/event_item_color_bar"
         android:text="13:00"
         android:textSize="@dimen/day_text_size"/>
 
@@ -31,7 +31,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/event_item_start"
-        android:layout_toRightOf="@+id/event_item_color_bar"
+        android:layout_toEndOf="@+id/event_item_color_bar"
         android:includeFontPadding="false"
         android:text="15:00"
         android:textSize="@dimen/day_text_size"/>
@@ -40,11 +40,11 @@
         android:id="@+id/event_item_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/normal_margin"
+        android:layout_marginStart="@dimen/normal_margin"
-        android:layout_toRightOf="@+id/event_item_start"
+        android:layout_toEndOf="@+id/event_item_start"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingRight="@dimen/small_margin"
+        android:paddingEnd="@dimen/small_margin"
         android:textSize="@dimen/day_text_size"
         tools:text="Event title"/>
 
@@ -53,12 +53,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/event_item_title"
-        android:layout_marginLeft="@dimen/normal_margin"
+        android:layout_marginStart="@dimen/normal_margin"
-        android:layout_toRightOf="@+id/event_item_end"
+        android:layout_toEndOf="@+id/event_item_end"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:paddingRight="@dimen/small_margin"
+        android:paddingEnd="@dimen/small_margin"
         android:textSize="@dimen/day_text_size"
         tools:text="Event description"/>
 

app/src/main/res/layout/event_list_item_widget_simple.xml

@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/event_item_start"
         android:layout_alignTop="@+id/event_item_start"
-        android:layout_marginRight="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
         android:background="@drawable/event_list_color_bar"
         android:paddingBottom="@dimen/tiny_margin"
         android:paddingTop="@dimen/tiny_margin"/>
@@ -22,7 +22,7 @@
         android:id="@+id/event_item_start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/event_item_color_bar"
+        android:layout_toEndOf="@+id/event_item_color_bar"
         android:textSize="@dimen/day_text_size"
         tools:text="13:00"/>
 
@@ -30,11 +30,11 @@
         android:id="@+id/event_item_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/normal_margin"
+        android:layout_marginStart="@dimen/normal_margin"
-        android:layout_toRightOf="@+id/event_item_start"
+        android:layout_toEndOf="@+id/event_item_start"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingRight="@dimen/small_margin"
+        android:paddingEnd="@dimen/small_margin"
         android:textSize="@dimen/day_text_size"
         tools:text="Event title"/>
 

app/src/main/res/layout/event_list_widget.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipToPadding="false"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
         android:paddingTop="@dimen/medium_margin"/>
 
 </RelativeLayout>

app/src/main/res/layout/filter_event_type_view.xml

@@ -11,10 +11,10 @@
         android:id="@+id/filter_event_type_checkbox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/medium_margin"
+        android:layout_marginEnd="@dimen/medium_margin"
-        android:layout_toLeftOf="@+id/filter_event_type_color"
+        android:layout_toStartOf="@+id/filter_event_type_color"
         android:clickable="false"
-        android:paddingLeft="@dimen/small_margin"/>
+        android:paddingStart="@dimen/small_margin"/>
 
     <ImageView
         android:id="@+id/filter_event_type_color"

app/src/main/res/layout/fragment_event_list.xml

@@ -24,8 +24,8 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/activity_margin"
         android:gravity="center"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:text="@string/no_upcoming_events"
         android:textSize="@dimen/bigger_text_size"
         android:visibility="gone"/>

app/src/main/res/layout/fragment_month_widget.xml

@@ -14,8 +14,8 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/top_value"
         android:layout_alignBottom="@+id/top_value"
-        android:paddingLeft="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:src="@drawable/ic_pointer_left"/>
 
     <TextView
@@ -23,8 +23,8 @@
         style="@style/MonthStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/top_go_to_today"
+        android:layout_toStartOf="@+id/top_go_to_today"
-        android:layout_toRightOf="@+id/top_left_arrow"
+        android:layout_toEndOf="@+id/top_left_arrow"
         android:gravity="center"
         android:lines="1"
         android:paddingTop="@dimen/medium_margin"
@@ -39,9 +39,9 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/top_value"
         android:layout_alignBottom="@+id/top_value"
-        android:layout_toLeftOf="@+id/top_right_arrow"
+        android:layout_toStartOf="@+id/top_right_arrow"
-        android:paddingLeft="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:src="@drawable/ic_today"/>
 
     <ImageView
@@ -51,9 +51,9 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/top_value"
         android:layout_alignBottom="@+id/top_value"
-        android:layout_toLeftOf="@+id/top_new_event"
+        android:layout_toStartOf="@+id/top_new_event"
-        android:paddingLeft="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:src="@drawable/ic_pointer_right"/>
 
     <ImageView
@@ -63,9 +63,9 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/top_value"
         android:layout_alignBottom="@+id/top_value"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
-        android:paddingLeft="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:src="@drawable/ic_plus"/>
 
     <include

app/src/main/res/layout/fragment_year.xml

@@ -39,8 +39,8 @@
             android:id="@+id/month_2_holder"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/yearly_padding_half"
+            android:layout_marginStart="@dimen/yearly_padding_half"
-            android:layout_marginRight="@dimen/yearly_padding_half"
+            android:layout_marginEnd="@dimen/yearly_padding_half"
             android:layout_weight="1">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -118,8 +118,8 @@
             android:id="@+id/month_5_holder"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/yearly_padding_half"
+            android:layout_marginStart="@dimen/yearly_padding_half"
-            android:layout_marginRight="@dimen/yearly_padding_half"
+            android:layout_marginEnd="@dimen/yearly_padding_half"
             android:layout_weight="1">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -195,8 +195,8 @@
             android:id="@+id/month_8_holder"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/yearly_padding_half"
+            android:layout_marginStart="@dimen/yearly_padding_half"
-            android:layout_marginRight="@dimen/yearly_padding_half"
+            android:layout_marginEnd="@dimen/yearly_padding_half"
             android:layout_weight="1">
 
             <com.simplemobiletools.commons.views.MyTextView
@@ -274,8 +274,8 @@
             android:id="@+id/month_11_holder"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/yearly_padding_half"
+            android:layout_marginStart="@dimen/yearly_padding_half"
-            android:layout_marginRight="@dimen/yearly_padding_half"
+            android:layout_marginEnd="@dimen/yearly_padding_half"
             android:layout_weight="1">
 
             <com.simplemobiletools.commons.views.MyTextView

app/src/main/res/layout/item_event_type.xml

@@ -22,9 +22,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/event_type_color"
+            android:layout_toStartOf="@+id/event_type_color"
-            android:paddingLeft="@dimen/medium_margin"
+            android:paddingStart="@dimen/medium_margin"
-            android:paddingRight="@dimen/medium_margin"
+            android:paddingEnd="@dimen/medium_margin"
             tools:text="Event type"/>
 
         <ImageView

app/src/main/res/layout/week_event_marker.xml

@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:ellipsize="end"
     android:maxLines="3"
-    android:paddingLeft="@dimen/tiny_margin"
+    android:paddingStart="@dimen/tiny_margin"
-    android:paddingRight="@dimen/tiny_margin"
+    android:paddingEnd="@dimen/tiny_margin"
     android:textColor="@android:color/white"
     android:textSize="@dimen/small_text_size"/>

app/src/main/res/layout/weekly_view_hour_textview.xml

@@ -5,6 +5,6 @@
     android:layout_height="wrap_content"
     android:gravity="bottom|center_horizontal"
     android:minHeight="@dimen/weekly_view_row_height"
-    android:paddingLeft="@dimen/small_margin"
+    android:paddingStart="@dimen/small_margin"
-    android:paddingRight="@dimen/small_margin"
+    android:paddingEnd="@dimen/small_margin"
     android:textSize="@dimen/normal_text_size"/>

app/src/main/res/layout/widget_config_list.xml

@@ -16,7 +16,7 @@
         android:layout_marginBottom="@dimen/activity_margin"
         android:clipToPadding="false"
         android:divider="@null"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
         android:paddingTop="@dimen/medium_margin"
         app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/>
 
@@ -32,7 +32,7 @@
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/config_bg_color"
         android:layout_alignTop="@+id/config_bg_color"
-        android:layout_toRightOf="@+id/config_bg_color"
+        android:layout_toEndOf="@+id/config_bg_color"
         android:background="@android:color/white">
 
         <com.simplemobiletools.commons.views.MySeekBar
@@ -40,8 +40,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"/>
+            android:paddingEnd="@dimen/activity_margin"/>
     </RelativeLayout>
 
     <ImageView
@@ -55,10 +55,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:fontFamily="sans-serif-light"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:text="@string/ok"
         android:textColor="@android:color/white"
         android:textSize="@dimen/big_text_size"/>

app/src/main/res/layout/widget_config_monthly.xml

@@ -27,7 +27,7 @@
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/config_bg_color"
         android:layout_alignTop="@+id/config_bg_color"
-        android:layout_toRightOf="@+id/config_bg_color"
+        android:layout_toEndOf="@+id/config_bg_color"
         android:background="@android:color/white">
 
         <com.simplemobiletools.commons.views.MySeekBar
@@ -35,8 +35,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:paddingLeft="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"/>
+            android:paddingEnd="@dimen/activity_margin"/>
     </RelativeLayout>
 
     <ImageView
@@ -50,10 +50,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:fontFamily="sans-serif-light"
-        android:paddingLeft="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:text="@string/ok"
         android:textColor="@android:color/white"
         android:textSize="@dimen/big_text_size"/>

app/src/main/res/layout/widget_event_list.xml

@@ -11,12 +11,12 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/widget_event_new_event"
         android:layout_alignTop="@+id/widget_event_new_event"
-        android:layout_toLeftOf="@+id/widget_event_new_event"
+        android:layout_toStartOf="@+id/widget_event_new_event"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
-        android:paddingLeft="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:textSize="@dimen/normal_text_size"/>
 
     <ImageView
@@ -24,11 +24,11 @@
         style="@style/ArrowStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
         android:paddingBottom="@dimen/small_margin"
-        android:paddingLeft="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:paddingTop="@dimen/medium_margin"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_plus"/>
@@ -41,7 +41,7 @@
         android:clipToPadding="false"
         android:divider="@null"
         android:paddingBottom="@dimen/small_margin"
-        android:paddingLeft="@dimen/medium_margin"/>
+        android:paddingStart="@dimen/medium_margin"/>
 
     <TextView
         android:id="@+id/widget_event_list_empty"
@@ -49,8 +49,8 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/widget_event_list_today"
         android:gravity="center_horizontal"
-        android:paddingLeft="@dimen/big_margin"
+        android:paddingStart="@dimen/big_margin"
-        android:paddingRight="@dimen/big_margin"
+        android:paddingEnd="@dimen/big_margin"
         android:text="@string/no_upcoming_events"
         android:textSize="@dimen/bigger_text_size"/>
 

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

@@ -8,7 +8,7 @@
     <string name="monthly_view">Месяц</string>
     <string name="yearly_view">Год</string>
     <string name="simple_event_list">Список событий</string>
-    <string name="no_upcoming_events">Похоже, у вас нет предстоящих событий.</string>
+    <string name="no_upcoming_events">Похоже, нет предстоящих событий.</string>
     <string name="go_to_today">Сегодня</string>
 
     <!-- Widget titles -->
@@ -49,11 +49,11 @@
     <string name="update_one_only">Обновить только выбранное</string>
     <string name="update_all_occurrences">Обновить все связанные</string>
     <string name="repeat_till_date">Повторять до даты</string>
-    <string name="stop_repeating_after_x">Перестать повторять после x раза</string>
+    <string name="stop_repeating_after_x">Повторять x раз</string>
     <string name="repeat_forever">Повторять бесконечно</string>
     <string name="times">раз</string>
     <string name="repeat">Повторять</string>
-    <string name="repeat_on">Повторять по</string>
+    <string name="repeat_on">Повторять в</string>
     <string name="every_day">Каждый день</string>
     <string name="selected_days">В выбранные дни</string>
     <string name="the_same_day">Этот же день</string>
@@ -100,8 +100,8 @@
     <!-- Export / Import -->
     <string name="import_events">Импорт событий</string>
     <string name="export_events">Экспорт событий</string>
-    <string name="import_events_from_ics">Импорт событий из файла .ics</string>
+    <string name="import_events_from_ics">Импорт событий из ics-файла</string>
-    <string name="export_events_to_ics">Экспорт событий в файл .ics</string>
+    <string name="export_events_to_ics">Экспорт событий в ics-файл</string>
     <string name="default_event_type">Тип события по умолчанию</string>
     <string name="export_past_events_too">Экспортировать прошедшие события</string>
     <string name="include_event_types">Включать типы событий</string>
@@ -143,21 +143,21 @@
     <string name="manage_event_types">Управление типами событий</string>
     <string name="start_day_at">Начало дня (неделя)</string>
     <string name="end_day_at">Окончание дня (неделя)</string>
-    <string name="week_numbers">Отображать номера недель</string>
+    <string name="week_numbers">Показывать номера недель</string>
     <string name="vibrate">Вибрация при напоминании</string>
     <string name="reminder_sound">Звук напоминания</string>
-    <string name="no_ringtone_picker">Не найдено приложение для выбора рингтона</string>
+    <string name="no_ringtone_picker">Не найдено приложение для выбора звука</string>
     <string name="no_ringtone_selected">Нет</string>
     <string name="day_end_before_start">Конец дня не может быть раньше начала</string>
     <string name="caldav_sync">Синхронизация по CalDAV</string>
     <string name="event_lists">Списки событий</string>
     <string name="display_past_events">Показывать прошедшие события</string>
-    <string name="replace_description_with_location">Заменить описание события местоположением</string>
+    <string name="replace_description_with_location">Заменять описание события местоположением</string>
     <string name="delete_all_events">Удалить все события</string>
-    <string name="delete_all_events_confirmation">Вы действительно хотите удалить все события? Это не затронет ваши типы событий и другие настройки.</string>
+    <string name="delete_all_events_confirmation">Вы действительно хотите удалить все события? Это не затронет типы событий и другие настройки.</string>
     <string name="show_a_grid">Показывать сетку</string>
     <string name="loop_reminders">Циклические напоминания до отключения</string>
-    <string name="dim_past_events">Прошедшие события отображать тусклыми</string>
+    <string name="dim_past_events">Показывать прошедшие события тусклыми</string>
     <string name="events">События</string>
     <string name="reminder_stream">Аудиопоток, используемый напоминаниями</string>
     <string name="system_stream">Cистема</string>

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.3.10'
+    ext.kotlin_version = '1.3.20'
 
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 05 20:16:57 CEST 2018
+#Thu Jan 24 23:19:46 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip