jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-04 23:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to latest qcontrolkit

Browse Source
This commit is contained in:
Joel Wetzell
2022-11-06 06:16:16 -06:00
parent 6e80be67ea
commit 811aefcb63
9 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Resources/Resource.designer.cs
Generated
+2 -1
View File
@@ -2,6 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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
{
Droid/packages.config
+2 -2
View File
@@ -9,10 +9,10 @@
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid90" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid10.0" />
<package id="QControlKit" version="0.0.30" targetFramework="monoandroid11.0" />
<package id="QControlKit" version="0.0.31" targetFramework="monoandroid11.0" />
<package id="Serilog" version="2.12.0" targetFramework="monoandroid11.0" />
<package id="Serilog.Sinks.Xamarin" version="1.0.0" targetFramework="monoandroid11.0" />
<package id="SuperSimpleTcp" version="3.0.0.2" targetFramework="monoandroid11.0" />
<package id="SuperSimpleTcp" version="3.0.5" targetFramework="monoandroid11.0" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" />
Droid/qController.Droid.csproj
+2 -2
View File
@@ -233,7 +233,7 @@
<HintPath>..\packages\Zeroconf.3.5.11\lib\netstandard2.0\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="QControlKit">
<HintPath>..\packages\QControlKit.0.0.30\lib\netstandard2.1\QControlKit.dll</HintPath>
<HintPath>..\packages\QControlKit.0.0.31\lib\netstandard2.1\QControlKit.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.MultiDex">
<HintPath>..\packages\Xamarin.AndroidX.MultiDex.2.0.1.10\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
@@ -447,7 +447,7 @@
<HintPath>..\packages\Xamarin.GooglePlayServices.Maps.117.0.1.3\lib\monoandroid90\Xamarin.GooglePlayServices.Maps.dll</HintPath>
</Reference>
<Reference Include="SuperSimpleTcp">
<HintPath>..\packages\SuperSimpleTcp.3.0.0.2\lib\netstandard2.1\SuperSimpleTcp.dll</HintPath>
<HintPath>..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
iOS/AppDelegate.cs
+1 -1
View File
@@ -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());
iOS/packages.config
+2 -2
View File
@@ -8,10 +8,10 @@
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="xamarinios10" />
<package id="QControlKit" version="0.0.30" targetFramework="xamarinios10" />
<package id="QControlKit" version="0.0.31" targetFramework="xamarinios10" />
<package id="Serilog" version="2.12.0" targetFramework="xamarinios10" />
<package id="Serilog.Sinks.Xamarin" version="1.0.0" targetFramework="xamarinios10" />
<package id="SuperSimpleTcp" version="3.0.0.2" targetFramework="xamarinios10" />
<package id="SuperSimpleTcp" version="3.0.5" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" />
iOS/qController.iOS.csproj
+2 -2
View File
@@ -148,13 +148,13 @@
<HintPath>..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="SuperSimpleTcp">
<HintPath>..\packages\SuperSimpleTcp.3.0.0.2\lib\netstandard2.1\SuperSimpleTcp.dll</HintPath>
<HintPath>..\packages\SuperSimpleTcp.3.0.5\lib\netstandard2.1\SuperSimpleTcp.dll</HintPath>
</Reference>
<Reference Include="Zeroconf">
<HintPath>..\packages\Zeroconf.3.5.11\lib\xamarinios10\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="QControlKit">
<HintPath>..\packages\QControlKit.0.0.30\lib\netstandard2.1\QControlKit.dll</HintPath>
<HintPath>..\packages\QControlKit.0.0.31\lib\netstandard2.1\QControlKit.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System.Numerics.Vectors" />
qController.Standard/Classes/UI/QCueGrid.cs
+10 -9
View File
@@ -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<View> 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();
}
}
}
qController.Standard/Views/QWorkspacePage.xaml.cs
+19 -6
View File
@@ -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);
qController.Standard/qController.csproj
+1 -1
View File
@@ -62,7 +62,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="QControlKit" Version="0.0.30" />
<PackageReference Include="QControlKit" Version="0.0.31" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
</ItemGroup>
<ItemGroup>