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

* Info.plist:

Browse Source 
* packages.config:
* qController.iOS.csproj:
* qController.Droid.csproj:
* AndroidManifest.xml:
* qController.csproj: Update Packages

* ControlPage.xaml.cs:
* QLevelsCell.cs: Revert multi level sliders...ugh
This commit is contained in:
Joel Wetzell
2021-04-29 01:00:59 -05:00
parent 0621275605
commit d391e6a688
8 changed files with 106 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Properties/AndroidManifest.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="31" android:versionName="1.6.1" package="com.jwetzell.qlabcontroller" android:installLocation="auto"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="32" android:versionName="1.6.2" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" /> <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
Droid/packages.config
+12 -10
View File
@@ -11,8 +11,8 @@
<package id="Serilog" version="2.10.0" targetFramework="monoandroid90" /> <package id="Serilog" version="2.10.0" targetFramework="monoandroid90" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="monoandroid90" /> <package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="monoandroid90" />
<package id="Splat" version="11.0.1" targetFramework="monoandroid10.0" /> <package id="Splat" version="11.0.1" targetFramework="monoandroid10.0" />
<package id="Square.OkHttp3" version="3.12.3" targetFramework="monoandroid10.0" /> <package id="Square.OkHttp3" version="4.9.0" targetFramework="monoandroid10.0" />
<package id="Square.OkIO" version="1.15.0" targetFramework="monoandroid10.0" /> <package id="Square.OkIO" version="2.8.0" targetFramework="monoandroid10.0" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" /> <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections" 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" /> <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" />
@@ -171,17 +171,19 @@
<package id="Xamarin.Build.Download" version="0.10.0" targetFramework="monoandroid10.0" /> <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Essentials" version="1.6.1" targetFramework="monoandroid10.0" /> <package id="Xamarin.Essentials" version="1.6.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Forms" version="5.0.0.2012" targetFramework="monoandroid10.0" /> <package id="Xamarin.Forms" version="5.0.0.2012" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportApi" version="2.2.0" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Android.DataTransport.TransportApi" version="2.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportBackendCct" version="2.2.3" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Android.DataTransport.TransportBackendCct" version="2.3.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportRuntime" version="2.2.3" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Android.DataTransport.TransportRuntime" version="2.2.6" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.Material" version="1.3.0.1" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Android.Material" version="1.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.AutoValue.Annotations" version="1.6.5" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.AutoValue.Annotations" version="1.6.6" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Dagger" version="2.25.2.1" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Dagger" version="2.27.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.2" targetFramework="monoandroid10.0" /> <package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Base" version="117.1.0" targetFramework="monoandroid10.0" /> <package id="Xamarin.GooglePlayServices.Basement" version="117.6.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Basement" version="117.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Stats" version="117.0.0" targetFramework="monoandroid10.0" /> <package id="Xamarin.GooglePlayServices.Stats" version="117.0.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Tasks" version="117.0.2" targetFramework="monoandroid10.0" /> <package id="Xamarin.GooglePlayServices.Tasks" version="117.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.JavaX.Inject" version="1.0.0" targetFramework="monoandroid10.0" /> <package id="Xamarin.JavaX.Inject" version="1.0.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Jetbrains.Annotations" version="13.0.0.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.Kotlin.StdLib" version="1.4.20" targetFramework="monoandroid10.0" />
<package id="Xamarin.Kotlin.StdLib.Common" version="1.4.20" targetFramework="monoandroid10.0" />
<package id="Zeroconf" version="3.4.2" targetFramework="monoandroid90" /> <package id="Zeroconf" version="3.4.2" targetFramework="monoandroid90" />
</packages> </packages>
Droid/qController.Droid.csproj
+24 -11
View File
@@ -31,6 +31,7 @@
<AndroidSupportedAbis>x86;armeabi-v7a;arm64-v8a;x86_64</AndroidSupportedAbis> <AndroidSupportedAbis>x86;armeabi-v7a;arm64-v8a;x86_64</AndroidSupportedAbis>
<MandroidI18n> <MandroidI18n>
</MandroidI18n> </MandroidI18n>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@@ -394,28 +395,28 @@
<HintPath>..\packages\Xamarin.AndroidX.ConstraintLayout.2.0.4.2\lib\monoandroid90\Xamarin.AndroidX.ConstraintLayout.dll</HintPath> <HintPath>..\packages\Xamarin.AndroidX.ConstraintLayout.2.0.4.2\lib\monoandroid90\Xamarin.AndroidX.ConstraintLayout.dll</HintPath>
</Reference> </Reference>
<Reference Include="Square.OkIO"> <Reference Include="Square.OkIO">
<HintPath>..\packages\Square.OkIO.1.15.0\lib\monoandroid44\Square.OkIO.dll</HintPath> <HintPath>..\packages\Square.OkIO.2.8.0\lib\monoandroid90\Square.OkIO.dll</HintPath>
</Reference> </Reference>
<Reference Include="Square.OkHttp3"> <Reference Include="Square.OkHttp3">
<HintPath>..\packages\Square.OkHttp3.3.12.3\lib\monoandroid44\Square.OkHttp3.dll</HintPath> <HintPath>..\packages\Square.OkHttp3.4.9.0\lib\monoandroid10.0\Square.OkHttp3.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Google.Android.DataTransport.TransportApi"> <Reference Include="Xamarin.Google.Android.DataTransport.TransportApi">
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportApi.2.2.0\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportApi.dll</HintPath> <HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportApi.2.2.1\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportApi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Google.Android.DataTransport.TransportBackendCct"> <Reference Include="Xamarin.Google.Android.DataTransport.TransportBackendCct">
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportBackendCct.2.2.3\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportBackendCct.dll</HintPath> <HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportBackendCct.2.3.3\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportBackendCct.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Google.AutoValue.Annotations"> <Reference Include="Xamarin.Google.AutoValue.Annotations">
<HintPath>..\packages\Xamarin.Google.AutoValue.Annotations.1.6.5\lib\monoandroid80\Xamarin.Google.AutoValue.Annotations.dll</HintPath> <HintPath>..\packages\Xamarin.Google.AutoValue.Annotations.1.6.6\lib\monoandroid80\Xamarin.Google.AutoValue.Annotations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.GooglePlayServices.Basement"> <Reference Include="Xamarin.GooglePlayServices.Basement">
<HintPath>..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll</HintPath> <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.117.6.0\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.GooglePlayServices.Stats"> <Reference Include="Xamarin.GooglePlayServices.Stats">
<HintPath>..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\lib\monoandroid90\Xamarin.GooglePlayServices.Stats.dll</HintPath> <HintPath>..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\lib\monoandroid90\Xamarin.GooglePlayServices.Stats.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.GooglePlayServices.Tasks"> <Reference Include="Xamarin.GooglePlayServices.Tasks">
<HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath> <HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.GooglePlayServices.Base"> <Reference Include="Xamarin.GooglePlayServices.Base">
<HintPath>..\packages\Xamarin.GooglePlayServices.Base.117.1.0\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll</HintPath> <HintPath>..\packages\Xamarin.GooglePlayServices.Base.117.1.0\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll</HintPath>
@@ -424,10 +425,19 @@
<HintPath>..\packages\Xamarin.JavaX.Inject.1.0.0\lib\monoandroid90\Xamarin.JavaX.Inject.dll</HintPath> <HintPath>..\packages\Xamarin.JavaX.Inject.1.0.0\lib\monoandroid90\Xamarin.JavaX.Inject.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Google.Dagger"> <Reference Include="Xamarin.Google.Dagger">
<HintPath>..\packages\Xamarin.Google.Dagger.2.25.2.1\lib\monoandroid90\Xamarin.Google.Dagger.dll</HintPath> <HintPath>..\packages\Xamarin.Google.Dagger.2.27.0\lib\monoandroid90\Xamarin.Google.Dagger.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Google.Android.DataTransport.TransportRuntime"> <Reference Include="Xamarin.Google.Android.DataTransport.TransportRuntime">
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportRuntime.2.2.3\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportRuntime.dll</HintPath> <HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportRuntime.2.2.6\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportRuntime.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Jetbrains.Annotations">
<HintPath>..\packages\Xamarin.Jetbrains.Annotations.13.0.0.3\lib\monoandroid10.0\Xamarin.Jetbrains.Annotations.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Kotlin.StdLib.Common">
<HintPath>..\packages\Xamarin.Kotlin.StdLib.Common.1.4.20\lib\monoandroid10.0\Xamarin.Kotlin.StdLib.Common.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Kotlin.StdLib">
<HintPath>..\packages\Xamarin.Kotlin.StdLib.1.4.20\lib\monoandroid10.0\Xamarin.Kotlin.StdLib.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -554,8 +564,11 @@
<Import Project="..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0\build\monoandroid9.0\Xamarin.AndroidX.Annotation.Experimental.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0\build\monoandroid9.0\Xamarin.AndroidX.Annotation.Experimental.targets')" /> <Import Project="..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0\build\monoandroid9.0\Xamarin.AndroidX.Annotation.Experimental.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0\build\monoandroid9.0\Xamarin.AndroidX.Annotation.Experimental.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Runtime.targets')" /> <Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
<Import Project="..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" /> <Import Project="..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Stats.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Stats.targets')" /> <Import Project="..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Stats.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Stats.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Base.117.1.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.117.1.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets')" /> <Import Project="..\packages\Xamarin.GooglePlayServices.Base.117.1.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.117.1.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Basement.117.6.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.117.6.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" />
<Import Project="..\packages\Xamarin.Jetbrains.Annotations.13.0.0.3\build\monoandroid10.0\Xamarin.Jetbrains.Annotations.targets" Condition="Exists('..\packages\Xamarin.Jetbrains.Annotations.13.0.0.3\build\monoandroid10.0\Xamarin.Jetbrains.Annotations.targets')" />
<Import Project="..\packages\Xamarin.Kotlin.StdLib.Common.1.4.20\build\monoandroid10.0\Xamarin.Kotlin.StdLib.Common.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.4.20\build\monoandroid10.0\Xamarin.Kotlin.StdLib.Common.targets')" />
<Import Project="..\packages\Xamarin.Kotlin.StdLib.1.4.20\build\monoandroid10.0\Xamarin.Kotlin.StdLib.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.1.4.20\build\monoandroid10.0\Xamarin.Kotlin.StdLib.targets')" />
</Project> </Project>
iOS/Info.plist
+1 -1
View File
@@ -36,7 +36,7 @@
<key>XSAppIconAssets</key> <key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string> <string>Assets.xcassets/AppIcon.appiconset</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.2.1</string> <string>2.2.5</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>1.0</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
iOS/qController.iOS.csproj
+4 -2
View File
@@ -33,7 +33,8 @@
<CodesignProvision>qController Dev</CodesignProvision> <CodesignProvision>qController Dev</CodesignProvision>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>pdbonly</DebugType> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\iPhone\Release</OutputPath> <OutputPath>bin\iPhone\Release</OutputPath>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
@@ -48,7 +49,8 @@
<CodesignProvision>qController Dev</CodesignProvision> <CodesignProvision>qController Dev</CodesignProvision>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>pdbonly</DebugType> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\iPhoneSimulator\Release</OutputPath> <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
qController.Standard/Classes/Cell/QLevelsCell.cs
+44 -44
View File
@@ -9,15 +9,11 @@ namespace qController.Cell
public List<double> levels; public List<double> levels;
public string activeCue; public string activeCue;
public Slider mainSlider; public Slider mainSlider;
//public Slider leftSlider; public Slider leftSlider;
//public Slider rightSlider; public Slider rightSlider;
public Label mainLabel; public Label mainLabel;
//public Label rightLabel; public Label rightLabel;
//public Label leftLabel; public Label leftLabel;
public List<Slider> sliders = new List<Slider>();
public List<Label> sliderLabels = new List<Label>();
public QLevelsCell() public QLevelsCell()
{ {
Padding = new Thickness(5); Padding = new Thickness(5);
@@ -26,8 +22,6 @@ namespace qController.Cell
HasShadow = true; HasShadow = true;
BackgroundColor = Color.FromHex("D8D8D8"); BackgroundColor = Color.FromHex("D8D8D8");
IsVisible = false; IsVisible = false;
int numberOfChannelsVisible = 6;
//highlight for testing //highlight for testing
//BackgroundColor = Color.Red; //BackgroundColor = Color.Red;
@@ -37,13 +31,14 @@ namespace qController.Cell
Padding = new Thickness(0), Padding = new Thickness(0),
RowDefinitions = { RowDefinitions = {
new RowDefinition{Height = GridLength.Star}, new RowDefinition{Height = GridLength.Star},
new RowDefinition{Height = GridLength.Star},
new RowDefinition{Height = GridLength.Star}
}, },
ColumnDefinitions = { ColumnDefinitions = {
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)}, new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)}, new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)}, new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)}, new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)} new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)}
} }
}; };
@@ -55,48 +50,52 @@ namespace qController.Cell
}; };
for (int i = 0; i < numberOfChannelsVisible; i++) leftSlider = new Slider
{ {
var sliderToAdd = new Slider Minimum = -60,
{ Maximum = 12
Minimum = -60, };
Maximum = 12
};
var labelToAdd = new Label
{
Text = $"{i + 1}:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
var valueLabelToAdd = new Label rightSlider = new Slider
{ {
Text = "", Minimum = -60,
VerticalTextAlignment = TextAlignment.Center, Maximum = 12
HorizontalTextAlignment = TextAlignment.Center };
};
mainG.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star });
mainG.Children.Add(sliderToAdd, 1, i + 1);
Grid.SetColumnSpan(sliderToAdd, 4);
mainG.Children.Add(labelToAdd, 0, i + 1);
mainG.Children.Add(valueLabelToAdd, 5, i + 1);
sliders.Add(sliderToAdd);
sliderLabels.Add(valueLabelToAdd);
}
mainLabel = new Label mainLabel = new Label
{ {
Text = "M:", Text = "MAIN:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
leftLabel = new Label
{
Text = "1:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
rightLabel = new Label
{
Text = "2:",
VerticalTextAlignment = TextAlignment.Center, VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center HorizontalTextAlignment = TextAlignment.Center
}; };
mainG.Children.Add(mainSlider, 1, 0); mainG.Children.Add(mainSlider, 1, 0);
mainG.Children.Add(leftSlider, 1, 1);
mainG.Children.Add(rightSlider, 1, 2);
Grid.SetColumnSpan(mainSlider, 4); Grid.SetColumnSpan(mainSlider, 4);
Grid.SetColumnSpan(leftSlider, 4);
Grid.SetColumnSpan(rightSlider, 4);
mainG.Children.Add(mainLabel, 0, 0); mainG.Children.Add(mainLabel, 0, 0);
mainG.Children.Add(leftLabel, 0, 1);
mainG.Children.Add(rightLabel, 0, 2);
Content = mainG; Content = mainG;
Margin = new Thickness(10); Margin = new Thickness(10);
@@ -109,12 +108,13 @@ namespace qController.Cell
{ {
mainSlider.Value = levels[0]; mainSlider.Value = levels[0];
} }
for (int i = 0; i < sliders.Count; i++) if (leftSlider != null)
{ {
Slider slider = sliders[i]; leftSlider.Value = levels[1];
Label label = sliderLabels[i]; }
slider.Value = levels[i + 1]; if (rightSlider != null)
label.Text = $"{levels[i + 1]}"; {
rightSlider.Value = levels[2];
} }
} }
} }
qController.Standard/Pages/ControlPage.xaml.cs
+13 -14
View File
@@ -176,22 +176,21 @@ namespace qController
{ {
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/0", (float)args.NewValue); qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/0", (float)args.NewValue);
}; };
qLevelsCell.leftSlider.ValueChanged += (sender, args) =>
for (int i = 0; i < qLevelsCell.sliders.Count; i++)
{ {
var channel = i + 1; qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/1", (float)args.NewValue);
Log.Debug("Setting value changed for channel: " + channel); };
qLevelsCell.sliders[i].ValueChanged += (sender, args) => qLevelsCell.rightSlider.ValueChanged += (sender, args) =>
{ {
qLevelsCell.sliderLabels[channel - 1].Text = $"{args.NewValue}"; qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/2", (float)args.NewValue);
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/" + channel, (float)args.NewValue); };
};
}
showLevelsButton = new QLevelsButton(); showLevelsButton = new QLevelsButton();
showLevelsButton.button.Clicked += ToggeQLevelsCellVisiblity; showLevelsButton.button.Clicked += (s, e) =>
{
qLevelsCell.IsVisible = !qLevelsCell.IsVisible;
};
qControlsBlock = new QControlsBlock(SendOSCFromButton); qControlsBlock = new QControlsBlock(SendOSCFromButton);
AbsoluteLayout.SetLayoutFlags(qControlsBlock, AbsoluteLayoutFlags.All); AbsoluteLayout.SetLayoutFlags(qControlsBlock, AbsoluteLayoutFlags.All);
@@ -203,12 +202,12 @@ namespace qController
{ {
case Device.iOS: case Device.iOS:
AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.53, 1, 0.25)); AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.53, 1, 0.25));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0, 0.63, 1, 0.35)); AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9, 0.40, 0.8, 0.25));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.34, App.HeightUnit * 8, App.HeightUnit * 8)); AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.34, App.HeightUnit * 8, App.HeightUnit * 8));
break; break;
case Device.Android: case Device.Android:
AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.58, 1, 0.25)); AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.58, 1, 0.25));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0, 0.63, 1, 0.25)); AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9, 0.45, 0.8, 0.25));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.39, App.HeightUnit * 8, App.HeightUnit * 8)); AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.39, App.HeightUnit * 8, App.HeightUnit * 8));
break; break;
} }
qController.Standard/qController.csproj
+7
View File
@@ -6,6 +6,13 @@
<RootNamespace>qController</RootNamespace> <RootNamespace>qController</RootNamespace>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="MyPage.cs" /> <Compile Remove="MyPage.cs" />
<Compile Remove="Bespoke.Osc\Bespoke.Common.Osc\Properties\AssemblyInfo.cs" /> <Compile Remove="Bespoke.Osc\Bespoke.Common.Osc\Properties\AssemblyInfo.cs" />