From cdd1ee871d170118ecce27e08abc3025f11e2b33 Mon Sep 17 00:00:00 2001
From: amazing-username <kundeng94@gmail.com>
Date: Tue, 25 Jun 2019 17:27:15 -0700
Subject: [PATCH] Continuing work on default interval. #38 and some UI Button
 changes

---
 .../Repositories/Database/DBRepository.cs     |  7 +++---
 Mear/Mear/ViewModels/SettingsViewModel.cs     |  2 ++
 Mear/Mear/Views/Landing.xaml                  |  8 ++++++
 Mear/Mear/Views/LoginPage.xaml                |  5 +++-
 Mear/Mear/Views/LoginPage.xaml.cs             | 25 ++++++++-----------
 Mear/Mear/Views/SettingsPage.xaml             |  6 ++---
 Mear/Mear/Views/SettingsPage.xaml.cs          |  8 +++---
 7 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/Mear/Mear/Repositories/Database/DBRepository.cs b/Mear/Mear/Repositories/Database/DBRepository.cs
index a9de13b..e834b64 100644
--- a/Mear/Mear/Repositories/Database/DBRepository.cs
+++ b/Mear/Mear/Repositories/Database/DBRepository.cs
@@ -55,19 +55,20 @@ namespace Mear.Repositories.Database
 		{
 			var result = 0;
 
-			try
-			{
+			//try
+			//{
 				result = _Db.GetTableInfo(tablename).Count;
 
 				if (result > 0)
 				{
 					return true;
 				}
-			}
+			/**}
 			catch (Exception ex)
 			{
 				var msg = ex.Message;
 			}
+            */
 			return false;
 		}
 
diff --git a/Mear/Mear/ViewModels/SettingsViewModel.cs b/Mear/Mear/ViewModels/SettingsViewModel.cs
index 6a24a29..61fc6e2 100644
--- a/Mear/Mear/ViewModels/SettingsViewModel.cs
+++ b/Mear/Mear/ViewModels/SettingsViewModel.cs
@@ -93,6 +93,7 @@ namespace Mear.ViewModels
             _sliderItems.Clear();
             _sliderItems.Add(new SliderItem
             {
+                Name = "DefaultInterval",
                 Title = "Default Track Interval",
                 Minimum = 0,
                 Maximum = 10,
@@ -115,6 +116,7 @@ namespace Mear.ViewModels
         }
         public class SliderItem
         {
+            public string Name { get; set; }
             public string Title { get; set; }
             public int Minimum { get; set; }
             public int Maximum { get; set; }
diff --git a/Mear/Mear/Views/Landing.xaml b/Mear/Mear/Views/Landing.xaml
index 3861cc2..27d2987 100644
--- a/Mear/Mear/Views/Landing.xaml
+++ b/Mear/Mear/Views/Landing.xaml
@@ -12,9 +12,17 @@
                 HorizontalOptions="CenterAndExpand" />
 
 			<Button x:Name="Login"
+                    VerticalOptions="Center"
+                    HorizontalOptions="Center"
+                    MinimumWidthRequest="250"
+                    WidthRequest="300"
 					Text="Login"
 					Clicked="Login_Clicked" />
 			<Button x:Name="Register"
+                    VerticalOptions="Center"
+                    HorizontalOptions="Center"
+                    MinimumWidthRequest="250"
+                    WidthRequest="300"
 					Text="Register"
 					Clicked="Register_Clicked" />
 		</StackLayout>
diff --git a/Mear/Mear/Views/LoginPage.xaml b/Mear/Mear/Views/LoginPage.xaml
index f857a90..2bc9347 100644
--- a/Mear/Mear/Views/LoginPage.xaml
+++ b/Mear/Mear/Views/LoginPage.xaml
@@ -6,7 +6,7 @@
              mc:Ignorable="d"
              x:Class="Mear.Views.LoginPage">
     <ContentPage.Content>
-        <StackLayout>
+        <StackLayout >
             <Label Text="Login into Icarus account"
                 VerticalOptions="CenterAndExpand" 
                 HorizontalOptions="CenterAndExpand" />
@@ -21,6 +21,9 @@
 				   Placeholder="Password" />
 
 			<Button x:Name="AuthenticateUser"
+                    HorizontalOptions="Center"
+                    MinimumWidthRequest="250"
+                    WidthRequest="300"
 					Text="Login"
 					Clicked="AuthenticateUser_Clicked" />
 		</StackLayout>
diff --git a/Mear/Mear/Views/LoginPage.xaml.cs b/Mear/Mear/Views/LoginPage.xaml.cs
index 232d3e7..885cf1f 100644
--- a/Mear/Mear/Views/LoginPage.xaml.cs
+++ b/Mear/Mear/Views/LoginPage.xaml.cs
@@ -36,22 +36,17 @@ namespace Mear.Views
 		#region Methods
 		private User ExtractCredentials()
 		{
-			try
-			{
-				var username = Username.Text;
-				var password = Password.Text;
+            if (string.IsNullOrEmpty(Username.Text) && string.IsNullOrEmpty(
+                Password.Text))
+            {
+                return null;
+            }
 
-				return new User
-				{
-					Username = username,
-					Password = password
-				};
-			}
-			catch (Exception ex)
-			{
-				var msg = ex.Message;
-			}
-			return null;
+            return new User
+            {
+                Username = Username.Text,
+                Password = Password.Text
+            };
 		}
 
 		#region Events
diff --git a/Mear/Mear/Views/SettingsPage.xaml b/Mear/Mear/Views/SettingsPage.xaml
index 6a32576..dac3e7c 100644
--- a/Mear/Mear/Views/SettingsPage.xaml
+++ b/Mear/Mear/Views/SettingsPage.xaml
@@ -87,9 +87,9 @@
                                        d:Text="{Binding .}"
                                        LineBreakMode="NoWrap"
                                        FontSize="22" />
-                                <Label Grid.Row="0" Grid.Column="1"
-                                       Text="{Binding DefaultInterval}"
-                                       d:Text="{Binding .}"
+                                <Label x:Name="{Binding Name}"
+                                       Grid.Row="0" Grid.Column="1"
+                                       Text=""
                                        LineBreakMode="NoWrap" />
                                 <Slider Grid.Row="0" Grid.Column="2"
                                        ValueChanged="Slider_ValueChanged"
diff --git a/Mear/Mear/Views/SettingsPage.xaml.cs b/Mear/Mear/Views/SettingsPage.xaml.cs
index a174859..ce1b808 100644
--- a/Mear/Mear/Views/SettingsPage.xaml.cs
+++ b/Mear/Mear/Views/SettingsPage.xaml.cs
@@ -64,10 +64,10 @@ namespace Mear.Views
 
         private void Slider_ValueChanged(object sender, ValueChangedEventArgs e)
         {
-            var e_var = e;
-            var s_var = (Slider)sender;
-            _viewModel.SliderItems.First().DefaultInterval = Convert.ToInt32(s_var.Value);
-            var stopper = 0;
+            var value = Convert.ToInt32((sender as Slider).Value);
+            var resLbl = ((sender as Slider).Parent as Grid).Children[1] as Label;
+            _viewModel.SliderItems.First().DefaultInterval = Convert.ToInt32(value);
+            resLbl.Text = $"{value}";
         }
     }
 }
\ No newline at end of file