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

Address warnings and move to FlyoutPage for Xamarin Forms 5

Browse Source
This commit is contained in:
Joel Wetzell
2021-01-28 12:39:31 -06:00
parent c3acd35850
commit 746fd924d3
13 changed files with 135 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Pages/App.xaml.cs
+1 -5
View File
@@ -52,13 +52,9 @@ namespace qController
}
var menuPage = new MenuPage();
rootPage = new RootPage();
NavigationPage = new NavigationPage(new QConnectionPage());
rootPage.Master = menuPage;
rootPage.Detail = NavigationPage;
rootPage.Detail = new NavigationPage(new QConnectionPage());
MainPage = rootPage;
rootPage.Init();
}
public static void showToast(string message)
qController.Standard/Pages/ControlPage.xaml.cs
+12 -9
View File
@@ -176,14 +176,17 @@ namespace qController
{
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++)
{
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/1", (float)args.NewValue);
};
qLevelsCell.rightSlider.ValueChanged += (sender, args) =>
{
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/2", (float)args.NewValue);
};
var channel = i + 1;
Log.Debug("Setting value changed for channel: " + channel);
qLevelsCell.sliders[i].ValueChanged += (sender, args) =>
{
qLevelsCell.sliderLabels[channel - 1].Text = $"{args.NewValue}";
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/" + channel, (float)args.NewValue);
};
}
showLevelsButton = new QLevelsButton();
@@ -200,12 +203,12 @@ namespace qController
{
case Device.iOS:
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, 0.63, 1, 0.35));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.34, App.HeightUnit * 8, App.HeightUnit * 8));
break;
case Device.Android:
AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.58, 1, 0.25));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9, 0.45, 0.8, 0.25));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0, 0.63, 1, 0.25));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.39, App.HeightUnit * 8, App.HeightUnit * 8));
break;
}
qController.Standard/Pages/RootPage.xaml
+5 -4
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<MasterDetailPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="qController.RootPage" xmlns:pages="clr-namespace:qController">
</MasterDetailPage>
<FlyoutPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="qController.RootPage">
</FlyoutPage>
qController.Standard/Pages/RootPage.xaml.cs
+5 -10
View File
@@ -12,7 +12,7 @@ namespace qController
}
}
public partial class RootPage : MasterDetailPage
public partial class RootPage : FlyoutPage
{
public MenuPage MenuPage;
public delegate void MenuItemSelectedHandler(object source, MenuEventArgs args);
@@ -21,14 +21,10 @@ namespace qController
public RootPage()
{
InitializeComponent();
}
public void Init()
{
MenuPage = (MenuPage)Master;
MenuPage = new MenuPage();
MenuPage.setItemSelected(OnItemSelected);
Flyout = MenuPage;
}
void OnItemSelected(object sender, SelectedItemChangedEventArgs e)
@@ -38,8 +34,7 @@ namespace qController
{
MenuPage.clearSelectedItem();
IsPresented = false;
if (MenuItemSelected != null)
MenuItemSelected(this, new MenuEventArgs { Command = item.Command });
MenuItemSelected?.Invoke(this, new MenuEventArgs { Command = item.Command });
}
}
}