Merge pull request #9 from RobertK66/develop

Make new Release
RobertK66 · Aug 28, 2023 · 7291315 · 7291315
2 parents 725927b + 0d01e61
commit 7291315
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 30 deletions.
diff --git a/MyHomeAudio/MyHomeAudio.csproj b/MyHomeAudio/MyHomeAudio.csproj
@@ -25,7 +25,7 @@
 
   <PropertyGroup>
     <PublishReadyToRun>false</PublishReadyToRun>
-    <AssemblyVersion>1.0.1.42</AssemblyVersion>
+    <AssemblyVersion>1.0.9.1</AssemblyVersion>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
   </PropertyGroup>
 
@@ -48,8 +48,9 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.18" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.230823-rc" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 

diff --git a/MyHomeAudio/Package.appxmanifest b/MyHomeAudio/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="Rob1000f29-5d74-47c6-800b-b36d7f1d18e7"
     Publisher="CN=RKOS Software"
-    Version="1.0.8.0" />
+    Version="1.0.9.0" />
 
   <mp:PhoneIdentity PhoneProductId="b1000f29-5d74-47c6-800b-b36d7f1d18e7" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/MyHomeAudio/Properties/launchSettings.json b/MyHomeAudio/Properties/launchSettings.json
@@ -1,7 +1,9 @@
 {
   "profiles": {
     "MyHomeAudio (Package)": {
-      "commandName": "MsixPackage"
+      "commandName": "MsixPackage",
+      "doNotLaunchApp": false,
+      "nativeDebugging": true
     },
     "MyHomeAudio (Unpackaged)": {
       "commandName": "Project"

diff --git a/MyHomeAudio/pages/SettingsPage.xaml b/MyHomeAudio/pages/SettingsPage.xaml
@@ -6,7 +6,7 @@
     xmlns:local="using:MyHomeAudio.pages"
     xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:system="using:System"
     mc:Ignorable="d"
       NavigationCacheMode="Enabled"
     Loaded="Page_Loaded"
@@ -33,24 +33,6 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <!--<VisualStateManager.VisualStateGroups>
-            <VisualStateGroup>
-                --><!--<VisualState x:Name="WideLayout">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="{StaticResource Breakpoint640Plus}" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-                <VisualState x:Name="NarrowLayout">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="contentSV.Padding" Value="16,0" />
-                        <Setter Target="PageHeader.Margin" Value="16,48,0,0" />
-                    </VisualState.Setters>
-                </VisualState>--><!--
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>-->
         <TextBlock
            x:Name="PageHeader"
            Margin="36,24,36,0"
@@ -70,7 +52,7 @@
                     <labs:SettingsCard.HeaderIcon>
                         <FontIcon Glyph="&#xE790;" />
                     </labs:SettingsCard.HeaderIcon>
-                    <ComboBox x:Name="themeMode" AutomationProperties.AutomationId="themeModeComboBox" SelectionChanged="themeMode_SelectionChanged_1">
+                    <ComboBox x:Name="themeMode" SelectionChanged="themeMode_SelectionChanged_1">
                         <ComboBoxItem Content="Light" Tag="Light" />
                         <ComboBoxItem Content="Dark" Tag="Dark" />
                         <ComboBoxItem Content="Use system setting" Tag="Default" />
@@ -92,11 +74,15 @@
                 <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Media" />
 
                 <labs:SettingsExpander x:Name="fileExpander" Header="Media Repository Path" HeaderIcon="PreviewLink" ItemsSource="{x:Bind RepositoryFiles, Mode=TwoWay}" Expanded="SettingsExpander_Expanded">
+                    <labs:SettingsExpander.ItemTemplate>
+                        <DataTemplate x:DataType="system:String">
+                            <labs:SettingsCard  Description="" Header="{Binding}" />
+                        </DataTemplate>
+                    </labs:SettingsExpander.ItemTemplate>
                     <StackPanel Orientation="Horizontal">
                         <TextBox x:Name="reposPath"  Text="{x:Bind RepositoryPath, Mode=TwoWay}" TextChanged="reposPath_TextChanged" />
                         <Button Content="Reset default" Click="Button_Click" />
                     </StackPanel>
-
                 </labs:SettingsExpander>
 
 

diff --git a/MyHomeAudio/pages/SettingsPage.xaml.cs b/MyHomeAudio/pages/SettingsPage.xaml.cs
@@ -129,18 +129,13 @@ public ObservableCollection<String> RepositoryFiles {
         }
 
 
-
-
         public event PropertyChangedEventHandler PropertyChanged;
         public void RaisePropertyChanged([CallerMemberName] string? propertyName = null) {
             if (PropertyChanged != null) {
                 PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
             }
         }
 
-
-
-
         public string WinAppSdkDetails {
             get => App.WinAppSdkDetails;
         }