From 061adabff8c71a400b50921aa201e46183399dc2 Mon Sep 17 00:00:00 2001 From: watsonb8 Date: Sun, 1 Dec 2019 06:53:30 -0500 Subject: [PATCH] First pass at some styling --- Aurora/Aurora.csproj | 126 ++++++------------ Aurora/Design/Components/Library/Library.css | 3 + .../Queue.xaml => Library/Library.xaml} | 4 +- .../Queue.xaml.cs => Library/Library.xaml.cs} | 25 ++-- .../NavigationMenu/NavigationMenu.css | 32 +++-- .../NavigationMenu/NavigationMenu.xaml | 6 +- .../NavigationMenu/NavigationMenu.xaml.cs | 3 + Aurora/Design/Views/MainView/MainView.css | 13 ++ Aurora/Design/Views/MainView/MainView.xaml | 46 +++++-- Aurora/Design/Views/MainView/MainView.xaml.cs | 2 +- Aurora/Design/Views/MainView/MainViewModel.cs | 9 +- .../Design/Views/MainView/PageContainer.xaml | 18 +-- Aurora/Design/Views/Party/PartyView.xaml | 5 +- Aurora/Design/Views/Songs/SongsView.xaml | 56 +------- 14 files changed, 151 insertions(+), 197 deletions(-) create mode 100644 Aurora/Design/Components/Library/Library.css rename Aurora/Design/Components/{Queue/Queue.xaml => Library/Library.xaml} (95%) rename Aurora/Design/Components/{Queue/Queue.xaml.cs => Library/Library.xaml.cs} (87%) create mode 100644 Aurora/Design/Views/MainView/MainView.css diff --git a/Aurora/Aurora.csproj b/Aurora/Aurora.csproj index 649ed1b..9533cee 100644 --- a/Aurora/Aurora.csproj +++ b/Aurora/Aurora.csproj @@ -1,112 +1,62 @@ - + netstandard2.0 true - + pdbonly true - - - - - - - - + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + Player.xaml - - - - - + + + + + - + PreserveNewest diff --git a/Aurora/Design/Components/Library/Library.css b/Aurora/Design/Components/Library/Library.css new file mode 100644 index 0000000..2c71ccc --- /dev/null +++ b/Aurora/Design/Components/Library/Library.css @@ -0,0 +1,3 @@ +#LibraryDataGrid { + background-color: black +} diff --git a/Aurora/Design/Components/Queue/Queue.xaml b/Aurora/Design/Components/Library/Library.xaml similarity index 95% rename from Aurora/Design/Components/Queue/Queue.xaml rename to Aurora/Design/Components/Library/Library.xaml index bfa5dad..4cde537 100644 --- a/Aurora/Design/Components/Queue/Queue.xaml +++ b/Aurora/Design/Components/Library/Library.xaml @@ -3,10 +3,10 @@ xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:dg="clr-namespace:Xamarin.Forms.DataGrid;assembly=Xamarin.Forms.DataGrid" - x:Class="Aurora.Design.Components.Queue.Queue"> + x:Class="Aurora.Design.Components.Library.Library"> + this.LibraryDataGrid.ItemSelected += (sender, e) => { this.SelectedItem = e.SelectedItem; }; @@ -28,7 +28,7 @@ namespace Aurora.Design.Components.Queue public static readonly BindableProperty ItemsSourceProperty = BindableProperty.Create(propertyName: "ItemsSource", returnType: typeof(IEnumerable), - declaringType: typeof(Queue), + declaringType: typeof(Library), defaultBindingMode: BindingMode.Default, propertyChanged: OnItemsSourceChanged); @@ -56,9 +56,10 @@ namespace Aurora.Design.Components.Queue /// private static void OnItemsSourceChanged(BindableObject bindable, object oldValue, object newValue) { - Queue control = bindable as Queue; - var queueDataGrid = control.FindByName("QueueDataGrid") as DataGrid; - queueDataGrid.ItemsSource = newValue as IEnumerable; + Library control = bindable as Library; + + var libraryDataGrid = control.LibraryDataGrid; + libraryDataGrid.ItemsSource = newValue as IEnumerable; } #endregion ItemsSource Property @@ -72,7 +73,7 @@ namespace Aurora.Design.Components.Queue public static readonly BindableProperty SelectedItemProperty = BindableProperty.Create(propertyName: "SelectedItem", returnType: typeof(object), - declaringType: typeof(Queue), + declaringType: typeof(Library), defaultBindingMode: BindingMode.TwoWay); /// @@ -101,7 +102,7 @@ namespace Aurora.Design.Components.Queue public static readonly BindableProperty ItemDoubleClickedProperty = BindableProperty.Create(propertyName: "ItemDoubleClicked", returnType: typeof(Command), - declaringType: typeof(Queue), + declaringType: typeof(Library), propertyChanged: OnDoubleClickPropertyChanged); /// @@ -128,8 +129,8 @@ namespace Aurora.Design.Components.Queue /// private static void OnDoubleClickPropertyChanged(BindableObject bindable, object newValue, object oldValue) { - Queue control = bindable as Queue; - var queueDataGrid = control.QueueDataGrid; + Library control = bindable as Library; + var queueDataGrid = control.LibraryDataGrid; if (queueDataGrid.GestureRecognizers.Count > 0) { var gestureRecognizer = queueDataGrid.GestureRecognizers.First(); diff --git a/Aurora/Design/Components/NavigationMenu/NavigationMenu.css b/Aurora/Design/Components/NavigationMenu/NavigationMenu.css index 8a0c249..c75df32 100644 --- a/Aurora/Design/Components/NavigationMenu/NavigationMenu.css +++ b/Aurora/Design/Components/NavigationMenu/NavigationMenu.css @@ -4,21 +4,29 @@ ListView { background-color: #232323; - margin-left: 20; - margin-top: 20; + margin-left: 15; + margin-top: 40; } -#GroupTemplate Label { - color: white; - font-size: 14; - font-family: Courier New, Courier, monospace; - font-weight: 100; - margin-top: 500; +#GroupTemplate { + align-items: end; } -#ItemTemplate label { - color: white; - font-size: 18; +#GroupCell Label { + color: lightgray; + background-color: #232323; + font-size: 12; font-family: Courier New, Courier, monospace; - font-weight: 400; + font-style: italic; + padding-top: 18; +} + +#ItemCell label { + color: white; + background-color: #232323; + font-size: 15; + font-family: Courier New, Courier, monospace; + font-style: normal; + text-align: left; + padding-top: 12; } diff --git a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml index b78f553..c401b23 100644 --- a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml +++ b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml @@ -14,18 +14,20 @@ SeparatorVisibility="None" HasUnevenRows="true" IsGroupingEnabled="true" + RowHeight="35" CachingStrategy="RecycleElement"> - + - + diff --git a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs index 8371106..3a98e07 100644 --- a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs +++ b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs @@ -11,10 +11,13 @@ namespace Aurora.Design.Components.NavigationMenu { InitializeComponent(); ListView = MenuItemsListView; + } + public ListView ListView; + public static readonly BindableProperty ItemsProperty = BindableProperty.Create(propertyName: nameof(Items), returnType: typeof(ObservableCollection), diff --git a/Aurora/Design/Views/MainView/MainView.css b/Aurora/Design/Views/MainView/MainView.css new file mode 100644 index 0000000..4a91d6a --- /dev/null +++ b/Aurora/Design/Views/MainView/MainView.css @@ -0,0 +1,13 @@ +^ContentPage { + background-color: #232323; +} + +#Header { + background-color: #232323; +} + + #Header > Entry { + margin-left: 155; + margin-top: 2; + margin-bottom: 2; + } diff --git a/Aurora/Design/Views/MainView/MainView.xaml b/Aurora/Design/Views/MainView/MainView.xaml index 87bad21..1495313 100644 --- a/Aurora/Design/Views/MainView/MainView.xaml +++ b/Aurora/Design/Views/MainView/MainView.xaml @@ -4,20 +4,50 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:views="clr-namespace:Aurora.Design.Views.MainView" xmlns:navigation="clr-namespace:Aurora.Design.Components.NavigationMenu" + xmlns:mp="clr-namespace:Aurora.Design.Components.MediaPlayer" x:Class="Aurora.Design.Views.Main.MainView"> + + + - - - - + + + + + + + + + - + + + + + + + - + + + + + + + \ No newline at end of file diff --git a/Aurora/Design/Views/MainView/MainView.xaml.cs b/Aurora/Design/Views/MainView/MainView.xaml.cs index 4137065..15a802f 100644 --- a/Aurora/Design/Views/MainView/MainView.xaml.cs +++ b/Aurora/Design/Views/MainView/MainView.xaml.cs @@ -33,7 +33,7 @@ namespace Aurora.Design.Views.Main BindingContext = new MainViewModel(); _viewModels = new Dictionary(); - _player = (Player)ContentPage.FindByName("Player"); + _player = Player; _viewContent = (ContentPresenter)ContentPage.Content.FindByName("ViewContent"); MasterPage.ListView.ItemSelected += OnNavItemSelected; diff --git a/Aurora/Design/Views/MainView/MainViewModel.cs b/Aurora/Design/Views/MainView/MainViewModel.cs index 8d9f1f0..4048a0f 100644 --- a/Aurora/Design/Views/MainView/MainViewModel.cs +++ b/Aurora/Design/Views/MainView/MainViewModel.cs @@ -32,12 +32,13 @@ namespace Aurora.Design.Views.MainView { _pages = new ObservableCollection(new[] { - new NavigationItem { Id = 0, Title = "Songs", Group="Library", TargetType = typeof(SongsView), TargetViewModelType = typeof(SongsViewModel) }, - new NavigationItem { Id = 1, Title = "Artists", Group="Library", TargetType = typeof(ArtistsView), TargetViewModelType = typeof(ArtistsViewModel)}, - new NavigationItem { Id = 2, Title = "Albums", Group="Library", TargetType = typeof(AlbumsView), TargetViewModelType = typeof(AlbumsViewModel)}, - new NavigationItem { Id = 3, Title = "Stations", Group="Library", TargetType = typeof(StationsView), TargetViewModelType = typeof(StationsViewModel)}, + new NavigationItem { Id = 0, Title = "Songs", Group="Your Music", TargetType = typeof(SongsView), TargetViewModelType = typeof(SongsViewModel) }, + new NavigationItem { Id = 1, Title = "Artists", Group="Your Music", TargetType = typeof(ArtistsView), TargetViewModelType = typeof(ArtistsViewModel)}, + new NavigationItem { Id = 2, Title = "Albums", Group="Your Music", TargetType = typeof(AlbumsView), TargetViewModelType = typeof(AlbumsViewModel)}, + new NavigationItem { Id = 3, Title = "Stations", Group="Your Music", TargetType = typeof(StationsView), TargetViewModelType = typeof(StationsViewModel)}, new NavigationItem { Id = 4, Title = "Party", Group="Social", TargetType = typeof(PartyView), TargetViewModelType = typeof(PartyViewModel)}, new NavigationItem { Id = 5, Title = "Profile", Group="Social", TargetType = typeof(ProfileView), TargetViewModelType = typeof(ProfileViewModel)}, + new NavigationItem { Id = 6, Title = "A + B", Group="Playlists", TargetType = typeof(StationsView), TargetViewModelType = typeof(StationsViewModel)} }); } diff --git a/Aurora/Design/Views/MainView/PageContainer.xaml b/Aurora/Design/Views/MainView/PageContainer.xaml index 652881d..4e50c92 100644 --- a/Aurora/Design/Views/MainView/PageContainer.xaml +++ b/Aurora/Design/Views/MainView/PageContainer.xaml @@ -1,28 +1,14 @@ - - - - - + \ No newline at end of file diff --git a/Aurora/Design/Views/Party/PartyView.xaml b/Aurora/Design/Views/Party/PartyView.xaml index 4dbad0c..869ac6e 100644 --- a/Aurora/Design/Views/Party/PartyView.xaml +++ b/Aurora/Design/Views/Party/PartyView.xaml @@ -4,8 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:hs="clr-namespace:Aurora.Design.Components.HostSelector" xmlns:ml="clr-namespace:Aurora.Design.Components.MemberList" - xmlns:renderedViews="clr-namespace:Sharpnado.Presentation.Forms.RenderedViews;assembly=Sharpnado.Presentation.Forms" - xmlns:qu="clr-namespace:Aurora.Design.Components.Queue" + xmlns:library="clr-namespace:Aurora.Design.Components.Library" x:Class="Aurora.Design.Views.Party.PartyView"> @@ -23,7 +22,7 @@ Members="{Binding Members}"/>