Merge pull request #5 from Commit451/androidx

androidx

Author: Jawnnypoo

app/build.gradle

@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.commit451.modalbottomsheetdialogfragment.sample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -23,7 +23,9 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation "androidx.appcompat:appcompat:1.0.0"
+
     implementation project(':modalbottomsheetdialogfragment')
 }

app/src/main/java/com/commit451/modalbottomsheetdialogfragment/sample/MainActivity.kt

@@ -1,11 +1,11 @@
 package com.commit451.modalbottomsheetdialogfragment.sample
 
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.commit451.modalbottomsheetdialogfragment.ModalBottomSheetDialogFragment
 import com.commit451.modalbottomsheetdialogfragment.Option
 import com.commit451.modalbottomsheetdialogfragment.OptionRequest
+import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity(), ModalBottomSheetDialogFragment.Listener {

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.2.71'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 01 17:06:28 CDT 2018
+#Mon Oct 01 20:45:40 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

modalbottomsheetdialogfragment/build.gradle

@@ -1,12 +1,13 @@
 apply plugin: 'com.android.library'
+
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -26,8 +27,9 @@ android {
 dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    api 'com.android.support:design:27.1.0'
-    api 'com.android.support:recyclerview-v7:27.1.0'
+    api "androidx.recyclerview:recyclerview:1.0.0"
+
+    api 'com.google.android.material:material:1.0.0'
 }
 
 apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'

modalbottomsheetdialogfragment/src/main/java/com/commit451/modalbottomsheetdialogfragment/ModalBottomSheetDialogFragment.kt

@@ -2,21 +2,21 @@ package com.commit451.modalbottomsheetdialogfragment
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.support.annotation.LayoutRes
-import android.support.annotation.MenuRes
-import android.support.design.widget.BottomSheetDialogFragment
-import android.support.v4.app.FragmentManager
-import android.support.v7.view.menu.MenuBuilder
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.MenuInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.annotation.MenuRes
+import androidx.appcompat.view.menu.MenuBuilder
+import androidx.fragment.app.FragmentManager
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.commit451.modalbottomsheetdialogfragment.ModalBottomSheetDialogFragment.Builder
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 @SuppressLint("RestrictedApi")
 /**
@@ -64,7 +64,7 @@ class ModalBottomSheetDialogFragment : BottomSheetDialogFragment() {
         val arguments = arguments
                 ?: throw IllegalStateException("You need to create this via the builder")
 
-        val optionHolders = arguments.getParcelableArrayList<OptionHolder>(KEY_OPTIONS)
+        val optionHolders = arguments.getParcelableArrayList<OptionHolder>(KEY_OPTIONS)!!
 
         val options = mutableListOf<Option>()
 
@@ -79,10 +79,10 @@ class ModalBottomSheetDialogFragment : BottomSheetDialogFragment() {
             }
         }
 
-        adapter = Adapter({
+        adapter = Adapter {
             listener?.onModalOptionSelected(this@ModalBottomSheetDialogFragment.tag, it)
             dismissAllowingStateLoss()
-        })
+        }
         adapter.layoutRes = arguments.getInt(KEY_LAYOUT)
         adapter.header = arguments.getString(KEY_HEADER)
         adapter.headerLayoutRes = arguments.getInt(KEY_HEADER_LAYOUT_RES)

modalbottomsheetdialogfragment/src/main/java/com/commit451/modalbottomsheetdialogfragment/OptionRequest.kt

@@ -4,8 +4,8 @@ import android.content.Context
 import android.graphics.drawable.Drawable
 import android.os.Parcel
 import android.os.Parcelable
-import android.support.annotation.DrawableRes
-import android.support.v4.content.res.ResourcesCompat
+import androidx.annotation.DrawableRes
+import androidx.core.content.res.ResourcesCompat
 
 /**
  * Request for an option you can select within the modal

modalbottomsheetdialogfragment/src/main/res/layout/modal_bottom_sheet_dialog_fragment.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/list"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />