From f9a884d36cadb6dea47371ea02a719dc19ca1594 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 24 Jan 2025 13:55:12 -0600 Subject: [PATCH 1/4] Merged `dotnet new maui` template into `samples/NativeAOT` --- samples/NativeAOT/App.xaml | 14 + samples/NativeAOT/App.xaml.cs | 14 + samples/NativeAOT/AppShell.xaml | 14 + samples/NativeAOT/AppShell.xaml.cs | 9 + samples/NativeAOT/MainActivity.cs | 21 - samples/NativeAOT/MainPage.xaml | 36 ++ samples/NativeAOT/MainPage.xaml.cs | 23 + samples/NativeAOT/MauiProgram.cs | 24 + samples/NativeAOT/NativeAOT.csproj | 18 +- .../Android}/AndroidManifest.xml | 3 +- .../Platforms/Android/MainActivity.cs | 18 + .../Platforms/Android/MainApplication.cs | 27 ++ .../Android/Resources/values/colors.xml | 6 + .../NativeAOT/Resources/AppIcon/appicon.svg | 4 + .../NativeAOT/Resources/AppIcon/appiconfg.svg | 8 + .../Resources/Fonts/OpenSans-Regular.ttf | Bin 0 -> 96932 bytes .../Resources/Fonts/OpenSans-Semibold.ttf | Bin 0 -> 100820 bytes .../NativeAOT/Resources/Images/dotnet_bot.png | Bin 0 -> 93437 bytes .../NativeAOT/Resources/Raw/AboutAssets.txt | 15 + samples/NativeAOT/Resources/Splash/splash.svg | 8 + .../NativeAOT/Resources/Styles/Colors.xaml | 45 ++ .../NativeAOT/Resources/Styles/Styles.xaml | 451 ++++++++++++++++++ .../Resources/layout/activity_main.xml | 13 - .../Resources/mipmap-anydpi-v26/appicon.xml | 4 - .../mipmap-anydpi-v26/appicon_round.xml | 4 - .../Resources/mipmap-hdpi/appicon.png | Bin 2178 -> 0 bytes .../mipmap-hdpi/appicon_background.png | Bin 97 -> 0 bytes .../mipmap-hdpi/appicon_foreground.png | Bin 1276 -> 0 bytes .../Resources/mipmap-mdpi/appicon.png | Bin 1524 -> 0 bytes .../mipmap-mdpi/appicon_background.png | Bin 92 -> 0 bytes .../mipmap-mdpi/appicon_foreground.png | Bin 1273 -> 0 bytes .../Resources/mipmap-xhdpi/appicon.png | Bin 3098 -> 0 bytes .../mipmap-xhdpi/appicon_background.png | Bin 100 -> 0 bytes .../mipmap-xhdpi/appicon_foreground.png | Bin 1805 -> 0 bytes .../Resources/mipmap-xxhdpi/appicon.png | Bin 4674 -> 0 bytes .../mipmap-xxhdpi/appicon_background.png | Bin 108 -> 0 bytes .../mipmap-xxhdpi/appicon_foreground.png | Bin 1926 -> 0 bytes .../Resources/mipmap-xxxhdpi/appicon.png | Bin 6832 -> 0 bytes .../mipmap-xxxhdpi/appicon_background.png | Bin 117 -> 0 bytes .../mipmap-xxxhdpi/appicon_foreground.png | Bin 2801 -> 0 bytes .../values/ic_launcher_background.xml | 4 - .../NativeAOT/Resources/values/strings.xml | 4 - 42 files changed, 735 insertions(+), 52 deletions(-) create mode 100644 samples/NativeAOT/App.xaml create mode 100644 samples/NativeAOT/App.xaml.cs create mode 100644 samples/NativeAOT/AppShell.xaml create mode 100644 samples/NativeAOT/AppShell.xaml.cs delete mode 100644 samples/NativeAOT/MainActivity.cs create mode 100644 samples/NativeAOT/MainPage.xaml create mode 100644 samples/NativeAOT/MainPage.xaml.cs create mode 100644 samples/NativeAOT/MauiProgram.cs rename samples/NativeAOT/{ => Platforms/Android}/AndroidManifest.xml (63%) create mode 100644 samples/NativeAOT/Platforms/Android/MainActivity.cs create mode 100644 samples/NativeAOT/Platforms/Android/MainApplication.cs create mode 100644 samples/NativeAOT/Platforms/Android/Resources/values/colors.xml create mode 100644 samples/NativeAOT/Resources/AppIcon/appicon.svg create mode 100644 samples/NativeAOT/Resources/AppIcon/appiconfg.svg create mode 100644 samples/NativeAOT/Resources/Fonts/OpenSans-Regular.ttf create mode 100644 samples/NativeAOT/Resources/Fonts/OpenSans-Semibold.ttf create mode 100644 samples/NativeAOT/Resources/Images/dotnet_bot.png create mode 100644 samples/NativeAOT/Resources/Raw/AboutAssets.txt create mode 100644 samples/NativeAOT/Resources/Splash/splash.svg create mode 100644 samples/NativeAOT/Resources/Styles/Colors.xaml create mode 100644 samples/NativeAOT/Resources/Styles/Styles.xaml delete mode 100644 samples/NativeAOT/Resources/layout/activity_main.xml delete mode 100644 samples/NativeAOT/Resources/mipmap-anydpi-v26/appicon.xml delete mode 100644 samples/NativeAOT/Resources/mipmap-anydpi-v26/appicon_round.xml delete mode 100644 samples/NativeAOT/Resources/mipmap-hdpi/appicon.png delete mode 100644 samples/NativeAOT/Resources/mipmap-hdpi/appicon_background.png delete mode 100644 samples/NativeAOT/Resources/mipmap-hdpi/appicon_foreground.png delete mode 100644 samples/NativeAOT/Resources/mipmap-mdpi/appicon.png delete mode 100644 samples/NativeAOT/Resources/mipmap-mdpi/appicon_background.png delete mode 100644 samples/NativeAOT/Resources/mipmap-mdpi/appicon_foreground.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xhdpi/appicon.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xhdpi/appicon_background.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xhdpi/appicon_foreground.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xxhdpi/appicon.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xxhdpi/appicon_background.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xxhdpi/appicon_foreground.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xxxhdpi/appicon.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xxxhdpi/appicon_background.png delete mode 100644 samples/NativeAOT/Resources/mipmap-xxxhdpi/appicon_foreground.png delete mode 100644 samples/NativeAOT/Resources/values/ic_launcher_background.xml delete mode 100644 samples/NativeAOT/Resources/values/strings.xml diff --git a/samples/NativeAOT/App.xaml b/samples/NativeAOT/App.xaml new file mode 100644 index 00000000000..05dc94e9e83 --- /dev/null +++ b/samples/NativeAOT/App.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/samples/NativeAOT/App.xaml.cs b/samples/NativeAOT/App.xaml.cs new file mode 100644 index 00000000000..79a77569f63 --- /dev/null +++ b/samples/NativeAOT/App.xaml.cs @@ -0,0 +1,14 @@ +namespace NativeAOT; + +public partial class App : Application +{ + public App() + { + InitializeComponent(); + } + + protected override Window CreateWindow(IActivationState? activationState) + { + return new Window(new AppShell()); + } +} \ No newline at end of file diff --git a/samples/NativeAOT/AppShell.xaml b/samples/NativeAOT/AppShell.xaml new file mode 100644 index 00000000000..f1086a916c0 --- /dev/null +++ b/samples/NativeAOT/AppShell.xaml @@ -0,0 +1,14 @@ + + + + + + diff --git a/samples/NativeAOT/AppShell.xaml.cs b/samples/NativeAOT/AppShell.xaml.cs new file mode 100644 index 00000000000..f393f3d5a07 --- /dev/null +++ b/samples/NativeAOT/AppShell.xaml.cs @@ -0,0 +1,9 @@ +namespace NativeAOT; + +public partial class AppShell : Shell +{ + public AppShell() + { + InitializeComponent(); + } +} diff --git a/samples/NativeAOT/MainActivity.cs b/samples/NativeAOT/MainActivity.cs deleted file mode 100644 index aaedc0aef2d..00000000000 --- a/samples/NativeAOT/MainActivity.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Android.Runtime; -using Android.Util; -using System.Reflection; -using System.Runtime.InteropServices; - -namespace NativeAOT; - -// Name required for typemap in NativeAotTypeManager -[Activity (Label = "@string/app_name", MainLauncher = true, Name = "my.MainActivity")] -public class MainActivity : Activity -{ - protected override void OnCreate(Bundle? savedInstanceState) - { - Log.Debug ("NativeAOT", "MainActivity.OnCreate()"); - - base.OnCreate(savedInstanceState); - - // Set our view from the "main" layout resource - SetContentView(Resource.Layout.activity_main); - } -} \ No newline at end of file diff --git a/samples/NativeAOT/MainPage.xaml b/samples/NativeAOT/MainPage.xaml new file mode 100644 index 00000000000..49e64e01156 --- /dev/null +++ b/samples/NativeAOT/MainPage.xaml @@ -0,0 +1,36 @@ + + + + + + + +