Refactored BaseViewModel & UserDataViewModel

- Moved IsBusy to UserDataViewModel because it is the only view model using the property
- Updated boolean property to follow Yes/No naming format

Author: TheCodeTraveler

src/XamarinAzureChallenge/XamarinAzureChallenge.Shared/Models/User.cs

@@ -13,10 +13,10 @@ public class User
         [JsonProperty("phone")]
         public string Phone { get; set; } = string.Empty;
 
-        [JsonProperty("acceptTermsOfService")]
-        public bool AcceptTermsOfService { get; set; } = false;
+        [JsonProperty("isTermsOfServiceAccepted")]
+        public bool IsTermsOfServiceAccepted { get; set; } = false;
 
-        [JsonProperty("allowsComercialUse")]
-        public bool AllowsComercialUse { get; set; } = false;
+        [JsonProperty("isComercialCommunicationsAccepted")]
+        public bool IsComercialCommunicationsAccepted { get; set; } = false;
     }
 }

src/XamarinAzureChallenge/XamarinAzureChallenge/Pages/UserDataPage.xaml

@@ -156,15 +156,15 @@
                        Text="I accept the terms of service*" />
                 <Switch Grid.Row="10"
                         Grid.Column="1"
-                        IsToggled="{Binding User.AcceptTermsOfService}"
+                        IsToggled="{Binding User.IsTermsOfServiceAccepted}"
                         VerticalOptions="Center" />
 
                 <Label Grid.Row="11"
                        Style="{StaticResource ToggleTitleStyle}"
                        Text="I give consent for Microsoft to send me personalised commercial communications" />
                 <Switch Grid.Row="11"
                         Grid.Column="1"
-                        IsToggled="{Binding User.AllowsComercialUse}"
+                        IsToggled="{Binding User.IsComercialCommunicationsAccepted}"
                         VerticalOptions="Center" />
 
 

src/XamarinAzureChallenge/XamarinAzureChallenge/ViewModels/BaseViewModel.cs

@@ -2,30 +2,14 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Xamarin.Forms;
 
 namespace XamarinAzureChallenge.ViewModels
 {
     public abstract class BaseViewModel : INotifyPropertyChanged
     {
-        private bool isBusy;
-
         public event PropertyChangedEventHandler PropertyChanged;
 
-        protected BaseViewModel()
-        {
-            FeatureNotAvailableCommand = new Command(async () => await ShowFeatureNotAvailable());
-        }
-
-        public ICommand FeatureNotAvailableCommand { get; }
-
-        public bool IsBusy
-        {
-            get => isBusy;
-            set => SetAndRaisePropertyChanged(ref isBusy, value);
-        }
-
         protected void SetAndRaisePropertyChanged<TRef>(
             ref TRef field, TRef value, [CallerMemberName] string propertyName = null)
         {
@@ -43,15 +27,10 @@ protected void SetAndRaisePropertyChangedIfDifferentValues<TRef>(
             SetAndRaisePropertyChanged(ref field, value, propertyName);
         }
 
-        protected Task NavigateToPage(Page page, bool clearStack = false)
+        protected Task NavigateToPage(Page page)
         {
             return RunOnUIThread(async () =>
-            {
-                if (clearStack)
-                    Application.Current.MainPage = new NavigationPage(page);
-                else
-                    await Application.Current.MainPage.Navigation.PushAsync(page);
-            });
+                await Application.Current.MainPage.Navigation.PushAsync(page));
         }
 
         protected Task NavigateBack()
@@ -66,7 +45,7 @@ protected Task ShowFeatureNotAvailable()
                 await Application.Current.MainPage.DisplayAlert("Feature not available", "", "Ok"));
         }
 
-        protected Task DisplayAlert(string message)
+        protected Task DisplayInvalidFieldAlert(string message)
         {
             return RunOnUIThread(async () =>
                 await Application.Current.MainPage.DisplayAlert("Invalid Field", message, "Ok"));

src/XamarinAzureChallenge/XamarinAzureChallenge/ViewModels/UserDataViewModel.cs

@@ -17,17 +17,24 @@ public class UserDataViewModel : BaseViewModel
         private readonly Lazy<HttpClient> clientHolder = new Lazy<HttpClient>();
 
         private User user;
+        private bool isBusy;
 
         public UserDataViewModel()
         {
             User = new User();
-            SubmitCommand = new Command(async () => await SubmitCommmandExecute());
+            SubmitCommand = new Command(async () => await SubmitCommmandExecute(User));
             PrivacyStatementCommand = new Command(async () => await PrivacyStatementCommandExecute());
         }
 
         public ICommand SubmitCommand { get; }
         public ICommand PrivacyStatementCommand { get; }
 
+        public bool IsBusy
+        {
+            get => isBusy;
+            set => SetAndRaisePropertyChanged(ref isBusy, value);
+        }
+
         public User User
         {
             get => user;
@@ -36,7 +43,7 @@ public User User
 
         private HttpClient Client => clientHolder.Value;
 
-        private async Task SubmitCommmandExecute()
+        private async Task SubmitCommmandExecute(User submittedUser)
         {
             if (IsBusy)
                 return;
@@ -45,7 +52,7 @@ private async Task SubmitCommmandExecute()
 
             try
             {
-                var areFieldsValid = await AreFieldsValid();
+                var areFieldsValid = await AreFieldsValid(submittedUser.Name, submittedUser.Email, submittedUser.Phone, submittedUser.IsTermsOfServiceAccepted);
 
                 if (areFieldsValid)
                 {
@@ -68,25 +75,25 @@ private async Task SubmitCommmandExecute()
             }
         }
 
-        private async Task<bool> AreFieldsValid()
+        private async Task<bool> AreFieldsValid(string name, string email, string phone, bool isTermsOfServiceAccepted)
         {
             var result = false;
 
-            if (string.IsNullOrWhiteSpace(User.Name))
+            if (string.IsNullOrWhiteSpace(name))
             {
-                await DisplayAlert("Name cannot be blank");
+                await DisplayInvalidFieldAlert("Name cannot be blank");
             }
-            else if (string.IsNullOrWhiteSpace(User.Email))
+            else if (string.IsNullOrWhiteSpace(email))
             {
-                await DisplayAlert("Email cannot be blank");
+                await DisplayInvalidFieldAlert("Email cannot be blank");
             }
-            else if (string.IsNullOrWhiteSpace(User.Phone))
+            else if (string.IsNullOrWhiteSpace(phone))
             {
-                await DisplayAlert("Phone cannot be blank");
+                await DisplayInvalidFieldAlert("Phone cannot be blank");
             }
-            else if (!User.AcceptTermsOfService)
+            else if (!isTermsOfServiceAccepted)
             {
-                await DisplayAlert("Terms of Service Not Accepted");
+                await DisplayInvalidFieldAlert("Terms of Service Not Accepted");
             }
             else
             {