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

Android v1.0.7 / iOS v2.0.7

Browse Source
This commit is contained in:
Joel Wetzell
2019-07-17 07:33:51 -05:00
parent 7b414e55a7
commit 4938a0a0b3
5 changed files with 20 additions and 12 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="23" android:versionName="1.0.6" package="com.jwetzell.qlabcontroller"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="24" android:versionName="1.0.7" package="com.jwetzell.qlabcontroller">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26" /> <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application android:label="qController" android:icon="@drawable/icon"></application> <application android:label="qController" android:icon="@drawable/icon"></application>
qController.Standard/Classes/Cell/QLevelsCell.cs
+2 -2
View File
@@ -74,14 +74,14 @@ namespace qController
leftLabel = new Label leftLabel = new Label
{ {
Text = "0:", Text = "1:",
VerticalTextAlignment = TextAlignment.Center, VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center HorizontalTextAlignment = TextAlignment.Center
}; };
rightLabel = new Label rightLabel = new Label
{ {
Text = "1:", Text = "2:",
VerticalTextAlignment = TextAlignment.Center, VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center HorizontalTextAlignment = TextAlignment.Center
}; };
qController.Standard/Pages/ControlPage.xaml
+2 -2
View File
@@ -8,10 +8,10 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="4*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label x:Name = "menuButton" FontFamily = "{StaticResource qfont}" HorizontalOptions = "Start" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="0" FontSize="25" Text="&#xF0C9;"/> <Label x:Name = "menuButton" FontFamily = "{StaticResource qfont}" HorizontalOptions = "Start" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="0" FontSize="25" Text="&#xF0C9;"/>
<Label x:Name = "instanceName" HorizontalTextAlignment="Center" HorizontalOptions = "CenterAndExpand" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="1"/> <Label x:Name = "instanceName" HorizontalTextAlignment="End" HorizontalOptions = "FillAndExpand" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="1"/>
</Grid> </Grid>
</AbsoluteLayout> </AbsoluteLayout>
</ContentPage.Content> </ContentPage.Content>
qController.Standard/Pages/ControlPage.xaml.cs
+14 -6
View File
@@ -26,7 +26,7 @@ namespace qController
App.rootPage.MenuItemSelected += OnMenuItemSelected; App.rootPage.MenuItemSelected += OnMenuItemSelected;
instanceName.Text = name; instanceName.Text = name;
InitGUI(); InitGUI();
qController.KickOff(); qController.KickOff();
@@ -75,12 +75,14 @@ namespace qController
NavigationPage.SetHasNavigationBar(this, false); NavigationPage.SetHasNavigationBar(this, false);
BackgroundColor = Color.FromHex("4A4A4A"); BackgroundColor = Color.FromHex("4A4A4A");
qCell = new QSelectedCueCell(); qCell = new QSelectedCueCell();
qCell.SelectedCueEdited += OnSelectedCueEdited; qCell.SelectedCueEdited += OnSelectedCueEdited;
AbsoluteLayout.SetLayoutFlags(qCell, AbsoluteLayoutFlags.All); AbsoluteLayout.SetLayoutFlags(qCell, AbsoluteLayoutFlags.All);
instanceName.FontSize = App.HeightUnit * 3;
switch (Device.RuntimePlatform) switch (Device.RuntimePlatform)
{ {
case Device.iOS: case Device.iOS:
@@ -159,12 +161,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.9,0.40,0.8,0.25)); AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9,0.40,0.8,0.25));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.04, 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.9, 0.40, 0.8, 0.25)); AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9, 0.45, 0.8, 0.25));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.04, 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;
} }
@@ -229,7 +231,10 @@ namespace qController
if (cue.levels != null) if (cue.levels != null)
showLevelsButton.IsVisible = true; showLevelsButton.IsVisible = true;
else else
{
showLevelsButton.IsVisible = false; showLevelsButton.IsVisible = false;
qLevelsCell.IsVisible = false;
}
qCell.UpdateSelectedCue(cue); qCell.UpdateSelectedCue(cue);
}); });
} }
@@ -255,7 +260,10 @@ namespace qController
if (args.Cue.levels != null) if (args.Cue.levels != null)
showLevelsButton.IsVisible = true; showLevelsButton.IsVisible = true;
else else
{
showLevelsButton.IsVisible = false; showLevelsButton.IsVisible = false;
qLevelsCell.IsVisible = false;
}
qCell.UpdateSelectedCue(args.Cue); qCell.UpdateSelectedCue(args.Cue);
if(qLevelsCell != null) if(qLevelsCell != null)
{ {
qController.Standard/Pages/qConnectionPage.xaml.cs
+1 -1
View File
@@ -31,7 +31,7 @@ namespace qController
} }
else if (args.Command == "feedback") else if (args.Command == "feedback")
{ {
Console.WriteLine("Give Feedback selected"); Device.OpenUri(new Uri("mailto:jwetzell1996@gmail.com"));
} }
else if(args.Command == "support") else if(args.Command == "support")
{ {