Merge pull request #9 from android/bw/androidx

Update samples to use androidx

Author: keyboardsurfer

OurStreets/app/build.gradle

@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         applicationId "com.google.samples.apps.ourstreets"
         minSdkVersion 21
-        targetSdkVersion 24
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -48,22 +48,21 @@ android {
 }
 
 ext {
-    appCompatVersion = "24.0.0"
     firebaseVersion = "2.3.1"
-    mapsVersion = "9.4.0"
+    mapsVersion = "17.0.0"
     mapsUtilsVersion = "0.4"
     hamcrestVersion = "1.3"
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:${appCompatVersion}"
-    compile "com.android.support:cardview-v7:${appCompatVersion}"
-    compile "com.android.support:design:${appCompatVersion}"
-    compile "com.android.support:recyclerview-v7:${appCompatVersion}"
-    compile "com.firebase:firebase-client-android:${firebaseVersion}"
-    compile "com.google.android.gms:play-services-maps:${mapsVersion}"
-    compile "com.google.maps.android:android-maps-utils:${mapsUtilsVersion}"
-    testCompile 'junit:junit:4.12'
-    testCompile "org.hamcrest:hamcrest-core:${hamcrestVersion}"
-    testCompile "org.hamcrest:hamcrest-library:${hamcrestVersion}"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation "com.firebase:firebase-client-android:${firebaseVersion}"
+    implementation "com.google.android.gms:play-services-maps:${mapsVersion}"
+    implementation "com.google.maps.android:android-maps-utils:${mapsUtilsVersion}"
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.hamcrest:hamcrest-core:${hamcrestVersion}"
+    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
 }

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/activity/MainActivity.java

@@ -17,10 +17,10 @@
 package com.google.samples.apps.ourstreets.activity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.google.samples.apps.ourstreets.fragment.BackPressAware;

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/data/DataPresenter.java

@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.ourstreets.data;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.firebase.client.DataSnapshot;

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/data/DataUtils.java

@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.ourstreets.data;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.android.gms.maps.model.LatLng;
 

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/data/DetailPresenter.java

@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.ourstreets.data;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.android.gms.maps.model.LatLng;
 

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/data/GalleryPresenter.java

@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.ourstreets.data;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.android.gms.maps.model.LatLng;
 

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/fragment/DetailFragment.java

@@ -18,11 +18,11 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.annotation.NonNull;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.transition.ChangeBounds;
 import android.transition.Fade;
 import android.transition.Transition;

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/fragment/GalleryFragment.java

@@ -22,14 +22,14 @@
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.animation.FastOutLinearInInterpolator;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.core.view.ViewCompat;
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
+import androidx.recyclerview.widget.RecyclerView;
 import android.transition.Explode;
 import android.transition.Fade;
 import android.transition.TransitionSet;

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/fragment/StreetViewFragment.java

@@ -22,11 +22,11 @@
 import android.animation.ObjectAnimator;
 import android.graphics.Point;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/map/DetailClusterManager.java

@@ -17,7 +17,7 @@
 package com.google.samples.apps.ourstreets.map;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.CameraPosition;