Merge pull request Rise-Software#245 from Rise-Software/cq/settings-c…

…leanup Settings cleanup
RiversideValley · Jun 28, 2023 · 3e5a827 · 3e5a827
2 parents 4ebe451 + f2029e8
commit 3e5a827
Show file tree

Hide file tree

Showing 33 changed files with 97 additions and 1,161 deletions.
diff --git a/Rise Media Player Dev/Assets/Settings/Appearance.png b/Rise Media Player Dev/Assets/Settings/Appearance.png
diff --git a/Rise Media Player Dev/Assets/Settings/LibraryCustomise/widgettoptrackpreview.png b/Rise Media Player Dev/Assets/Settings/LibraryCustomise/widgettoptrackpreview.png
diff --git a/Rise Media Player Dev/Assets/Settings/Sidebar.png b/Rise Media Player Dev/Assets/Settings/Sidebar.png
diff --git a/Rise Media Player Dev/Assets/Settings/about.png b/Rise Media Player Dev/Assets/Settings/about.png
diff --git a/Rise Media Player Dev/Assets/Settings/feedback.png b/Rise Media Player Dev/Assets/Settings/feedback.png
diff --git a/Rise Media Player Dev/Assets/Settings/language.png b/Rise Media Player Dev/Assets/Settings/language.png
diff --git a/Rise Media Player Dev/Assets/Settings/library.png b/Rise Media Player Dev/Assets/Settings/library.png
diff --git a/Rise Media Player Dev/Assets/Settings/playback.png b/Rise Media Player Dev/Assets/Settings/playback.png
diff --git a/Rise Media Player Dev/Dialogs/LibraryPageEditDialog.xaml b/Rise Media Player Dev/Dialogs/LibraryPageEditDialog.xaml
diff --git a/Rise Media Player Dev/Dialogs/LibraryPageEditDialog.xaml.cs b/Rise Media Player Dev/Dialogs/LibraryPageEditDialog.xaml.cs
diff --git a/Rise Media Player Dev/Dialogs/SettingsDialogContainer.xaml b/Rise Media Player Dev/Dialogs/SettingsDialogContainer.xaml
diff --git a/Rise Media Player Dev/Dialogs/SettingsDialogContainer.xaml.cs b/Rise Media Player Dev/Dialogs/SettingsDialogContainer.xaml.cs
diff --git a/Rise Media Player Dev/ResourceDictionaries/CustomStyles.xaml b/Rise Media Player Dev/ResourceDictionaries/CustomStyles.xaml
@@ -25,6 +25,8 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <FontFamily x:Key="SettingsIconsFontFamily">ms-appx:///Assets/SettingsIcons.ttf#Settings Fluent Icons</FontFamily>
+
     <!--  Title bar resources  -->
     <Thickness x:Key="TitleBarIconMargin">0,0,0,0</Thickness>
     <BitmapIconSource

diff --git a/Rise Media Player Dev/Rise.App.csproj b/Rise Media Player Dev/Rise.App.csproj
@@ -146,19 +146,13 @@
     <Compile Include="Dialogs\EqualizerDialog.xaml.cs">
       <DependentUpon>EqualizerDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Dialogs\LibraryPageEditDialog.xaml.cs">
-      <DependentUpon>LibraryPageEditDialog.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Dialogs\SetupDialogContent.xaml.cs">
       <DependentUpon>SetupDialogContent.xaml</DependentUpon>
     </Compile>
     <Compile Include="Helpers\AddToPlaylistHelper.cs" />
     <Compile Include="Helpers\CollectionViewDelegates.cs" />
     <Compile Include="Helpers\GroupingLabelComparer.cs" />
     <Compile Include="Helpers\MusixmatchHelper.cs" />
-    <Compile Include="Settings\LibraryCustomise\ArtistsCustomisePage.xaml.cs">
-      <DependentUpon>ArtistsCustomisePage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Settings\MediaLibraryPages\MediaSourcesListsPage.xaml.cs">
       <DependentUpon>MediaSourcesListsPage.xaml</DependentUpon>
     </Compile>
@@ -207,9 +201,6 @@
     <Compile Include="Dialogs\MusicStreamingDialog.xaml.cs">
       <DependentUpon>MusicStreamingDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Dialogs\SettingsDialogContainer.xaml.cs">
-      <DependentUpon>SettingsDialogContainer.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Dialogs\WidgetsDialogContent.xaml.cs">
       <DependentUpon>WidgetsDialogContent.xaml</DependentUpon>
     </Compile>
@@ -310,12 +301,6 @@
     <Compile Include="Web\FeedbackPage.xaml.cs">
       <DependentUpon>FeedbackPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Web\SupportProject.xaml.cs">
-      <DependentUpon>SupportProject.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Web\WhatsNew.xaml.cs">
-      <DependentUpon>WhatsNew.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Windows\CompactNowPlayingPage.xaml.cs">
       <DependentUpon>CompactNowPlayingPage.xaml</DependentUpon>
     </Compile>
@@ -383,9 +368,6 @@
     <Compile Include="Views\LocalVideosPage.xaml.cs">
       <DependentUpon>LocalVideosPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Settings\SettingsPage.xaml.cs">
-      <DependentUpon>SettingsPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Windows\SetupPage.xaml.cs">
       <DependentUpon>SetupPage.xaml</DependentUpon>
     </Compile>
@@ -489,20 +471,12 @@
     <Content Include="Assets\NavigationView\BrowsePage\Colorful.png" />
     <Content Include="Assets\NavigationView\PlaylistsPage\blankplaylist.png" />
     <Content Include="Assets\NavigationView\PlaylistsPage\likedplaylist.png" />
-    <Content Include="Assets\Settings\Feedback.png" />
     <Content Include="Assets\NavigationView\AlbumsPage\Colorful.png" />
     <Content Include="Assets\NavigationView\ArtistsPage\Colorful.png" />
     <Content Include="Assets\NavigationView\HomePage\Colorful.png" />
     <Content Include="Assets\NavigationView\LocalVideosPage\Colorful.png" />
     <Content Include="Assets\NavigationView\PlaylistsPage\Colorful.png" />
     <Content Include="Assets\NavigationView\SongsPage\Colorful.png" />
-    <Content Include="Assets\Settings\Library.png" />
-    <Content Include="Assets\Settings\About.png" />
-    <Content Include="Assets\Settings\Language.png" />
-    <Content Include="Assets\Settings\LibraryCustomise\widgettoptrackpreview.png" />
-    <Content Include="Assets\Settings\Playback.png" />
-    <Content Include="Assets\Settings\Appearance.png" />
-    <Content Include="Assets\Settings\Sidebar.png" />
     <Content Include="Assets\Setup\Appearance.png" />
     <Content Include="Assets\Setup\Connect.png" />
     <Content Include="Assets\Setup\Done.png" />
@@ -684,10 +658,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Dialogs\LibraryPageEditDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Dialogs\MessagesDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -704,10 +674,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Dialogs\SettingsDialogContainer.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Dialogs\WidgetsDialogContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -792,10 +758,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Settings\LibraryCustomise\ArtistsCustomisePage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Settings\MediaLibraryPages\MediaLibraryBasePage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -876,14 +838,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Web\SupportProject.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Web\WhatsNew.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Windows\CompactNowPlayingPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -964,10 +918,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Settings\SettingsPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Windows\SetupPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1070,13 +1020,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Assets\AtAGlance\WidgetService\" />
-    <Folder Include="Settings\AboutPages\" />
-    <Folder Include="Settings\AppearancePages\" />
-    <Folder Include="Settings\BehaviourPages\" />
-    <Folder Include="Settings\ComponentsPages\" />
-    <Folder Include="Settings\NavigationPages\" />
-    <Folder Include="Settings\PlaybackSoundPages\" />
-    <Folder Include="Settings\SyncingPages\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\MediaPlayerIcons.ttf">

diff --git a/Rise Media Player Dev/Settings/AboutPage.xaml.cs b/Rise Media Player Dev/Settings/AboutPage.xaml.cs
@@ -34,7 +34,6 @@ private void CommandBarButton_Click(object sender, RoutedEventArgs e)
                     _ = Frame.Navigate(typeof(InsiderPage));
                     AllSettingsPage.Current.MainSettingsHeaderIcon.Glyph = "\uF1AD";
                     AllSettingsPage.Current.MainSettingsHeader.Text = ResourceHelper.GetString("InsiderHub");
-                    SettingsDialogContainer.Breadcrumbs.Add(ResourceHelper.GetString("InsiderHub"));
                     break;
 
                 case "Version":
@@ -48,10 +47,5 @@ private void VTip_CloseButtonClick(Microsoft.UI.Xaml.Controls.TeachingTip sender
 
         private async void VTip_ActionButtonClick(Microsoft.UI.Xaml.Controls.TeachingTip sender, object args)
             => await URLs.Releases.LaunchAsync();
-
-        private void ExpanderControl_Loaded(object sender, RoutedEventArgs e)
-        {
-
-        }
     }
 }