jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-10 01:43:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into qcontrolkit-conversion

Browse Source
This commit is contained in:
Joel Wetzell
2023-11-26 14:06:24 -06:00
parent 811aefcb63 f85dc8effc
commit fbb85e05c5
17 changed files with 17276 additions and 8944 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Classes/Settings/QStorage.cs
-1
View File
@@ -135,7 +135,6 @@ namespace qController
public static bool Contains(string address){
foreach (QInstance item in qInstances)
{
//Log.Debug("Item name: " + item.name + " Found Name: " + name);
if (item.address == address)
{
return true;
qController.Standard/Views/MenuPage.xaml.cs
+4 -1
View File
@@ -1,6 +1,8 @@
using System.Collections.ObjectModel;
using Xamarin.Forms;
using System;
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
using qController.Helpers;
namespace qController
@@ -11,6 +13,7 @@ namespace qController
public ObservableCollection<MenuPageItem> items { get; } = new ObservableCollection<MenuPageItem>();
public MenuPage()
{
On<iOS>().SetUseSafeArea(true);
Title = "Menu";
InitializeComponent();
@@ -30,7 +33,7 @@ namespace qController
};
Label icon = new Label {
FontFamily = (OnPlatform<string>)Application.Current.Resources["MaterialFontFamily"],
FontFamily = (OnPlatform<string>)Xamarin.Forms.Application.Current.Resources["MaterialFontFamily"],
HorizontalTextAlignment = TextAlignment.Center,
VerticalTextAlignment = TextAlignment.Center,
VerticalOptions = LayoutOptions.FillAndExpand,
qController.Standard/qController.csproj
+13 -6
View File
@@ -6,6 +6,13 @@
<RootNamespace>qController</RootNamespace>
</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>
<Compile Remove="MyPage.cs" />
<Compile Remove="Bespoke.Osc\Bespoke.Common.Osc\Properties\AssemblyInfo.cs" />
@@ -58,12 +65,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.2.0.562" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
<PackageReference Include="Acr.Settings" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="QControlKit" Version="0.0.31" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="QControlKit" Version="0.0.33" />
</ItemGroup>
<ItemGroup>
<None Remove="App.xaml" />
@@ -76,7 +83,7 @@
<None Remove="Bespoke.Osc\Samples\VB\Receiver\My Project\Application.myapp" />
<None Remove="Bespoke.Net\.gitignore" />
<None Remove="Bespoke.Net\Help\Bespoke Common Library.chm" />
<None Remove="Xamarin.Forms" />
<None Remove="SuperSimpleTcp" />
</ItemGroup>
<!--<ItemGroup>
<EmbeddedResource Include="Pages\ControlPage.xaml">