diff --git a/app/build.gradle b/app/build.gradle index bcbefa764..3aba5b511 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,7 +42,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.7.1' + implementation 'com.simplemobiletools:commons:3.7.3' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index a1d94296c..943445d12 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -520,8 +520,7 @@ class MainActivity : SimpleActivity(), NavigationListener { private fun exportEvents() { FilePickerDialog(this, pickFile = false, showFAB = true) { - val path = it - ExportEventsDialog(this, path) { exportPastEvents, file, eventTypes -> + ExportEventsDialog(this, it) { exportPastEvents, file, eventTypes -> Thread { val events = dbHelper.getEventsToExport(exportPastEvents).filter { eventTypes.contains(it.eventType.toString()) } if (events.isEmpty()) { diff --git a/app/src/main/res/drawable/divider_width.xml b/app/src/main/res/drawable/divider_width.xml index d0c567b33..04e97ef39 100644 --- a/app/src/main/res/drawable/divider_width.xml +++ b/app/src/main/res/drawable/divider_width.xml @@ -7,6 +7,6 @@ android:width="5000dp" android:height="1dp"/> - + diff --git a/app/src/main/res/drawable/stroke_bottom.xml b/app/src/main/res/drawable/stroke_bottom.xml index cbd44ae6c..d851d1192 100644 --- a/app/src/main/res/drawable/stroke_bottom.xml +++ b/app/src/main/res/drawable/stroke_bottom.xml @@ -10,7 +10,7 @@ + android:color="@color/divider_grey"/> diff --git a/app/src/main/res/drawable/stroke_bottom_right.xml b/app/src/main/res/drawable/stroke_bottom_right.xml index a3ac94652..206722803 100644 --- a/app/src/main/res/drawable/stroke_bottom_right.xml +++ b/app/src/main/res/drawable/stroke_bottom_right.xml @@ -10,7 +10,7 @@ + android:color="@color/divider_grey"/> diff --git a/app/src/main/res/drawable/stroke_right.xml b/app/src/main/res/drawable/stroke_right.xml index 1269abf2b..9bd8e4265 100644 --- a/app/src/main/res/drawable/stroke_right.xml +++ b/app/src/main/res/drawable/stroke_right.xml @@ -10,7 +10,7 @@ + android:color="@color/divider_grey"/> diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml index 61082ed62..07fbec05d 100644 --- a/app/src/main/res/layout/activity_event.xml +++ b/app/src/main/res/layout/activity_event.xml @@ -82,7 +82,7 @@ android:layout_below="@+id/event_description" android:layout_marginBottom="@dimen/normal_margin" android:layout_marginTop="@dimen/activity_margin" - android:background="@color/darker_divider" + android:background="@color/divider_grey" android:importantForAccessibility="no"/> @@ -472,7 +472,7 @@ android:layout_height="1px" android:layout_below="@+id/event_type_holder" android:layout_marginTop="@dimen/medium_margin" - android:background="@color/darker_divider" + android:background="@color/divider_grey" android:importantForAccessibility="no"/> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 0dc111729..6c526eb24 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -258,7 +258,7 @@ android:id="@+id/caldav_divider" android:layout_width="match_parent" android:layout_height="1px" - android:background="@color/divider_strong" + android:background="@color/divider_grey" android:importantForAccessibility="no"/> diff --git a/app/src/main/res/layout/dialog_export_events.xml b/app/src/main/res/layout/dialog_export_events.xml index a8c70a5c2..c733b8db6 100644 --- a/app/src/main/res/layout/dialog_export_events.xml +++ b/app/src/main/res/layout/dialog_export_events.xml @@ -70,7 +70,7 @@ android:layout_height="1px" android:layout_marginBottom="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin" - android:background="@color/darker_divider" + android:background="@color/divider_grey" android:importantForAccessibility="no"/> #ff444444 - #66808080 #FFF62F2F #FF303DF6 #FF64DD17