MOB-40 added save can to home fragment, fixed language resources

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/AuthFragment.kt

@@ -34,7 +34,7 @@ class AuthFragment : Fragment() {
 
     private val viewModel: SmartCardViewModel by activityViewModels()
 
-    private val intentParameters: ParametersViewModel by activityViewModels()
+    private val paramsModel: ParametersViewModel by activityViewModels()
 
     private var binding: FragmentAuthBinding? = null
 
@@ -67,17 +67,18 @@ class AuthFragment : Fragment() {
 
             override fun onFinish() {
                 Thread.sleep(750)
-                goToTheStart()
+                cancelAuth()
             }
         }.start()
+        // The button exists in code for testing reasons, but not visible to the user anymore unless visibility is changed in the code.
         binding!!.nextButton.visibility = View.GONE
         binding!!.nextButton.setOnClickListener { goToNextFragment() }
-        binding!!.cancelButton.setOnClickListener { goToTheStart() }
+        binding!!.cancelButton.setOnClickListener { cancelAuth() }
         val adapter = NfcAdapter.getDefaultAdapter(activity)
         if (adapter != null)
             getInfoFromIdCard(adapter)
-        else { // If we don't have access to an NFC adapter then we can't detect an ID card, maybe should tell the user reason as well
+        else { // If NFC adapter can not be detected then end the auth process as it is not possible to read an ID card
-            goToTheStart()
+            cancelAuth()
         }
     }
 
@@ -87,7 +88,7 @@ class AuthFragment : Fragment() {
         findNavController().navigate(action)
     }
 
-    private fun goToTheStart() {
+    private fun cancelAuth() {
         viewModel.clearUserInfo()
         timer.cancel()
         if (args.mobile) {
@@ -111,11 +112,11 @@ class AuthFragment : Fragment() {
                 try {
                     val comms = Comms(it, viewModel.userCan)
                     val jws = Authenticator(comms).authenticate(
-                        intentParameters.challenge,
+                        paramsModel.challenge,
-                        intentParameters.origin,
+                        paramsModel.origin,
                         viewModel.userPin
                     )
-                    intentParameters.setToken(jws)
+                    paramsModel.setToken(jws)
                     requireActivity().runOnUiThread {
                         goToNextFragment()
                     }
@@ -129,8 +130,8 @@ class AuthFragment : Fragment() {
                                     binding!!.timeCounter.text = getString(R.string.wrong_pin, messagePieces[messagePieces.size - 1])
                                     viewModel.deletePin(requireContext())
                                 }
-                                else -> {
+                                else -> requireActivity().runOnUiThread {
-                                    binding!!.timeCounter.text = getString(R.string.no_success)
+                                    binding!!.timeCounter.text = getString(R.string.wrong_can_text)
                                     viewModel.deleteCan(requireContext())
                                 }
                             }
@@ -138,7 +139,7 @@ class AuthFragment : Fragment() {
                     }
                     // Give user some time to read the error message
                     Thread.sleep(2000)
-                    goToTheStart()
+                    cancelAuth()
                 } finally {
                     adapter.disableReaderMode(activity)
                 }

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/CanFragment.kt

@@ -29,8 +29,6 @@ class CanFragment : Fragment() {
 
     // Navigation arguments:
     // saving = true means that we are navigating here from the settings menu and must return to the settings menu.
-    // reading = true means that we are only reading the information from the ID card that does not need PIN 1,
-    //                this information is passed on to the next PinFragment.
     private val args: CanFragmentArgs by navArgs()
 
     override fun onCreateView(
@@ -65,7 +63,7 @@ class CanFragment : Fragment() {
      * Takes user to the next fragment, which is PinFragment.
      */
     private fun goToTheNextFragment() {
-        val action = CanFragmentDirections.actionCanFragmentToPinFragment(reading = args.reading, auth = args.auth, mobile = args.mobile)
+        val action = CanFragmentDirections.actionCanFragmentToPinFragment(auth = args.auth, mobile = args.mobile)
         findNavController().navigate(action)
     }
 
@@ -76,7 +74,11 @@ class CanFragment : Fragment() {
      */
     private fun goToTheStart() {
         if (args.saving) {
-            findNavController().navigate(R.id.action_canFragment_to_settingsFragment)
+            if (args.fromhome) {
+                findNavController().navigate(R.id.action_canFragment_to_homeFragment)
+            } else {
+                findNavController().navigate(R.id.action_canFragment_to_settingsFragment)
+            }
         } else if (args.auth || args.mobile) {
             if (args.mobile) {
                 val resultIntent = Intent()

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/HomeFragment.kt

@@ -1,11 +1,12 @@
 package com.tarkvaraprojekt.mobileauthapp
 
+import android.content.BroadcastReceiver
 import android.content.Intent
+import android.content.IntentFilter
 import android.nfc.NfcAdapter
 import android.nfc.TagLostException
 import android.nfc.tech.IsoDep
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -18,7 +19,6 @@ import com.tarkvaraprojekt.mobileauthapp.databinding.FragmentHomeBinding
 import com.tarkvaraprojekt.mobileauthapp.model.ParametersViewModel
 import com.tarkvaraprojekt.mobileauthapp.model.SmartCardViewModel
 import java.lang.Exception
-import java.net.URLDecoder
 
 /**
  * HomeFragment is only shown to the user when then the user launches the application. When the application
@@ -99,7 +99,7 @@ class HomeFragment : Fragment() {
         } catch (e: Exception) {
             // There was a problem with parameters, which means that authentication is not possible.
             // In that case we will cancel the authentication immediately as it would be waste of the user's time to carry on
-            // before eventual error.
+            // before getting an inevitable error.
             val resultIntent = Intent()
             requireActivity().setResult(AppCompatActivity.RESULT_CANCELED, resultIntent)
             requireActivity().finish()
@@ -161,8 +161,15 @@ class HomeFragment : Fragment() {
         if (canIsSaved) {
             binding!!.detectionActionText.text = getString(R.string.action_detect)
             enableReaderMode()
+            binding!!.homeActionButton.visibility = View.GONE
         } else {
             binding!!.detectionActionText.text = getString(R.string.action_detect_unavailable)
+            binding!!.homeActionButton.text = getString(R.string.add_can_text)
+            binding!!.homeActionButton.setOnClickListener {
+                val action = HomeFragmentDirections.actionHomeFragmentToCanFragment(saving = true, fromhome = true)
+                findNavController().navigate(action)
+            }
+            binding!!.homeActionButton.visibility = View.VISIBLE
         }
     }
 
@@ -170,11 +177,11 @@ class HomeFragment : Fragment() {
      * Resets the error message and allows the user to try again
      */
     private fun reset() {
-        binding!!.buttonAgain.setOnClickListener {
+        binding!!.homeActionButton.text = getString(R.string.try_again_text)
+        binding!!.homeActionButton.setOnClickListener {
             updateAction(canSaved)
-            binding!!.buttonAgain.visibility = View.GONE
         }
-        binding!!.buttonAgain.visibility = View.VISIBLE
+        binding!!.homeActionButton.visibility = View.VISIBLE
     }
 
     /**

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/MainActivity.kt

@@ -47,7 +47,7 @@ class MainActivity : AppCompatActivity() {
                 true
             } else {
                 if (!inMenu) {
-                    Toast.makeText(this, getString(R.string.unavailable), Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this, getString(R.string.menu_unavailable_message), Toast.LENGTH_SHORT).show()
                 }
                 false
             }

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/PinFragment.kt

@@ -28,8 +28,6 @@ class PinFragment : Fragment() {
 
     // Navigation arguments:
     // saving = true means that the user must be returned to the settings menu
-    // reading = true means that we are reading information from the ID card that does
-    //                not require PIN 1 so it is not necessary to ask it.
     private val args: PinFragmentArgs by navArgs()
 
     // TODO: Should be persistent and read when launching the app
@@ -69,7 +67,7 @@ class PinFragment : Fragment() {
      * Takes user to the next fragment, which is AuthFragment.
      */
     private fun goToTheNextFragment() {
-        val action = PinFragmentDirections.actionPinFragmentToAuthFragment(reading = args.reading, auth = args.auth, mobile = args.mobile)
+        val action = PinFragmentDirections.actionPinFragmentToAuthFragment(auth = args.auth, mobile = args.mobile)
         findNavController().navigate(action)
     }
 
@@ -97,13 +95,9 @@ class PinFragment : Fragment() {
      * Checks if the current fragment can be skipped or not.
      * If the user has PIN 1 saved on the device or PIN 1 is not required
      * then the PIN 1 won't be asked.
-     *
-     * NOTE: maybe args.reading can be removed after changing the nav_graph
      */
     private fun checkIfSkip() {
-        if (args.reading) {
+        if (viewModel.userPin.length in 4..12) {
-            goToTheNextFragment()
-        } else if (viewModel.userPin.length in 4..12) {
             goToTheNextFragment()
         }
     }
@@ -127,7 +121,7 @@ class PinFragment : Fragment() {
                 goToTheNextFragment()
             }
         } else {
-            Toast.makeText(requireContext(), getString(R.string.length_pin), Toast.LENGTH_SHORT)
+            Toast.makeText(requireContext(), getString(R.string.pin_helper_text), Toast.LENGTH_SHORT)
                 .show()
         }
     }

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/ResultFragment.kt

@@ -68,17 +68,13 @@ class ResultFragment : Fragment() {
                 .setJsonObjectBody(json)
                 .asJsonObject()
                 .setCallback { e, result ->
-                    // do stuff with the result or error
                     if (result == null) {
-                        // TODO: Set auth message failed and close the app
-                        Log.i("Log thingy fail", "result was null")
                         if (args.mobile) {
                             createResponse(false)
                         } else {
                             requireActivity().finishAndRemoveTask()
                         }
                     } else {
-                        Log.i("POST request response", result.toString())
                         if (args.mobile) {
                             createResponse(true, result.toString(), paramsModel.token)
                         } else {

MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/menu/SettingsFragment.kt

@@ -55,7 +55,7 @@ class SettingsFragment : Fragment() {
             binding!!.canMenuAction.text = getString(R.string.can_delete)
         } else {
             binding!!.canSaved.text = getString(R.string.saved_can, getString(R.string.missing))
-            binding!!.canMenuAction.text = getString(R.string.can_add)
+            binding!!.canMenuAction.text = getString(R.string.add_can_text)
         }
     }
 

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

@@ -62,7 +62,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_big"
-        android:text="@string/next_text"
+        android:text="@string/continue_button"
         android:textSize="@dimen/regular_text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/cancel_button"

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

@@ -23,11 +23,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/margin_big"
-        android:hint="@string/hint"
+        android:hint="@string/can_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title_text"
         app:helperTextEnabled="true"
-        app:helperText="@string/helper"
+        app:helperText="@string/can_helper_text"
         app:helperTextTextAppearance="@style/helper"
         app:counterEnabled="true"
         app:counterMaxLength="6"
@@ -48,7 +48,7 @@
 
     <Button
         android:id="@+id/button_cancel"
-        android:text="@string/button_cancel"
+        android:text="@string/cancel_text"
         android:textSize="@dimen/regular_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -101,9 +101,9 @@
     </LinearLayout>
 
     <Button
-        android:id="@+id/button_again"
+        android:id="@+id/home_action_button"
         android:textSize="@dimen/regular_text"
-        android:text="@string/try_again"
+        android:text="@string/try_again_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_small"

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

@@ -30,7 +30,7 @@
         app:counterOverflowTextAppearance="@style/helper"
         app:counterTextAppearance="@style/helper"
         app:endIconMode="password_toggle"
-        app:helperText="@string/helper_pin"
+        app:helperText="@string/pin_helper_text"
         app:helperTextEnabled="true"
         app:helperTextTextAppearance="@style/helper"
         app:layout_constraintStart_toStartOf="parent"
@@ -106,7 +106,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/margin_big"
         android:fontFamily="sans-serif"
-        android:text="@string/button_cancel"
+        android:text="@string/cancel_text"
         android:textSize="@dimen/regular_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/button_continue" />

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

@@ -64,7 +64,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:text="@string/next_text"
+        android:text="@string/continue_button"
         android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/cancel_button"

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

@@ -114,7 +114,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_big"
-        android:text="@string/clear_button"
+        android:text="@string/return_text"
         android:textSize="@dimen/regular_text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -45,10 +45,6 @@
             android:id="@+id/action_pinFragment_to_authFragment"
             app:destination="@id/authFragment"
             app:popUpTo="@id/homeFragment" />
-        <argument
-            android:name="reading"
-            app:argType="boolean"
-            android:defaultValue="false" />
         <argument
             android:name="auth"
             app:argType="boolean"
@@ -81,10 +77,6 @@
             android:id="@+id/action_canFragment_to_pinFragment"
             app:destination="@id/pinFragment"
             app:popUpTo="@id/homeFragment" />
-        <argument
-            android:name="reading"
-            app:argType="boolean"
-            android:defaultValue="false" />
         <argument
             android:name="auth"
             app:argType="boolean"
@@ -93,6 +85,10 @@
             android:name="mobile"
             app:argType="boolean"
             android:defaultValue="false" />
+        <argument
+            android:name="fromhome"
+            app:argType="boolean"
+            android:defaultValue="false" />
     </fragment>
     <fragment
         android:id="@+id/authFragment"
@@ -116,10 +112,6 @@
             android:name="auth"
             app:argType="boolean"
             android:defaultValue="false" />
-        <argument
-            android:name="reading"
-            app:argType="boolean"
-            android:defaultValue="false" />
         <argument
             android:name="mobile"
             app:argType="boolean"

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

@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Must translate to English, but should work now -->
-    <string name="app_name">NFC authentication</string>
+    <string name="app_name">NFC authenticator</string>
-    <string name="home_fragment">Work in progress</string>
+
+    <!-- BUTTONS -->
+    <string name="cancel_text">CANCEL</string>
+    <string name="return_text">BACK</string>
+    <string name="add_can_text">ADD CAN</string>
+    <string name="try_again_text">TRY AGAIN</string>
+    <string name="continue_button">CONTINUE</string>
+
+    <!-- Card Detection related -->
+    <string name="card_detected">Card detected. Hold it against the phone.</string>
+    <string name="data_read">Data read. You can continue.</string>
+    <string name="wrong_can_text">Wrong CAN</string>
+    <string name="action_detect">Put the ID card against the phone to detect it</string>
+    <string name="action_detect_unavailable">CAN must be added before ID card can be detected</string>
+    <string name="nfc_not_available">NFC is not turned on or is not supported by the phone</string>
+    <string name="nfc_reading_error">The provided CAN does not match the ID card</string>
+    <string name="id_card_removed_early">ID card was removed too early</string>
+    <string name="wrong_pin">Wrong PIN 1. Tries on the card left %s</string>
 
     <!-- string resources for HomeFragment -->
     <string name="pin_status_saved">PIN 1 saved</string>
@@ -10,20 +27,13 @@
     <string name="can_status_saved">CAN saved</string>
     <string name="can_status_negative">CAN not saved</string>
 
-    <string name="begin_text">READ ID CARD</string>
-    <string name="next_text">NEXT</string>
-    <string name="cancel_text">CANCEL</string>
-    <string name="save_text">SAVE</string>
-    <string name="deny_text">NO</string>
-    <string name="return_text">BACK</string>
-
     <!-- string resources for PinFragment -->
-    <string name="pin_fragment">Please enter PIN 1</string>
+    <string name="pin_view">Please enter PIN 1</string>
-    <string name="enter_pin">PIN 1</string>
+    <string name="hint_pin">PIN 1</string>
-    <string name="example_pin">Example. 1234</string>
+    <string name="pin_helper_text">PIN 1 must be 4–12 digits long</string>
-    <string name="length_pin">Allowed length for PIN 1 is 4..12</string>
+    <string name="save_pin">Save PIN 1</string>
-    <string name="pin_save_request">PIN 1 is currently not saved. Do you wish to save the entered PIN 1? Saved PIN 1 will be entered automatically in the future. Saved PIN 1 can be changed and deleted in the settings menu.</string>
+    <string name="pin_save_on">On</string>
-    <string name="save_pin_title">Save PIN 1</string>
+    <string name="pin_save_off">Off</string>
 
     <!-- string resources for Pin2Fragment -->
     <string name="pin2_fragment">Please enter PIN 2</string>
@@ -32,19 +42,14 @@
     <string name="length_pin2">Allowed length for PIN 2 is 5..12</string>
 
     <!-- string resources for CanFragment -->
-    <string name="example_can">Example. 123456</string>
+    <string name="can_view">Please enter CAN</string>
-    <string name="text_can">CAN</string>
+    <string name="can_text">CAN</string>
-    <string name="enter_can">Enter ID card\'s CAN (Card Access Number)</string>
+    <string name="can_helper_text">CAN must be 6 digits long</string>
-    <string name="length_can">Length of the CAN is wrong</string>
-    <string name="card_detected">Card detected. Hold it against the phone.</string>
-    <string name="data_read">Data read. You can continue.</string>
-    <string name="save_can_title">Save CAN</string>
 
     <!-- string resources for AuthFragment layout -->
     <string name="auth_instruction_text">Put the ID card against the phone</string>
     <string name="time_left">Time left %d sek</string>
     <string name="no_time">No time left</string>
-    <string name="no_success">Wrong CAN</string>
 
     <!-- string resources for UserFragment layout -->
     <string name="user_name_label">NAME</string>
@@ -53,18 +58,14 @@
     <string name="expiration_label">DATE OF EXPIRY</string>
     <string name="citizenship_label">CITIZENSHIP</string>
     <string name="gender_label">SEX</string>
-    <string name="clear_button">FORGET</string>
 
     <!-- string resources for ResultFragment layout-->
     <string name="result_text">Controlling the created token</string>
-    <string name="result_info">Wait for the app to close</string>
+    <string name="result_info">The app will close automatically</string>
 
     <!-- menu -->
     <string name="menu_settings_title">Settings</string>
-    <string name="menu_language_title">Language</string>
-    <string name="menu_action_unavailable">Currently unavailable</string>
     <string name="saved_can">CAN: %s</string>
-    <string name="can_add">Add CAN</string>
     <string name="can_delete">Delete CAN</string>
     <string name="saved_pin">PIN1: %s</string>
     <string name="pin1_add">Add PIN1</string>
@@ -73,31 +74,5 @@
     <string name="show">SHOW</string>
     <string name="hide">HIDE</string>
     <string name="hidden_pin">****</string>
-    <string name="unavailable">Settings currently unavailabe</string>
+    <string name="menu_unavailable_message">Settings are currently unavailable</string>
-    <string name="can_save_request">CAN is currently not saved. Do you wish to save the CAN? Saved CAN will be entered automatically in the future. Saved CAN can be changed and deleted in the settings menu.</string>
-
-    <!-- TEMPORARY SOLUTION -->
-    <string name="can_view">Please enter CAN</string>
-    <string name="hint">CAN</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="helper">CAN must be 6 digits long</string>
-    <string name="can_saved">CAN saved</string>
-    <string name="action_undo">UNDO</string>
-    <string name="pin_view">Please enter PIN 1</string>
-    <string name="hint_pin">PIN 1</string>
-    <string name="helper_pin">PIN 1 must be 4–12 digits long</string>
-    <string name="save_pin">Save PIN 1</string>
-    <string name="pin_saved">PIN saved</string>
-    <string name="pin_save_on">On</string>
-    <string name="pin_save_off">Off</string>
-    <string name="continue_button">CONTINUE</string>
-
-    <!-- TEMPORARY HOME FRAGMENT STRINGS -->
-    <string name="action_detect">Put the ID card against the phone to detect it</string>
-    <string name="action_detect_unavailable">CAN must be added before ID card can be detected</string>
-    <string name="nfc_not_available">NFC is not turned on or is not supported by the phone</string>
-    <string name="nfc_reading_error">The provided CAN does not match the ID card</string>
-    <string name="id_card_removed_early">ID card was removed too early</string>
-    <string name="try_again">Try Again</string>
-    <string name="wrong_pin">Wrong PIN 1. Tries on the card left %s</string>
 </resources>

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

@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">NFC authentication</string>
+    <string name="app_name">NFC autentija</string>
-    <string name="home_fragment">Work in progress</string>
 
-    <string name="begin_text">LOE ID KAARTI</string>
+    <!-- Buttons -->
-    <string name="next_text">EDASI</string>
     <string name="cancel_text">KATKESTA</string>
-    <string name="save_text">SALVESTA</string>
-    <string name="deny_text">EI</string>
     <string name="return_text">TAGASI</string>
+    <string name="add_can_text">LISA CAN</string>
+    <string name="try_again_text">ÜRITA UUESTI</string>
+    <string name="continue_button">JÄTKA</string>
+
+    <!-- Card Detection related -->
+    <string name="card_detected">Kaart tuvastatud. Hoia kaarti vastu telefoni.</string>
+    <string name="data_read">Andmed loetud, võid jätkata.</string>
+    <string name="wrong_can_text">Vale CAN</string>
+    <string name="action_detect">ID kaardi tuvastamiseks pane kaart vastu telefoni</string>
+    <string name="action_detect_unavailable">ID kaardi tuvastamiseks peab olema CAN lisatud</string>
+    <string name="nfc_not_available">NFC ei ole sisse lülitatud või puudub telefonil NFC võimekus</string>
+    <string name="nfc_reading_error">Sisestatud CAN ei ole vastavuses ID kaardiga</string>
+    <string name="id_card_removed_early">ID kaart eemaldati liiga vara</string>
+    <string name="wrong_pin">Vale PIN 1. ID kaardil PIN 1 sisetamise kordi alles: %s</string>
 
     <!-- string resources for HomeFragment -->
     <string name="pin_status_saved">PIN 1 on salvestatud</string>
@@ -17,12 +27,12 @@
     <string name="can_status_negative">CAN ei ole salvestatud</string>
 
     <!-- string resources for PinFragment -->
-    <string name="pin_fragment">Palun sisesta PIN 1</string>
+    <string name="pin_view">Palun sisesta PIN 1</string>
-    <string name="enter_pin">PIN 1</string>
+    <string name="hint_pin">PIN 1</string>
-    <string name="example_pin">Näide. 1234</string>
+    <string name="pin_helper_text">PIN 1 lubatud pikkus on 4..12</string>
-    <string name="length_pin">PIN 1 lubatud pikkus on 4..12</string>
+    <string name="save_pin">Save PIN 1</string>
-    <string name="pin_save_request">Praegu ei ole rakenduses PIN 1 salvestatud. Kas sa soovid sisestatud PIN 1-te salvestada? Sellisel juhul sisestatakse see järgmisel korral automaatselt. Salvestatud PIN 1-te saab alati menüüs muuta ja kustutada.</string>
+    <string name="pin_save_on">On</string>
-    <string name="save_pin_title">Salvesta PIN 1</string>
+    <string name="pin_save_off">Off</string>
 
     <!-- string resources for Pin2Fragment -->
     <string name="pin2_fragment">Palun sisesta PIN 2</string>
@@ -31,25 +41,19 @@
     <string name="length_pin2">PIN 2 lubatud pikkus on 5..12</string>
 
     <!-- string resources for CanFragment -->
-    <string name="example_can">Näide. 123456</string>
+    <string name="can_view">Please enter CAN</string>
-    <string name="text_can">CAN</string>
+    <string name="can_text">CAN</string>
-    <string name="enter_can">Sisesta ID kaardi CAN (Card Access Number)</string>
+    <string name="can_helper_text">CAN must be 6 digits long</string>
-    <string name="length_can">CANi pikkus on vale</string>
-    <string name="card_detected">Kaart on tuvastatud. Hoia kaarti vastu telefoni.</string>
-    <string name="data_read">Andmed loetud. Võid edasi minna.</string>
-    <string name="can_save_request">Praegu ei ole rakenduses CAN salvestatud. Kas sa soovid sisestatud CANi salvestada? Sellisel juhul sisestatakse see järgmisel korral automaatselt. Salvestatud CANi saab alati menüüs muuta ja kustutada.</string>    <string name="save_can_title">Salvesta CAN</string>
 
     <!-- string resources for AuthFragment layout -->
     <string name="auth_instruction_text">Pane ID kaart vastu telefoni</string>
     <string name="time_left">Aega on jäänud %d sek</string>
     <string name="no_time">Aeg on otsas</string>
-    <string name="no_success">Vale CAN</string>
 
     <!-- string resources for UserFragment layout -->
     <string name="user_name_label">NIMI</string>
     <string name="user_name">%1$s %2$s</string>
     <string name="identification_number_label">ISIKUKOOD</string>
-    <string name="clear_button">UNUSTA</string>
     <string name="expiration_label">KEHTIV KUNI</string>
     <string name="citizenship_label">KODAKONDSUS</string>
     <string name="gender_label">SUGU</string>
@@ -60,10 +64,7 @@
 
     <!-- menu -->
     <string name="menu_settings_title">Seaded</string>
-    <string name="menu_language_title">Keel</string>
-    <string name="menu_action_unavailable">Toiming pole hetkel saadaval</string>
     <string name="saved_can">CAN: %s</string>
-    <string name="can_add">Lisa CAN</string>
     <string name="can_delete">Kustuta CAN</string>
     <string name="saved_pin">PIN1: %s</string>
     <string name="pin1_add">Lisa PIN1</string>
@@ -72,30 +73,5 @@
     <string name="show">NÄITA</string>
     <string name="hide">PEIDA</string>
     <string name="hidden_pin">****</string>
-    <string name="unavailable">Seaded pole hetkel saadaval</string>
+    <string name="menu_unavailable_message">Seaded pole hetkel saadaval</string>
-
-    <!-- TEMPORARY SOLUTION -->
-    <string name="can_view">Please enter CAN</string>
-    <string name="hint">CAN</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="helper">CAN must be 6 digits long</string>
-    <string name="can_saved">CAN saved</string>
-    <string name="action_undo">UNDO</string>
-    <string name="pin_view">Please enter PIN 1</string>
-    <string name="hint_pin">PIN 1</string>
-    <string name="helper_pin">PIN 1 must be 4–12 digits long</string>
-    <string name="save_pin">Save PIN 1</string>
-    <string name="pin_saved">PIN saved</string>
-    <string name="pin_save_on">On</string>
-    <string name="pin_save_off">Off</string>
-    <string name="continue_button">CONTINUE</string>
-
-    <!-- TEMPORARY HOME FRAGMENT STRINGS -->
-    <string name="action_detect">Put the ID card against the phone to detect it</string>
-    <string name="action_detect_unavailable">CAN must be added before ID card can be detected</string>
-    <string name="nfc_not_available">NFC is not turned on or is not supported by the phone</string>
-    <string name="nfc_reading_error">The provided CAN does not match the ID card</string>
-    <string name="id_card_removed_early">ID card was removed too early</string>
-    <string name="try_again">Try Again</string>
-    <string name="wrong_pin">Wrong PIN 1. Tries on the card left %s</string>
 </resources>

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

@@ -1,13 +1,23 @@
 <resources>
-    <string name="app_name">NFC authentication</string>
+    <string name="app_name">NFC authenticator</string>
-    <string name="home_fragment">Work in progress</string>
 
-    <string name="begin_text">READ ID CARD</string>
+    <!-- BUTTONS -->
-    <string name="next_text">NEXT</string>
     <string name="cancel_text">CANCEL</string>
-    <string name="save_text">SAVE</string>
-    <string name="deny_text">NO</string>
     <string name="return_text">BACK</string>
+    <string name="add_can_text">ADD CAN</string>
+    <string name="try_again_text">TRY AGAIN</string>
+    <string name="continue_button">CONTINUE</string>
+
+    <!-- Card Detection related -->
+    <string name="card_detected">Card detected. Hold it against the phone.</string>
+    <string name="data_read">Data read. You can continue.</string>
+    <string name="wrong_can_text">Wrong CAN</string>
+    <string name="action_detect">Put the ID card against the phone to detect it</string>
+    <string name="action_detect_unavailable">CAN must be added before ID card can be detected</string>
+    <string name="nfc_not_available">NFC is not turned on or is not supported by the phone</string>
+    <string name="nfc_reading_error">The provided CAN does not match the ID card</string>
+    <string name="id_card_removed_early">ID card was removed too early</string>
+    <string name="wrong_pin">Wrong PIN 1. Tries on the card left %s</string>
 
     <!-- string resources for HomeFragment -->
     <string name="pin_status_saved">PIN 1 saved</string>
@@ -16,12 +26,12 @@
     <string name="can_status_negative">CAN not saved</string>
 
     <!-- string resources for PinFragment -->
-    <string name="pin_fragment">Please enter PIN 1</string>
+    <string name="pin_view">Please enter PIN 1</string>
-    <string name="enter_pin">PIN 1</string>
+    <string name="hint_pin">PIN 1</string>
-    <string name="example_pin">Example. 1234</string>
+    <string name="pin_helper_text">PIN 1 must be 4–12 digits long</string>
-    <string name="length_pin">Allowed length for PIN 1 is 4..12</string>
+    <string name="save_pin">Save PIN 1</string>
-    <string name="pin_save_request">PIN 1 is currently not saved. Do you wish to save the entered PIN 1? Saved PIN 1 will be entered automatically in the future. Saved PIN 1 can be changed and deleted in the settings menu.</string>
+    <string name="pin_save_on">On</string>
-    <string name="save_pin_title">Save PIN 1</string>
+    <string name="pin_save_off">Off</string>
 
     <!-- string resources for Pin2Fragment -->
     <string name="pin2_fragment">Please enter PIN 2</string>
@@ -30,20 +40,14 @@
     <string name="length_pin2">Allowed length for PIN 2 is 5..12</string>
 
     <!-- string resources for CanFragment -->
-    <string name="example_can">Example. 123456</string>
+    <string name="can_view">Please enter CAN</string>
-    <string name="text_can">CAN</string>
+    <string name="can_text">CAN</string>
-    <string name="enter_can">Enter ID card\'s CAN (Card Access Number)</string>
+    <string name="can_helper_text">CAN must be 6 digits long</string>
-    <string name="length_can">Length of the CAN is wrong</string>
-    <string name="card_detected">Card detected. Hold it against the phone.</string>
-    <string name="data_read">Data read. You can continue.</string>
-    <string name="can_save_request">CAN is currently not saved. Do you wish to save the CAN? Saved CAN will be entered automatically in the future. Saved CAN can be changed and deleted in the settings menu.</string>
-    <string name="save_can_title">Save CAN</string>
 
     <!-- string resources for AuthFragment layout -->
     <string name="auth_instruction_text">Put the ID card against the phone</string>
     <string name="time_left">Time left %d sek</string>
     <string name="no_time">No time left</string>
-    <string name="no_success">Wrong CAN</string>
 
     <!-- string resources for UserFragment layout -->
     <string name="user_name_label">NAME</string>
@@ -52,18 +56,14 @@
     <string name="expiration_label">DATE OF EXPIRY</string>
     <string name="citizenship_label">CITIZENSHIP</string>
     <string name="gender_label">SEX</string>
-    <string name="clear_button">FORGET</string>
 
     <!-- string resources for ResultFragment layout-->
     <string name="result_text">Controlling the created token</string>
-    <string name="result_info">Wait for the app to close</string>
+    <string name="result_info">The app will close automatically</string>
 
     <!-- menu -->
     <string name="menu_settings_title">Settings</string>
-    <string name="menu_language_title">Language</string>
-    <string name="menu_action_unavailable">Currently unavailable</string>
     <string name="saved_can">CAN: %s</string>
-    <string name="can_add">Add CAN</string>
     <string name="can_delete">Delete CAN</string>
     <string name="saved_pin">PIN1: %s</string>
     <string name="pin1_add">Add PIN 1</string>
@@ -72,30 +72,5 @@
     <string name="show">SHOW</string>
     <string name="hide">HIDE</string>
     <string name="hidden_pin">****</string>
-    <string name="unavailable">Settings currently unavailable</string>
+    <string name="menu_unavailable_message">Settings are currently unavailable</string>
-
-    <!-- TEMPORARY SOLUTION -->
-    <string name="can_view">Please enter CAN</string>
-    <string name="hint">CAN</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="helper">CAN must be 6 digits long</string>
-    <string name="can_saved">CAN saved</string>
-    <string name="action_undo">UNDO</string>
-    <string name="pin_view">Please enter PIN 1</string>
-    <string name="hint_pin">PIN 1</string>
-    <string name="helper_pin">PIN 1 must be 4–12 digits long</string>
-    <string name="save_pin">Save PIN 1</string>
-    <string name="pin_saved">PIN saved</string>
-    <string name="pin_save_on">On</string>
-    <string name="pin_save_off">Off</string>
-    <string name="continue_button">CONTINUE</string>
-
-    <!-- TEMPORARY HOME FRAGMENT STRINGS -->
-    <string name="action_detect">Put the ID card against the phone to detect it</string>
-    <string name="action_detect_unavailable">CAN must be added before ID card can be detected</string>
-    <string name="nfc_not_available">NFC is not turned on or is not supported by the phone</string>
-    <string name="nfc_reading_error">The provided CAN does not match the ID card</string>
-    <string name="id_card_removed_early">ID card was removed too early</string>
-    <string name="try_again">Try Again</string>
-    <string name="wrong_pin">Wrong PIN 1. Tries on the card left %s</string>
 </resources>