diff --git a/Droid/Resources/Resource.designer.cs b/Droid/Resources/Resource.designer.cs index 5a5c210..ea89ea9 100644 --- a/Droid/Resources/Resource.designer.cs +++ b/Droid/Resources/Resource.designer.cs @@ -2,6 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -14,7 +15,7 @@ namespace qController.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.0.0.73")] public partial class Resource { diff --git a/Droid/packages.config b/Droid/packages.config index f632fa9..798deb8 100644 --- a/Droid/packages.config +++ b/Droid/packages.config @@ -9,10 +9,10 @@ - + - + diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj index a8ef5ab..bd1fd3e 100644 --- a/Droid/qController.Droid.csproj +++ b/Droid/qController.Droid.csproj @@ -233,7 +233,7 @@ ..\packages\Zeroconf.3.5.11\lib\netstandard2.0\Zeroconf.dll - ..\packages\QControlKit.0.0.30\lib\netstandard2.1\QControlKit.dll + ..\packages\QControlKit.0.0.31\lib\netstandard2.1\QControlKit.dll ..\packages\Xamarin.AndroidX.MultiDex.2.0.1.10\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll @@ -447,7 +447,7 @@ ..\packages\Xamarin.GooglePlayServices.Maps.117.0.1.3\lib\monoandroid90\Xamarin.GooglePlayServices.Maps.dll - ..\packages\SuperSimpleTcp.3.0.0.2\lib\netstandard2.1\SuperSimpleTcp.dll + ..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll diff --git a/iOS/AppDelegate.cs b/iOS/AppDelegate.cs index 95f1a6e..abc5dab 100644 --- a/iOS/AppDelegate.cs +++ b/iOS/AppDelegate.cs @@ -10,7 +10,7 @@ namespace qController.iOS { global::Xamarin.Forms.Forms.Init(); - Log.Logger = new LoggerConfiguration().WriteTo.NSLog().MinimumLevel.Information().CreateLogger(); + Log.Logger = new LoggerConfiguration().WriteTo.NSLog().MinimumLevel.Debug().CreateLogger(); LoadApplication(new App()); diff --git a/iOS/packages.config b/iOS/packages.config index 5077422..a055abc 100644 --- a/iOS/packages.config +++ b/iOS/packages.config @@ -8,10 +8,10 @@ - + - + diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj index 1f30b78..9dee07f 100644 --- a/iOS/qController.iOS.csproj +++ b/iOS/qController.iOS.csproj @@ -148,13 +148,13 @@ ..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\packages\SuperSimpleTcp.3.0.0.2\lib\netstandard2.1\SuperSimpleTcp.dll + ..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll ..\packages\Zeroconf.3.5.11\lib\xamarinios10\Zeroconf.dll - ..\packages\QControlKit.0.0.30\lib\netstandard2.1\QControlKit.dll + ..\packages\QControlKit.0.0.31\lib\netstandard2.1\QControlKit.dll diff --git a/qController.Standard/Classes/UI/QCueGrid.cs b/qController.Standard/Classes/UI/QCueGrid.cs index ac7a22c..0d138d1 100644 --- a/qController.Standard/Classes/UI/QCueGrid.cs +++ b/qController.Standard/Classes/UI/QCueGrid.cs @@ -3,6 +3,7 @@ using qController.ViewModels; using QControlKit; using System.Linq; using System.Collections.Generic; +using Serilog; namespace qController.UI { @@ -22,6 +23,7 @@ namespace qController.UI private void BuildGrid(QCue cue) { + RowDefinitions.Clear(); RowDefinitions.Add( new RowDefinition { @@ -214,19 +216,17 @@ namespace qController.UI Device.BeginInvokeOnMainThread(() => { //Nuke current grid - List children = Children.ToList(); - foreach (View child in children) - { - Children.Remove(child); - } - - RowDefinitions = new RowDefinitionCollection(); + Children.Clear(); + RowDefinitions.Clear(); //rebuild BuildGrid(qCueViewModel.cue); //TODO: check if this is working - qCueViewModel.cue.workspace.fetchPlaybackPositionForCue(qCueViewModel.cue); + if (qCueViewModel.cue.IsGroup) + { + qCueViewModel.cue.workspace.fetchPlaybackPositionForCue(qCueViewModel.cue); + } }); } @@ -234,7 +234,8 @@ namespace qController.UI { if (e.PropertyName.Equals("cues")) { - ReloadGrid(); + //TODO: Figure out why this doesn't work + //ReloadGrid(); } } } diff --git a/qController.Standard/Views/QWorkspacePage.xaml.cs b/qController.Standard/Views/QWorkspacePage.xaml.cs index 1b302f4..15e1b6c 100644 --- a/qController.Standard/Views/QWorkspacePage.xaml.cs +++ b/qController.Standard/Views/QWorkspacePage.xaml.cs @@ -111,11 +111,12 @@ namespace qController selectedCueFrame.BindingContext = new QCueViewModel(selectedCue, false); //Find cue grid for selected cue and scroll to it if it exists - QCueGrid gridToScrollTo = QCueGridListHelper.get(args.cueID); - if(gridToScrollTo != null) - { - cueListScrollView.ScrollToAsync(gridToScrollTo, ScrollToPosition.Center,true); - } + //TODO: something about element isn't a member + //QCueGrid gridToScrollTo = QCueGridListHelper.get(args.cueID); + //if(gridToScrollTo != null) + //{ + // cueListScrollView.ScrollToAsync(gridToScrollTo, ScrollToPosition.Center,true); + //} } else { @@ -132,6 +133,18 @@ namespace qController }); } + void updateCuePropertes(QCue cue) + { + cue.workspace.fetchDefaultPropertiesForCue(cue); + if(cue.cues.Count > 0) + { + foreach(QCue childCue in cue.cues) + { + childCue.workspace.fetchDefaultPropertiesForCue(childCue); + } + } + } + void Workspace_WorkspaceUpdated(object source, QWorkspaceUpdatedArgs args) { Log.Debug("[workspacepage] Workspace Updated"); @@ -146,7 +159,7 @@ namespace qController foreach (QCue aCue in connectedWorkspace.cueLists) { - + updateCuePropertes(aCue); if(aCue.cues.Count > 0) { QCueGrid mainCueGrid = new QCueGrid(aCue); diff --git a/qController.Standard/qController.csproj b/qController.Standard/qController.csproj index bf85696..a897893 100644 --- a/qController.Standard/qController.csproj +++ b/qController.Standard/qController.csproj @@ -62,7 +62,7 @@ - +