From 30a9870c7e5cecdc00544cf11e6686626f8a9450 Mon Sep 17 00:00:00 2001
From: Rashi Saini <rashisaini2010@gmail.com>
Date: Wed, 12 Jul 2023 12:22:11 -0700
Subject: [PATCH 1/2] API integration and User Info form

---
 UndoAssessment/UndoAssessment/App.xaml.cs     |  7 +-
 UndoAssessment/UndoAssessment/AppShell.xaml   |  1 +
 .../UndoAssessment/AppShell.xaml.cs           |  2 +
 .../UndoAssessment/Models/ResponseModel.cs    | 19 ++++
 .../RequestProvider/IRequestProvider.cs       | 19 ++++
 .../RequestProvider/RequestProvider.cs        | 96 ++++++++++++++++++
 .../Services/AssessmentService.cs             | 33 +++++++
 .../Services/IAssessmentService.cs            | 23 +++++
 .../UndoAssessment/UndoAssessment.csproj      | 16 +++
 .../ViewModels/AddUserInfoViewModel.cs        | 39 ++++++++
 .../ViewModels/AssessmentViewModel.cs         | 97 +++++++++++++++++++
 .../UndoAssessment/Views/AddUserInfoPage.xaml | 17 ++++
 .../Views/AddUserInfoPage.xaml.cs             | 16 +++
 .../UndoAssessment/Views/AssessmentPage.xaml  | 38 ++++++++
 .../Views/AssessmentPage.xaml.cs              | 24 +++++
 15 files changed, 443 insertions(+), 4 deletions(-)
 create mode 100644 UndoAssessment/UndoAssessment/Models/ResponseModel.cs
 create mode 100644 UndoAssessment/UndoAssessment/RequestProvider/IRequestProvider.cs
 create mode 100644 UndoAssessment/UndoAssessment/RequestProvider/RequestProvider.cs
 create mode 100644 UndoAssessment/UndoAssessment/Services/AssessmentService.cs
 create mode 100644 UndoAssessment/UndoAssessment/Services/IAssessmentService.cs
 create mode 100644 UndoAssessment/UndoAssessment/ViewModels/AddUserInfoViewModel.cs
 create mode 100644 UndoAssessment/UndoAssessment/ViewModels/AssessmentViewModel.cs
 create mode 100644 UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml
 create mode 100644 UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml.cs
 create mode 100644 UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml
 create mode 100644 UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml.cs

diff --git a/UndoAssessment/UndoAssessment/App.xaml.cs b/UndoAssessment/UndoAssessment/App.xaml.cs
index 254aae8..41fafb2 100644
--- a/UndoAssessment/UndoAssessment/App.xaml.cs
+++ b/UndoAssessment/UndoAssessment/App.xaml.cs
@@ -1,6 +1,4 @@
-using System;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
+using Xamarin.Forms;
 using UndoAssessment.Services;
 using UndoAssessment.Views;
 
@@ -12,8 +10,9 @@ public partial class App : Application
         public App ()
         {
             InitializeComponent();
-
             DependencyService.Register<MockDataStore>();
+            DependencyService.Register<AssessmentService>();
+            DependencyService.Register<RequestProvider.RequestProvider>();
             MainPage = new AppShell();
         }
 
diff --git a/UndoAssessment/UndoAssessment/AppShell.xaml b/UndoAssessment/UndoAssessment/AppShell.xaml
index 9b3603b..aa40f5c 100644
--- a/UndoAssessment/UndoAssessment/AppShell.xaml
+++ b/UndoAssessment/UndoAssessment/AppShell.xaml
@@ -32,6 +32,7 @@
     <TabBar>
         <ShellContent Title="About" Icon="icon_about.png" Route="AboutPage" ContentTemplate="{DataTemplate local:AboutPage}" />
         <ShellContent Title="Browse" Icon="icon_feed.png" ContentTemplate="{DataTemplate local:ItemsPage}" />
+        <ShellContent Title="API" Icon="icon_feed.png" ContentTemplate="{DataTemplate local:AssessmentPage}" />
     </TabBar>
 
     <!--
diff --git a/UndoAssessment/UndoAssessment/AppShell.xaml.cs b/UndoAssessment/UndoAssessment/AppShell.xaml.cs
index abbe3ed..eb3bd5f 100644
--- a/UndoAssessment/UndoAssessment/AppShell.xaml.cs
+++ b/UndoAssessment/UndoAssessment/AppShell.xaml.cs
@@ -13,6 +13,8 @@ public AppShell()
             InitializeComponent();
             Routing.RegisterRoute(nameof(ItemDetailPage), typeof(ItemDetailPage));
             Routing.RegisterRoute(nameof(NewItemPage), typeof(NewItemPage));
+            Routing.RegisterRoute(nameof(AssessmentPage), typeof(AssessmentPage));
+            Routing.RegisterRoute(nameof(AddUserInfoPage), typeof(AddUserInfoPage));
         }
 
     }
diff --git a/UndoAssessment/UndoAssessment/Models/ResponseModel.cs b/UndoAssessment/UndoAssessment/Models/ResponseModel.cs
new file mode 100644
index 0000000..2789f30
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Models/ResponseModel.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace UndoAssessment.Models
+{
+    public class ResponseModel
+    {
+        [JsonProperty("errorcode")]
+        public int ErrorCode { get; set; }
+
+        [JsonProperty("message")]
+        public string Message { get; set; }
+
+        [JsonProperty("date")]
+        public string Date { get; set; }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/RequestProvider/IRequestProvider.cs b/UndoAssessment/UndoAssessment/RequestProvider/IRequestProvider.cs
new file mode 100644
index 0000000..85c5b86
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/RequestProvider/IRequestProvider.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace UndoAssessment.RequestProvider
+{
+    public interface IRequestProvider
+    {
+        Task<TResult> GetAsync<TResult>(string uri, string token = "", Dictionary<string, string> headers = null);
+
+        Task<TResult> PostAsync<TResult>(string uri, TResult data, string token = "", Dictionary<string, string> headers = null);
+
+        Task<TResult> PutAsync<TResult, TInput>(string uri, TInput data, string token = "", Dictionary<string, string> headers = null);
+
+        Task<string> PutAsync<TInput>(string uri, TInput data, string token = "", Dictionary<string, string> headers = null);
+
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/RequestProvider/RequestProvider.cs b/UndoAssessment/UndoAssessment/RequestProvider/RequestProvider.cs
new file mode 100644
index 0000000..c98e226
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/RequestProvider/RequestProvider.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net.Http.Headers;
+using System.Net.Http;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Essentials;
+using Newtonsoft.Json;
+
+namespace UndoAssessment.RequestProvider
+{
+    public class RequestProvider : IRequestProvider
+    {
+        private HttpClient httpClient;
+        public RequestProvider()
+        {
+            httpClient = CreateHttpClient();
+        }
+
+        public async Task<TResult> GetAsync<TResult>(string uri, string token = "",
+            Dictionary<string, string> headers = null)
+        {
+            HttpResponseMessage response = null;
+            try
+            {
+                if (!string.IsNullOrEmpty(token))
+                {
+                    httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
+                }
+
+                if (headers == null)
+                {
+                    headers = new Dictionary<string, string>();
+                }
+
+                SetHeaders(httpClient, headers);
+
+                response = await httpClient.GetAsync(uri);
+
+                string serialized = await response.Content.ReadAsStringAsync();
+               
+                TResult result = await Task.Run(() =>
+                JsonConvert.DeserializeObject<TResult>(serialized));
+
+                return result;
+
+            }
+            catch (Exception)
+            {
+                return await Task.Run(() => JsonConvert.DeserializeObject<TResult>(""));
+            }
+
+        }
+
+        public Task<TResult> PostAsync<TResult>(string uri, TResult data, string token = "", Dictionary<string, string> headers = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<TResult> PutAsync<TResult, TInput>(string uri, TInput data, string token = "", Dictionary<string, string> headers = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<string> PutAsync<TInput>(string uri, TInput data, string token = "", Dictionary<string, string> headers = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        #region private methods
+        private HttpClient CreateHttpClient(string token = "")
+        {
+            httpClient = new HttpClient();
+            httpClient.Timeout = TimeSpan.FromMinutes(5);
+            httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+            if (!string.IsNullOrEmpty(token))
+            {
+                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
+            }
+            return httpClient;
+        }
+
+        private void SetHeaders(HttpClient httpClient, Dictionary<string, string> headers)
+        {
+            httpClient.DefaultRequestHeaders.Clear();
+            foreach (KeyValuePair<string, string> header in headers)
+            {
+                httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Services/AssessmentService.cs b/UndoAssessment/UndoAssessment/Services/AssessmentService.cs
new file mode 100644
index 0000000..2e96cfb
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Services/AssessmentService.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using UndoAssessment.Models;
+using UndoAssessment.RequestProvider;
+using Xamarin.Forms;
+
+namespace UndoAssessment.Services
+{
+    public class AssessmentService : IAssessmentService
+    {
+        private readonly IRequestProvider _requestProvider;
+        private string baseURL = "https://malkarakundostagingpublicapi.azurewebsites.net";
+        public AssessmentService() 
+        {
+            _requestProvider = DependencyService.Get<IRequestProvider>();
+        }
+        public async Task<ResponseModel> ExecuteFailureAPI()
+        {
+            var requestURL = $"{baseURL}/fail";
+            var response = await _requestProvider.GetAsync<ResponseModel>(requestURL);
+            return response;
+        }
+
+        public async Task<ResponseModel> ExecuteSuccessAPI()
+        {
+            var requestURL = $"{baseURL}/success";
+            var response = await _requestProvider.GetAsync<ResponseModel>(requestURL);
+            return response;
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Services/IAssessmentService.cs b/UndoAssessment/UndoAssessment/Services/IAssessmentService.cs
new file mode 100644
index 0000000..6aefc97
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Services/IAssessmentService.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using UndoAssessment.Models;
+
+namespace UndoAssessment.Services
+{
+    public interface IAssessmentService
+    {
+        /// <summary>
+        /// API call that returns success response
+        /// </summary>
+        /// <returns></returns>
+        Task<ResponseModel> ExecuteSuccessAPI();
+
+        /// <summary>
+        /// API call that returns failure response
+        /// </summary>
+        /// <returns></returns>
+        Task<ResponseModel> ExecuteFailureAPI();
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/UndoAssessment.csproj b/UndoAssessment/UndoAssessment/UndoAssessment.csproj
index 95a3587..62b91c3 100644
--- a/UndoAssessment/UndoAssessment/UndoAssessment.csproj
+++ b/UndoAssessment/UndoAssessment/UndoAssessment.csproj
@@ -6,7 +6,23 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />  
     <PackageReference Include="Xamarin.Essentials" Version="1.7.6" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Views\AssessmentPage.xaml.cs">
+      <DependentUpon>AssessmentPage.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Views\AddUserInfoPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Views\AssessmentPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/ViewModels/AddUserInfoViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/AddUserInfoViewModel.cs
new file mode 100644
index 0000000..f8335d2
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/ViewModels/AddUserInfoViewModel.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xamarin.Essentials;
+using Xamarin.Forms;
+using static System.Net.Mime.MediaTypeNames;
+
+namespace UndoAssessment.ViewModels
+{
+    public class AddUserInfoViewModel : BaseViewModel
+    {
+        public string UserName
+        {
+            get => _userName;
+            set => SetProperty(ref _userName, value);
+        }
+        private string _userName;
+
+        public string Age
+        {
+            get => _age;
+            set => SetProperty(ref _age, value);
+        }
+        private string _age;
+
+        public Command SubmitUserInfoCommand { get; }
+        public AddUserInfoViewModel()
+        {
+            SubmitUserInfoCommand = new Command(OnSumbitUserInfo);
+        }
+
+        private async void OnSumbitUserInfo(object obj)
+        {
+            Preferences.Set(nameof(UserName), UserName);
+            Preferences.Set(nameof(Age), Age);
+            await Shell.Current.GoToAsync("..");
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/ViewModels/AssessmentViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/AssessmentViewModel.cs
new file mode 100644
index 0000000..27e1930
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/ViewModels/AssessmentViewModel.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using UndoAssessment.Models;
+using UndoAssessment.Services;
+using UndoAssessment.Views;
+using Xamarin.Essentials;
+using Xamarin.Forms;
+
+namespace UndoAssessment.ViewModels
+{
+    public class AssessmentViewModel : BaseViewModel
+    {
+        private readonly IAssessmentService _assessmentService;
+
+        public string UserName
+        {
+            get => _userName;
+            set => SetProperty(ref _userName, value);
+        }
+        private string _userName;
+
+        public string Age
+        {
+            get => _age;
+            set => SetProperty(ref _age, value);
+        }
+        private string _age;
+
+        public Command SuccessCommand { get; }
+        public Command FailureCommand { get; }
+        public Command AddUserInfoCommand { get; }
+
+        public AssessmentViewModel()
+        {
+            _assessmentService = DependencyService.Get<IAssessmentService>();
+            SuccessCommand = new Command(OnSuccessTapped);
+            FailureCommand = new Command(OnFailureTapped);
+            AddUserInfoCommand = new Command(OnAddUserInfoTapped);
+        }
+
+        private async void OnAddUserInfoTapped(object obj)
+        {
+            await Shell.Current.GoToAsync("AddUserInfoPage");
+        }
+        private async void OnSuccessTapped(object obj)
+        {
+            try
+            {
+                var response = await _assessmentService.ExecuteSuccessAPI();
+                if (response != null)
+                {
+                    await DisplayAlertMessage(response.Message);
+                }
+                else
+                {
+                    await DisplayAlertMessage("No Response");
+                }
+            }
+            catch(Exception ex)
+            {
+                await DisplayAlertMessage(ex.Message);
+            }
+        }
+        private async void OnFailureTapped(object obj)
+        {
+            try
+            {
+                var response = await _assessmentService.ExecuteFailureAPI();
+                if (response != null)
+                {
+                    await DisplayAlertMessage(response.Message);
+                }
+                else
+                {
+                    await DisplayAlertMessage("No Response");
+                }
+            }
+            catch (Exception ex)
+            {
+                await DisplayAlertMessage(ex.Message);
+            }
+        }
+
+        public void LoadUserData()
+        {
+            UserName = Preferences.Get(nameof(UserName), "");
+            Age = Preferences.Get(nameof(Age), "");
+        }
+
+        private async Task DisplayAlertMessage(string message)
+        {
+            await App.Current.MainPage.DisplayAlert("Assessment", message, "Ok");
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml b/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml
new file mode 100644
index 0000000..ed4f5e4
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="UndoAssessment.Views.AddUserInfoPage"
+             Title="Add User Info">
+    <ContentPage.Content>
+        <StackLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
+            <Grid Margin="30" HorizontalOptions="Center" VerticalOptions="Center">
+                <Label Text="User Name:" Grid.Row="0" Grid.Column="0" VerticalOptions="Center"/>
+                <Entry Text="{Binding UserName}" Grid.Row="0" Grid.Column="1"/>
+                <Label Text="Age:" Grid.Row="1" Grid.Column="0" VerticalOptions="Center"/>
+                <Entry Text="{Binding Age}" Grid.Row="1" Grid.Column="1" Keyboard="Numeric"/>
+                <Button Margin="0,10,0,0" Text="SUBMIT" Command="{Binding SubmitUserInfoCommand}" Grid.Row="2" Grid.Column="1" />
+            </Grid>
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml.cs b/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml.cs
new file mode 100644
index 0000000..646d198
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml.cs
@@ -0,0 +1,16 @@
+using UndoAssessment.ViewModels;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace UndoAssessment.Views
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class AddUserInfoPage : ContentPage
+    {
+        public AddUserInfoPage()
+        {
+            InitializeComponent();
+            BindingContext = new AddUserInfoViewModel();
+        }
+    }
+}
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml b/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml
new file mode 100644
index 0000000..5d205f4
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="UndoAssessment.Views.AssessmentPage"
+             Title="Assessment">
+    <ContentPage.Content>
+        <StackLayout 
+            Orientation="Horizontal"
+            HorizontalOptions="FillAndExpand"
+            VerticalOptions="FillAndExpand">
+            <Button Margin="10" Text="User Info" HorizontalOptions="Start" VerticalOptions="Start" Command="{Binding AddUserInfoCommand}"/>
+            <StackLayout HorizontalOptions="Center" VerticalOptions="Center">
+                <Grid Margin="30">
+                    <Label Text="User Name:" TextColor="Black" Grid.Row="0" Grid.Column="0">
+                        <Label.Triggers>
+                            <DataTrigger TargetType="Label" Binding="{Binding UserName}" Value="">
+                                <Setter Property="IsVisible" Value="False"/>
+                            </DataTrigger>
+                        </Label.Triggers>
+                    </Label>
+                    <Label Text="{Binding UserName}" Grid.Row="0" Grid.Column="1"/>
+                    <Label Text="Age:" TextColor="Black" Grid.Row="1" Grid.Column="0">
+                        <Label.Triggers>
+                            <DataTrigger TargetType="Label" Binding="{Binding Age}" Value="">
+                                <Setter Property="IsVisible" Value="False"/>
+                            </DataTrigger>
+                        </Label.Triggers>
+                    </Label>
+                    <Label Text="{Binding Age}" Grid.Row="1" Grid.Column="1"/>
+                </Grid>
+                <StackLayout Orientation="Horizontal">
+                    <Button Text="Success" BackgroundColor="Green" Command="{Binding SuccessCommand}"/>
+                    <Button Text="Failure" BackgroundColor="Red" Command="{Binding FailureCommand}"/>
+                </StackLayout>
+            </StackLayout>
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml.cs b/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml.cs
new file mode 100644
index 0000000..6cf72bd
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml.cs
@@ -0,0 +1,24 @@
+using UndoAssessment.ViewModels;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace UndoAssessment.Views
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class AssessmentPage : ContentPage
+    {
+        AssessmentViewModel _viewModel;
+        public AssessmentPage()
+        {
+            InitializeComponent();
+            BindingContext = _viewModel =  new AssessmentViewModel();
+        }
+
+        protected override void OnAppearing()
+        {
+            base.OnAppearing();
+            _viewModel.LoadUserData();
+
+        }
+    }
+}
\ No newline at end of file

From 695e8c815850ba3fd462ff0ea0b25075a1c231b1 Mon Sep 17 00:00:00 2001
From: rashisaini20 <46350188+rashisaini20@users.noreply.github.com>
Date: Wed, 12 Jul 2023 12:55:29 -0700
Subject: [PATCH 2/2] refactoring

---
 .../ViewModels/AssessmentViewModel.cs         | 13 ++---
 .../UndoAssessment/Views/AddUserInfoPage.xaml | 25 ++++++++--
 .../UndoAssessment/Views/AssessmentPage.xaml  | 49 ++++++++++++++-----
 3 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/UndoAssessment/UndoAssessment/ViewModels/AssessmentViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/AssessmentViewModel.cs
index 27e1930..e19a37f 100644
--- a/UndoAssessment/UndoAssessment/ViewModels/AssessmentViewModel.cs
+++ b/UndoAssessment/UndoAssessment/ViewModels/AssessmentViewModel.cs
@@ -39,7 +39,13 @@ public AssessmentViewModel()
             FailureCommand = new Command(OnFailureTapped);
             AddUserInfoCommand = new Command(OnAddUserInfoTapped);
         }
+        public void LoadUserData()
+        {
+            UserName = Preferences.Get(nameof(UserName), "");
+            Age = Preferences.Get(nameof(Age), "");
+        }
 
+        #region Commands
         private async void OnAddUserInfoTapped(object obj)
         {
             await Shell.Current.GoToAsync("AddUserInfoPage");
@@ -82,12 +88,7 @@ private async void OnFailureTapped(object obj)
                 await DisplayAlertMessage(ex.Message);
             }
         }
-
-        public void LoadUserData()
-        {
-            UserName = Preferences.Get(nameof(UserName), "");
-            Age = Preferences.Get(nameof(Age), "");
-        }
+        #endregion
 
         private async Task DisplayAlertMessage(string message)
         {
diff --git a/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml b/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml
index ed4f5e4..cda53f4 100644
--- a/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml
+++ b/UndoAssessment/UndoAssessment/Views/AddUserInfoPage.xaml
@@ -6,11 +6,26 @@
     <ContentPage.Content>
         <StackLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
             <Grid Margin="30" HorizontalOptions="Center" VerticalOptions="Center">
-                <Label Text="User Name:" Grid.Row="0" Grid.Column="0" VerticalOptions="Center"/>
-                <Entry Text="{Binding UserName}" Grid.Row="0" Grid.Column="1"/>
-                <Label Text="Age:" Grid.Row="1" Grid.Column="0" VerticalOptions="Center"/>
-                <Entry Text="{Binding Age}" Grid.Row="1" Grid.Column="1" Keyboard="Numeric"/>
-                <Button Margin="0,10,0,0" Text="SUBMIT" Command="{Binding SubmitUserInfoCommand}" Grid.Row="2" Grid.Column="1" />
+                <Label Text="User Name:"
+                       Grid.Row="0"
+                       Grid.Column="0" 
+                       VerticalOptions="Center"/>
+                <Entry Text="{Binding UserName}" 
+                       Grid.Row="0" 
+                       Grid.Column="1"/>
+                <Label Text="Age:" 
+                       Grid.Row="1" 
+                       Grid.Column="0" 
+                       VerticalOptions="Center"/>
+                <Entry Text="{Binding Age}" 
+                       Grid.Row="1" 
+                       Grid.Column="1"
+                       Keyboard="Numeric"/>
+                <Button Margin="0,10,0,0" 
+                        Text="SUBMIT" 
+                        Command="{Binding SubmitUserInfoCommand}" 
+                        Grid.Row="2" 
+                        Grid.Column="1" />
             </Grid>
         </StackLayout>
     </ContentPage.Content>
diff --git a/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml b/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml
index 5d205f4..4e858a4 100644
--- a/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml
+++ b/UndoAssessment/UndoAssessment/Views/AssessmentPage.xaml
@@ -8,29 +8,54 @@
             Orientation="Horizontal"
             HorizontalOptions="FillAndExpand"
             VerticalOptions="FillAndExpand">
-            <Button Margin="10" Text="User Info" HorizontalOptions="Start" VerticalOptions="Start" Command="{Binding AddUserInfoCommand}"/>
-            <StackLayout HorizontalOptions="Center" VerticalOptions="Center">
+            <Button Margin="10" 
+                    Text="User Info"
+                    HorizontalOptions="Start" 
+                    VerticalOptions="Start" 
+                    Command="{Binding AddUserInfoCommand}"/>
+            <StackLayout HorizontalOptions="Center" 
+                         VerticalOptions="Center">
                 <Grid Margin="30">
-                    <Label Text="User Name:" TextColor="Black" Grid.Row="0" Grid.Column="0">
+                    <Label Text="User Name:"
+                           TextColor="Black"
+                           Grid.Row="0" 
+                           Grid.Column="0">
                         <Label.Triggers>
-                            <DataTrigger TargetType="Label" Binding="{Binding UserName}" Value="">
-                                <Setter Property="IsVisible" Value="False"/>
+                            <DataTrigger TargetType="Label" 
+                                         Binding="{Binding UserName}" Value="">
+                                <Setter Property="IsVisible" 
+                                        Value="False"/>
                             </DataTrigger>
                         </Label.Triggers>
                     </Label>
-                    <Label Text="{Binding UserName}" Grid.Row="0" Grid.Column="1"/>
-                    <Label Text="Age:" TextColor="Black" Grid.Row="1" Grid.Column="0">
+                    <Label Text="{Binding UserName}"
+                           Grid.Row="0" 
+                           Grid.Column="1"/>
+                    <Label Text="Age:" 
+                           TextColor="Black" 
+                           Grid.Row="1" 
+                           Grid.Column="0">
                         <Label.Triggers>
-                            <DataTrigger TargetType="Label" Binding="{Binding Age}" Value="">
-                                <Setter Property="IsVisible" Value="False"/>
+                            <DataTrigger TargetType="Label" 
+                                         Binding="{Binding Age}" 
+                                         Value="">
+                                <Setter Property="IsVisible" 
+                                        Value="False"/>
                             </DataTrigger>
                         </Label.Triggers>
                     </Label>
-                    <Label Text="{Binding Age}" Grid.Row="1" Grid.Column="1"/>
+                    <Label Text="{Binding Age}" 
+                           Grid.Row="1" 
+                           Grid.Column="1"/>
                 </Grid>
+                
                 <StackLayout Orientation="Horizontal">
-                    <Button Text="Success" BackgroundColor="Green" Command="{Binding SuccessCommand}"/>
-                    <Button Text="Failure" BackgroundColor="Red" Command="{Binding FailureCommand}"/>
+                    <Button Text="Success" 
+                            BackgroundColor="Green" 
+                            Command="{Binding SuccessCommand}"/>
+                    <Button Text="Failure" 
+                            BackgroundColor="Red" 
+                            Command="{Binding FailureCommand}"/>
                 </StackLayout>
             </StackLayout>
         </StackLayout>