diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index 5a014d1..3571677 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
enable
- 11.0.0-rc1.1
+ 11.0.0-rc2.1
diff --git a/demo/Semi.Avalonia.Demo.Android/SplashActivity.cs b/demo/Semi.Avalonia.Demo.Android/SplashActivity.cs
index d5b8f09..3186324 100644
--- a/demo/Semi.Avalonia.Demo.Android/SplashActivity.cs
+++ b/demo/Semi.Avalonia.Demo.Android/SplashActivity.cs
@@ -7,7 +7,7 @@ using Application = Android.App.Application;
namespace Semi.Avalonia.Demo.Android;
[Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
-public class SplashActivity: AvaloniaSplashActivity
+public class SplashActivity: AvaloniaMainActivity
{
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
diff --git a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
index 8148e2e..77d164b 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
@@ -7,114 +7,159 @@
d:DesignHeight="800"
d:DesignWidth="800"
mc:Ignorable="d">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Value="60" />
-
+ Value="60" />
+ ShowProgressText="True"
+ Value="60" />
+
+
+
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/src/Package.props b/src/Package.props
index 0143a6e..b2191b8 100644
--- a/src/Package.props
+++ b/src/Package.props
@@ -7,7 +7,7 @@
IRIHI Technology
Avalonia Theme inspired by Semi Design.
https://github.com/irihitech/Semi.Avalonia
- 11.0.0-rc1.1
+ 11.0.0-rc2.1
MIT
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 4692226..57cbb1a 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -40,8 +40,6 @@
-
-
@@ -50,8 +48,8 @@
x:Name="Background"
Grid.Column="0"
Grid.ColumnSpan="2"
- MinHeight="{DynamicResource ComboBoxDefaultHeight}"
MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
+ MinHeight="{DynamicResource ComboBoxDefaultHeight}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
@@ -63,7 +61,8 @@
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Foreground="{TemplateBinding Foreground}"
- IsVisible="{TemplateBinding SelectionBoxItem,Converter={x:Static ObjectConverters.IsNull}}"
+ IsVisible="{TemplateBinding SelectionBoxItem,
+ Converter={x:Static ObjectConverters.IsNull}}"
Opacity="0.3"
Text="{TemplateBinding PlaceholderText}" />
-
+
@@ -169,15 +170,24 @@
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Semi.Avalonia/Controls/TextBlock.axaml b/src/Semi.Avalonia/Controls/TextBlock.axaml
index bb26c04..7650620 100644
--- a/src/Semi.Avalonia/Controls/TextBlock.axaml
+++ b/src/Semi.Avalonia/Controls/TextBlock.axaml
@@ -9,7 +9,6 @@
-
diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
index d74a28b..47e8744 100644
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -15,6 +15,14 @@
+
+
+
+
+
-
-
-