Update OurStreets to use androidx

keyboardsurfer · keyboardsurfer · commit 6aefd326dba2 · 2019-08-27T13:49:01.000+01:00
diff --git a/OurStreets/app/build.gradle b/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}"
 }
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/activity/MainActivity.java b/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;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/data/DataPresenter.java b/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;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/data/DataUtils.java b/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;
 
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/data/DetailPresenter.java b/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;
 
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/data/GalleryPresenter.java b/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;
 
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/fragment/DetailFragment.java b/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;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/fragment/GalleryFragment.java b/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;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/fragment/StreetViewFragment.java b/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;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/map/DetailClusterManager.java b/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;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/map/DetailMarkerRenderer.java b/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/map/DetailMarkerRenderer.java
@@ -18,8 +18,8 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.BitmapDescriptor;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/model/Detail.java b/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/model/Detail.java
@@ -18,7 +18,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.android.gms.maps.model.LatLng;
 import com.google.maps.android.clustering.ClusterItem;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/model/Gallery.java b/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/model/Gallery.java
@@ -18,7 +18,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/GalleryAdapter.java b/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/GalleryAdapter.java
@@ -17,8 +17,8 @@
 package com.google.samples.apps.ourstreets.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/GalleryDivider.java b/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/GalleryDivider.java
@@ -17,11 +17,11 @@
 package com.google.samples.apps.ourstreets.view;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
- * Divider for items within the Gallery {@link android.support.v7.widget.RecyclerView}.
+ * Divider for items within the Gallery {@link RecyclerView}.
  */
 public class GalleryDivider extends RecyclerView.ItemDecoration {
 
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/GalleryViewHolder.java b/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/GalleryViewHolder.java
@@ -17,7 +17,7 @@
 package com.google.samples.apps.ourstreets.view;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/RecyclerItemClickListener.java b/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/RecyclerItemClickListener.java
@@ -17,7 +17,7 @@
 package com.google.samples.apps.ourstreets.view;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -55,4 +55,4 @@ public boolean onInterceptTouchEvent(RecyclerView view, MotionEvent e) {
      * @param position The position of the clicked view.
      */
     public abstract void onItemClick(RecyclerView.ViewHolder holder, int position);
-}
+}
diff --git a/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/ViewUtils.java b/OurStreets/app/src/main/java/com/google/samples/apps/ourstreets/view/ViewUtils.java
@@ -27,12 +27,12 @@
 import android.graphics.Point;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.hardware.display.DisplayManagerCompat;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.hardware.display.DisplayManagerCompat;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
diff --git a/OurStreets/app/src/main/res/layout/fragment_detail.xml b/OurStreets/app/src/main/res/layout/fragment_detail.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
@@ -24,7 +24,7 @@
 
     <include layout="@layout/map_description" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -33,4 +33,4 @@
             android:visibility="invisible"
             style="@style/OurStreets.Detail.Fab" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/OurStreets/app/src/main/res/layout/fragment_gallery.xml b/OurStreets/app/src/main/res/layout/fragment_gallery.xml
@@ -21,28 +21,28 @@
              android:layout_height="match_parent"
              android:fitsSystemWindows="true">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/gallery_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:transitionGroup="false"
             android:visibility="gone">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
                 android:id="@+id/appbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/blue_grey_800"
                     app:logo="@drawable/appbar_logo"
                     app:layout_scrollFlags="scroll|enterAlways" />
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/galleries"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
                 android:fillViewport="true"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior"
                 style="@style/OurStreets.Gallery.Grid" />
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <ProgressBar
             android:id="@+id/progress"
@@ -67,4 +67,4 @@
             android:inflatedId="@+id/failed"
             android:layout="@layout/loading_failed"
             android:visibility="gone" />
-</FrameLayout>
+</FrameLayout>
diff --git a/OurStreets/app/src/main/res/layout/gallery_item.xml b/OurStreets/app/src/main/res/layout/gallery_item.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/gallery_card"
@@ -78,4 +78,4 @@
 
         </LinearLayout>
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/OurStreets/build.gradle b/OurStreets/build.gradle
@@ -18,10 +18,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:3.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -30,10 +31,8 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = "2.10"
-}
diff --git a/OurStreets/gradle.properties b/OurStreets/gradle.properties
@@ -36,3 +36,5 @@ org.gradle.daemon=true
 galleries_url=https://material-streetview.firebaseio.com/collections
 detail_url=https://material-streetview.firebaseio.com/data
 maps_api_key=INSERT_KEY_HERE
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/OurStreets/gradle/wrapper/gradle-wrapper.properties b/OurStreets/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
