More styling

This commit is contained in:
watsonb8
2019-12-01 20:20:55 -08:00
parent 89d7d65d8d
commit 6bb4b5fdd5
10 changed files with 109 additions and 15 deletions

View File

@ -11,3 +11,14 @@
margin-top: 2;
margin-bottom: 2;
}
#TitleContainer {
margin-top: 10;
}
#TitleContainer Label {
color: white;
margin-left: 155;
font-size: 18;
vertical-align: bottom;
}

View File

@ -12,6 +12,7 @@
</ContentPage.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="28"/>
<RowDefinition Height="28"/>
<RowDefinition Height="*"/>
<RowDefinition Height="50"/>
@ -19,12 +20,20 @@
<!--Header-->
<StackLayout
x:Name="Header"
Grid.Row="0"
Orientation="Horizontal">
<Entry Text="Search"/>
</StackLayout>
<!--Title-->
<StackLayout
Grid.Row="1"
x:Name="TitleContainer">
<Label Text="{Binding Title}" TextColor="White"/>
</StackLayout>
<!--Library Grid-->
<Grid Grid.Row="1">
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="*"/>
@ -33,7 +42,8 @@
<navigation:NavigationMenu
Grid.Column="0"
x:Name="MasterPage"
Items="{Binding Pages}"/>
Items="{Binding Pages}"
SelectedItem="{Binding SelectedItem}"/>
<views:PageContainer
Grid.Column="1"
@ -45,8 +55,7 @@
<!--Music Player-->
<mp:Player
x:Name="Player"
Grid.Row="2"
HorizontalOptions="Center"
Grid.Row="3"
HeightRequest="50"/>
</Grid>

View File

@ -93,8 +93,6 @@ namespace Aurora.Design.Views.Main
AssignPlayerControls(vm);
_viewContent.Content = view;
MasterPage.ListView.SelectedItem = null;
}
/// <summary>
@ -129,8 +127,8 @@ namespace Aurora.Design.Views.Main
vm.OnActive();
_viewContent.Content = view;
MasterPage.ListView.SelectedItem = firstNavItem;
MasterPage.ListView.SelectedItem = screenList.FirstOrDefault();
}
/// <summary>

View File

@ -28,6 +28,30 @@ namespace Aurora.Design.Views.MainView
}
}
private NavigationItem _selectedItem;
public NavigationItem SelectedItem
{
get
{
return _selectedItem;
}
set
{
SetProperty(ref _selectedItem, value);
OnPropertyChanged("Title");
}
}
public string Title
{
get
{
return (_selectedItem != null && !string.IsNullOrWhiteSpace(_selectedItem.Title)) ?
_selectedItem.Title : "";
}
}
public MainViewModel()
{
_pages = new ObservableCollection<NavigationItem>(new[]