jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-11 02:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

* packages.config:

Browse Source 
* packages.config:
* qController.iOS.csproj:
* qController.Droid.csproj:
* qController.csproj: Update QControlKit

* QBrowserPage.xaml.cs:
* QCueViewModel.cs:
* QWorkspacePage.xaml.cs:
* QBrowserViewModel.cs: Logging cleanup
This commit is contained in:
Joel Wetzell
2021-02-13 14:49:34 -05:00
parent 6debd99655
commit 6e52a67726
9 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/packages.config
+1 -1
View File
@@ -9,7 +9,7 @@
<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="12.0.3" targetFramework="monoandroid90" />
<package id="QControlKit" version="0.0.15" targetFramework="monoandroid10.0" />
<package id="QControlKit" version="0.0.17" targetFramework="monoandroid10.0" />
<package id="Serilog" version="2.10.0" targetFramework="monoandroid90" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="monoandroid90" />
<package id="Splat" version="10.0.1" targetFramework="monoandroid90" />
Droid/qController.Droid.csproj
+1 -1
View File
@@ -231,7 +231,7 @@
<HintPath>..\packages\Zeroconf.3.4.2\lib\netstandard2.0\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="QControlKit">
<HintPath>..\packages\QControlKit.0.0.15\lib\netstandard2.0\QControlKit.dll</HintPath>
<HintPath>..\packages\QControlKit.0.0.17\lib\netstandard2.0\QControlKit.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.MultiDex">
<HintPath>..\packages\Xamarin.AndroidX.MultiDex.2.0.1.6\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
iOS/packages.config
+1 -1
View File
@@ -8,7 +8,7 @@
<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="12.0.3" targetFramework="xamarinios10" />
<package id="QControlKit" version="0.0.15" targetFramework="xamarinios10" />
<package id="QControlKit" version="0.0.17" targetFramework="xamarinios10" />
<package id="Serilog" version="2.10.0" targetFramework="xamarinios10" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
iOS/qController.iOS.csproj
+1 -1
View File
@@ -146,7 +146,7 @@
<HintPath>..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll</HintPath>
</Reference>
<Reference Include="QControlKit">
<HintPath>..\packages\QControlKit.0.0.15\lib\netstandard2.0\QControlKit.dll</HintPath>
<HintPath>..\packages\QControlKit.0.0.17\lib\netstandard2.0\QControlKit.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="Xamarin.Forms.Platform.iOS">
qController.Standard/ViewModels/QBrowserViewModel.cs
+3 -2
View File
@@ -7,6 +7,7 @@ using QControlKit;
using QControlKit.Events;
using System;
using System.Threading.Tasks;
using Serilog;
namespace qController.ViewModels
{
@@ -42,7 +43,7 @@ namespace qController.ViewModels
{
Device.BeginInvokeOnMainThread(() =>
{
System.Console.WriteLine($"[QBrowserViewModel] adding server: {args.server.description}");
Log.Debug($"[QBrowserViewModel] adding server: {args.server.description}");
ServersGrouped.Add(new QServerViewModel(args.server));
});
}
@@ -65,7 +66,7 @@ namespace qController.ViewModels
{
Device.BeginInvokeOnMainThread(() =>
{
System.Console.WriteLine($"[QBrowserViewModel] removing server: {args.server.description}");
Log.Debug($"[QBrowserViewModel] removing server: {args.server.description}");
ServersGrouped.Remove(serverToRemove);
});
}
qController.Standard/ViewModels/QCueViewModel.cs
-1
View File
@@ -46,7 +46,6 @@ namespace qController.ViewModels
}
else if (property.Equals(QOSCKey.Children))
{
//Log.Debug("children property updated");
if (cue.IsGroup)
{
OnPropertyChanged("cues");
qController.Standard/Views/QBrowserPage.xaml.cs
-1
View File
@@ -68,7 +68,6 @@ namespace qController.Pages
{
if (resp.Ok)
{
Console.WriteLine($"Passcode is null: {resp.Value == null}");
await Navigation.PushAsync(new QWorkspacePage(selectedWorkspace, resp.Value));
}
}
qController.Standard/Views/QWorkspacePage.xaml.cs
+3 -4
View File
@@ -60,8 +60,7 @@ namespace qController
private void ConnectedWorkspace_WorkspaceConnectionError(object source, QWorkspaceConnectionErrorArgs connectionErrorArgs)
{
System.Console.WriteLine("WorkspaceConnectionError Called");
if (connectionErrorArgs.status.Equals("badpass"))
if (connectionErrorArgs.status.Equals(QConnectionStatus.BadPass))
{
UserDialogs.Instance.Prompt(new PromptConfig
{
@@ -106,10 +105,10 @@ namespace qController
}
else
{
//Setup and "empty" cue for when no cue is selected
//Setup an "empty" cue for when no cue is selected
QCue emptyCue = new QCue();
emptyCue.workspace = connectedWorkspace;
emptyCue.type = "Memo";
emptyCue.type = QCueType.Memo;
emptyCue.listName = "No Cue Selected";
selectedCueFrame.BindingContext = new QCueViewModel(emptyCue, false);
qController.Standard/qController.csproj
+1 -1
View File
@@ -64,7 +64,7 @@
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="QControlKit" Version="0.0.15" />
<PackageReference Include="QControlKit" Version="0.0.17" />
</ItemGroup>
<ItemGroup>
<None Remove="App.xaml" />