Hotfix/androidx (#18)

Hotfix/androidx

.travis.yml

@@ -4,8 +4,8 @@ jdk: oraclejdk8
 sudo: required
 
 before_install:
- - chmod +x gradlew
- - yes | sdkmanager "platforms;android-27"
+  - chmod +x gradlew
+  - yes | sdkmanager "platforms;android-27"
 
 android:
   components:
@@ -29,6 +29,6 @@ android:
     - '.+'
 
 script:
-- ./gradlew
+  - ./gradlew
 
 install: true

app/build.gradle

@@ -36,13 +36,11 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:${versions.supportLib}"
-    implementation "com.android.support:design:${versions.supportLib}"
-    implementation "com.android.support:support-v13:${versions.supportLib}"
-    implementation "com.android.support:gridlayout-v7:${versions.supportLib}"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation project(':library')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    kapt 'com.android.databinding:compiler:3.1.1'
 }
 
 kapt {

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="com.adityaanand.morphdialogsample"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -11,19 +11,17 @@
         android:theme="@style/AppBaseTheme">
         <activity android:name="com.adityaanand.morphdialogsample.MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name="com.adityaanand.morphdialog.MorphDialogActivity"
-            android:theme="@style/MorphDialog.Custom.Light">
-        </activity>
+            android:theme="@style/MorphDialog.Custom.Light"></activity>
         <activity
             android:name="com.adityaanand.morphdialog.MorphDialogActivityDark"
-            android:theme="@style/MorphDialog.Custom.Dark">
-        </activity>
+            android:theme="@style/MorphDialog.Custom.Dark"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/adityaanand/morphdialogsample/MainActivity.kt

@@ -1,17 +1,17 @@
 package com.adityaanand.morphdialogsample
 
 import android.content.Intent
-import android.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.design.widget.FloatingActionButton
-import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
 import com.adityaanand.morphdialog.MorphDialog
 import com.adityaanand.morphdialog.interfaces.MorphListCallbackMultiChoice
 import com.adityaanand.morphdialog.interfaces.MorphSingleButtonCallback
 import com.adityaanand.morphdialog.utils.MorphDialogAction
 import com.adityaanand.morphdialogsample.databinding.ActivityMain2Binding
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import java.util.*
 
 
@@ -59,7 +59,7 @@ class MainActivity : AppCompatActivity() {
         dialog.show()
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         MorphDialog.registerOnActivityResult(requestCode, resultCode, data)
                 .forDialogs(dialog)