MOB-41 created a base for app that can launch authapp

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() {

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)
         }

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() }

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)
         }
     }
 

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

MobileAuthApp/app/src/main/res/layout/fragment_result.xml

@@ -19,14 +19,39 @@
         app:strokeColor="@color/stroke_color"
         app:cardElevation="0dp">
 
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
         <TextView
             android:id="@+id/result_text"
             android:text="@string/result_text"
             android:textSize="20sp"
             android:padding="12dp"
+            android:layout_marginVertical="6dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <TextView
+            android:id="@+id/result_info_text"
+            android:text="@string/result_info"
+            android:padding="12dp"
+            android:textSize="16sp"
+            android:layout_marginVertical="6dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <Button
+            android:id="@+id/result_back_button"
+            android:text="@string/return_text"
+            android:layout_marginHorizontal="12dp"
+            android:layout_marginVertical="6dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
     </com.google.android.material.card.MaterialCardView>
 
 

MobileAuthApp/app/src/main/res/navigation/nav_graph.xml

@@ -105,6 +105,10 @@
             android:name="auth"
             app:argType="boolean"
             android:defaultValue="false" />
+        <argument
+            android:name="reading"
+            app:argType="boolean"
+            android:defaultValue="false" />
     </fragment>
     <fragment
         android:id="@+id/userFragment"

MobileAuthApp/app/src/main/res/values-en/strings.xml

@@ -52,6 +52,7 @@
 
     <!-- string resources for ResultFragment layout-->
     <string name="result_text">See Fragment vastutab vastuse tagastamise eest.</string>
+    <string name="result_info">Hiljem sulgeb rakendus automaatselt.</string>
 
     <!-- menu -->
     <string name="menu_settings_title">Seaded</string>

MobileAuthApp/app/src/main/res/values-et/strings.xml

@@ -50,6 +50,7 @@
 
     <!-- string resources for ResultFragment layout-->
     <string name="result_text">See Fragment vastutab vastuse tagastamise eest.</string>
+    <string name="result_info">Hiljem sulgeb rakendus automaatselt.</string>
 
     <!-- menu -->
     <string name="menu_settings_title">Seaded</string>

MobileAuthApp/app/src/main/res/values/strings.xml

@@ -50,6 +50,7 @@
 
     <!-- string resources for ResultFragment layout-->
     <string name="result_text">See Fragment vastutab vastuse tagastamise eest.</string>
+    <string name="result_info">Hiljem sulgeb rakendus automaatselt.</string>
 
     <!-- menu -->
     <string name="menu_settings_title">Seaded</string>