Migrate from support lib to androidx

jshvarts · jshvarts · commit 0744acff8d33 · 2018-09-08T10:43:31.000-04:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,19 +4,19 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'androidx.navigation.safeargs'
 
 ext {
-    supportLibraryVersion = "27.1.1"
+    appCompatVersion = "1.0.0-rc02"
     constraintLayoutVersion = "1.1.3"
     archLifecycleVersion = "1.1.1"
     timberVersion = "4.7.1"
     navigationVersion = "1.0.0-alpha05"
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.jshvarts.notesnavigation"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -43,9 +43,9 @@ androidExtensions {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
-    implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.recyclerview:recyclerview:$appCompatVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
 
     // ViewModel and LiveData
     implementation "android.arch.lifecycle:runtime:$archLifecycleVersion"
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/MainActivity.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/MainActivity.kt
@@ -1,8 +1,8 @@
 package com.jshvarts.notesnavigation.presentation
 
 import android.os.Bundle
-import android.support.v4.view.GravityCompat
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.GravityCompat
 import androidx.navigation.Navigation.findNavController
 import androidx.navigation.ui.NavigationUI.*
 import com.jshvarts.notesnavigation.R
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/addnote/AddNoteFragment.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/addnote/AddNoteFragment.kt
@@ -1,14 +1,14 @@
 package com.jshvarts.notesnavigation.presentation.addnote
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import androidx.navigation.fragment.findNavController
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.navigation.findNavController
 import com.jshvarts.notesnavigation.R
 import com.jshvarts.notesnavigation.presentation.closeSoftKeyboard
 import kotlinx.android.synthetic.main.add_note_fragment.*
@@ -42,7 +42,11 @@ class AddNoteFragment : Fragment() {
 
     private fun render(status: Boolean) {
         when (status) {
-            true -> findNavController().navigateUp()
+            true -> {
+                view?.let { v ->
+                    v.findNavController().navigateUp()
+                }
+            }
             false -> addNoteText.error = getString(R.string.error_validating_note)
         }
     }
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/addnote/AddNoteViewModel.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/addnote/AddNoteViewModel.kt
@@ -1,8 +1,8 @@
 package com.jshvarts.notesnavigation.presentation.addnote
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import com.jshvarts.notesnavigation.domain.NotesManager
 
 class AddNoteViewModel : ViewModel() {
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/deletenote/DeleteNoteFragment.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/deletenote/DeleteNoteFragment.kt
@@ -1,15 +1,14 @@
 package com.jshvarts.notesnavigation.presentation.deletenote
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.findNavController
-import androidx.navigation.fragment.findNavController
+import com.google.android.material.snackbar.Snackbar
 import com.jshvarts.notesnavigation.R
 import com.jshvarts.notesnavigation.domain.Note
 import com.jshvarts.notesnavigation.presentation.deletenote.DeleteNoteFragmentArgs.fromBundle
@@ -53,7 +52,11 @@ class DeleteNoteFragment : Fragment() {
 
     private fun render(deleteStatus: Boolean) {
         when (deleteStatus) {
-            true -> findNavController().popBackStack(R.id.notesFragment, false)
+            true -> {
+                view?.let { v ->
+                    v.findNavController().popBackStack(R.id.notesFragment, false)
+                }
+            }
             false -> Snackbar.make(confirmDeleteButton, R.string.error_deleting_note, Snackbar.LENGTH_LONG).show()
         }
     }
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/deletenote/DeleteNoteViewModel.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/deletenote/DeleteNoteViewModel.kt
@@ -1,8 +1,8 @@
 package com.jshvarts.notesnavigation.presentation.deletenote
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import com.jshvarts.notesnavigation.domain.Note
 import com.jshvarts.notesnavigation.domain.NotesManager
 
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/editnote/EditNoteFragment.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/editnote/EditNoteFragment.kt
@@ -1,14 +1,14 @@
 package com.jshvarts.notesnavigation.presentation.editnote
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import androidx.navigation.fragment.findNavController
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.navigation.findNavController
 import com.jshvarts.notesnavigation.R
 import com.jshvarts.notesnavigation.domain.Note
 import com.jshvarts.notesnavigation.presentation.closeSoftKeyboard
@@ -46,7 +46,11 @@ class EditNoteFragment : Fragment() {
 
     private fun render(editStatus: Boolean) {
         when (editStatus) {
-            true -> findNavController().navigateUp()
+            true -> {
+                view?.let { v ->
+                    v.findNavController().navigateUp()
+                }
+            }
             false -> editNoteText.error = getString(R.string.error_validating_note)
         }
     }
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/editnote/EditNoteViewModel.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/editnote/EditNoteViewModel.kt
@@ -1,8 +1,8 @@
 package com.jshvarts.notesnavigation.presentation.editnote
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import com.jshvarts.notesnavigation.domain.Note
 import com.jshvarts.notesnavigation.domain.NotesManager
 
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/notedetail/NoteDetailFragment.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/notedetail/NoteDetailFragment.kt
@@ -1,14 +1,14 @@
 package com.jshvarts.notesnavigation.presentation.notedetail
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.findNavController
+import com.google.android.material.snackbar.Snackbar
 import com.jshvarts.notesnavigation.R
 import com.jshvarts.notesnavigation.domain.Note
 import com.jshvarts.notesnavigation.presentation.notedetail.NoteDetailFragmentArgs.fromBundle
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/notedetail/NoteDetailViewModel.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/notedetail/NoteDetailViewModel.kt
@@ -1,8 +1,8 @@
 package com.jshvarts.notesnavigation.presentation.notedetail
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import com.jshvarts.notesnavigation.domain.Note
 import com.jshvarts.notesnavigation.domain.NotesManager
 
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/notelist/NoteAdapter.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/notelist/NoteAdapter.kt
@@ -1,10 +1,10 @@
 package com.jshvarts.notesnavigation.presentation.notelist
 
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil.calculateDiff
+import androidx.recyclerview.widget.RecyclerView
 import com.jshvarts.notesnavigation.R
 import com.jshvarts.notesnavigation.domain.Note
 
@@ -35,7 +35,7 @@ class NoteAdapter(
     override fun getItemCount() = noteList.size
 
     fun updateNotes(noteList: List<Note>) {
-        val diffResult = DiffUtil.calculateDiff(NoteDiffCallback(this.noteList, noteList))
+        val diffResult = calculateDiff(NoteDiffCallback(this.noteList, noteList))
         this.noteList = noteList
         diffResult.dispatchUpdatesTo(this)
     }
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/notelist/NoteDiffCallback.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/notelist/NoteDiffCallback.kt
@@ -1,6 +1,6 @@
 package com.jshvarts.notesnavigation.presentation.notelist
 
-import android.support.v7.util.DiffUtil
+import androidx.recyclerview.widget.DiffUtil
 import com.jshvarts.notesnavigation.domain.Note
 
 class NoteDiffCallback(private val old: List<Note>,
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/notelist/NoteListFragment.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/notelist/NoteListFragment.kt
@@ -1,15 +1,14 @@
 package com.jshvarts.notesnavigation.presentation.notelist
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.findNavController
-import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.jshvarts.notesnavigation.R
 import com.jshvarts.notesnavigation.domain.Note
 import com.jshvarts.notesnavigation.presentation.notelist.NoteListFragmentDirections.actionNotesToAddNote
@@ -63,7 +62,9 @@ class NoteListFragment : Fragment() {
 
     private fun onNoteClicked(note: Note) {
         val navDirections = actionNotesToNoteDetail(note.id)
-        findNavController().navigate(navDirections)
+        view?.let { v ->
+            v.findNavController().navigate(navDirections)
+        }
     }
 
     private fun setupRecyclerView() {
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/notelist/NoteListViewModel.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/notelist/NoteListViewModel.kt
@@ -1,8 +1,8 @@
 package com.jshvarts.notesnavigation.presentation.notelist
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import com.jshvarts.notesnavigation.domain.Note
 import com.jshvarts.notesnavigation.domain.NotesManager
 
diff --git a/app/src/main/java/com/jshvarts/notesnavigation/presentation/search/SearchFragment.kt b/app/src/main/java/com/jshvarts/notesnavigation/presentation/search/SearchFragment.kt
@@ -1,10 +1,10 @@
 package com.jshvarts.notesnavigation.presentation.search
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import com.jshvarts.notesnavigation.R
 
 class SearchFragment : Fragment() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -28,11 +28,11 @@
 
     </LinearLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/navigationView"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:menu="@menu/menu_nav_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/add_note_fragment.xml b/app/src/main/res/layout/add_note_fragment.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/addNoteText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -21,5 +21,5 @@
             android:inputType="textAutoCorrect"
             android:singleLine="true" />
 
-    </android.support.design.widget.TextInputLayout>
-</android.support.constraint.ConstraintLayout>
+    </com.google.android.material.textfield.TextInputLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/delete_note_fragment.xml b/app/src/main/res/layout/delete_note_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -47,4 +47,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/cancelDeleteButton" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/edit_note_fragment.xml b/app/src/main/res/layout/edit_note_fragment.xml
diff --git a/app/src/main/res/layout/note_detail_fragment.xml b/app/src/main/res/layout/note_detail_fragment.xml
diff --git a/app/src/main/res/layout/note_list_fragment.xml b/app/src/main/res/layout/note_list_fragment.xml
diff --git a/app/src/main/res/layout/search_fragment.xml b/app/src/main/res/layout/search_fragment.xml
diff --git a/gradle.properties b/gradle.properties
