* Info.plist:

* 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:
2021-04-29 01:00:59 -05:00
parent 0621275605
commit d391e6a688
8 changed files with 106 additions and 83 deletions
@@ -9,15 +9,11 @@ namespace qController.Cell
public List<double> levels;
public string activeCue;
public Slider mainSlider;
//public Slider leftSlider;
//public Slider rightSlider;
public Slider leftSlider;
public Slider rightSlider;
public Label mainLabel;
//public Label rightLabel;
//public Label leftLabel;
public List<Slider> sliders = new List<Slider>();
public List<Label> sliderLabels = new List<Label>();
public Label rightLabel;
public Label leftLabel;
public QLevelsCell()
{
Padding = new Thickness(5);
@@ -26,8 +22,6 @@ namespace qController.Cell
HasShadow = true;
BackgroundColor = Color.FromHex("D8D8D8");
IsVisible = false;
int numberOfChannelsVisible = 6;
//highlight for testing
//BackgroundColor = Color.Red;
@@ -37,13 +31,14 @@ namespace qController.Cell
Padding = new Thickness(0),
RowDefinitions = {
new RowDefinition{Height = GridLength.Star},
new RowDefinition{Height = GridLength.Star},
new RowDefinition{Height = GridLength.Star}
},
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)}
}
};
@@ -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
{
Text = "",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
rightSlider = new Slider
{
Minimum = -60,
Maximum = 12
};
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
{
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,
HorizontalTextAlignment = TextAlignment.Center
};
mainG.Children.Add(mainSlider, 1, 0);
mainG.Children.Add(leftSlider, 1, 1);
mainG.Children.Add(rightSlider, 1, 2);
Grid.SetColumnSpan(mainSlider, 4);
Grid.SetColumnSpan(leftSlider, 4);
Grid.SetColumnSpan(rightSlider, 4);
mainG.Children.Add(mainLabel, 0, 0);
mainG.Children.Add(leftLabel, 0, 1);
mainG.Children.Add(rightLabel, 0, 2);
Content = mainG;
Margin = new Thickness(10);
@@ -109,12 +108,13 @@ namespace qController.Cell
{
mainSlider.Value = levels[0];
}
for (int i = 0; i < sliders.Count; i++)
if (leftSlider != null)
{
Slider slider = sliders[i];
Label label = sliderLabels[i];
slider.Value = levels[i + 1];
label.Text = $"{levels[i + 1]}";
leftSlider.Value = levels[1];
}
if (rightSlider != null)
{
rightSlider.Value = levels[2];
}
}
}