Merge remote-tracking branch 'origin/frank' into kenric

InABox.Core/Classes/Location.cs

@@ -30,7 +30,7 @@ namespace InABox.Core
         [DoubleEditor(Editable = Editable.Hidden, Visible = Visible.Optional)]
         public double Latitude { get; set; }
 
-        [DoubleEditor(Editable = Editable.Hidden, Visible = Visible.Optional)]
+        [DateTimeEditor(Editable = Editable.Hidden, Visible = Visible.Optional)]
         public DateTime Timestamp { get; set; }
 
         [TextBoxEditor(Editable = Editable.Hidden, Visible = Visible.Optional)]

InABox.Core/CoreUtils.cs

@@ -89,6 +89,7 @@ namespace InABox.Core
         v23_1,
         v23_2,
         v25_2,
+        v26_x,
         Unspecified
     }
 
@@ -190,6 +191,10 @@ namespace InABox.Core
                     SyncfusionVersion.v25_2 ,
                     "MzMwNDU4OUAzMjM1MmUzMDJlMzBPYmxqTDFKaUlLVHgvTmdXZk5Lcm5tNkhJT0RtWUZwM1JxQ1ZLVXVJaDJvPQ==;MzMwNDU5MEAzMjM1MmUzMDJlMzBoamJkMDY0QWFhWnVCbEZDelFCZWtkYXFoTGp3anlEUThrSGlReGxBOXdjPQ=="
                 },
+                {
+                    SyncfusionVersion.v26_x,
+                    "MzM0OTg1MUAzMjM2MmUzMDJlMzBCSy82eWowdW8rSUIzQmRseGlHTUx2WDNRVUJucnpQSGRiUUJEOWtISklNPQ==;MzM0OTg1MkAzMjM2MmUzMDJlMzBhL0lLS3FZMTNOL2dQZXVkTkNWM2psdU9obU1UVklyV2tVczFvcE13eHpNPQ==;MzM0OTg1M0AzMjM2MmUzMDJlMzBhL0lLS3FZMTNOL2dQZXVkTkNWM2psdU9obU1UVklyV2tVczFvcE13eHpNPQ=="
+                },
                 {
                     SyncfusionVersion.Unspecified,
                     "NjcyNDdAMzEzNjJlMzQyZTMwbWZlcXhUQW80NjUrTENRTVM0c2J5empYZDFUcHhDcEE0T3gwZDZZVGVtQT0=;NjcyNDhAMzEzNjJlMzQyZTMwZWtuc0VlSXVteWNtUE8zQ1V1azcrZmRjTFBqUGFHenU1YzNwbUVTdlcxVT0="

InABox.Mobile/InABox.Mobile.Shared/Bluetooth.cs

@@ -127,7 +127,7 @@ namespace InABox.Mobile
                         //var data = await chr.ReadAsync();
                         //Console.WriteLine("- Found Data: " + String.Join("-", data.Select(x => String.Format("{0:X2}", x))));
                         var newdata = Encoding.ASCII.GetBytes(key);
-                        bool bWrite = await chr.WriteAsync(newdata);
+                        bool bWrite = await chr.WriteAsync(newdata) == 0;
                         if (bWrite)
                         {
                             //Console.WriteLine("** Wrote Data " + String.Join("-", newdata.Select(x => String.Format("{0:X2}", x))));

InABox.Mobile/InABox.Mobile.Shared/InABox.Mobile.Shared.csproj

@@ -15,23 +15,24 @@
 
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Plugin.BLE" Version="2.1.3" />
+        <PackageReference Include="Plugin.BLE" Version="3.1.0" />
         <PackageReference Include="Resizetizer.NT" Version="0.3.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Serilog" Version="3.0.1" />
-        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-        <PackageReference Include="Syncfusion.Licensing" Version="23.2.6" />
-        <PackageReference Include="Syncfusion.Xamarin.Pdf" Version="23.2.6" />
-        <PackageReference Include="Syncfusion.Xamarin.SfBusyIndicator" Version="23.2.6" />
-        <PackageReference Include="Syncfusion.Xamarin.SfDataGrid" Version="23.2.6" />
-        <PackageReference Include="Syncfusion.Xamarin.SfPicker" Version="23.2.6" />
-        <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="23.2.6" />
-        <PackageReference Include="Syncfusion.Xamarin.SfPullToRefresh" Version="23.2.6" />
+        <PackageReference Include="Serilog" Version="4.0.0" />
+        <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+        <PackageReference Include="Syncfusion.Licensing" Version="26.1.39" />
+        <PackageReference Include="Syncfusion.Xamarin.Buttons" Version="26.1.39" />
+        <PackageReference Include="Syncfusion.Xamarin.Pdf" Version="26.1.39" />
+        <PackageReference Include="Syncfusion.Xamarin.SfBusyIndicator" Version="26.1.39" />
+        <PackageReference Include="Syncfusion.Xamarin.SfDataGrid" Version="26.1.39" />
+        <PackageReference Include="Syncfusion.Xamarin.SfPicker" Version="26.1.39" />
+        <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="26.1.39" />
+        <PackageReference Include="Syncfusion.Xamarin.SfPullToRefresh" Version="26.1.39" />
         <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
-        <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-        <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
+        <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
+        <PackageReference Include="Xamarin.Forms" Version="5.0.0.2662" />
         <PackageReference Include="XF.Material" Version="1.8.0" />
     </ItemGroup>
 

InABox.Mobile/InABox.Mobile.Shared/MobileUtils.cs

@@ -15,7 +15,7 @@ namespace InABox.Mobile
 
         public static void Init()
         {
-            Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense(CoreUtils.SyncfusionLicense(SyncfusionVersion.v23_2));
+            Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense(CoreUtils.SyncfusionLicense(SyncfusionVersion.v26_x));
         }
 
         public static String GetDeviceID()

inabox.wpf/MasterDetailPanel/IMasterDetailPage.cs

@@ -4,10 +4,14 @@ using InABox.DynamicGrid;
 
 namespace InABox.Wpf;
 
-public interface IMasterDetailPage<TMaster>
+public interface IMasterDetailPage
 {
     DynamicTabItem Tab { get; set; }
+}
 
+public interface IMasterDetailPage<TMaster> : IMasterDetailPage
+{
+    
     Dictionary<string, object[]>? Selected();
 
     IDataModelSource Refresh(TMaster? entity);

inabox.wpf/MasterDetailPanel/MasterDetailPanel.cs

@@ -97,7 +97,7 @@ public abstract class MasterDetailPanel<TMaster, TMasterGrid, TSettings> : Maste
         
     }
     
-    protected void CreatePage<TPage>(Func<bool> isAllowed, string caption) 
+    protected TPage? CreatePage<TPage>(Func<bool> isAllowed, string caption) 
         where TPage : class, IMasterDetailPage<TMaster>
     {
         if (isAllowed())
@@ -105,14 +105,19 @@ public abstract class MasterDetailPanel<TMaster, TMasterGrid, TSettings> : Maste
             var header = new DynamicTabItem() { Header = caption };
             _tabControl.Items.Add(header);
             if (Activator.CreateInstance(typeof(TPage), header) is TPage page)
+            {
                 _pages.Add(page);
+                return page;
+            }
         }
+
+        return null;
     }
 
-    protected void CreatePage<TPage>(string caption)
+    protected TPage? CreatePage<TPage>(string caption)
         where TPage : class, IMasterDetailPage<TMaster>
     {
-        CreatePage<TPage>(() => true, caption);
+        return CreatePage<TPage>(() => true, caption);
     }
 
     public void Shutdown(CancelEventArgs? cancel)