From c6661d8a929d08e0fe8b56bd760835c2011a8b3e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 1 Nov 2018 22:25:21 +0100
Subject: [PATCH] update commons to 5.3.0

---
 app/build.gradle                              |  2 +-
 .../gallery/activities/SettingsActivity.kt    |  9 -------
 .../gallery/models/Directory.kt               |  2 +-
 .../gallery/models/Medium.kt                  |  2 +-
 app/src/main/res/layout/activity_settings.xml | 26 +------------------
 build.gradle                                  |  2 +-
 6 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 984af8da6..174761961 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.2.19'
+    implementation 'com.simplemobiletools:commons:5.3.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
index ed4b332a9..01a413724 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -38,7 +38,6 @@ class SettingsActivity : SimpleActivity() {
         setupPurchaseThankYou()
         setupCustomizeColors()
         setupUseEnglish()
-        setupAvoidWhatsNew()
         setupManageIncludedFolders()
         setupManageExcludedFolders()
         setupManageHiddenFolders()
@@ -114,14 +113,6 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupAvoidWhatsNew() {
-        settings_avoid_whats_new.isChecked = config.avoidWhatsNew
-        settings_avoid_whats_new_holder.setOnClickListener {
-            settings_avoid_whats_new.toggle()
-            config.avoidWhatsNew = settings_avoid_whats_new.isChecked
-        }
-    }
-
     private fun setupManageIncludedFolders() {
         settings_manage_included_folders_holder.setOnClickListener {
             startActivity(Intent(this, IncludedFoldersActivity::class.java))
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt
index b6332d6f6..e73002b51 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt
@@ -14,7 +14,7 @@ import com.simplemobiletools.gallery.helpers.FAVORITES
 import com.simplemobiletools.gallery.helpers.RECYCLE_BIN
 import java.io.Serializable
 
-@Entity(tableName = "directories", indices = [Index(value = "path", unique = true)])
+@Entity(tableName = "directories", indices = [Index(value = ["path"], unique = true)])
 data class Directory(
         @PrimaryKey(autoGenerate = true) var id: Long?,
         @ColumnInfo(name = "path") var path: String,
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
index aea443b78..093a62991 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
@@ -15,7 +15,7 @@ import com.simplemobiletools.gallery.helpers.*
 import java.io.Serializable
 import java.util.*
 
-@Entity(tableName = "media", indices = [(Index(value = "full_path", unique = true))])
+@Entity(tableName = "media", indices = [(Index(value = ["full_path"], unique = true))])
 data class Medium(
         @PrimaryKey(autoGenerate = true) var id: Long?,
         @ColumnInfo(name = "filename") var name: String,
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 06912da55..a76152ada 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -80,30 +80,6 @@
 
         </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/settings_avoid_whats_new_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
-            android:paddingBottom="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_avoid_whats_new"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
-                android:text="@string/avoid_whats_new"
-                app:switchPadding="@dimen/medium_margin"/>
-
-        </RelativeLayout>
-
         <View
             android:id="@+id/visibility_divider"
             android:layout_width="match_parent"
@@ -298,7 +274,7 @@
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingLeft="@dimen/medium_margin"
                 android:text="@string/remember_last_video_position"
-                app:switchPadding="@dimen/medium_margin" />
+                app:switchPadding="@dimen/medium_margin"/>
 
         </RelativeLayout>
 
diff --git a/build.gradle b/build.gradle
index 0b0dbc07b..17a20ee31 100644
--- a/build.gradle
+++ b/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.2.71'
+    ext.kotlin_version = '1.3.0'
 
     repositories {
         google()