Skip to content
This repository has been archived by the owner on Jul 24, 2023. It is now read-only.

Commit

Permalink
Merge pull request #455 from google-developer-training/androidx-nav
Browse files Browse the repository at this point in the history 
Rename resource Id
  • Loading branch information
@android-dev-lxl
android-dev-lxl committed Nov 2, 2020
2 parents 0f45324 + 8c8c582 commit 3ae0d72
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion AndroidTrivia/app/build.gradle
View file
Expand Up @@ -50,7 +50,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"
implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
Expand Down
4 changes: 2 additions & 2 deletions AndroidTrivia/app/src/main/res/layout/fragment_game_over.xml
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
6 changes: 3 additions & 3 deletions AndroidTrivia/build.gradle
View file
Expand Up @@ -17,12 +17,12 @@
// 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.
navigationVersion = '2.3.0'
navigationVersion = '2.3.1'
}
repositories {
google()
Expand Down
6 changes: 3 additions & 3 deletions AndroidTrivia/gradle/wrapper/gradle-wrapper.properties
View file
@@ -1,7 +1,7 @@
#Tue Aug 11 12:55:41 PDT 2020
#Fri Oct 30 16:13:54 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
2 changes: 1 addition & 1 deletion AndroidTriviaFragment/app/build.gradle
View file
Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions AndroidTriviaFragment/app/src/main/res/layout/fragment_game_over.xml
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
6 changes: 3 additions & 3 deletions AndroidTriviaFragment/build.gradle
View file
Expand Up @@ -17,12 +17,12 @@
// 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.
navigationVersion = '2.3.0'
navigationVersion = '2.3.1'
}
repositories {
google()
Expand Down
6 changes: 3 additions & 3 deletions AndroidTriviaFragment/gradle/wrapper/gradle-wrapper.properties
View file
@@ -1,7 +1,7 @@
#Tue Aug 11 13:26:30 PDT 2020
#Fri Oct 30 15:56: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
2 changes: 1 addition & 1 deletion AndroidTriviaNavigation/app/build.gradle
View file
Expand Up @@ -50,7 +50,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"
implementation"androidx.navigation:navigation-fragment-ktx:$navigationVersion"
Expand Down
4 changes: 2 additions & 2 deletions AndroidTriviaNavigation/app/src/main/res/layout/fragment_game_over.xml
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
6 changes: 3 additions & 3 deletions AndroidTriviaNavigation/build.gradle
View file
Expand Up @@ -17,12 +17,12 @@
// 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.
navigationVersion = '2.3.0'
navigationVersion = '2.3.1'
}
repositories {
google()
Expand Down
6 changes: 3 additions & 3 deletions AndroidTriviaNavigation/gradle/wrapper/gradle-wrapper.properties
View file
@@ -1,7 +1,7 @@
#Tue Aug 11 13:54:51 PDT 2020
#Fri Oct 30 15:59:52 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

0 comments on commit 3ae0d72

Please sign in to comment.