Merge branch 'rel-1.1' into develop

enisn · Nov 10, 2022 · 9e26d8e · 9e26d8e
2 parents d2cb86c + a9336b9
commit 9e26d8e
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 8 deletions.
diff --git a/common.props b/common.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>1.0.2</Version>
+        <Version>1.1.0</Version>
         <PackageIcon>logo_128.png</PackageIcon>
         <NeutralLanguage>en</NeutralLanguage>
         <RepositoryUrl>https://github.com/enisn/UraniumUI</RepositoryUrl>

diff --git a/docs/en/migration-guides/Migrating-To-1.1.md b/docs/en/migration-guides/Migrating-To-1.1.md
@@ -16,6 +16,7 @@ Each input has a disabled state now. It's working well after updating to v1.1. B
                     <VisualState.Setters>
                         <Setter Property="Opacity" Value="1"/>
                         <Setter Property="AccentColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
+                        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource OnBackground}, Dark={StaticResource OnBackgroundDark}}" />
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Disabled">

diff --git a/src/UraniumUI.Material/Controls/InputField.cs b/src/UraniumUI.Material/Controls/InputField.cs
@@ -100,6 +100,10 @@ public InputField()
 
         InitializeValidation();
     }
+    ~InputField()
+    {
+        ReleaseEvents();
+    }
 
     protected override async void OnSizeAllocated(double width, double height)
     {
@@ -108,7 +112,18 @@ protected override async void OnSizeAllocated(double width, double height)
         InitializeBorder();
     }
 
-    private void InitializeBorder()
+	// TODO: Remove this member hiding after android unfocus fixed.
+	public new void Unfocus()
+	{
+		base.Unfocus();
+#if ANDROID
+        var view = Content.Handler.PlatformView as Android.Views.View;
+
+        view?.ClearFocus();
+#endif
+	}
+
+	private void InitializeBorder()
     {
         var perimeter = (this.Width + this.Height) * 2;
 
@@ -199,7 +214,13 @@ protected virtual void RegisterForEvents()
         }
     }
 
-    private void Content_Unfocused(object sender, FocusEventArgs e)
+	protected virtual void ReleaseEvents()
+	{
+		Content.Focused -= Content_Focused;
+		Content.Unfocused -= Content_Unfocused;
+	}
+
+	private void Content_Unfocused(object sender, FocusEventArgs e)
     {
         border.Stroke = BorderColor;
         labelTitle.TextColor = TitleColor;

diff --git a/src/UraniumUI.Material/Controls/TextField.cs b/src/UraniumUI.Material/Controls/TextField.cs
@@ -62,7 +62,12 @@ public TextField()
 #endif
 	}
 
-	public void Clear()
+	~TextField()
+	{
+		EntryView.TextChanged -= EntryView_TextChanged;
+	}
+
+	public void ClearValue()
 	{
 		if (IsEnabled)
 		{

diff --git a/src/UraniumUI.Material/Resources/StyleResource.xaml b/src/UraniumUI.Material/Resources/StyleResource.xaml
@@ -299,6 +299,7 @@
                                     <VisualState.Setters>
                                         <Setter Property="Opacity" Value="1"/>
                                         <Setter Property="AccentColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
+                                        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource OnBackground}, Dark={StaticResource OnBackgroundDark}}" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="Disabled">

diff --git a/templates/UraniumUI.Templates.csproj b/templates/UraniumUI.Templates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>1.0.2</PackageVersion>
+    <PackageVersion>1.1.0</PackageVersion>
     <Title>Uranium UI MAUI Templates</Title>
     <Authors>enisn</Authors>
     <Description>Templates for new MAUI Apps, Themes and Libraries</Description>

diff --git a/templates/default/MyCompany.MyProject/MyCompany.MyProject.csproj b/templates/default/MyCompany.MyProject/MyCompany.MyProject.csproj
@@ -49,12 +49,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="UraniumUI.Material" Version="1.0.2" />
+    <PackageReference Include="UraniumUI.Material" Version="1.1.0" />
 		<!--#if (FontAwesome)-->
-    <PackageReference Include="UraniumUI.Icons.FontAwesome" Version="1.0.2" />
+    <PackageReference Include="UraniumUI.Icons.FontAwesome" Version="1.1.0" />
     <!--#endif-->
     <!--#if (MaterialIcons)-->
-    <PackageReference Include="UraniumUI.Icons.MaterialIcons" Version="1.0.2" />
+    <PackageReference Include="UraniumUI.Icons.MaterialIcons" Version="1.1.0" />
     <!--#endif-->
 	</ItemGroup>
 

diff --git a/templates/uranium-material-resources/MaterialResourceStyle.xaml b/templates/uranium-material-resources/MaterialResourceStyle.xaml
@@ -264,6 +264,7 @@
                                     <VisualState.Setters>
                                         <Setter Property="Opacity" Value="1"/>
                                         <Setter Property="AccentColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
+                                        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource OnBackground}, Dark={StaticResource OnBackgroundDark}}" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="Disabled">