From afd1751edd92a455b0b47a1a6d44fe63b413ec47 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 18 Jun 2020 20:00:01 -0500 Subject: [PATCH] Selected Cue Styling --- .../QSharpXamDemo.Android.csproj | 3 +- QSharpXamDemo/QSharpXamDemo/CueListPage.xaml | 34 +++++++++++++++++-- .../QSharpXamDemo/CueListPage.xaml.cs | 15 +++----- .../QSharpXamDemo/ViewModels/QCueViewModel.cs | 15 +++++++- .../ViewModels/SelectedQCueViewModel.cs | 13 +++++++ 5 files changed, 63 insertions(+), 17 deletions(-) diff --git a/QSharpXamDemo/QSharpXamDemo.Android/QSharpXamDemo.Android.csproj b/QSharpXamDemo/QSharpXamDemo.Android/QSharpXamDemo.Android.csproj index 750e15f..b5f7059 100644 --- a/QSharpXamDemo/QSharpXamDemo.Android/QSharpXamDemo.Android.csproj +++ b/QSharpXamDemo/QSharpXamDemo.Android/QSharpXamDemo.Android.csproj @@ -16,7 +16,6 @@ Properties\AndroidManifest.xml Resources Assets - false v9.0 true true @@ -97,7 +96,7 @@ QSharp - {48097AD8-2188-4F99-8092-E4EFD7571268} + {20D2D0D8-A518-42DC-BAB8-CF098CDF03C4} QSharpXamDemo diff --git a/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml b/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml index 1569e32..5646dde 100644 --- a/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml +++ b/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml @@ -22,14 +22,42 @@ + RowSpacing="0" + BackgroundColor="#D8D8D8"> + - + + + + + + + + + + - diff --git a/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml.cs b/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml.cs index f9543a7..c0ad1e3 100644 --- a/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml.cs +++ b/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml.cs @@ -1,21 +1,13 @@ -using System; + using System.Collections.Generic; -using System.Data; -using System.Diagnostics; -using System.Net.Http.Headers; -using System.Runtime.InteropServices; using System.Threading.Tasks; -using System.Xml; using QSharp; using QSharpXamDemo.ViewModels; using Serilog; -using Xamarin.Essentials; using Xamarin.Forms; -using Xamarin.Forms.Xaml; namespace QSharpXamDemo { - [XamlCompilation(XamlCompilationOptions.Compile)] public partial class CueListPage : ContentPage { private QWorkspace connectedWorkspace; @@ -76,15 +68,16 @@ namespace QSharpXamDemo { BindingContext = qCueViewModel, HorizontalOptions = LayoutOptions.StartAndExpand, - VerticalTextAlignment = TextAlignment.Center + VerticalTextAlignment = TextAlignment.Center, }; cueLabel.SetBinding(Label.TextProperty, "name", BindingMode.OneWay); var cueBackground = new Frame { BindingContext = qCueViewModel, - Opacity = 0.75, + Opacity = 0.60, HasShadow = false, CornerRadius = 0, + BorderColor = Color.Black }; cueBackground.SetBinding(BackgroundColorProperty, "color",BindingMode.OneWay); diff --git a/QSharpXamDemo/QSharpXamDemo/ViewModels/QCueViewModel.cs b/QSharpXamDemo/QSharpXamDemo/ViewModels/QCueViewModel.cs index 799d336..a8a6ea8 100644 --- a/QSharpXamDemo/QSharpXamDemo/ViewModels/QCueViewModel.cs +++ b/QSharpXamDemo/QSharpXamDemo/ViewModels/QCueViewModel.cs @@ -29,7 +29,7 @@ namespace QSharpXamDemo.ViewModels public string name { get { - return cue.nonEmptyName; + return cue.displayName; } set @@ -38,6 +38,19 @@ namespace QSharpXamDemo.ViewModels } } + public string number + { + get + { + return cue.number; + } + + set + { + cue.number = value; + } + } + public Color color { get diff --git a/QSharpXamDemo/QSharpXamDemo/ViewModels/SelectedQCueViewModel.cs b/QSharpXamDemo/QSharpXamDemo/ViewModels/SelectedQCueViewModel.cs index 2b19715..eca8e43 100644 --- a/QSharpXamDemo/QSharpXamDemo/ViewModels/SelectedQCueViewModel.cs +++ b/QSharpXamDemo/QSharpXamDemo/ViewModels/SelectedQCueViewModel.cs @@ -31,6 +31,19 @@ namespace QSharpXamDemo.ViewModels } } + public string number + { + get + { + return cue.number; + } + + set + { + cue.number = value; + } + } + public Color color { get