From cb20b0a814bee628c0e72cc6f209220c42adb743 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 15 Jan 2018 14:36:25 +0100
Subject: [PATCH] update Commons with just one shade of divider grey

---
 app/build.gradle                              |  2 +-
 .../calendar/activities/MainActivity.kt       |  3 +--
 app/src/main/res/drawable/divider_width.xml   |  2 +-
 app/src/main/res/drawable/stroke_bottom.xml   |  2 +-
 .../main/res/drawable/stroke_bottom_right.xml |  2 +-
 app/src/main/res/drawable/stroke_right.xml    |  2 +-
 app/src/main/res/layout/activity_event.xml    | 12 +++++------
 app/src/main/res/layout/activity_settings.xml | 20 +++++++++----------
 .../main/res/layout/calendar_item_account.xml |  2 +-
 .../main/res/layout/dialog_export_events.xml  |  2 +-
 app/src/main/res/values/colors.xml            |  1 -
 11 files changed, 24 insertions(+), 26 deletions(-)

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"/>
 
-    <solid android:color="@color/divider_weak"/>
+    <solid android:color="@color/divider_grey"/>
 
 </shape>
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 @@
             <solid android:color="@android:color/transparent"/>
             <stroke
                 android:width="1px"
-                android:color="@color/divider_strong"/>
+                android:color="@color/divider_grey"/>
         </shape>
     </item>
 </layer-list>
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 @@
             <solid android:color="@android:color/transparent"/>
             <stroke
                 android:width="1px"
-                android:color="@color/divider_strong"/>
+                android:color="@color/divider_grey"/>
         </shape>
     </item>
 </layer-list>
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 @@
             <solid android:color="@android:color/transparent"/>
             <stroke
                 android:width="1px"
-                android:color="@color/divider_strong"/>
+                android:color="@color/divider_grey"/>
         </shape>
     </item>
 </layer-list>
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"/>
 
         <ImageView
@@ -178,7 +178,7 @@
             android:layout_below="@+id/event_end_date"
             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"/>
 
         <ImageView
@@ -245,7 +245,7 @@
             android:layout_below="@+id/event_reminder_3"
             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"/>
 
         <ImageView
@@ -352,7 +352,7 @@
             android:layout_height="1px"
             android:layout_below="@+id/event_repetition_limit_holder"
             android:layout_marginTop="@dimen/medium_margin"
-            android:background="@color/darker_divider"
+            android:background="@color/divider_grey"
             android:importantForAccessibility="no"/>
 
         <ImageView
@@ -414,7 +414,7 @@
             android:layout_width="match_parent"
             android:layout_height="1px"
             android:layout_below="@+id/event_caldav_calendar_holder"
-            android:background="@color/darker_divider"
+            android:background="@color/divider_grey"
             android:importantForAccessibility="no"
             android:visibility="gone"/>
 
@@ -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"/>
     </RelativeLayout>
 </ScrollView>
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"/>
 
         <com.simplemobiletools.commons.views.MyTextView
@@ -271,7 +271,7 @@
             android:alpha="0.6"
             android:text="@string/caldav"
             android:textAllCaps="true"
-            android:textColor="@color/divider_strong"
+            android:textColor="@color/divider_grey"
             android:textSize="@dimen/small_text_size"/>
 
         <RelativeLayout
@@ -320,7 +320,7 @@
             android:id="@+id/weekly_view_divider"
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/divider_strong"
+            android:background="@color/divider_grey"
             android:importantForAccessibility="no"/>
 
         <com.simplemobiletools.commons.views.MyTextView
@@ -333,7 +333,7 @@
             android:alpha="0.6"
             android:text="@string/weekly_view"
             android:textAllCaps="true"
-            android:textColor="@color/divider_strong"
+            android:textColor="@color/divider_grey"
             android:textSize="@dimen/small_text_size"/>
 
         <RelativeLayout
@@ -409,7 +409,7 @@
             android:id="@+id/monthly_view_divider"
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/divider_strong"
+            android:background="@color/divider_grey"
             android:importantForAccessibility="no"/>
 
         <com.simplemobiletools.commons.views.MyTextView
@@ -422,7 +422,7 @@
             android:alpha="0.6"
             android:text="@string/monthly_view"
             android:textAllCaps="true"
-            android:textColor="@color/divider_strong"
+            android:textColor="@color/divider_grey"
             android:textSize="@dimen/small_text_size"/>
 
         <RelativeLayout
@@ -449,7 +449,7 @@
             android:id="@+id/events_list_view_divider"
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/divider_strong"
+            android:background="@color/divider_grey"
             android:importantForAccessibility="no"/>
 
         <com.simplemobiletools.commons.views.MyTextView
@@ -462,7 +462,7 @@
             android:alpha="0.6"
             android:text="@string/event_lists"
             android:textAllCaps="true"
-            android:textColor="@color/divider_strong"
+            android:textColor="@color/divider_grey"
             android:textSize="@dimen/small_text_size"/>
 
         <RelativeLayout
@@ -503,7 +503,7 @@
             android:id="@+id/widgets_divider"
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/divider_strong"
+            android:background="@color/divider_grey"
             android:importantForAccessibility="no"/>
 
         <com.simplemobiletools.commons.views.MyTextView
@@ -516,7 +516,7 @@
             android:alpha="0.6"
             android:text="@string/widgets"
             android:textAllCaps="true"
-            android:textColor="@color/divider_strong"
+            android:textColor="@color/divider_grey"
             android:textSize="@dimen/small_text_size"/>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/calendar_item_account.xml b/app/src/main/res/layout/calendar_item_account.xml
index 96c206a8d..4b8cc0e16 100644
--- a/app/src/main/res/layout/calendar_item_account.xml
+++ b/app/src/main/res/layout/calendar_item_account.xml
@@ -11,6 +11,6 @@
     android:layout_marginTop="@dimen/activity_margin"
     android:alpha="0.6"
     android:textAllCaps="true"
-    android:textColor="@color/divider_strong"
+    android:textColor="@color/divider_grey"
     android:textSize="@dimen/small_text_size"
     tools:text="Account"/>
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"/>
 
             <com.simplemobiletools.commons.views.MyTextView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c218a66a5..8b6d9a50f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="dark_theme_dialog_background">#ff444444</color>
-    <color name="darker_divider">#66808080</color>
     <color name="red_text">#FFF62F2F</color>
     <color name="default_birthdays_color">#FF303DF6</color>
     <color name="default_holidays_color">#FF64DD17</color>