更新设置控件 (#67)

Clean-Reader · Feb 22, 2023 · fcdc9e5 · fcdc9e5
1 parent 207aaaa
commit fcdc9e5
Show file tree

Hide file tree

Showing 30 changed files with 212 additions and 1,739 deletions.
diff --git a/CleanReader.Desktop.sln b/CleanReader.Desktop.sln
@@ -197,7 +197,7 @@ Global
 		{62DE67CD-8995-4ED7-AF71-F873B447B2F5}.Debug|ARM.Build.0 = Debug|Any CPU
 		{62DE67CD-8995-4ED7-AF71-F873B447B2F5}.Debug|arm64.ActiveCfg = Debug|Any CPU
 		{62DE67CD-8995-4ED7-AF71-F873B447B2F5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{62DE67CD-8995-4ED7-AF71-F873B447B2F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62DE67CD-8995-4ED7-AF71-F873B447B2F5}.Debug|x64.ActiveCfg = Debug|x64
 		{62DE67CD-8995-4ED7-AF71-F873B447B2F5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{62DE67CD-8995-4ED7-AF71-F873B447B2F5}.Debug|x86.Build.0 = Debug|Any CPU
 		{62DE67CD-8995-4ED7-AF71-F873B447B2F5}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/nuget.config b/nuget.config
@@ -3,6 +3,7 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="labs.windows" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
   </packageSources>
     <disabledPackageSources>
         <clear />

diff --git a/src/CleanReader.App/App.xaml b/src/CleanReader.App/App.xaml
@@ -11,7 +11,6 @@
                 <ResourceDictionary Source="ms-appx:///Themes/Style.Dimensions.xaml" />
                 <ResourceDictionary Source="ms-appx:///Controls/App/CardPanel/CardPanel.xaml" />
                 <ResourceDictionary Source="ms-appx:///Controls/App/CustomDialog/CustomDialog.xaml" />
-                <ResourceDictionary Source="ms-appx:///Controls/App/ExpanderEx.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Light" Source="ms-appx:///Themes/Themes.Light.xaml" />

diff --git a/src/CleanReader.App/CleanReader.App.csproj b/src/CleanReader.App/CleanReader.App.csproj
@@ -34,7 +34,6 @@
     <None Remove="Controls\AmbieSettingItem.xaml" />
     <None Remove="Controls\AppTitleBar.xaml" />
     <None Remove="Controls\App\CustomDialog\CustomDialog.xaml" />
-    <None Remove="Controls\App\ExpanderEx.xaml" />
     <None Remove="Controls\App\FileSystemErrorPanel.xaml" />
     <None Remove="Controls\App\TipPopup.xaml" />
     <None Remove="Controls\BookInformationDialog.xaml" />
@@ -89,6 +88,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.15" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Media" Version="7.1.2" />
@@ -118,10 +118,6 @@
     <Page Update="Controls\App\CustomDialog\CustomDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Update="Controls\App\ExpanderEx.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Update="Controls\Popups\BookInformationDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>

diff --git a/src/CleanReader.App/Controls/App/ExpanderEx.xaml b/src/CleanReader.App/Controls/App/ExpanderEx.xaml