Merge pull request #249 from irihitech/enhance

Several Enhancements
irihitech · Aug 29, 2023 · 255e21d · 255e21d
2 parents de578d3 + d54e4ab
commit 255e21d
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 207 deletions.
diff --git a/demo/Semi.Avalonia.Demo.Android/App.axaml b/demo/Semi.Avalonia.Demo.Android/App.axaml
diff --git a/demo/Semi.Avalonia.Demo.Android/MainActivity.cs b/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
@@ -4,9 +4,13 @@
 
 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>
 {
-
 }
diff --git a/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml b/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml
diff --git a/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml.cs b/demo/Semi.Avalonia.Demo.Android/Views/MainView.axaml.cs
diff --git a/demo/Semi.Avalonia.Demo.Desktop/App.axaml b/demo/Semi.Avalonia.Demo.Desktop/App.axaml
diff --git a/demo/Semi.Avalonia.Demo.Desktop/App.axaml.cs b/demo/Semi.Avalonia.Demo.Desktop/App.axaml.cs
diff --git a/demo/Semi.Avalonia.Demo.Drm/App.axaml b/demo/Semi.Avalonia.Demo.Drm/App.axaml
diff --git a/demo/Semi.Avalonia.Demo.Drm/App.axaml.cs b/demo/Semi.Avalonia.Demo.Drm/App.axaml.cs
diff --git a/demo/Semi.Avalonia.Demo.Web/App.axaml.cs b/demo/Semi.Avalonia.Demo.Web/App.axaml.cs
diff --git a/demo/Semi.Avalonia.Demo.Web/App.axaml → demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo.Web/App.axaml → 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 → demo/Semi.Avalonia.Demo/App.axaml.cs b/demo/Semi.Avalonia.Demo.Android/App.axaml.cs → 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 override void Initialize()
 
     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();
     }
 }
diff --git a/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
@@ -129,22 +129,22 @@
             <Button.Flyout>
                 <Flyout FlyoutPresenterTheme="{StaticResource LightFlyout}" Placement="Top">
                     <StackPanel>
-                        <Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                        <Label Classes="Red" Theme="{StaticResource TagLabel}">Red</Label>
+                        <Label Classes="Pink" Theme="{StaticResource TagLabel}">Pink</Label>
+                        <Label Classes="Purple" Theme="{StaticResource TagLabel}">Purple</Label>
+                        <Label Classes="Violet" Theme="{StaticResource TagLabel}">Violet</Label>
+                        <Label Classes="Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
                         <Label Classes="Blue" Theme="{StaticResource TagLabel}">Blue</Label>
+                        <Label Classes="LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
                         <Label Classes="Cyan" Theme="{StaticResource TagLabel}">Cyan</Label>
+                        <Label Classes="Teal" Theme="{StaticResource TagLabel}">Teal</Label>
                         <Label Classes="Green" Theme="{StaticResource TagLabel}">Green</Label>
-                        <Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
-                        <Label Classes="Indigo" Theme="{StaticResource TagLabel}">Indigo</Label>
-                        <Label Classes="LightBlue" Theme="{StaticResource TagLabel}">LightBlue</Label>
                         <Label Classes="LightGreen" Theme="{StaticResource TagLabel}">LightGreen</Label>
                         <Label Classes="Lime" Theme="{StaticResource TagLabel}">Lime</Label>
-                        <Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
-                        <Label Classes="Pink" Theme="{StaticResource TagLabel}">Pink</Label>
-                        <Label Classes="Purple" Theme="{StaticResource TagLabel}">Purple</Label>
-                        <Label Classes="Red" Theme="{StaticResource TagLabel}">Red</Label>
-                        <Label Classes="Teal" Theme="{StaticResource TagLabel}">Teal</Label>
-                        <Label Classes="Violet" Theme="{StaticResource TagLabel}">Violet</Label>
                         <Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
+                        <Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
+                        <Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
+                        <Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
                         <Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
                     </StackPanel>
                 </Flyout>

diff --git a/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml b/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml
@@ -16,6 +16,7 @@
                 </Style>
             </StackPanel.Styles>
             <HeaderedContentControl
+                Width="400"
                 Height="400"
                 Margin="16"
                 VerticalAlignment="Top"
@@ -95,6 +96,7 @@
                 </Grid>
             </HeaderedContentControl>
             <HeaderedContentControl
+                Width="400"
                 Height="400"
                 Margin="16"
                 VerticalAlignment="Top"