Merge pull request google-developer-training#46 from google-developer…

…-training/androidx-nav Rename resource ID.
k12e5989 · Nov 2, 2020 · 83db879 · 83db879
2 parents 4f48c81 + dcb8434
commit 83db879
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/AndroidTrivia-Starter/app/build.gradle b/AndroidTrivia-Starter/app/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "androidx.appcompat:appcompat:$supportlibVersion"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "com.google.android.material:material:1.2.1"
 }
diff --git a/AndroidTrivia-Starter/app/src/main/res/layout/fragment_game_over.xml b/AndroidTrivia-Starter/app/src/main/res/layout/fragment_game_over.xml
@@ -26,7 +26,7 @@
         android:background="@color/gameOverBackground">
 
         <ImageView
-            android:id="@+id/gameOverFragment"
+            android:id="@+id/tryAgainImage"
             android:layout_width="wrap_content"
             android:layout_height="362dp"
             android:layout_marginStart="@dimen/horizontal_margin"
@@ -57,6 +57,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/gameOverFragment" />
+            app:layout_constraintTop_toBottomOf="@+id/tryAgainImage" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/AndroidTrivia-Starter/build.gradle b/AndroidTrivia-Starter/build.gradle
@@ -17,9 +17,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.3.72'
+        kotlin_version = '1.4.10'
         archLifecycleVersion = '1.1.1'
-        gradleVersion = '4.0.1'
+        gradleVersion = '4.1.0'
         supportlibVersion = '1.2.0'
         dataBindingCompilerVersion = gradleVersion // Always need to be the same.
     }

diff --git a/AndroidTrivia-Starter/gradle/wrapper/gradle-wrapper.properties b/AndroidTrivia-Starter/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Fri Jun 26 12:26:36 PDT 2020
+#Fri Oct 30 15:51:07 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
 android.databinding.enableV2=true
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip