hossain-khan · hossain-khan · Mar 24, 2019 · Mar 24, 2019 · Mar 24, 2019 · Mar 24, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
       # Our Android Docker images are currently tagged with the suffix -alpha.
       # This is to indicate the images are currently under development and
       # might change in backwards incompatible ways from week to week.
-      - image: circleci/android:api-27-alpha
+      - image: circleci/android:api-28-alpha
     environment:
       JVM_OPTS: -Xmx3200m
     steps:

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,7 +22,7 @@ android {
         buildConfigField "String", "GIT_SHA", "\"${gitSha()}\""
         buildConfigField "String", "BUILD_TIME", "\"${buildTime()}\""
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -44,26 +44,26 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     // Kotlin support
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     // Android Support libs and Google Android libs
-    implementation "com.android.support:support-v13:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
+    implementation "androidx.legacy:legacy-support-v13:$rootProject.supportLibraryVersion"
+    implementation "com.google.android.material:material:$rootProject.supportLibraryVersion"
+    implementation "androidx.cardview:cardview:$rootProject.supportLibraryVersion"
 
-    implementation "com.android.support.constraint:constraint-layout:$rootProject.constraintLayoutVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"
 
     // ViewModel and LiveData
     // https://developer.android.com/topic/libraries/architecture/adding-components
-    implementation "android.arch.lifecycle:extensions:$rootProject.archComponentVersion"
+    implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.archComponentVersion"
 
     // https://developer.chrome.com/multidevice/android/customtabs
-    implementation "com.android.support:customtabs:$rootProject.supportLibraryVersion"
+    implementation "androidx.browser:browser:$rootProject.supportLibraryVersion"
 
     // ========================================================
     // 3rd party libraries
     // ========================================================
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$rootProject.leakcanaryLibraryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$rootProject.leakcanaryLibraryVersion"
 
@@ -98,11 +98,11 @@ dependencies {
     // Mocking framework for unit tests written in Java
     testImplementation "org.mockito:mockito-core:$rootProject.mockitoVersion"
 
-    androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion", {
+    androidTestImplementation("androidx.test.espresso:espresso-core:$rootProject.espressoVersion", {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    testImplementation "android.arch.core:core-testing:$rootProject.archComponentVersion"
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    testImplementation "androidx.arch.core:core-testing:$rootProject.archComponentVersion"
 }
 
 // ADD THIS AT THE BOTTOM

diff --git a/app/src/androidTest/java/com/hossainkhan/android/demo/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/hossainkhan/android/demo/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package com.hossainkhan.android.demo
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseActivity.kt
@@ -16,11 +16,11 @@
 
 package com.hossainkhan.android.demo.browse
 
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.hossainkhan.android.demo.R
 import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
 import com.hossainkhan.android.demo.layoutpreview.LayoutPreviewBaseActivity

diff --git a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseAdapter.kt b/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseAdapter.kt
@@ -16,9 +16,9 @@
 
 package com.hossainkhan.android.demo.browse
 
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.Observer
-import android.support.v7.widget.RecyclerView
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

diff --git a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModel.kt b/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModel.kt
@@ -16,9 +16,9 @@
 
 package com.hossainkhan.android.demo.browse
 
-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.hossainkhan.android.demo.data.AppDataStore
 import com.hossainkhan.android.demo.data.LayoutInformation
 import timber.log.Timber

diff --git a/app/src/main/java/com/hossainkhan/android/demo/data/LayoutDataStore.kt b/app/src/main/java/com/hossainkhan/android/demo/data/LayoutDataStore.kt
@@ -17,7 +17,7 @@
 package com.hossainkhan.android.demo.data
 
 import android.content.res.Resources
-import android.support.annotation.LayoutRes
+import androidx.annotation.LayoutRes
 import com.hossainkhan.android.demo.R
 import com.hossainkhan.android.demo.base.AppConfig
 import javax.inject.Inject

diff --git a/app/src/main/java/com/hossainkhan/android/demo/data/LayoutInformation.kt b/app/src/main/java/com/hossainkhan/android/demo/data/LayoutInformation.kt
@@ -16,8 +16,8 @@
 
 package com.hossainkhan.android.demo.data
 
-import android.support.annotation.DrawableRes
-import android.support.annotation.LayoutRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.LayoutRes
 
 /**
  * A simple data class containing layout resource ID and it's respective description.

diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutChainStyleActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutChainStyleActivity.kt
@@ -19,13 +19,13 @@ package com.hossainkhan.android.demo.layoutpreview
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.annotation.StringRes
-import android.support.constraint.ConstraintLayout
-import android.support.constraint.ConstraintSet
-import android.support.constraint.ConstraintSet.CHAIN_PACKED
-import android.support.constraint.ConstraintSet.CHAIN_SPREAD
-import android.support.constraint.ConstraintSet.CHAIN_SPREAD_INSIDE
-import android.support.transition.TransitionManager
+import androidx.annotation.StringRes
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.constraintlayout.widget.ConstraintSet.CHAIN_PACKED
+import androidx.constraintlayout.widget.ConstraintSet.CHAIN_SPREAD
+import androidx.constraintlayout.widget.ConstraintSet.CHAIN_SPREAD_INSIDE
+import androidx.transition.TransitionManager
 import android.view.View
 import com.hossainkhan.android.demo.R
 import android.widget.RadioButton

diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModel.kt b/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModel.kt
@@ -16,10 +16,10 @@
 
 package com.hossainkhan.android.demo.layoutpreview
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.ViewModel
-import android.support.annotation.LayoutRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.annotation.LayoutRes
 import com.hossainkhan.android.demo.data.AppDataStore
 import com.hossainkhan.android.demo.data.LayoutInformation
 import timber.log.Timber

diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutPreviewBaseActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutPreviewBaseActivity.kt
@@ -16,16 +16,16 @@
 
 package com.hossainkhan.android.demo.layoutpreview
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.support.annotation.LayoutRes
-import android.support.customtabs.CustomTabsIntent
-import android.support.v4.app.NavUtils
-import android.support.v7.app.AppCompatActivity
+import androidx.annotation.LayoutRes
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.app.NavUtils
+import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import com.andrognito.flashbar.Flashbar

diff --git a/app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt b/app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt
@@ -16,8 +16,8 @@
 
 package com.hossainkhan.android.demo.viewmodel
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import com.hossainkhan.android.demo.browse.LayoutBrowseViewModel
 import com.hossainkhan.android.demo.data.AppDataStore
 import com.hossainkhan.android.demo.layoutpreview.LayoutInfoViewModel

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,16 +1,17 @@
 <?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"
     android:layout_height="match_parent"
     tools:context="com.hossainkhan.android.demo.browse.LayoutBrowseActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
+        tools:listitem="@layout/list_item_layout_preview"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/list_item_layout_preview.xml b/app/src/main/res/layout/list_item_layout_preview.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView 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"
@@ -25,7 +25,7 @@
     app:cardMaxElevation="5dp"
     app:contentPadding="5dp">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -58,5 +58,5 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:text="This is the layout title. If this is long, it will be truncated." />
 
-    </android.support.constraint.ConstraintLayout>
-</android.support.v7.widget.CardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/preview_chain_style_main.xml b/app/src/main/res/layout/preview_chain_style_main.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<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:id="@+id/constraint_layout_root"
@@ -56,4 +56,4 @@
     -->
     <include layout="@layout/include_layout_chain_style" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/preview_chain_weighted.xml b/app/src/main/res/layout/preview_chain_weighted.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<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:id="@+id/constraint_layout_root"
@@ -77,4 +77,4 @@
         app:layout_constraintTop_toBottomOf="@+id/view_chain_view_middle" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/preview_positioning_bias.xml b/app/src/main/res/layout/preview_positioning_bias.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<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"
@@ -54,4 +54,4 @@
     <include layout="@layout/include_layout_positioning_bias" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/preview_positioning_centered.xml b/app/src/main/res/layout/preview_positioning_centered.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.constraint.ConstraintLayout
+<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"
@@ -35,4 +35,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         style="@style/MediumBox" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/preview_positioning_circular.xml b/app/src/main/res/layout/preview_positioning_circular.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.constraint.ConstraintLayout
+<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"
@@ -44,7 +44,7 @@
         app:layout_constraintCircle="@+id/view_centered"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="100dp"
-        tools:ignore="HardcodedText" />
+        tools:ignore="HardcodedText,MissingConstraints" />
 
     <!--
          Text at 220 degree with distance 150dp from centered box.
@@ -55,7 +55,7 @@
         app:layout_constraintCircle="@+id/view_centered"
         app:layout_constraintCircleAngle="220"
         app:layout_constraintCircleRadius="150dp"
-        tools:ignore="HardcodedText" />
+        tools:ignore="HardcodedText,MissingConstraints" />
 
 
     <!--
@@ -64,4 +64,4 @@
     -->
     <include layout="@layout/include_layout_positioning_circle_overlay" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/preview_positioning_top_left.xml b/app/src/main/res/layout/preview_positioning_top_left.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<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"
@@ -34,4 +34,4 @@
         android:background="@color/md_purple_700"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>