Merge pull request #272 from enisn/windows-visual-improvements

Remove Plainer and AdvancedEntry improvements

Author: enisn

sandbox/SandboxMAUI/Pages/AdvancedEntryPage.xaml

@@ -13,7 +13,7 @@
         <StackLayout Padding="30" MaximumWidthRequest="400">
                 <Label Text="You can see FormView Below:" />
                 <BoxView HeightRequest="1" Color="LightGray" />
-                <input:FormView IsValidated="{Binding IsValidated}">
+                <input:FormView IsValidated="{Binding IsValidated}" Spacing="15">
 
                     <input:AdvancedEntry
                         Title="Place your email below:"

src/InputKit.Maui/Handlers/InputKitHandlersCollectionExtension.cs

@@ -1,5 +1,4 @@
 using InputKit.Shared.Layouts;
-using Plainer.Maui;
 
 namespace InputKit.Handlers
 {
@@ -8,7 +7,6 @@ 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.Maui/InputKit.Maui.csproj

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

src/InputKit.Maui/Shared/Controls/AdvancedEntry.cs

@@ -1,6 +1,5 @@
 using InputKit.Shared.Abstraction;
 using InputKit.Shared.Configuration;
-using Plainer.Maui.Controls;
 using System.Text.RegularExpressions;
 using System.Windows.Input;
 
@@ -43,7 +42,7 @@ public partial class AdvancedEntry : StackLayout, IValidatable
         readonly 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 };
         readonly Frame frmBackground = new Frame { BackgroundColor = GlobalSetting.BackgroundColor, CornerRadius = (float)GlobalSetting.CornerRadius, BorderColor = GlobalSetting.BorderColor, Padding = new Thickness(5, 0, 0, 0), HasShadow = false };
         readonly Image imgWarning = new Image { Margin = 10, HorizontalOptions = LayoutOptions.End, VerticalOptions = LayoutOptions.Center, InputTransparent = true, Source = "alert.png" };
-        readonly IconView imgIcon = new IconView { InputTransparent = true, IsVisible = false, Margin = new Thickness(5, 10, 10, 10), VerticalOptions = LayoutOptions.CenterAndExpand, HeightRequest = 30, FillColor = GlobalSetting.Color };
+        readonly IconView imgIcon = new IconView { InputTransparent = true, Margin = 5, IsVisible = false, VerticalOptions = LayoutOptions.CenterAndExpand, HeightRequest = 30, FillColor = GlobalSetting.Color };
         readonly Entry txtInput;
         #endregion
 
@@ -57,23 +56,20 @@ public AdvancedEntry()
             Children.Add(lblTitle);
             Children.Add(frmBackground);
 
+            var inputGrid = new Grid();
+            inputGrid.ColumnDefinitions.Add(new ColumnDefinition() { Width = 30 });
+            inputGrid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star));
+            inputGrid.Add(imgIcon, column: 0);
+            inputGrid.Add(txtInput, column: 1);
+
             ApplyValidationPosition(GlobalSetting.LabelPosition);
 
             frmBackground.Content = new Grid
             {
                 BackgroundColor = Colors.Transparent,
                 Children =
                 {
-                    new StackLayout
-                    {
-                        Orientation = StackOrientation.Horizontal,
-                        BackgroundColor = Colors.Transparent,
-                        Children =
-                        {
-                            imgIcon,
-                            txtInput
-                        }
-                    },
+                    inputGrid,
                     imgWarning
                 }
             };
@@ -601,7 +597,7 @@ private void ApplyValidationPosition(LabelPosition position)
 
         private protected virtual Entry GetInputEntry()
         {
-            return new EntryView
+            return new Entry
             {
                 TextColor = GlobalSetting.TextColor,
                 PlaceholderColor = Colors.LightGray,

src/InputKit.Maui/Shared/Controls/Dropdown.cs

@@ -5,7 +5,6 @@
 using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Graphics;
-using Plainer.Maui.Controls;
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -37,7 +36,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 EntryView { TextColor = Colors.Blue, PlaceholderColor = Colors.Blue, HorizontalOptions = LayoutOptions.FillAndExpand, VerticalOptions = LayoutOptions.Center, FontFamily = GlobalSetting.FontFamily, IsEnabled = false };
+    protected Entry txtInput = new Entry { 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;
@@ -52,11 +51,11 @@ public Dropdown()
         {
             Orientation = StackOrientation.Horizontal,
             Children =
-                        {
-                            imgIcon,
-                            txtInput,
-                            imgArrow
-                        }
+            {
+                imgIcon,
+                txtInput,
+                imgArrow
+            }
         };
         Children.Add(frmBackground);
         frmBackground.GestureRecognizers.Add(new TapGestureRecognizer { Command = new Command(Menu_Requested), CommandParameter = frmBackground });