Continuing work on default interval. #38 and some UI Button changes
This commit is contained in:
@@ -55,19 +55,20 @@ namespace Mear.Repositories.Database
|
|||||||
{
|
{
|
||||||
var result = 0;
|
var result = 0;
|
||||||
|
|
||||||
try
|
//try
|
||||||
{
|
//{
|
||||||
result = _Db.GetTableInfo(tablename).Count;
|
result = _Db.GetTableInfo(tablename).Count;
|
||||||
|
|
||||||
if (result > 0)
|
if (result > 0)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
/**}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
var msg = ex.Message;
|
var msg = ex.Message;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -93,6 +93,7 @@ namespace Mear.ViewModels
|
|||||||
_sliderItems.Clear();
|
_sliderItems.Clear();
|
||||||
_sliderItems.Add(new SliderItem
|
_sliderItems.Add(new SliderItem
|
||||||
{
|
{
|
||||||
|
Name = "DefaultInterval",
|
||||||
Title = "Default Track Interval",
|
Title = "Default Track Interval",
|
||||||
Minimum = 0,
|
Minimum = 0,
|
||||||
Maximum = 10,
|
Maximum = 10,
|
||||||
@@ -115,6 +116,7 @@ namespace Mear.ViewModels
|
|||||||
}
|
}
|
||||||
public class SliderItem
|
public class SliderItem
|
||||||
{
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
public string Title { get; set; }
|
public string Title { get; set; }
|
||||||
public int Minimum { get; set; }
|
public int Minimum { get; set; }
|
||||||
public int Maximum { get; set; }
|
public int Maximum { get; set; }
|
||||||
|
|||||||
@@ -12,9 +12,17 @@
|
|||||||
HorizontalOptions="CenterAndExpand" />
|
HorizontalOptions="CenterAndExpand" />
|
||||||
|
|
||||||
<Button x:Name="Login"
|
<Button x:Name="Login"
|
||||||
|
VerticalOptions="Center"
|
||||||
|
HorizontalOptions="Center"
|
||||||
|
MinimumWidthRequest="250"
|
||||||
|
WidthRequest="300"
|
||||||
Text="Login"
|
Text="Login"
|
||||||
Clicked="Login_Clicked" />
|
Clicked="Login_Clicked" />
|
||||||
<Button x:Name="Register"
|
<Button x:Name="Register"
|
||||||
|
VerticalOptions="Center"
|
||||||
|
HorizontalOptions="Center"
|
||||||
|
MinimumWidthRequest="250"
|
||||||
|
WidthRequest="300"
|
||||||
Text="Register"
|
Text="Register"
|
||||||
Clicked="Register_Clicked" />
|
Clicked="Register_Clicked" />
|
||||||
</StackLayout>
|
</StackLayout>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
x:Class="Mear.Views.LoginPage">
|
x:Class="Mear.Views.LoginPage">
|
||||||
<ContentPage.Content>
|
<ContentPage.Content>
|
||||||
<StackLayout>
|
<StackLayout >
|
||||||
<Label Text="Login into Icarus account"
|
<Label Text="Login into Icarus account"
|
||||||
VerticalOptions="CenterAndExpand"
|
VerticalOptions="CenterAndExpand"
|
||||||
HorizontalOptions="CenterAndExpand" />
|
HorizontalOptions="CenterAndExpand" />
|
||||||
@@ -21,6 +21,9 @@
|
|||||||
Placeholder="Password" />
|
Placeholder="Password" />
|
||||||
|
|
||||||
<Button x:Name="AuthenticateUser"
|
<Button x:Name="AuthenticateUser"
|
||||||
|
HorizontalOptions="Center"
|
||||||
|
MinimumWidthRequest="250"
|
||||||
|
WidthRequest="300"
|
||||||
Text="Login"
|
Text="Login"
|
||||||
Clicked="AuthenticateUser_Clicked" />
|
Clicked="AuthenticateUser_Clicked" />
|
||||||
</StackLayout>
|
</StackLayout>
|
||||||
|
|||||||
@@ -36,22 +36,17 @@ namespace Mear.Views
|
|||||||
#region Methods
|
#region Methods
|
||||||
private User ExtractCredentials()
|
private User ExtractCredentials()
|
||||||
{
|
{
|
||||||
try
|
if (string.IsNullOrEmpty(Username.Text) && string.IsNullOrEmpty(
|
||||||
{
|
Password.Text))
|
||||||
var username = Username.Text;
|
{
|
||||||
var password = Password.Text;
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return new User
|
return new User
|
||||||
{
|
{
|
||||||
Username = username,
|
Username = Username.Text,
|
||||||
Password = password
|
Password = Password.Text
|
||||||
};
|
};
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
var msg = ex.Message;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Events
|
#region Events
|
||||||
|
|||||||
@@ -87,9 +87,9 @@
|
|||||||
d:Text="{Binding .}"
|
d:Text="{Binding .}"
|
||||||
LineBreakMode="NoWrap"
|
LineBreakMode="NoWrap"
|
||||||
FontSize="22" />
|
FontSize="22" />
|
||||||
<Label Grid.Row="0" Grid.Column="1"
|
<Label x:Name="{Binding Name}"
|
||||||
Text="{Binding DefaultInterval}"
|
Grid.Row="0" Grid.Column="1"
|
||||||
d:Text="{Binding .}"
|
Text=""
|
||||||
LineBreakMode="NoWrap" />
|
LineBreakMode="NoWrap" />
|
||||||
<Slider Grid.Row="0" Grid.Column="2"
|
<Slider Grid.Row="0" Grid.Column="2"
|
||||||
ValueChanged="Slider_ValueChanged"
|
ValueChanged="Slider_ValueChanged"
|
||||||
|
|||||||
@@ -64,10 +64,10 @@ namespace Mear.Views
|
|||||||
|
|
||||||
private void Slider_ValueChanged(object sender, ValueChangedEventArgs e)
|
private void Slider_ValueChanged(object sender, ValueChangedEventArgs e)
|
||||||
{
|
{
|
||||||
var e_var = e;
|
var value = Convert.ToInt32((sender as Slider).Value);
|
||||||
var s_var = (Slider)sender;
|
var resLbl = ((sender as Slider).Parent as Grid).Children[1] as Label;
|
||||||
_viewModel.SliderItems.First().DefaultInterval = Convert.ToInt32(s_var.Value);
|
_viewModel.SliderItems.First().DefaultInterval = Convert.ToInt32(value);
|
||||||
var stopper = 0;
|
resLbl.Text = $"{value}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user