From e264bad268e27c2713d3251a3c3efd22ad5cb159 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 18 Oct 2018 17:51:00 +0200
Subject: [PATCH] updating Commons to 5.1.4, min required Android OS to 5

---
 .gitignore                                                | 1 -
 app/build.gradle                                          | 6 +++---
 .../simplemobiletools/notes/activities/MainActivity.kt    | 6 +++---
 .../simplemobiletools/notes/adapters/NotesPagerAdapter.kt | 4 +---
 .../simplemobiletools/notes/dialogs/DeleteNoteDialog.kt   | 4 ++--
 .../simplemobiletools/notes/dialogs/ExportFileDialog.kt   | 2 +-
 .../simplemobiletools/notes/dialogs/ExportFilesDialog.kt  | 2 +-
 .../simplemobiletools/notes/dialogs/ImportFolderDialog.kt | 2 +-
 .../com/simplemobiletools/notes/dialogs/NewNoteDialog.kt  | 2 +-
 .../com/simplemobiletools/notes/dialogs/OpenFileDialog.kt | 2 +-
 .../com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt | 2 +-
 .../simplemobiletools/notes/dialogs/RenameNoteDialog.kt   | 2 +-
 .../com/simplemobiletools/notes/fragments/NoteFragment.kt | 4 ++--
 app/src/main/res/layout/activity_main.xml                 | 2 +-
 build.gradle                                              | 8 ++++----
 gradle.properties                                         | 2 ++
 gradle/wrapper/gradle-wrapper.properties                  | 4 ++--
 17 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 gradle.properties

diff --git a/.gitignore b/.gitignore
index 7051e766..dc267ae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 *.iml
 .gradle
 /local.properties
-/gradle.properties
 /.idea/
 .DS_Store
 /build
diff --git a/app/build.gradle b/app/build.gradle
index 214ae224..306d29a6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "28.0.2"
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.simplemobiletools.notes"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode 51
         versionName "4.3.0"
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:4.7.5'
+    implementation 'com.simplemobiletools:commons:5.1.4'
     implementation 'com.facebook.stetho:stetho:1.5.0'
 }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
index 048b36f7..91a10801 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
@@ -3,7 +3,6 @@ package com.simplemobiletools.notes.activities
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.support.v4.view.ViewPager
 import android.text.method.ArrowKeyMovementMethod
 import android.text.method.LinkMovementMethod
 import android.util.TypedValue
@@ -37,7 +36,7 @@ import kotlinx.android.synthetic.main.activity_main.*
 import java.io.File
 import java.nio.charset.Charset
 
-class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
+class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPageChangeListener {
     private var mAdapter: NotesPagerAdapter? = null
 
     private lateinit var mCurrentNote: Note
@@ -459,8 +458,9 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
                 handleSAFDialog(path) {
                     var document = getDocumentFile(path) ?: return@handleSAFDialog
                     if (!getDoesFilePathExist(path)) {
-                        document = document.createFile("", path.getFilenameFromPath())
+                        document = document.createFile("", path.getFilenameFromPath())!!
                     }
+
                     contentResolver.openOutputStream(document.uri).apply {
                         write(content.toByteArray(Charset.forName("UTF-8")), 0, content.length)
                         flush()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
index 0896f037..0d9a879c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
@@ -2,15 +2,13 @@ package com.simplemobiletools.notes.adapters
 
 import android.app.Activity
 import android.os.Bundle
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentStatePagerAdapter
 import android.view.ViewGroup
 import com.simplemobiletools.commons.extensions.showErrorToast
 import com.simplemobiletools.notes.fragments.NoteFragment
 import com.simplemobiletools.notes.helpers.NOTE_ID
 import com.simplemobiletools.notes.models.Note
 
-class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val activity: Activity) : FragmentStatePagerAdapter(fm) {
+class NotesPagerAdapter(fm: androidx.fragment.app.FragmentManager, val notes: List<Note>, val activity: Activity) : androidx.fragment.app.FragmentStatePagerAdapter(fm) {
     private var fragments: HashMap<Int, NoteFragment> = LinkedHashMap()
 
     override fun getCount() = notes.size
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/DeleteNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/DeleteNoteDialog.kt
index 550288b0..87c02722 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/DeleteNoteDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/DeleteNoteDialog.kt
@@ -1,6 +1,6 @@
 package com.simplemobiletools.notes.dialogs
 
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.beVisible
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.notes.R
@@ -22,7 +22,7 @@ class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callbac
         }
 
         AlertDialog.Builder(activity)
-                .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed(view.delete_note_checkbox.isChecked) })
+                .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed(view.delete_note_checkbox.isChecked) }
                 .setNegativeButton(R.string.cancel, null)
                 .create().apply {
                     activity.setupDialogStuff(view, this)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFileDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFileDialog.kt
index b342ff52..fa8f67cf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFileDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFileDialog.kt
@@ -1,6 +1,6 @@
 package com.simplemobiletools.notes.dialogs
 
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.notes.R
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFilesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFilesDialog.kt
index 8b195ed8..94d3b858 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFilesDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFilesDialog.kt
@@ -1,6 +1,6 @@
 package com.simplemobiletools.notes.dialogs
 
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.humanizePath
 import com.simplemobiletools.commons.extensions.setupDialogStuff
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt
index 60df1d00..3b80bb5b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ImportFolderDialog.kt
@@ -1,7 +1,7 @@
 package com.simplemobiletools.notes.dialogs
 
-import android.support.v7.app.AlertDialog
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.getFilenameFromPath
 import com.simplemobiletools.commons.extensions.humanizePath
 import com.simplemobiletools.commons.extensions.isMediaFile
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt
index e0294dee..c7c2b9e1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt
@@ -2,7 +2,7 @@ package com.simplemobiletools.notes.dialogs
 
 import android.app.Activity
 import android.content.DialogInterface.BUTTON_POSITIVE
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.extensions.showKeyboard
 import com.simplemobiletools.commons.extensions.toast
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenFileDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenFileDialog.kt
index 14e190b8..b3ed2473 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenFileDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenFileDialog.kt
@@ -1,7 +1,7 @@
 package com.simplemobiletools.notes.dialogs
 
-import android.support.v7.app.AlertDialog
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.getFilenameFromPath
 import com.simplemobiletools.commons.extensions.humanizePath
 import com.simplemobiletools.commons.extensions.setupDialogStuff
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt
index f23d7b69..1092b953 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt
@@ -1,9 +1,9 @@
 package com.simplemobiletools.notes.dialogs
 
 import android.app.Activity
-import android.support.v7.app.AlertDialog
 import android.view.ViewGroup
 import android.widget.RadioGroup
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.commons.extensions.setupDialogStuff
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt
index 8bde16c3..f271d349 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt
@@ -1,7 +1,7 @@
 package com.simplemobiletools.notes.dialogs
 
 import android.content.DialogInterface.BUTTON_POSITIVE
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.notes.R
 import com.simplemobiletools.notes.activities.SimpleActivity
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
index 54d4fee0..123fbd82 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
@@ -3,7 +3,7 @@ package com.simplemobiletools.notes.fragments
 import android.annotation.SuppressLint
 import android.graphics.Typeface
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.text.Editable
 import android.text.Selection
 import android.text.TextWatcher
@@ -33,7 +33,7 @@ import kotlinx.android.synthetic.main.note_view_horiz_scrollable.view.*
 import java.io.File
 
 // text history handling taken from https://gist.github.com/zeleven/0cfa738c1e8b65b23ff7df1fc30c9f7e
-class NoteFragment : Fragment() {
+class NoteFragment : androidx.fragment.app.Fragment() {
     private val TEXT = "text"
 
     private var textHistory = TextHistory()
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index be9a3c51..a73f4561 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.view.PagerTitleStrip
+    <androidx.viewpager.widget.PagerTitleStrip
         android:id="@+id/pager_title_strip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/build.gradle b/build.gradle
index ed5841b3..0b0dbc07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.70'
+    ext.kotlin_version = '1.2.71'
 
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -19,8 +19,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
         maven { url "https://jitpack.io" }
     }
 }
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..5465fec0
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9cd10b4..ef68e370 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 10 15:12:09 CET 2017
+#Thu Oct 18 14:57:45 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip