From 452c69c318823165d7f54b4dd887f1c7a6911c35 Mon Sep 17 00:00:00 2001 From: skysamara Date: Mon, 2 Mar 2020 18:03:55 +0300 Subject: [PATCH] Task: Change the Back button's destination --- .../android/navigation/GameFragment.kt | 1 + .../android/navigation/GameOverFragment.kt | 6 +++++ .../android/navigation/GameWonFragment.kt | 6 +++++ .../src/main/res/navigation/navigation.xml | 24 +++++++++++++++---- AndroidTriviaFragment/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameFragment.kt b/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameFragment.kt index a47a391..e9a5f39 100755 --- a/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameFragment.kt +++ b/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameFragment.kt @@ -25,6 +25,7 @@ import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.navigation.findNavController import com.example.android.navigation.databinding.FragmentGameBinding +import java.security.cert.LDAPCertStoreParameters class GameFragment : Fragment() { data class Question( diff --git a/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameOverFragment.kt b/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameOverFragment.kt index c40fc7a..4feeaaa 100755 --- a/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameOverFragment.kt +++ b/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameOverFragment.kt @@ -22,6 +22,7 @@ import android.view.View import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment +import androidx.navigation.findNavController import com.example.android.navigation.databinding.FragmentGameOverBinding class GameOverFragment : Fragment() { @@ -30,6 +31,11 @@ class GameOverFragment : Fragment() { // Inflate the layout for this fragment val binding: FragmentGameOverBinding = DataBindingUtil.inflate( inflater, R.layout.fragment_game_over, container, false) + // Add OnClick Handler for Try Again button + binding.tryAgainButton.setOnClickListener { view -> + view.findNavController(). + navigate(R.id.action_gameOverFragment_to_gameFragment) + } return binding.root } } diff --git a/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameWonFragment.kt b/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameWonFragment.kt index 525a57a..b6cfe33 100755 --- a/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameWonFragment.kt +++ b/AndroidTriviaFragment/app/src/main/java/com/example/android/navigation/GameWonFragment.kt @@ -22,6 +22,7 @@ import android.view.View import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment +import androidx.navigation.findNavController import com.example.android.navigation.databinding.FragmentGameWonBinding @@ -31,6 +32,11 @@ class GameWonFragment : Fragment() { // Inflate the layout for this fragment val binding: FragmentGameWonBinding = DataBindingUtil.inflate( inflater, R.layout.fragment_game_won, container, false) + // Add OnClick Handler for Next Match button + binding.nextMatchButton.setOnClickListener { view: View -> + view.findNavController(). + navigate(R.id.action_gameWonFragment_to_gameFragment) + } return binding.root } } diff --git a/AndroidTriviaFragment/app/src/main/res/navigation/navigation.xml b/AndroidTriviaFragment/app/src/main/res/navigation/navigation.xml index 4e36272..968d276 100644 --- a/AndroidTriviaFragment/app/src/main/res/navigation/navigation.xml +++ b/AndroidTriviaFragment/app/src/main/res/navigation/navigation.xml @@ -21,19 +21,35 @@ tools:layout="@layout/fragment_game"> + app:destination="@id/gameOverFragment" + app:popUpTo="@id/gameFragment" + app:popUpToInclusive="true" /> + app:destination="@id/gameWonFragment" + app:popUpTo="@id/gameFragment" + app:popUpToInclusive="true" /> + tools:layout="@layout/fragment_game_over" > + + + tools:layout="@layout/fragment_game_won" > + + \ No newline at end of file diff --git a/AndroidTriviaFragment/build.gradle b/AndroidTriviaFragment/build.gradle index 336d7ec..b249cc0 100755 --- a/AndroidTriviaFragment/build.gradle +++ b/AndroidTriviaFragment/build.gradle @@ -20,7 +20,7 @@ buildscript { navigationVersion = '1.0.0-rc02' kotlin_version = '1.3.11' archLifecycleVersion = '1.1.1' - gradleVersion = '3.3.1' + gradleVersion = '3.6.1' supportlibVersion = '1.0.0-rc03' dataBindingCompilerVersion = gradleVersion // Always need to be the same. navigationVersion = '1.0.0-rc02' diff --git a/AndroidTriviaFragment/gradle/wrapper/gradle-wrapper.properties b/AndroidTriviaFragment/gradle/wrapper/gradle-wrapper.properties index e57fefc..dbcae0d 100755 --- a/AndroidTriviaFragment/gradle/wrapper/gradle-wrapper.properties +++ b/AndroidTriviaFragment/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Mon Jan 14 23:13:44 IST 2019 +#Mon Mar 02 16:33:07 MSK 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME android.databinding.enableV2=true zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip