Merge remote-tracking branch 'origin/main'

kikipoulet · Oct 9, 2024 · 4cefbd8 · 4cefbd8
2 parents 31eb8c3 + 28bf022
commit 4cefbd8
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -80,14 +80,16 @@ SukiUI offer a versatile way to display unique toasts, to help you create nice i
 
 <br/>
 
-![dialogs](https://github.com/user-attachments/assets/f786d724-0cae-417a-bc60-69e4d1a2bfc0)
+![dialogslight](https://github.com/user-attachments/assets/51f05964-e847-4ed6-a1f7-78616eea9cee)
+
 
 <br/> <br/>
 
 ### Dock
 
 SukiUI includes styles for the [Dock](https://github.com/wieslawsoltes/Dock) library.
 
-![dock](https://github.com/user-attachments/assets/ef7ec55f-f13c-4214-b5ce-ad5ef3042868)
+
+![dockgradient](https://github.com/user-attachments/assets/828cf7f1-ca76-4e36-ab27-921c35f93280)
 
 
diff --git a/SukiUI.Demo/App.axaml b/SukiUI.Demo/App.axaml
@@ -29,6 +29,10 @@
         </TrayIcons>
     </TrayIcon.Icons>
 
+    <!--
+    Refer to the link below to customize your font.
+    https://kikipoulet.github.io/SukiUI/documentation/faq/custom-font.html#how-to-use-custom-font
+    -->
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -38,9 +42,7 @@
     </Application.Resources>
     <Application.Styles>
     <FluentTheme></FluentTheme>
-
         <StyleInclude Source="avares://SukiUI.Dock/Index.axaml" />
-
         <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />
         <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
         <suki:SukiTheme ThemeColor="Blue"/>
@@ -49,10 +51,6 @@
         <StyleInclude Source="avares://SukiUI.Demo/Styles/TextStyles.axaml" />
         <StyleInclude Source="avares://SukiUI.Demo/Styles/GlassCardStyles.axaml" />
         <avalonia:MaterialIconStyles />
-
-        <!--
-        <StyleInclude Source="avares://SukiUI/CustomFont/MiSans/ChineseSupport.axaml"></StyleInclude>
-        -->
     </Application.Styles>
 
 </Application>
diff --git a/docs/docs/documentation/controls/inputs/radiobutton.md b/docs/docs/documentation/controls/inputs/radiobutton.md
@@ -2,18 +2,32 @@
 
 A control used for collecting the user's choice.
 
-## Show
+## Base
 
-<img src="/controls/inputs/radiobutton.gif"/>
-
-## Example
+![{3562E3E6-C5A7-4D5C-BB1A-BF95347A6AA3}](https://github.com/user-attachments/assets/3157a435-10dd-4d84-ac91-e83739023ee9)
 
 ```xml
 <RadioButton Content="Option One"
              GroupName="A"
              IsChecked="True" />
 ```
 
+## Chips
+
+![{6BB65B0C-C0E8-4F6E-ADC0-EB29FFDD93DA}](https://github.com/user-attachments/assets/7d573d74-65b0-4379-a4b7-2830bfd381cf)
+
+```xml
+<RadioButton Classes="Chips" Content="Option One" IsChecked="True" />
+```
+
+## GigaChips
+
+![{466C440E-25EE-4CF1-985F-EC8105043D22}](https://github.com/user-attachments/assets/aea0e668-c02c-432c-9f3f-e8621e726444)
+
+```xml
+<RadioButton Classes="GigaChips" Content="Option One" IsChecked="True" />
+```
+
 ## See Also
 
-[Demo: SukiUI.Demo/Features/ControlsLibrary/TogglesView.axaml](https://github.com/kikipoulet/SukiUI/blob/main/SukiUI.Demo/Features/ControlsLibrary/TogglesView.axaml)
+[Demo: SukiUI.Demo/Features/ControlsLibrary/TogglesView.axaml](https://github.com/kikipoulet/SukiUI/blob/main/SukiUI.Demo/Features/ControlsLibrary/TogglesView.axaml)
diff --git a/docs/docs/documentation/faq/custom-font.md b/docs/docs/documentation/faq/custom-font.md
@@ -1,6 +1,6 @@
 # How to use Custom Font
 
-Here is the `App.axaml` after creating the SukiUI project:
+Here is the `App.axaml` after creating your SukiUI project:
 
 ```xml
 <Application xmlns="https://github.com/avaloniaui"
@@ -21,7 +21,7 @@ Here is the `App.axaml` after creating the SukiUI project:
 </Application>
 ```
 
-Assuming that there exists a font file `Assets/MiSans-Bold.ttf` and set the build action of that to `AvaloniaResource`
+Assuming that there exists a font file `Assets/FontName-xxx.ttf` and set the build action of that to `AvaloniaResource`
 
 Then replace the `DefaultFontFamily` with your font:
 
@@ -37,7 +37,7 @@ Then replace the `DefaultFontFamily` with your font:
 
     <Application.Resources> // [!code highlight]
         <ResourceDictionary> // [!code highlight]
-            <FontFamily x:Key="DefaultFontFamily">avares://SukiTest/Assets/MiSans-Bold.ttf#MiSans</FontFamily> // [!code highlight]
+            <FontFamily x:Key="DefaultFontFamily">avares://YourProject/Assets#FontName</FontFamily> // [!code highlight]
         </ResourceDictionary> // [!code highlight]
     </Application.Resources> // [!code highlight]
 
@@ -49,8 +49,4 @@ Then replace the `DefaultFontFamily` with your font:
         <sukiUi:SukiTheme ThemeColor="Blue" />
     </Application.Styles>
 </Application>
-```
-
-::: tip
-`#MiSans` is not the same in other font files, you can use a program like `Windows Font Viewer` to see the font name
-:::
+```
diff --git a/docs/docs/zh/documentation/controls/inputs/radiobutton.md b/docs/docs/zh/documentation/controls/inputs/radiobutton.md
@@ -2,18 +2,32 @@
 
 收集用户单项选择的控件
 
-## 展示
+## Base
 
-<img src="/controls/inputs/radiobutton.gif"/>
-
-## 示例
+![{3562E3E6-C5A7-4D5C-BB1A-BF95347A6AA3}](https://github.com/user-attachments/assets/3157a435-10dd-4d84-ac91-e83739023ee9)
 
 ```xml
 <RadioButton Content="Option One"
              GroupName="A"
              IsChecked="True" />
 ```
 
+## Chips
+
+![{6BB65B0C-C0E8-4F6E-ADC0-EB29FFDD93DA}](https://github.com/user-attachments/assets/7d573d74-65b0-4379-a4b7-2830bfd381cf)
+
+```xml
+<RadioButton Classes="Chips" Content="Option One" IsChecked="True" />
+```
+
+## GigaChips
+
+![{466C440E-25EE-4CF1-985F-EC8105043D22}](https://github.com/user-attachments/assets/aea0e668-c02c-432c-9f3f-e8621e726444)
+
+```xml
+<RadioButton Classes="GigaChips" Content="Option One" IsChecked="True" />
+```
+
 ## 参阅
 
 [Demo: SukiUI.Demo/Features/ControlsLibrary/TogglesView.axaml](https://github.com/kikipoulet/SukiUI/blob/main/SukiUI.Demo/Features/ControlsLibrary/TogglesView.axaml)
diff --git a/docs/docs/zh/documentation/faq/custom-font.md b/docs/docs/zh/documentation/faq/custom-font.md
@@ -1,6 +1,6 @@
 # 如何使用自定义字体
 
-以下是创建一个新的 SukiUI 项目后的 `App.axaml` 文件：
+以下是创建一个新的基于 SukiUI 项目后的 `App.axaml` 文件：
 
 ```xml
 <Application xmlns="https://github.com/avaloniaui"
@@ -21,7 +21,7 @@
 </Application>
 ```
 
-假设存在一个字体文件 `Assets/MiSans-Bold.ttf`，并将其构建行为设置为 `AvaloniaResource`
+假设存在一组字体文件 `Assets/FontName-xxx.ttf`，并将其构建行为设置为 `AvaloniaResource`
 
 然后替换 `DefaultFontFamily` 为你的字体：
 
@@ -37,7 +37,7 @@
 
     <Application.Resources> // [!code highlight]
         <ResourceDictionary> // [!code highlight]
-            <FontFamily x:Key="DefaultFontFamily">avares://SukiTest/Assets/MiSans-Bold.ttf#MiSans</FontFamily> // [!code highlight]
+            <FontFamily x:Key="DefaultFontFamily">avares://YourProject/Assets#FontName</FontFamily> // [!code highlight]
         </ResourceDictionary> // [!code highlight]
     </Application.Resources> // [!code highlight]
 
@@ -49,8 +49,4 @@
         <sukiUi:SukiTheme ThemeColor="Blue" />
     </Application.Styles>
 </Application>
-```
-
-::: tip
-`#MiSans` 在其他字体中的名称都不一样，你可以使用类似 `Windows 字体查看器` 等软件查看字体名称
-:::
+```