Merge pull request #241 from enisn/maui/plainer-implementation

Plainer implementation for AdvancedEntry

sandbox/SandboxMAUI/MauiProgram.cs

@@ -1,4 +1,6 @@
-namespace SandboxMAUI;
+using InputKit.Handlers;
+
+namespace SandboxMAUI;
 
 public static class MauiProgram
 {
@@ -12,6 +14,10 @@ public static MauiApp CreateMauiApp()
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
 			});
 
+		builder.ConfigureMauiHandlers(handlers =>
+		{
+			handlers.AddInputKitHandlers();
+		});
 
 		return builder.Build();
 	}

src/InputKit/Handlers/InputKitHandlersCollectionExtension.cs

@@ -1,10 +1,5 @@
 using InputKit.Shared.Layouts;
-using Microsoft.Maui.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Plainer.Maui;
 
 namespace InputKit.Handlers
 {
@@ -13,6 +8,7 @@ public static class InputKitHandlersCollectionExtension
         public static IMauiHandlersCollection AddInputKitHandlers(this IMauiHandlersCollection collection)
         {
             return collection
+                .AddPlainer()
                 .AddHandler(typeof(Shared.Controls.IconView), typeof(InputKit.Handlers.IconView.IconViewHandler))
                 .AddHandler(typeof(StatefulStackLayout), typeof(InputKit.Handlers.StatefulStackLayoutHandler));
         }

src/InputKit/InputKit.csproj

@@ -44,4 +44,8 @@
   <ItemGroup>
       <None Include="icon512.png" Pack="true" PackagePath="" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Plainer.Maui" Version="1.2.0" />
+  </ItemGroup>
 </Project>

src/InputKit/Shared/Controls/AdvancedEntry.cs

@@ -1,9 +1,6 @@
 using InputKit.Shared.Abstraction;
 using InputKit.Shared.Configuration;
-using Microsoft.Maui;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Graphics;
-using System;
+using Plainer.Maui.Controls;
 using System.Text.RegularExpressions;
 using System.Windows.Input;
 
@@ -604,11 +601,11 @@ private void ApplyValidationPosition(LabelPosition position)
 
         private protected virtual Entry GetInputEntry()
         {
-            return new EmptyEntry
+            return new EntryView
             {
                 TextColor = GlobalSetting.TextColor,
                 PlaceholderColor = Colors.LightGray,
-                HorizontalOptions = LayoutOptions.FillAndExpand,
+                HorizontalOptions = LayoutOptions.Fill,
                 VerticalOptions = LayoutOptions.Center,
                 FontFamily = GlobalSetting.FontFamily,
                 BackgroundColor = Colors.Transparent,

src/InputKit/Shared/Controls/Dropdown.cs

@@ -5,6 +5,7 @@
 using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
+using Plainer.Maui.Controls;
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -36,7 +37,7 @@ public partial class Dropdown : StatefulStackLayout, IValidatable
     protected Label lblTitle = new Label { Margin = new Thickness(6, 0, 0, 0), IsVisible = false, TextColor = GlobalSetting.TextColor, LineBreakMode = LineBreakMode.TailTruncation, FontFamily = GlobalSetting.FontFamily };
     protected Label lblAnnotation = new Label { Margin = new Thickness(6, 0, 0, 0), IsVisible = false, FontSize = Device.GetNamedSize(NamedSize.Micro, typeof(Label)), Opacity = 0.8, TextColor = GlobalSetting.TextColor, FontFamily = GlobalSetting.FontFamily };
     protected Frame frmBackground = new Frame { Padding = 0, BackgroundColor = GlobalSetting.BackgroundColor, HasShadow = false, CornerRadius = (int)GlobalSetting.CornerRadius, BorderColor = GlobalSetting.BorderColor };
-    protected Entry txtInput = new EmptyEntry { TextColor = Colors.Blue, PlaceholderColor = Colors.Blue, HorizontalOptions = LayoutOptions.FillAndExpand, VerticalOptions = LayoutOptions.Center, FontFamily = GlobalSetting.FontFamily, IsEnabled = false };
+    protected Entry txtInput = new EntryView { TextColor = Colors.Blue, PlaceholderColor = Colors.Blue, HorizontalOptions = LayoutOptions.FillAndExpand, VerticalOptions = LayoutOptions.Center, FontFamily = GlobalSetting.FontFamily, IsEnabled = false };
 
     private protected PopupMenu pMenu = new PopupMenu();
     private string _placeholder;