diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt index 23924ec..706aaca 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt @@ -1,12 +1,15 @@ package com.tarkvaraprojekt.mobileauthapp +import android.content.Intent import android.nfc.NfcAdapter import android.nfc.tech.IsoDep import android.os.Bundle import android.os.CountDownTimer +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController @@ -115,7 +118,13 @@ class AuthFragment : Fragment() { private fun goToTheStart() { viewModel.clearUserInfo() timer.cancel() - findNavController().navigate(R.id.action_authFragment_to_homeFragment) + if (args.reading) { + findNavController().navigate(R.id.action_authFragment_to_homeFragment) + } else { + val resultIntent = Intent() + requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent) + requireActivity().finish() + } } override fun onDestroy() { diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/CanFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/CanFragment.kt index b65e89c..f73b243 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/CanFragment.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/CanFragment.kt @@ -1,11 +1,13 @@ package com.tarkvaraprojekt.mobileauthapp import android.app.AlertDialog +import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController @@ -123,8 +125,12 @@ class CanFragment : Fragment() { */ private fun goToTheStart() { // TODO: Needs special handling when the app is launched with intent. Temporary solution at the moment. - if (args.saving || args.auth) { + if (args.saving) { findNavController().navigate(R.id.action_canFragment_to_settingsFragment) + } else if (args.auth) { + val resultIntent = Intent() + requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent) + requireActivity().finish() } else { findNavController().navigate(R.id.action_canFragment_to_homeFragment) } diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/HomeFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/HomeFragment.kt index e7c6b4a..318f25d 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/HomeFragment.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/HomeFragment.kt @@ -1,6 +1,7 @@ package com.tarkvaraprojekt.mobileauthapp import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -38,7 +39,8 @@ class HomeFragment : Fragment() { super.onViewCreated(view, savedInstanceState) initialChecks() // TODO: If app launched with intent then go to the CanFragment immediately. - if (true){ // Currently true for testing purposes + val auth = requireActivity().intent.getBooleanExtra("auth", false) + if (auth){ // Currently true for testing purposes goToTheNextFragment(true) } binding!!.beginButton.setOnClickListener { goToTheNextFragment() } diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt index 33f730d..7bace11 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt @@ -1,11 +1,13 @@ package com.tarkvaraprojekt.mobileauthapp import android.app.AlertDialog +import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController @@ -68,7 +70,7 @@ class PinFragment : Fragment() { * Takes user to the next fragment, which is AuthFragment. */ private fun goToTheNextFragment() { - val action = PinFragmentDirections.actionPinFragmentToAuthFragment(auth = args.auth) + val action = PinFragmentDirections.actionPinFragmentToAuthFragment(reading = args.reading, auth = args.auth) findNavController().navigate(action) } @@ -125,10 +127,13 @@ class PinFragment : Fragment() { */ private fun goToTheStart() { if (args.saving) { - findNavController().navigate(R.id.action_pinFragment_to_settingsFragment) + findNavController().navigate(R.id.action_canFragment_to_settingsFragment) + } else if (args.auth) { + val resultIntent = Intent() + requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent) + requireActivity().finish() } else { - viewModel.clearUserInfo() - findNavController().navigate(R.id.action_pinFragment_to_homeFragment) + findNavController().navigate(R.id.action_canFragment_to_homeFragment) } } diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/ResultFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/ResultFragment.kt index 4cf541a..c510048 100644 --- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/ResultFragment.kt +++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/ResultFragment.kt @@ -1,9 +1,11 @@ package com.tarkvaraprojekt.mobileauthapp +import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import com.tarkvaraprojekt.mobileauthapp.databinding.FragmentResultBinding @@ -28,6 +30,19 @@ class ResultFragment : Fragment() { return binding!!.root } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + binding!!.resultBackButton.setOnClickListener { + createResponse() + } + } + + private fun createResponse() { + val resultIntent = Intent() + requireActivity().setResult(AppCompatActivity.RESULT_OK, resultIntent) + requireActivity().finish() + } + override fun onDestroy() { super.onDestroy() binding = null diff --git a/MobileAuthApp/app/src/main/res/layout/fragment_result.xml b/MobileAuthApp/app/src/main/res/layout/fragment_result.xml index 81ac62a..1bff4c1 100644 --- a/MobileAuthApp/app/src/main/res/layout/fragment_result.xml +++ b/MobileAuthApp/app/src/main/res/layout/fragment_result.xml @@ -19,14 +19,39 @@ app:strokeColor="@color/stroke_color" app:cardElevation="0dp"> + + + + +