From d54e4ab2b733c19e3a35d7d15ea74368fb918f41 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 30 Aug 2023 00:13:26 +0800
Subject: [PATCH] misc: extract App.axaml; Android demo display label.

---
 demo/Semi.Avalonia.Demo.Android/App.axaml     | 11 ---------
 .../MainActivity.cs                           | 10 +++++---
 .../Views/MainView.axaml                      | 11 ---------
 .../Views/MainView.axaml.cs                   | 18 --------------
 demo/Semi.Avalonia.Demo.Desktop/App.axaml     | 13 ----------
 demo/Semi.Avalonia.Demo.Desktop/App.axaml.cs  | 23 ------------------
 demo/Semi.Avalonia.Demo.Drm/App.axaml         | 13 ----------
 demo/Semi.Avalonia.Demo.Drm/App.axaml.cs      | 24 -------------------
 demo/Semi.Avalonia.Demo.Web/App.axaml.cs      | 23 ------------------
 .../App.axaml                                 |  2 +-
 .../App.axaml.cs                              | 16 +++++++------
 11 files changed, 17 insertions(+), 147 deletions(-)
 delete mode 100644 demo/Semi.Avalonia.Demo.Android/App.axaml
 delete mode 100644 demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml
 delete mode 100644 demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml.cs
 delete mode 100644 demo/Semi.Avalonia.Demo.Desktop/App.axaml
 delete mode 100644 demo/Semi.Avalonia.Demo.Desktop/App.axaml.cs
 delete mode 100644 demo/Semi.Avalonia.Demo.Drm/App.axaml
 delete mode 100644 demo/Semi.Avalonia.Demo.Drm/App.axaml.cs
 delete mode 100644 demo/Semi.Avalonia.Demo.Web/App.axaml.cs
 rename demo/{Semi.Avalonia.Demo.Web => Semi.Avalonia.Demo}/App.axaml (91%)
 rename demo/{Semi.Avalonia.Demo.Android => Semi.Avalonia.Demo}/App.axaml.cs (53%)

diff --git a/demo/Semi.Avalonia.Demo.Android/App.axaml b/demo/Semi.Avalonia.Demo.Android/App.axaml
deleted file mode 100644
index 6387ef8..0000000
--- a/demo/Semi.Avalonia.Demo.Android/App.axaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Application
-    x:Class="Semi.Avalonia.Demo.Android.App"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Semi.Avalonia.Demo.Android">
-    <Application.Styles>
-        <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-    </Application.Styles>
-</Application>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo.Android/MainActivity.cs b/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
index d037305..03b691f 100644
--- a/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
+++ b/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
@@ -4,9 +4,13 @@ using Avalonia.Android;
 
 namespace Semi.Avalonia.Demo.Android;
 
-[Activity(Label = "Semi.Avalonia.Demo.Android", Icon = "@drawable/Icon", MainLauncher = true, Theme = "@style/MyTheme.NoActionBar",
-    LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
+[Activity(
+    Label = "Semi.Avalonia",
+    Theme = "@style/MyTheme.NoActionBar",
+    Icon = "@drawable/Icon",
+    MainLauncher = true,
+    LaunchMode = LaunchMode.SingleTop,
+    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity<App>
 {
-    
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml b/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml
deleted file mode 100644
index 250500b..0000000
--- a/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<UserControl
-    x:Class="Semi.Avalonia.Demo.Android.Views.MainView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    Welcome to Avalonia!
-</UserControl>
diff --git a/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml.cs b/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml.cs
deleted file mode 100644
index dfc7f2d..0000000
--- a/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Semi.Avalonia.Demo.Android.Views;
-
-public partial class MainView : UserControl
-{
-    public MainView()
-    {
-        InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo.Desktop/App.axaml b/demo/Semi.Avalonia.Demo.Desktop/App.axaml
deleted file mode 100644
index c12b782..0000000
--- a/demo/Semi.Avalonia.Demo.Desktop/App.axaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Application
-    x:Class="Semi.Avalonia.Demo.Desktop.App"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Semi.Avalonia.Demo.Desktop"
-    RequestedThemeVariant="Light">
-    <Application.Styles>
-        <!--<StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />-->
-        <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-    </Application.Styles>
-</Application>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo.Desktop/App.axaml.cs b/demo/Semi.Avalonia.Demo.Desktop/App.axaml.cs
deleted file mode 100644
index d5fe94a..0000000
--- a/demo/Semi.Avalonia.Demo.Desktop/App.axaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-using Semi.Avalonia.Demo.Views;
-
-namespace Semi.Avalonia.Demo.Desktop;
-
-public partial class App : Application
-{
-    public override void Initialize()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
-    public override void OnFrameworkInitializationCompleted()
-    {
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            desktop.MainWindow = new MainWindow();
-        }
-        base.OnFrameworkInitializationCompleted();
-    }
-}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo.Drm/App.axaml b/demo/Semi.Avalonia.Demo.Drm/App.axaml
deleted file mode 100644
index d4ceb6d..0000000
--- a/demo/Semi.Avalonia.Demo.Drm/App.axaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Application
-    x:Class="Semi.Avalonia.Demo.Drm.App"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    RequestedThemeVariant="Light">
-
-    <Application.Styles>
-        <!--<StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />-->
-        <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-    </Application.Styles>
-</Application>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo.Drm/App.axaml.cs b/demo/Semi.Avalonia.Demo.Drm/App.axaml.cs
deleted file mode 100644
index f436ee6..0000000
--- a/demo/Semi.Avalonia.Demo.Drm/App.axaml.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-using Semi.Avalonia.Demo.Views;
-
-namespace Semi.Avalonia.Demo.Drm
-{
-    public partial class App : Application
-    {
-        public override void Initialize()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public override void OnFrameworkInitializationCompleted()
-        {
-            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-                desktop.MainWindow = new MainWindow();
-            else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
-                singleView.MainView = new MainView();
-            base.OnFrameworkInitializationCompleted();
-        }
-    }
-}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo.Web/App.axaml.cs b/demo/Semi.Avalonia.Demo.Web/App.axaml.cs
deleted file mode 100644
index 5638d50..0000000
--- a/demo/Semi.Avalonia.Demo.Web/App.axaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-using Semi.Avalonia.Demo.Views;
-
-namespace Semi.Avalonia.Demo.Web;
-
-public partial class App : Application
-{
-    public override void Initialize()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
-    public override void OnFrameworkInitializationCompleted()
-    {
-        if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
-        {
-            singleViewPlatform.MainView = new MainView();
-        }
-        base.OnFrameworkInitializationCompleted();
-    }
-}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo.Web/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml
similarity index 91%
rename from demo/Semi.Avalonia.Demo.Web/App.axaml
rename to demo/Semi.Avalonia.Demo/App.axaml
index 6b850fc..07879bb 100644
--- a/demo/Semi.Avalonia.Demo.Web/App.axaml
+++ b/demo/Semi.Avalonia.Demo/App.axaml
@@ -1,5 +1,5 @@
 <Application
-    x:Class="Semi.Avalonia.Demo.Web.App"
+    x:Class="Semi.Avalonia.Demo.App"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Styles>
diff --git a/demo/Semi.Avalonia.Demo.Android/App.axaml.cs b/demo/Semi.Avalonia.Demo/App.axaml.cs
similarity index 53%
rename from demo/Semi.Avalonia.Demo.Android/App.axaml.cs
rename to demo/Semi.Avalonia.Demo/App.axaml.cs
index e68f7de..399c279 100644
--- a/demo/Semi.Avalonia.Demo.Android/App.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/App.axaml.cs
@@ -1,10 +1,9 @@
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Semi.Avalonia.Demo.Views;
 
-namespace Semi.Avalonia.Demo.Android;
+namespace Semi.Avalonia.Demo;
 
 public partial class App : Application
 {
@@ -15,13 +14,16 @@ public partial class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
-        if (ApplicationLifetime is ISingleViewApplicationLifetime single)
+        switch (ApplicationLifetime)
         {
-            single.MainView = new MainView()
-            {
-
-            };
+            case IClassicDesktopStyleApplicationLifetime desktop:
+                desktop.MainWindow = new MainWindow();
+                break;
+            case ISingleViewApplicationLifetime singleView:
+                singleView.MainView = new MainView();
+                break;
         }
+
         base.OnFrameworkInitializationCompleted();
     }
 }
\ No newline at end of file