From 8c8fb23c40d531fdc59b32a5de8e2f5eb5a14ec8 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Mar 2022 12:15:38 -0400
Subject: [PATCH] Make android test application buildable

---
 .../Avalonia.AndroidTestApplication.csproj    |  8 +++-
 .../MainActivity.cs                           | 39 +++++++------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 8cb7aa1cfd..548393fb2f 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -11,7 +11,13 @@
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
     <DebugType>portable</DebugType>
   </PropertyGroup>
-  
+
+  <ItemGroup>
+    <AndroidResource Include="..\..\..\build\Assets\Icon.png">
+      <Link>Resources\drawable\Icon.png</Link>
+    </AndroidResource>
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
     <DebugSymbols>True</DebugSymbols>
     <RunAOTCompilation>True</RunAOTCompilation>
diff --git a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
index 471b982d9e..e34fa6cf7b 100644
--- a/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
+++ b/src/Android/Avalonia.AndroidTestApplication/MainActivity.cs
@@ -1,9 +1,9 @@
 using System;
 using Android.App;
 using Android.Content.PM;
-using Android.OS;
 using Avalonia.Android;
 using Avalonia.Controls;
+using Avalonia.Input.TextInput;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Styling;
@@ -14,22 +14,15 @@ namespace Avalonia.AndroidTestApplication
     [Activity(Label = "Main",
         MainLauncher = true,
         Icon = "@drawable/icon",
-         Theme = "@style/Theme.AppCompat.NoActionBar",
-         ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize,
+        Theme = "@style/Theme.AppCompat.NoActionBar",
+        ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize,
         LaunchMode = LaunchMode.SingleInstance/*,
         ScreenOrientation = ScreenOrientation.Landscape*/)]
-    public class MainBaseActivity : AvaloniaActivity
+    public class MainActivity : AvaloniaActivity<App>
     {
-        protected override void OnCreate(Bundle savedInstanceState)
+        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
         {
-            if (Avalonia.Application.Current == null)
-            {
-                AppBuilder.Configure<App>()
-                    .UseAndroid()
-                    .SetupWithoutStarting();
-            }
-            base.OnCreate(savedInstanceState);
-            Content = App.CreateSimpleWindow();
+            return base.CustomizeAppBuilder(builder);
         }
     }
 
@@ -42,8 +35,6 @@ namespace Avalonia.AndroidTestApplication
             var baseLight = (IStyle)AvaloniaXamlLoader.Load(
                 new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"));
             Styles.Add(baseLight);
-
-
         }
 
         // This provides a simple UI tree for testing input handling, drawing, etc
@@ -76,12 +67,12 @@ namespace Avalonia.AndroidTestApplication
                             Foreground = Brushes.Black
                         },
 
-                        CreateTextBox(Input.TextInput.TextInputContentType.Normal),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Password),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Email),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Url),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Phone),
-                        CreateTextBox(Input.TextInput.TextInputContentType.Number),
+                        CreateTextBox(TextInputContentType.Normal),
+                        CreateTextBox(TextInputContentType.Password),
+                        CreateTextBox(TextInputContentType.Email),
+                        CreateTextBox(TextInputContentType.Url),
+                        CreateTextBox(TextInputContentType.Digits),
+                        CreateTextBox(TextInputContentType.Number),
                     }
                 }
             };
@@ -89,16 +80,16 @@ namespace Avalonia.AndroidTestApplication
             return window;
         }
 
-        private static TextBox CreateTextBox(Input.TextInput.TextInputContentType contentType)
+        private static TextBox CreateTextBox(TextInputContentType contentType)
         {
             var textBox = new TextBox()
             {
                 Margin = new Thickness(20, 10),
                 Watermark = contentType.ToString(),
                 BorderThickness = new Thickness(3),
-                FontSize = 20
+                FontSize = 20,
+                [TextInputOptions.ContentTypeProperty] = contentType
             };
-            textBox.TextInputOptionsQuery += (s, e) => { e.ContentType = contentType; };
 
             return textBox;
         }