Update dependencies & remove deprecated APIs

Author: anggrayudi

README.md

@@ -83,8 +83,9 @@ class SettingsFragment : PreferenceFragmentMaterial() {
 
     companion object {
         fun newInstance(rootKey: String?) = SettingsFragment().apply {
-            arguments = Bundle()
-            arguments!!.putString(PreferenceFragmentMaterial.ARG_PREFERENCE_ROOT, rootKey)
+            arguments = Bundle().also {
+                it.putString(PreferenceFragmentMaterial.ARG_PREFERENCE_ROOT, rootKey)
+            }
         }
     }
 }
@@ -209,43 +210,6 @@ From above code, `accountName` is a generated method based on your configuration
 It takes `android:defaultValue` if method `accountName` can't find any value stored in the `SharedPreferences`.
 You can customize the method name via `app:helperMethodName="yourMethodName"`. Read our sample code for more information.
 
-### Java compatibility support
-
-Kotlin is interoperable with Java. Just configure the following setup in your project.
-
-#### Setup
-
-In your `build.gradle` of project level:
-
-````gradle
-buildscript {
-    // add this line
-    ext.kotlin_version = '1.4.30'
-
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
-        // add this line
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-````
-
-And for your app's `build.gradle`:
-
-````gradle
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.anggrayudi:materialpreference:3.x.x'
-}
-````
-
 #### Example
 
 From your [`SettingsFragment.java`](https://github.com/anggrayudi/MaterialPreference/blob/master/sample/src/main/java/com/anggrayudi/materialpreference/sample/java/SettingsFragment.java):

build.gradle

@@ -2,28 +2,26 @@
 apply from: 'extensions.gradle'
 
 buildscript {
-    ext.kotlin_version = '1.4.30'
+    ext.kotlin_version = '1.5.0'
 
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
-        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.google.gms:google-services:4.3.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.20'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     }

extensions.gradle

@@ -1,11 +1,11 @@
 ext {
-    appVersionCode = 17
+    appVersionCode = 18
     minSdkVersion = 17
     targetSdkVersion = 30
     compileSdkVersion = 30
     buildToolsVersion = '30.0.2'
-    dialogVersion = '2.8.1'
-    coroutinesVersion = '1.3.8'
+    dialogVersion = '3.3.0'
+    coroutinesVersion = '1.4.3'
 
     // Project
     VCS_URL = "https://github.com/anggrayudi/MaterialPreference.git"

gradle.properties

@@ -7,4 +7,4 @@ org.gradle.daemon=false
 #kapt.use.worker.api=true
 # ------- Library versions
 PROCESSOR_VERSION=1.7
-MATERIAL_PREFERENCE_VERSION=3.6.7
+MATERIAL_PREFERENCE_VERSION=3.7.0

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

materialpreference/build.gradle

@@ -33,7 +33,7 @@ android {
 }
 
 dependencies {
-    api 'androidx.appcompat:appcompat:1.2.0'
+    api 'androidx.appcompat:appcompat:1.3.0'
     api 'com.google.android.material:material:1.3.0'
     api 'androidx.documentfile:documentfile:1.0.1'
     api 'androidx.cardview:cardview:1.0.0'
@@ -48,8 +48,8 @@ dependencies {
     api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
     api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
 
-    implementation "com.anggrayudi:storage:0.4.4"
-//    implementation("com.anggrayudi:storage:0.4.1-SNAPSHOT") { changing = true }
+    api "com.anggrayudi:storage:0.6.0"
+//    api("com.anggrayudi:storage:0.6.0-SNAPSHOT") { changing = true }
 }
 
 ext {

materialpreference/src/main/java/com/anggrayudi/materialpreference/DatePreference.kt

@@ -104,13 +104,13 @@ open class DatePreference @Keep @JvmOverloads constructor(
             if (highlightedDays != null)
                 dialog.highlightedDays = highlightedDays
 
-            dialog.show(preferenceFragment!!.fragmentManager!!, key)
+            dialog.show(preferenceFragment!!.parentFragmentManager, key)
             true
         }
     }
 
     override fun onSetupFinished(fragment: PreferenceFragmentMaterial) {
-        val dialog = fragment.fragmentManager?.findFragmentByTag(key) as? DatePickerDialog
+        val dialog = fragment.parentFragmentManager.findFragmentByTag(key) as? DatePickerDialog
         dialog?.onDateSetListener = this
     }
 

materialpreference/src/main/java/com/anggrayudi/materialpreference/FolderPreference.kt

@@ -14,7 +14,7 @@ import com.afollestad.materialdialogs.files.folderChooser
 import com.afollestad.materialdialogs.files.selectedFolder
 import com.anggrayudi.materialpreference.util.FolderType
 import com.anggrayudi.storage.SimpleStorageHelper
-import com.anggrayudi.storage.file.absolutePath
+import com.anggrayudi.storage.file.getAbsolutePath
 import java.io.File
 
 /**
@@ -78,13 +78,13 @@ open class FolderPreference @Keep @JvmOverloads constructor(
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             FolderPreferenceDialog().apply {
                 arguments = Bundle().apply { putString("folder", folder) }
-                show(fragment.fragmentManager!!, key)
+                show(fragment.parentFragmentManager, key)
             }
         } else {
-            preferenceFragment!!.storageHelper.run {
+            fragment.storageHelper.run {
                 requestCodeFolderPicker = REQUEST_CODE_STORAGE_GET_FOLDER
                 onFolderSelected = { _, folder ->
-                    this@FolderPreference.folder = folder.absolutePath
+                    this@FolderPreference.folder = folder.getAbsolutePath(context)
                 }
                 openFolderPicker()
             }
@@ -96,9 +96,9 @@ open class FolderPreference @Keep @JvmOverloads constructor(
         private var dialog: MaterialDialog? = null
 
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            dialog = MaterialDialog(context!!)
+            dialog = MaterialDialog(requireContext())
                 .negativeButton(android.R.string.cancel)
-                .folderChooser(File(arguments!!.getString("folder")!!), allowFolderCreation = true) { _, file ->
+                .folderChooser(requireContext(), File(requireArguments().getString("folder")!!), allowFolderCreation = true) { _, file ->
                     val preference = (activity as PreferenceActivityMaterial)
                         .visiblePreferenceFragment!!.findPreference(tag!!) as FolderPreference
                     preference.folder = file.absolutePath
@@ -108,7 +108,7 @@ open class FolderPreference @Keep @JvmOverloads constructor(
 
         override fun onSaveInstanceState(outState: Bundle) {
             super.onSaveInstanceState(outState)
-            arguments!!.putString("folder", dialog!!.selectedFolder()!!.absolutePath)
+            requireArguments().putString("folder", dialog!!.selectedFolder()!!.absolutePath)
         }
     }
 

materialpreference/src/main/java/com/anggrayudi/materialpreference/Preference.kt

@@ -1566,7 +1566,7 @@ open class Preference @Keep @JvmOverloads constructor(
 
         private const val TAG = "Preference"
 
-        /** Specify for [.setOrder] if a specific order is not required. */
+        /** Specify for [setOrder] if a specific order is not required. */
         const val DEFAULT_ORDER = Integer.MAX_VALUE
     }
 }

materialpreference/src/main/java/com/anggrayudi/materialpreference/PreferenceActivityMaterial.kt

@@ -75,7 +75,7 @@ abstract class PreferenceActivityMaterial : AppCompatActivity(),
         title = screen.title
         val key = screen.key
         val f = onBuildPreferenceFragment(key)
-        f.arguments!!.putCharSequence(PreferenceFragmentMaterial.PREFERENCE_TITLE, screen.title)
+        f.requireArguments().putCharSequence(PreferenceFragmentMaterial.PREFERENCE_TITLE, screen.title)
         val ft = supportFragmentManager.beginTransaction()
         replaceFragmentStrategy?.run {
             ft.setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)