From 716b983389880c567178367df8d13837ea896240 Mon Sep 17 00:00:00 2001
From: Henrik Lepson <henrikk895@gmail.com>
Date: Mon, 29 Nov 2021 20:22:20 +0200
Subject: [PATCH] MOB-40 made user fragment scrollable, changed app logo

---
 .../res/drawable/ic_launcher_background.xml   |   2 +-
 .../app/src/main/res/layout/fragment_user.xml | 206 +++++++++---------
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   2 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   2 +-
 4 files changed, 108 insertions(+), 104 deletions(-)

diff --git a/MobileAuthApp/app/src/main/res/drawable/ic_launcher_background.xml b/MobileAuthApp/app/src/main/res/drawable/ic_launcher_background.xml
index 07d5da9..ca78d5c 100644
--- a/MobileAuthApp/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/MobileAuthApp/app/src/main/res/drawable/ic_launcher_background.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#3DDC84"
+        android:fillColor="#001970"
         android:pathData="M0,0h108v108h-108z" />
     <path
         android:fillColor="#00000000"
diff --git a/MobileAuthApp/app/src/main/res/layout/fragment_user.xml b/MobileAuthApp/app/src/main/res/layout/fragment_user.xml
index bb95ca1..216bb27 100644
--- a/MobileAuthApp/app/src/main/res/layout/fragment_user.xml
+++ b/MobileAuthApp/app/src/main/res/layout/fragment_user.xml
@@ -1,123 +1,127 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="@dimen/padding"
-    tools:context=".UserFragment">
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card_view"
+    android:layout_height="wrap_content">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:strokeWidth="1dp"
-        app:strokeColor="@color/stroke_color"
-        app:cardElevation="0dp">
+        android:layout_height="match_parent"
+        android:padding="@dimen/padding"
+        tools:context=".UserFragment">
 
-        <LinearLayout
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/card_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_tiny">
+            android:layout_margin="@dimen/margin"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:strokeWidth="1dp"
+            app:strokeColor="@color/stroke_color"
+            app:cardElevation="0dp">
 
-            <TextView
-                android:id="@+id/user_name_label"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/user_name_label"
-                android:textSize="@dimen/regular_text" />
+                android:orientation="vertical"
+                android:padding="@dimen/padding_tiny">
 
-            <TextView
-                android:id="@+id/user_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_small"
-                android:text="@string/user_name"
-                android:textSize="@dimen/regular_text"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/user_name_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/user_name_label"
+                    android:textSize="@dimen/regular_text" />
 
-            <TextView
-                android:id="@+id/identification_number_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_big"
-                android:text="@string/identification_number_label"
-                android:textSize="@dimen/regular_text" />
+                <TextView
+                    android:id="@+id/user_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_small"
+                    android:text="@string/user_name"
+                    android:textSize="@dimen/regular_text"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/identification_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_small"
-                android:textSize="@dimen/regular_text"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/identification_number_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_big"
+                    android:text="@string/identification_number_label"
+                    android:textSize="@dimen/regular_text" />
 
-            <TextView
-                android:id="@+id/gender_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_big"
-                android:text="@string/gender_label"
-                android:textSize="@dimen/regular_text" />
+                <TextView
+                    android:id="@+id/identification_number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_small"
+                    android:textSize="@dimen/regular_text"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/gender"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_small"
-                android:textSize="@dimen/regular_text"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/gender_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_big"
+                    android:text="@string/gender_label"
+                    android:textSize="@dimen/regular_text" />
 
-            <TextView
-                android:id="@+id/expiration_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_big"
-                android:text="@string/expiration_label"
-                android:textSize="@dimen/regular_text" />
+                <TextView
+                    android:id="@+id/gender"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_small"
+                    android:textSize="@dimen/regular_text"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/expiration"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_small"
-                android:textSize="@dimen/regular_text"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/expiration_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_big"
+                    android:text="@string/expiration_label"
+                    android:textSize="@dimen/regular_text" />
 
-            <TextView
-                android:id="@+id/citizenship_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_big"
-                android:text="@string/citizenship_label"
-                android:textSize="@dimen/regular_text" />
+                <TextView
+                    android:id="@+id/expiration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_small"
+                    android:textSize="@dimen/regular_text"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/citizenship"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_small"
-                android:textSize="@dimen/regular_text"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/citizenship_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_big"
+                    android:text="@string/citizenship_label"
+                    android:textSize="@dimen/regular_text" />
 
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/citizenship"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_small"
+                    android:textSize="@dimen/regular_text"
+                    android:textStyle="bold" />
 
-    </com.google.android.material.card.MaterialCardView>
+            </LinearLayout>
 
-    <Button
-        android:id="@+id/clear_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_big"
-        android:text="@string/return_text"
-        android:textSize="@dimen/regular_text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/card_view" />
+        </com.google.android.material.card.MaterialCardView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/clear_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_big"
+            android:text="@string/return_text"
+            android:textSize="@dimen/regular_text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/card_view" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/MobileAuthApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/MobileAuthApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..88bd299 100644
--- a/MobileAuthApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/MobileAuthApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_check_logo" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/MobileAuthApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/MobileAuthApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..88bd299 100644
--- a/MobileAuthApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/MobileAuthApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_check_logo" />
 </adaptive-icon>
\ No newline at end of file