Update Unsplash to use androidx

keyboardsurfer · keyboardsurfer · commit 335ec90af176 · 2019-08-27T13:39:45.000+01:00
diff --git a/Unsplash/app/build.gradle b/Unsplash/app/build.gradle
@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "28.0.3"
 
     dataBinding {
         enabled = true
@@ -27,7 +27,7 @@ android {
     defaultConfig {
         applicationId "com.example.android.unsplash"
         minSdkVersion 21
-        targetSdkVersion 23
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -44,8 +44,8 @@ ext {
 }
 
 dependencies {
-    compile "com.android.support:support-annotations:${supportLibVersion}"
-    compile "com.android.support:recyclerview-v7:${supportLibVersion}"
-    compile 'com.squareup.retrofit:retrofit:1.9.0'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation 'com.squareup.retrofit:retrofit:1.9.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
 }
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/DetailActivity.java b/Unsplash/app/src/main/java/com/example/android/unsplash/DetailActivity.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
 import android.transition.Fade;
 import android.transition.Slide;
 import android.transition.TransitionSet;
@@ -28,6 +27,8 @@
 import android.view.animation.AnimationUtils;
 import android.widget.Toolbar;
 
+import androidx.viewpager.widget.ViewPager;
+
 import com.example.android.unsplash.data.model.Photo;
 import com.example.android.unsplash.ui.DetailSharedElementEnterCallback;
 import com.example.android.unsplash.ui.pager.DetailViewPagerAdapter;
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/MainActivity.java b/Unsplash/app/src/main/java/com/example/android/unsplash/MainActivity.java
@@ -21,16 +21,17 @@
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.transition.Transition;
 import android.util.Log;
 import android.util.Pair;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.ProgressBar;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.example.android.unsplash.data.UnsplashService;
 import com.example.android.unsplash.data.model.Photo;
 import com.example.android.unsplash.databinding.PhotoItemBinding;
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/data/model/Photo.java b/Unsplash/app/src/main/java/com/example/android/unsplash/data/model/Photo.java
@@ -18,7 +18,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.util.Locale;
 
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/ui/DetailSharedElementEnterCallback.java b/Unsplash/app/src/main/java/com/example/android/unsplash/ui/DetailSharedElementEnterCallback.java
@@ -20,12 +20,13 @@
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.example.android.unsplash.IntentUtil;
 import com.example.android.unsplash.databinding.DetailViewBinding;
 import com.example.android.unsplash.databinding.PhotoItemBinding;
@@ -179,4 +180,4 @@ private void forceSharedElementLayout(View view) {
         view.layout(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
     }
 
-}
+}
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/ui/grid/GridMarginDecoration.java b/Unsplash/app/src/main/java/com/example/android/unsplash/ui/grid/GridMarginDecoration.java
@@ -17,9 +17,10 @@
 package com.example.android.unsplash.ui.grid;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 public class GridMarginDecoration extends RecyclerView.ItemDecoration {
 
     private int space;
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/ui/grid/OnItemSelectedListener.java b/Unsplash/app/src/main/java/com/example/android/unsplash/ui/grid/OnItemSelectedListener.java
@@ -17,11 +17,12 @@
 package com.example.android.unsplash.ui.grid;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 public abstract class OnItemSelectedListener implements RecyclerView.OnItemTouchListener {
 
     private final GestureDetector gestureDetector;
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/ui/grid/PhotoAdapter.java b/Unsplash/app/src/main/java/com/example/android/unsplash/ui/grid/PhotoAdapter.java
@@ -17,12 +17,13 @@
 package com.example.android.unsplash.ui.grid;
 
 import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.bumptech.glide.Glide;
 import com.example.android.unsplash.R;
 import com.example.android.unsplash.data.model.Photo;
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/ui/grid/PhotoViewHolder.java b/Unsplash/app/src/main/java/com/example/android/unsplash/ui/grid/PhotoViewHolder.java
@@ -16,7 +16,7 @@
 
 package com.example.android.unsplash.ui.grid;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.example.android.unsplash.databinding.PhotoItemBinding;
 
diff --git a/Unsplash/app/src/main/java/com/example/android/unsplash/ui/pager/DetailViewPagerAdapter.java b/Unsplash/app/src/main/java/com/example/android/unsplash/ui/pager/DetailViewPagerAdapter.java
@@ -16,13 +16,14 @@
 package com.example.android.unsplash.ui.pager;
 
 import android.app.Activity;
-import android.databinding.DataBindingUtil;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
+import androidx.viewpager.widget.PagerAdapter;
+
 import com.bumptech.glide.Glide;
 import com.example.android.unsplash.R;
 import com.example.android.unsplash.data.model.Photo;
@@ -59,7 +60,7 @@ public int getCount() {
     }
 
     @Override
-    public Object instantiateItem(ViewGroup container, int position) {
+    public Object instantiateItem(@NonNull ViewGroup container, int position) {
         DetailViewBinding binding =
                 DataBindingUtil.inflate(layoutInflater, R.layout.detail_view, container, false);
         binding.setData(allPhotos.get(position));
@@ -78,20 +79,20 @@ private void onViewBound(DetailViewBinding binding) {
     }
 
     @Override
-    public void setPrimaryItem(ViewGroup container, int position, Object object) {
+    public void setPrimaryItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
         if (object instanceof DetailViewBinding) {
             sharedElementCallback.setBinding((DetailViewBinding) object);
         }
     }
 
     @Override
-    public boolean isViewFromObject(View view, Object object) {
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
         return object instanceof DetailViewBinding
                 && view.equals(((DetailViewBinding) object).getRoot());
     }
 
     @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
+    public void destroyItem(ViewGroup container, int position, @NonNull Object object) {
         container.removeView(((DetailViewBinding) object).getRoot());
     }
 }
diff --git a/Unsplash/app/src/main/res/layout/activity_detail.xml b/Unsplash/app/src/main/res/layout/activity_detail.xml
@@ -17,7 +17,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
-    <android.support.v4.view.ViewPager android:id="@+id/pager"
+    <androidx.viewpager.widget.ViewPager android:id="@+id/pager"
                                        android:layout_width="match_parent"
                                        android:layout_height="match_parent" />
     <Toolbar android:id="@+id/toolbar"
diff --git a/Unsplash/app/src/main/res/layout/activity_main.xml b/Unsplash/app/src/main/res/layout/activity_main.xml
@@ -29,7 +29,7 @@
             android:indeterminateTint="@color/placeholder"
             android:indeterminateTintMode="src_in" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/image_grid"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -38,7 +38,7 @@
             android:scrollbars="vertical"
             android:scrollbarStyle="insideOverlay"
             android:orientation="vertical"
-            app:layoutManager="android.support.v7.widget.GridLayoutManager"
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
             app:spanCount="@integer/photo_grid_columns" />
 
 </FrameLayout>
diff --git a/Unsplash/app/src/main/res/values/attrs_foreground_view.xml b/Unsplash/app/src/main/res/values/attrs_foreground_view.xml
@@ -18,8 +18,8 @@
 
     <declare-styleable name="ForegroundView">
         <attr name="android:foreground" />
-        <attr name="android:foregroundInsidePadding" />
+        <attr name="foregroundInsidePadding" />
         <attr name="android:foregroundGravity" />
     </declare-styleable>
 
-</resources>
+</resources>
diff --git a/Unsplash/build.gradle b/Unsplash/build.gradle
@@ -18,10 +18,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        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,6 +31,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/Unsplash/gradle.properties b/Unsplash/gradle.properties
@@ -31,4 +31,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/Unsplash/gradle/wrapper/gradle-wrapper.properties b/Unsplash/gradle/wrapper/gradle-wrapper.properties
@@ -1,22 +1,6 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#Thu May 05 11:30:03 BST 2016
+#Tue Aug 27 12:07:02 BST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
