From 804b4472e879c98b87fd11d647ed0e272e26dc96 Mon Sep 17 00:00:00 2001
From: Henrik Lepson <henrikk895@gmail.com>
Date: Sun, 3 Oct 2021 13:28:09 +0300
Subject: [PATCH] MOB-14 changed the placement of views inside the layout

---
 MobileAuthApp/.idea/misc.xml                  |  2 +-
 .../mobileauthapp/UserFragment.kt             |  5 +--
 .../app/src/main/res/layout/fragment_user.xml | 45 +++++++------------
 .../app/src/main/res/values/strings.xml       |  8 ++--
 4 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/MobileAuthApp/.idea/misc.xml b/MobileAuthApp/.idea/misc.xml
index 0921839..c160b5d 100644
--- a/MobileAuthApp/.idea/misc.xml
+++ b/MobileAuthApp/.idea/misc.xml
@@ -8,7 +8,7 @@
         <entry key="..\:/Users/henri/Desktop/Tarkvaraprojekt/Estonian-ID-card-mobile-authenticator-POC/MobileAuthApp/app/src/main/res/layout/fragment_can.xml" value="0.1598731884057971" />
         <entry key="..\:/Users/henri/Desktop/Tarkvaraprojekt/Estonian-ID-card-mobile-authenticator-POC/MobileAuthApp/app/src/main/res/layout/fragment_home.xml" value="0.17300724637681159" />
         <entry key="..\:/Users/henri/Desktop/Tarkvaraprojekt/Estonian-ID-card-mobile-authenticator-POC/MobileAuthApp/app/src/main/res/layout/fragment_pin.xml" value="0.1598731884057971" />
-        <entry key="..\:/Users/henri/Desktop/Tarkvaraprojekt/Estonian-ID-card-mobile-authenticator-POC/MobileAuthApp/app/src/main/res/layout/fragment_user.xml" value="0.1598731884057971" />
+        <entry key="..\:/Users/henri/Desktop/Tarkvaraprojekt/Estonian-ID-card-mobile-authenticator-POC/MobileAuthApp/app/src/main/res/layout/fragment_user.xml" value="0.35170603674540685" />
       </map>
     </option>
   </component>
diff --git a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/UserFragment.kt b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/UserFragment.kt
index 554bbc1..6e59a8c 100644
--- a/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/UserFragment.kt
+++ b/MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/UserFragment.kt
@@ -36,9 +36,8 @@ class UserFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding!!.firstName.text = getString(R.string.info_text, "First name", viewModel.userFirstName)
-        binding!!.lastName.text = getString(R.string.info_text, "Last name", viewModel.userLastName)
-        binding!!.identificationNumber.text = getString(R.string.info_text, "Idenfitication number", viewModel.userIdentificationNumber)
+        binding!!.userName.text = getString(R.string.user_name, viewModel.userFirstName, viewModel.userLastName)
+        binding!!.identificationNumber.text = viewModel.userIdentificationNumber
         binding!!.clearButton.setOnClickListener { goToTheStart() }
     }
 
diff --git a/MobileAuthApp/app/src/main/res/layout/fragment_user.xml b/MobileAuthApp/app/src/main/res/layout/fragment_user.xml
index cc6c542..5a61b9e 100644
--- a/MobileAuthApp/app/src/main/res/layout/fragment_user.xml
+++ b/MobileAuthApp/app/src/main/res/layout/fragment_user.xml
@@ -8,53 +8,42 @@
     tools:context=".UserFragment">
 
     <TextView
-        android:id="@+id/user_fragment_text"
-        android:layout_width="wrap_content"
+        android:id="@+id/user_name_label"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/user_fragment"
-        app:layout_constraintTop_toTopOf="parent"
+        android:text="@string/user_name_label"
+        android:layout_marginTop="24dp"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
-        android:id="@+id/test_info_output"
+        android:id="@+id/user_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/test_info"
-        android:layout_marginTop="24dp"
+        android:text="@string/user_name"
+        android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/user_fragment_text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/clear_button"/>
+        app:layout_constraintTop_toBottomOf="@id/user_name_label"
+        app:layout_constraintBottom_toTopOf="@id/identification_number_label"/>
 
     <TextView
-        android:id="@+id/first_name"
+        android:id="@+id/identification_number_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/info_text"
-        android:layout_marginTop="24dp"
+        android:text="@string/identification_number_label"
+        android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/test_info_output"
-        app:layout_constraintBottom_toTopOf="@id/last_name"/>
-
-    <TextView
-        android:id="@+id/last_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/info_text"
-        android:layout_marginTop="24dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/first_name"
+        app:layout_constraintTop_toBottomOf="@id/user_name"
         app:layout_constraintBottom_toTopOf="@id/identification_number"/>
 
     <TextView
         android:id="@+id/identification_number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/info_text"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/last_name"
+        app:layout_constraintTop_toBottomOf="@id/identification_number_label"
         app:layout_constraintBottom_toTopOf="@id/clear_button"/>
 
     <Button
@@ -62,7 +51,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/clear_text"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="12dp"
         app:layout_constraintTop_toBottomOf="@id/identification_number"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/MobileAuthApp/app/src/main/res/values/strings.xml b/MobileAuthApp/app/src/main/res/values/strings.xml
index 84afc58..1fe5079 100644
--- a/MobileAuthApp/app/src/main/res/values/strings.xml
+++ b/MobileAuthApp/app/src/main/res/values/strings.xml
@@ -12,9 +12,11 @@
     <string name="clear_text">Clear</string>
     <string name="cancel_text">Cancel</string>
 
-    <string name="test_info">Test information</string>
-    <string name="info_text">%1$s: %2$s</string>
-
     <string name="enter_can">Enter CAN</string>
     <string name="enter_pin">Enter PIN</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>
 </resources>
\ No newline at end of file