Small fixes found with Demo App

This commit is contained in:
Joel Wetzell
2020-06-18 19:25:57 -05:00
parent c824a12043
commit 283481af8f
6 changed files with 148 additions and 59 deletions
+108 -21
View File
@@ -4,18 +4,29 @@ VisualStudioVersion = 16.0.30128.74
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QSharp", "QSharp\QSharp.csproj", "{51CD2579-79C9-49A9-B68D-93CBE878BAA1}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QSharp", "QSharp\QSharp.csproj", "{51CD2579-79C9-49A9-B68D-93CBE878BAA1}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QSharpDemoApp", "QSharpDemoApp\QSharpDemoApp.csproj", "{734E00A0-31BC-4ED8-BC29-FE7649FD2089}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QSharpXamDemo.Android", "QSharpXamDemo\QSharpXamDemo.Android\QSharpXamDemo.Android.csproj", "{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QSharpXamDemo.iOS", "QSharpXamDemo\QSharpXamDemo.iOS\QSharpXamDemo.iOS.csproj", "{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QSharpXamDemo", "QSharpXamDemo\QSharpXamDemo\QSharpXamDemo.csproj", "{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}"
ProjectSection(ProjectDependencies) = postProject
{51CD2579-79C9-49A9-B68D-93CBE878BAA1} = {51CD2579-79C9-49A9-B68D-93CBE878BAA1}
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64 Debug|ARM64 = Debug|ARM64
Debug|iPhone = Debug|iPhone
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
Debug|x86 = Debug|x86 Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64 Release|ARM64 = Release|ARM64
Release|iPhone = Release|iPhone
Release|iPhoneSimulator = Release|iPhoneSimulator
Release|x64 = Release|x64 Release|x64 = Release|x64
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
@@ -26,6 +37,10 @@ Global
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|ARM.Build.0 = Debug|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|ARM.Build.0 = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|ARM64.ActiveCfg = Debug|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|ARM64.Build.0 = Debug|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|ARM64.Build.0 = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|iPhone.Build.0 = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|x64.ActiveCfg = Debug|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|x64.ActiveCfg = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|x64.Build.0 = Debug|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|x64.Build.0 = Debug|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|x86.ActiveCfg = Debug|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -36,30 +51,102 @@ Global
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|ARM.Build.0 = Release|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|ARM.Build.0 = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|ARM64.ActiveCfg = Release|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|ARM64.ActiveCfg = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|ARM64.Build.0 = Release|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|ARM64.Build.0 = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|iPhone.ActiveCfg = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|iPhone.Build.0 = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|x64.ActiveCfg = Release|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|x64.ActiveCfg = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|x64.Build.0 = Release|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|x64.Build.0 = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|x86.ActiveCfg = Release|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|x86.ActiveCfg = Release|Any CPU
{51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|x86.Build.0 = Release|Any CPU {51CD2579-79C9-49A9-B68D-93CBE878BAA1}.Release|x86.Build.0 = Release|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|Any CPU.Build.0 = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|ARM.ActiveCfg = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|ARM.Build.0 = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|ARM64.ActiveCfg = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|ARM.Build.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|ARM64.Build.0 = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|ARM.Deploy.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|x64.ActiveCfg = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|x64.Build.0 = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|ARM64.Build.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|x86.ActiveCfg = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|ARM64.Deploy.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Debug|x86.Build.0 = Debug|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|Any CPU.ActiveCfg = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|iPhone.Build.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|Any CPU.Build.0 = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|iPhone.Deploy.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|ARM.ActiveCfg = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|ARM.Build.0 = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|ARM64.ActiveCfg = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|ARM64.Build.0 = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|x64.ActiveCfg = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|x64.ActiveCfg = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|x64.Build.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|x64.Build.0 = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|x64.Deploy.0 = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|x86.ActiveCfg = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|x86.ActiveCfg = Debug|Any CPU
{734E00A0-31BC-4ED8-BC29-FE7649FD2089}.Release|x86.Build.0 = Release|Any CPU {4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|x86.Build.0 = Debug|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Debug|x86.Deploy.0 = Debug|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|Any CPU.Build.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|ARM.ActiveCfg = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|ARM.Build.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|ARM.Deploy.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|ARM64.ActiveCfg = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|ARM64.Build.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|ARM64.Deploy.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|iPhone.ActiveCfg = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|iPhone.Build.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|iPhone.Deploy.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|x64.ActiveCfg = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|x64.Build.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|x64.Deploy.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|x86.ActiveCfg = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|x86.Build.0 = Release|Any CPU
{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}.Release|x86.Deploy.0 = Release|Any CPU
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|ARM.ActiveCfg = Debug|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|ARM64.ActiveCfg = Debug|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|iPhone.ActiveCfg = Debug|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|iPhone.Build.0 = Debug|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|x64.ActiveCfg = Debug|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Debug|x86.ActiveCfg = Debug|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|Any CPU.ActiveCfg = Release|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|ARM.ActiveCfg = Release|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|ARM64.ActiveCfg = Release|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|iPhone.ActiveCfg = Release|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|iPhone.Build.0 = Release|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|x64.ActiveCfg = Release|iPhone
{9A10344E-F9FB-4319-9665-CB7E78FCF4F4}.Release|x86.ActiveCfg = Release|iPhone
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|ARM.ActiveCfg = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|ARM.Build.0 = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|ARM64.Build.0 = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|iPhone.Build.0 = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|x64.ActiveCfg = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|x64.Build.0 = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|x86.ActiveCfg = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Debug|x86.Build.0 = Debug|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|Any CPU.Build.0 = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|ARM.ActiveCfg = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|ARM.Build.0 = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|ARM64.ActiveCfg = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|ARM64.Build.0 = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|iPhone.ActiveCfg = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|iPhone.Build.0 = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|x64.ActiveCfg = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|x64.Build.0 = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|x86.ActiveCfg = Release|Any CPU
{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
+32 -30
View File
@@ -8,11 +8,15 @@ namespace QSharp
{ {
public class QColor public class QColor
{ {
public string name; public string name { get; set; }
public string Hex; public string Hex { get; set; }
public string lightHex; public string lightHex { get; set; }
public string darkHex; public string darkHex { get; set; }
public QColor()
{
defaultColor();
}
public QColor(string name) public QColor(string name)
{ {
@@ -48,63 +52,61 @@ namespace QSharp
private void defaultColor() private void defaultColor()
{ {
name = "default"; name = "default";
lightHex = "ACAAB2"; lightHex = "#ACAAB2";
Hex = "8F8A99"; Hex = "#8F8A99";
darkHex = "77737F"; darkHex = "#77737F";
} }
private void redColor() private void redColor()
{ {
name = "red"; name = "red";
lightHex = "FC563C"; lightHex = "#FC563C";
Hex = "FC363B"; Hex = "#FC363B";
darkHex = "E31C24"; darkHex = "#E31C24";
} }
private void orangeColor() private void orangeColor()
{ {
name = "orange"; name = "orange";
lightHex = "FFAA00"; lightHex = "#FFAA00";
Hex = "FF9500"; Hex = "#FF9500";
darkHex = "FF6A00"; darkHex = "#FF6A00";
} }
private void yellowColor () private void yellowColor ()
{ {
name = "yellow"; name = "yellow";
lightHex = "FFF480"; lightHex = "#FFF480";
Hex = "F7E519"; Hex = "#F7E519";
darkHex = "FFD500"; darkHex = "#FFD500";
} }
private void greenColor() private void greenColor()
{ {
name = "green"; name = "green";
lightHex = "17E639"; lightHex = "#17E639";
Hex = "00CC22"; Hex = "#00CC22";
darkHex = "00B300"; darkHex = "#00B300";
} }
private void blueColor() private void blueColor()
{ {
name = "blue"; name = "blue";
lightHex = "5C73E6"; lightHex = "#5C73E6";
Hex = "415AD9"; Hex = "#415AD9";
darkHex = "2944CC"; darkHex = "#2944CC";
} }
private void indigoColor() private void indigoColor()
{ {
name = "purple"; name = "purple";
lightHex = "3F388C"; lightHex = "#3F388C";
Hex = "5A5499"; Hex = "#5A5499";
darkHex = "6262B3"; darkHex = "#6262B3";
} }
private void purpleColor() private void purpleColor()
{ {
name = "purple"; name = "purple";
lightHex = "B500D9"; lightHex = "#B500D9";
Hex = "9500B3"; Hex = "#9500B3";
darkHex = "730099"; darkHex = "#730099";
} }
} }
} }
+1 -1
View File
@@ -116,7 +116,7 @@ namespace QSharp
public string replyAddress { get{ return IsReply ? address.Substring("/reply".Length) : address; } } public string replyAddress { get{ return IsReply ? address.Substring("/reply".Length) : address; } }
public string[] AddressParts { get { return address.Split("/",StringSplitOptions.RemoveEmptyEntries); } } public string[] AddressParts { get { return address.Split(new char[] { '/' },StringSplitOptions.RemoveEmptyEntries); } }
public JToken response public JToken response
{ {
+3 -3
View File
@@ -12,9 +12,9 @@ namespace QSharp
private QClient client; private QClient client;
public string host; public string host { get; set; }
public int port; public int port { get; set; }
public string name; public string name { get; set; }
public IZeroconfHost zeroconfHost; public IZeroconfHost zeroconfHost;
public List<QWorkspace> workspaces = new List<QWorkspace>(); public List<QWorkspace> workspaces = new List<QWorkspace>();
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild> <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Authors>Joel Wetzell</Authors> <Authors>Joel Wetzell</Authors>
</PropertyGroup> </PropertyGroup>
+3 -3
View File
@@ -14,7 +14,7 @@ namespace QSharp
private QServer server; private QServer server;
private QClient client; private QClient client;
public string name; public string name { get; set; }
public string uniqueID; public string uniqueID;
public bool connected; public bool connected;
public bool hasPasscode; public bool hasPasscode;
@@ -436,8 +436,8 @@ namespace QSharp
} }
currentCueLists.Add(cueList); currentCueLists.Add(cueList);
index++; index++;
valueForKey(cueList,QOSCKey.PlaybackPositionId);
} }
QCue activeCuesList = root.cueWithID(QIdentifiers.ActiveCues, false); QCue activeCuesList = root.cueWithID(QIdentifiers.ActiveCues, false);
if(activeCuesList != null) if(activeCuesList != null)
{ {
@@ -463,7 +463,7 @@ namespace QSharp
if (root.cues.Count() != currentCueLists.Count()) if (root.cues.Count() != currentCueLists.Count())
rootCueUpdated = true; rootCueUpdated = true;
root.setProperty(currentCueLists, QOSCKey.Cues); root.setProperty(currentCueLists, QOSCKey.Cues, false) ;
if (rootCueUpdated) if (rootCueUpdated)
{ {