From b8071028f170a69fc7749f37849669eb85a421f3 Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Fri, 17 May 2024 02:43:06 -0500
Subject: [PATCH] [WIP] Allow theming of AbsUI controls

---
 .../AbstractUI/Themes/AbstractDataListStyle.xaml   | 14 +++++++++-----
 .../Themes/AbstractUIGroupPresenterStyle.xaml      | 10 ----------
 .../AbstractUI/Themes/AbstractUIResources.xaml     | 12 +++++++++++-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
index b5acc37..32daf5f 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
@@ -17,7 +17,9 @@
     <convertvis:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
     <convertvis:NotNullOrEmptyToVisibilityConverter x:Key="NotNullOrEmptyToVisibilityConverter"/>
     <converters:SelectionChangedEventArgsToClickedItemConverter x:Key="SelectionChangedEventArgsToClickedItemConverter" />
-    
+
+    <SolidColorBrush x:Key="AbstractDataListItemBorderBrush" Color="Gray" />
+
     <DataTemplate x:Key="DefaultAbstractDataListListTemplate" DataType="abstractUI:AbstractDataListViewModel">
         <ListView x:Name="PrimaryListView" ItemsSource="{Binding Items}" SelectionMode="Single" Margin="10">
             <behaviors:Interaction.Triggers>
@@ -102,7 +104,9 @@
     </DataTemplate>
 
     <DataTemplate x:Key="DefaultAbstractDataListGridTemplate" DataType="abstractUI:AbstractDataListViewModel">
-        <ListView SelectionMode="Single" ItemsSource="{Binding Items}">
+        <ListView SelectionMode="Single" ItemsSource="{Binding Items}"
+                  Background="Transparent" Foreground="{DynamicResource ZuneMediumTextBrush}"
+                  BorderThickness="0">
             <behaviors:Interaction.Triggers>
                 <behaviors:EventTrigger EventName="SelectionChanged">
                     <behaviors:InvokeCommandAction Command="{Binding ItemTappedCommand}" EventArgsConverter="{StaticResource SelectionChangedEventArgsToClickedItemConverter}" />
@@ -140,7 +144,7 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        <Border BorderBrush="White" BorderThickness="1">
+                        <Border BorderBrush="{DynamicResource AbstractDataListItemBorderBrush}" BorderThickness="1">
                             <Grid Height="150" Width="150" Grid.ColumnSpan="2">
                                 <TextBlock Text="{Binding IconCode}" FontFamily="Segoe MDL2 Assets" FontSize="34"
                                            VerticalAlignment="Center" HorizontalAlignment="Center"/>
@@ -165,8 +169,8 @@
                         </Border>
 
                         <TextBlock x:Name="SubtitleTextBlock" Grid.Row="2"  Grid.ColumnSpan="2"
-                                       Text="{Binding Subtitle}"
-                                       FontSize="12" FontWeight="Light" Opacity="0.5" TextTrimming="CharacterEllipsis" />
+                                   Text="{Binding Subtitle}"
+                                   FontSize="12" FontWeight="Light" Opacity="0.5" TextTrimming="CharacterEllipsis" />
                     </Grid>
                 </DataTemplate>
             </ListView.ItemTemplate>
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
index 7355a72..912e749 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
@@ -64,16 +64,6 @@
         </controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate>
     </controls:AbstractUIGroupItemTemplateSelector>
 
-    <Style x:Key="AbstractUICollectionTitleStyle" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="30"/>
-    </Style>
-
-    <Style x:Key="AbstractUICollectionSubtitleStyle" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="18"/>
-        <Setter Property="FontWeight" Value="Light"/>
-        <Setter Property="Opacity" Value="0.5"/>
-    </Style>
-
     <DataTemplate x:Key="DefaultAbstractUICollectionTemplate" DataType="abstractUIVm:AbstractUICollectionViewModel">
         <StackPanel Margin="10,20">
 
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractUIResources.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractUIResources.xaml
index 3657a58..cf04a94 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractUIResources.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractUIResources.xaml
@@ -5,8 +5,18 @@
 
     <core:Double x:Key="DefaultAbstractUITitleFontSize">24</core:Double>
 
-    <core:Double x:Key="DefaultAbstractUISubtitleFontSize">16</core:Double>
+    <core:Double x:Key="DefaultAbstractUISubtitleFontSize">18</core:Double>
     <FontWeight x:Key="DefaultAbstractUISubtitleFontWeight">Light</FontWeight>
     <core:Double x:Key="DefaultAbstractUISubtitleOpacity">0.5</core:Double>
 
+    <Style x:Key="AbstractUICollectionTitleStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{DynamicResource DefaultAbstractUITitleFontSize}"/>
+    </Style>
+
+    <Style x:Key="AbstractUICollectionSubtitleStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource DefaultAbstractUISubtitleFontSize}"/>
+        <Setter Property="FontWeight" Value="{StaticResource DefaultAbstractUISubtitleFontWeight}"/>
+        <Setter Property="Opacity" Value="{StaticResource DefaultAbstractUISubtitleOpacity}"/>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file