Merge pull request #66 from wieslawsoltes/UpdateV11

wieslawsoltes · Jul 11, 2023 · f9c7f28 · f9c7f28
2 parents 81f4baa + 5d52595
commit f9c7f28
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 49 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>preview.20</VersionSuffix>
+    <VersionSuffix>preview.21</VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
     <Copyright>Copyright © Wiesław Šoltés 2023</Copyright>
@@ -13,12 +13,12 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <AvaloniaVersion>11.0.0-rc1.1</AvaloniaVersion>
-    <DockVersion>11.0.0-rc1.1</DockVersion>
-    <NodeEditorVersion>11.0.0-rc1.1</NodeEditorVersion>
+    <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    <DockVersion>11.0.0</DockVersion>
+    <NodeEditorVersion>11.0.0</NodeEditorVersion>
     <CommunityToolkitMvvmVersion>8.1.0</CommunityToolkitMvvmVersion>
-    <MarkdownAvaloniaVersion>11.0.0-d1</MarkdownAvaloniaVersion>
-    <AvaloniaHtmlRendererVersion>11.0.0-rc1.1</AvaloniaHtmlRendererVersion>
+    <MarkdownAvaloniaVersion>11.0.0</MarkdownAvaloniaVersion>
+    <AvaloniaHtmlRendererVersion>11.0.0</AvaloniaHtmlRendererVersion>
     <MicrosoftExtensionsDependencyInjectionVersion>7.0.0</MicrosoftExtensionsDependencyInjectionVersion>
     <SystemCommandLineVersion>2.0.0-beta1.20104.2</SystemCommandLineVersion>
     <XUnitVersion>2.4.1</XUnitVersion>

diff --git a/src/ChatGPT.UI.Android/MainActivity.cs b/src/ChatGPT.UI.Android/MainActivity.cs
@@ -2,18 +2,20 @@
 using Android.App;
 using Android.Content.PM;
 using Android.Views;
+using Avalonia;
 using Avalonia.Android;
 
 namespace ChatGPT.UI.Android;
 
 [Activity(
     Label = "ChatGPT", 
     Theme = "@style/MyTheme.Main", 
-    Icon = "@drawable/icon", 
+    Icon = "@drawable/icon",
+    MainLauncher = true,
     LaunchMode = LaunchMode.SingleTop, 
     ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode,
     WindowSoftInputMode = SoftInput.AdjustResize)]
-public class MainActivity : AvaloniaMainActivity
+public class MainActivity : AvaloniaMainActivity<App>
 {
     protected override void OnDestroy()
     {
@@ -32,4 +34,13 @@ protected override void OnDestroy()
 
         base.OnDestroy();
     }
+
+    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+    {
+        App.ConfigureMobileServices();
+
+        builder.WithInterFont();
+
+        return base.CustomizeAppBuilder(builder);
+    }
 }
diff --git a/src/ChatGPT.UI.Android/SplashActivity.cs b/src/ChatGPT.UI.Android/SplashActivity.cs
diff --git a/src/ChatGPT.UI/Themes/SelectingItemsControl.axaml b/src/ChatGPT.UI/Themes/SelectingItemsControl.axaml
@@ -9,8 +9,6 @@
                 CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{TemplateBinding Padding}">
           <ItemsPresenter Name="PART_ItemsPresenter"
-                          AreVerticalSnapPointsRegular="{TemplateBinding AreVerticalSnapPointsRegular}"
-                          AreHorizontalSnapPointsRegular="{TemplateBinding AreHorizontalSnapPointsRegular}"
                           ItemsPanel="{TemplateBinding ItemsPanel}"/>
         </Border>
       </ControlTemplate>