GridToPager: Update dependencies (#34)

* GridToPager: Update dependencies

Replace uses of deprecated APIs.

* Remove a debug log

Author: yaraki

GridToPager/app/build.gradle

@@ -15,14 +15,13 @@
  */
 
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.google.samples.gridtopager"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
@@ -40,14 +39,13 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:1.0.2"
+    implementation "androidx.appcompat:appcompat:1.1.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
-    implementation "androidx.annotation:annotation:1.0.1"
-    implementation "com.github.bumptech.glide:glide:4.8.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.1.1"
-    androidTestImplementation "androidx.test:rules:1.1.1"
-    androidTestImplementation "androidx.test.ext:junit:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "com.github.bumptech.glide:glide:4.9.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
+    androidTestImplementation "androidx.test:rules:1.2.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
 }

GridToPager/app/src/main/java/com/google/samples/gridtopager/MainActivity.java

@@ -17,6 +17,7 @@
 
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentManager;
 import androidx.appcompat.app.AppCompatActivity;
 import com.google.samples.gridtopager.fragment.GridFragment;
@@ -53,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
   }
 
   @Override
-  protected void onSaveInstanceState(Bundle outState) {
+  protected void onSaveInstanceState(@NonNull Bundle outState) {
     super.onSaveInstanceState(outState);
     outState.putInt(KEY_CURRENT_POSITION, currentPosition);
   }

GridToPager/app/src/main/java/com/google/samples/gridtopager/adapter/GridAdapter.java

@@ -19,6 +19,8 @@
 import static com.google.samples.gridtopager.adapter.ImageData.IMAGE_DRAWABLES;
 
 import android.graphics.drawable.Drawable;
+
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
@@ -37,6 +39,7 @@
 import com.google.samples.gridtopager.R;
 import com.google.samples.gridtopager.adapter.GridAdapter.ImageViewHolder;
 import com.google.samples.gridtopager.fragment.ImagePagerFragment;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -65,6 +68,7 @@ public GridAdapter(Fragment fragment) {
     this.viewHolderListener = new ViewHolderListenerImpl(fragment);
   }
 
+  @NonNull
   @Override
   public ImageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     View view = LayoutInflater.from(parent.getContext())

GridToPager/app/src/main/java/com/google/samples/gridtopager/adapter/ImagePagerAdapter.java

@@ -18,6 +18,7 @@
 
 import static com.google.samples.gridtopager.adapter.ImageData.IMAGE_DRAWABLES;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import com.google.samples.gridtopager.fragment.ImageFragment;
@@ -26,14 +27,15 @@ public class ImagePagerAdapter extends FragmentStatePagerAdapter {
 
   public ImagePagerAdapter(Fragment fragment) {
     // Note: Initialize with the child fragment manager.
-    super(fragment.getChildFragmentManager());
+    super(fragment.getChildFragmentManager(), BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
   }
 
   @Override
   public int getCount() {
     return IMAGE_DRAWABLES.length;
   }
 
+  @NonNull
   @Override
   public Fragment getItem(int position) {
     return ImageFragment.newInstance(IMAGE_DRAWABLES[position]);

GridToPager/app/src/main/java/com/google/samples/gridtopager/fragment/GridFragment.java

@@ -105,7 +105,7 @@ public void onMapSharedElements(List<String> names, Map<String, View> sharedElem
             // Locate the ViewHolder for the clicked position.
             RecyclerView.ViewHolder selectedViewHolder = recyclerView
                 .findViewHolderForAdapterPosition(MainActivity.currentPosition);
-            if (selectedViewHolder == null || selectedViewHolder.itemView == null) {
+            if (selectedViewHolder == null) {
               return;
             }
 

GridToPager/build.gradle

@@ -17,13 +17,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.70'
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -34,7 +34,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        mavenCentral()
         jcenter()
     }
 }

GridToPager/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Feb 06 14:40:02 PST 2018
+#Mon Mar 09 14:35:23 JST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip