Merge pull request #277 from enisn/xf-v4-adaptation

XF Drawing adaptation

Author: enisn

sandbox/SandboxMAUI/Pages/CheckBoxPage.xaml.cs

@@ -1,6 +1,4 @@
-using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Graphics;
+using InputKit.Shared.Helpers;
 using CheckBox = InputKit.Shared.Controls.CheckBox;
 
 namespace SandboxMAUI.Pages;
@@ -27,6 +25,7 @@ private void Button_Clicked(object sender, EventArgs e)
         if(sender is Button button)
         {
             button.BackgroundColor = color;
+            button.TextColor = color.ToSurfaceColor();
         }
     }
 }

sandbox/SandboxXF/SandboxXF.Android/Resources/Resource.designer.cs

@@ -11,13 +11,18 @@
             Padding="25"
             Spacing="15">
 
-            <input:CheckBox Text="Option 0 with Box Type" Type="Box" LabelPosition="After"/>
-            <input:CheckBox Text="Option 1 with Check Type" Type="Check"/>
-            <input:CheckBox Text="Option 2 wity Cross Type" Type="Cross"/>
-            <input:CheckBox Text="Option 3 with Custom Type" Type="Custom" CustomIcon="ic_account_balance_black"/>
-            <input:CheckBox Text="Option 4 with Material Type" Type="Material"/>
-            <input:CheckBox Text="Option 5 with Star Type" Type="Star"/>
-            <input:CheckBox Text="Option 6 (Position)" Type="Check" LabelPosition="Before"/>
+            <Button Text="Randomize colors" Clicked="Button_Clicked" />
+            <BoxView Color="{AppThemeBinding Dark=White, Light=Black}" HeightRequest="1" HorizontalOptions="Fill" Margin="5,10" />
+
+            <input:CheckBox Text="Option 0 Plain Checkbox" />
+            <input:CheckBox Text="Option 1 with Filled Type" Type="Filled" />
+            <input:CheckBox Text="Option 2 with Material Type" Type="Material" />
+            <input:CheckBox Text="Option 2 with Square Shape" IconGeometry="{x:Static input:PredefinedShapes.Square}" />
+            <input:CheckBox Text="Option 3 with Line Shape" IconGeometry="{x:Static input:PredefinedShapes.Line}" />
+            <input:CheckBox Text="Option 3 with Line Shape with Material Type" Type="Material" IconGeometry="{x:Static input:PredefinedShapes.Line}" />
+            <input:CheckBox Text="Option 3 with Custom Type (X)" Type="Custom" IconGeometry="M17.705 7.705l-1.41-1.41L12 10.59 7.705 6.295l-1.41 1.41L10.59 12l-4.295 4.295 1.41 1.41L12 13.41l4.295 4.295 1.41-1.41L13.41 12l4.295-4.295z"/>
+            <input:CheckBox Text="Option 5 with Material Custom Type (X)" Type="Material" IconGeometry="M17.705 7.705l-1.41-1.41L12 10.59 7.705 6.295l-1.41 1.41L10.59 12l-4.295 4.295 1.41 1.41L12 13.41l4.295 4.295 1.41-1.41L13.41 12l4.295-4.295z"/>
+            <input:CheckBox Text="Option 6 (Position)" Type="Regular" LabelPosition="Before"/>
 
         </StackLayout>
 

sandbox/SandboxXF/SandboxXF/Views/CheckBoxesPage.xaml

@@ -1,4 +1,5 @@
-using System;
+using Plugin.InputKit.Shared.Helpers;
+using System;
 
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
@@ -7,12 +8,12 @@
 namespace SandboxXF.Views
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-	public partial class CheckBoxesPage : ContentPage
-	{
+    public partial class CheckBoxesPage : ContentPage
+    {
         static readonly Random rnd = new Random();
-		public CheckBoxesPage()
-		{
-			InitializeComponent ();
+        public CheckBoxesPage()
+        {
+            InitializeComponent();
         }
 
         private void Button_Clicked(object sender, EventArgs e)
@@ -26,6 +27,12 @@ private void Button_Clicked(object sender, EventArgs e)
                     chk.Color = color;
                 }
             }
+
+            if (sender is Button button)
+            {
+                button.BackgroundColor = color;
+                button.TextColor = color.ToSurfaceColor();
+            }
         }
     }
 }