style adjustments

.net 6
MemeLabs · Nov 8, 2021 · 9a5e837 · 9a5e837
1 parent ad363f4
commit 9a5e837
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 124 deletions.
diff --git a/anidow/App.xaml b/anidow/App.xaml
@@ -49,11 +49,7 @@
                 <Setter Property="HorizontalContentAlignment" Value="Center" />
                 <Setter Property="VerticalContentAlignment" Value="Center" />
                 <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="BorderBrush">
-                    <Setter.Value>
-                        <SolidColorBrush Opacity=".4" Color="Black" />
-                    </Setter.Value>
-                </Setter>
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.Layer1BorderBrush}}" />
                 <Setter Property="Margin" Value="2,0,2,2" />
             </Style>
 
@@ -64,11 +60,7 @@
                 <Setter Property="HorizontalContentAlignment" Value="Center" />
                 <Setter Property="VerticalContentAlignment" Value="Center" />
                 <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="BorderBrush">
-                    <Setter.Value>
-                        <SolidColorBrush Opacity=".4" Color="Black" />
-                    </Setter.Value>
-                </Setter>
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.Layer1BorderBrush}}" />
                 <Setter Property="Margin" Value="0,0,2,2" />
             </Style>
 
@@ -79,11 +71,7 @@
                 <Setter Property="HorizontalContentAlignment" Value="Center" />
                 <Setter Property="VerticalContentAlignment" Value="Center" />
                 <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="BorderBrush">
-                    <Setter.Value>
-                        <SolidColorBrush Opacity=".4" Color="Black" />
-                    </Setter.Value>
-                </Setter>
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.Layer1BorderBrush}}" />
                 <Setter Property="Margin" Value="2,0,0,2" />
             </Style>
 
@@ -151,6 +139,32 @@
                     </EventTrigger>
                 </Style.Triggers>
             </Style>
+
+            <!--<Style x:Key="{x:Type ListView}" TargetType="ListView">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.Layer1BorderBrush}}"/>
+                <Setter Property="BorderThickness" Value="{DynamicResource {x:Static adonisUi:Dimensions.BorderThickness}}"/>
+                <Setter Property="extensions:GridViewSortExtension.AutoSort" Value="True"/>
+                <Setter Property="extensions:ScrollViewerExtension.VerticalScrollBarExpansionMode" Value="ExpandOnHover"/>
+                <Setter Property="extensions:ScrollViewerExtension.HorizontalScrollBarExpansionMode" Value="ExpandOnHover"/>
+                <Setter Property="extensions:ScrollViewerExtension.VerticalScrollBarPlacement" Value="Docked"/>
+                <Setter Property="extensions:ScrollViewerExtension.HorizontalScrollBarPlacement" Value="Docked"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ListView}">
+                            <ScrollViewer Style="{DynamicResource {x:Static GridView.GridViewScrollViewerStyleKey}}">
+                                <ItemsPresenter />
+                            </ScrollViewer>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsGrouping" Value="True">
+                                    <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>-->
         </s:ApplicationLoader>
     </Application.Resources>
 </Application>
diff --git a/anidow/Pages/Components/Notify/NotifyAddView.xaml b/anidow/Pages/Components/Notify/NotifyAddView.xaml
@@ -24,7 +24,7 @@
     WindowStyle="None"
     mc:Ignorable="d">
     <Border
-        Background="{DynamicResource {x:Static adonisUi:Brushes.Layer0BackgroundBrush}}"
+        Background="{DynamicResource {x:Static adonisUi:Brushes.Layer1BackgroundBrush}}"
         BorderBrush="{DynamicResource {x:Static adonisUi:Brushes.Layer1BorderBrush}}"
         BorderThickness="2"
         CornerRadius="4">

diff --git a/anidow/Pages/Components/Tracked/TrackedCardView.xaml b/anidow/Pages/Components/Tracked/TrackedCardView.xaml
@@ -20,6 +20,7 @@
                         Padding="0"
                         extensions1:TouchScrolling.IsEnabled="True"
                         extensions:ScrollViewerExtension.VerticalScrollBarPlacement="Overlay"
+                        extensions:ScrollViewerExtension.VerticalScrollBarExpansionMode="AlwaysExpand"
                         VerticalScrollBarVisibility="Auto">
                         <ItemsPresenter />
                     </ScrollViewer>

diff --git a/anidow/Pages/FolderFilesView.xaml b/anidow/Pages/FolderFilesView.xaml
@@ -30,10 +30,10 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <GroupBox Margin="0,0,0,2" BorderThickness="0,1,0,1">
-            <GroupBox.BorderBrush>
-                <SolidColorBrush Opacity=".4" Color="Black" />
-            </GroupBox.BorderBrush>
+        <GroupBox
+            Margin="0,0,0,2"
+            BorderBrush="{DynamicResource {x:Static adonisUi:Brushes.Layer1BorderBrush}}"
+            BorderThickness="0,1,0,1">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />

diff --git a/anidow/Pages/HomeView.xaml b/anidow/Pages/HomeView.xaml
@@ -34,11 +34,13 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
+
 
         <ListView
             x:Name="ListView"
             Grid.Row="0"
             Margin="2"
+            ScrollViewer.CanContentScroll="False"
             extensions:GridViewSortExtension.AutoSort="True"
             listViewLayout:ListViewLayoutManager.Enabled="true"
             ItemContainerStyle="{StaticResource ListViewItemHome}"
@@ -55,7 +57,7 @@
                 </ContextMenu>
             </ListView.ContextMenu>
             <ListView.View>
-                <GridView AllowsColumnReorder="False">
+                <GridView AllowsColumnReorder="False" >
                     <GridViewColumn
                         extensions:GridViewSortExtension.PropertyName="Name"
                         listViewLayout:RangeColumn.IsFillColumn="true"

diff --git a/anidow/Pages/MainView.xaml b/anidow/Pages/MainView.xaml
@@ -53,6 +53,8 @@
             Margin="4,0,4,4"
             Padding="2"
             Background="{DynamicResource {x:Static adonisUi:Brushes.Layer1BackgroundBrush}}"
+            BorderBrush="{DynamicResource {x:Static adonisUi:Brushes.Layer1BorderBrush}}"
+            BorderThickness="1"
             CornerRadius="4">
             <Grid extensions:LayerExtension.Layer="1">
                 <Grid.ColumnDefinitions>

diff --git a/anidow/Pages/ShellView.xaml b/anidow/Pages/ShellView.xaml
@@ -73,10 +73,7 @@
             </StackPanel>
         </Grid>
     </controls:AdonisWindow.TitleBarContent>
-    <Border BorderThickness="0,1,0,0">
-        <Border.BorderBrush>
-            <SolidColorBrush Opacity=".4" Color="Black" />
-        </Border.BorderBrush>
+    <Border BorderBrush="{DynamicResource {x:Static adonisUi:Brushes.Layer1BorderBrush}}" BorderThickness="0,1,0,0">
         <Grid Margin="0,4,0,0">
             <ContentControl
                 HorizontalAlignment="Stretch"

diff --git a/anidow/Styles/CustomDark.xaml b/anidow/Styles/CustomDark.xaml
@@ -12,8 +12,7 @@
     <Color x:Key="{x:Static adonisUi:Colors.AccentIntenseHighlightBorderColor}">#E67858</Color>
     <Color x:Key="{x:Static adonisUi:Colors.AccentInteractionColor}">#e58a70</Color>
     <Color x:Key="{x:Static adonisUi:Colors.AccentInteractionBorderColor}">#e58a70</Color>
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.AccentInteractionForegroundColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.AccentInteractionForegroundColor}" ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
 
     <Color x:Key="{x:Static adonisUi:Colors.Layer0BackgroundColor}">#202428</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer0BorderColor}">#1c1f23</Color>
@@ -24,51 +23,39 @@
     <Color x:Key="{x:Static adonisUi:Colors.Layer1HighlightBorderColor}">#2C3036</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer1IntenseHighlightColor}">#454A54</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer1IntenseHighlightBorderColor}">#33373E</Color>
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer1InteractionColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentColor}" />
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer1InteractionBorderColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentInteractionColor}" />
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer1InteractionForegroundColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer1InteractionColor}" ResourceKey="{x:Static adonisUi:Colors.AccentColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer1InteractionBorderColor}" ResourceKey="{x:Static adonisUi:Colors.AccentInteractionColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer1InteractionForegroundColor}" ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
 
     <Color x:Key="{x:Static adonisUi:Colors.Layer2BackgroundColor}">#202428</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer2BorderColor}">#202428</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer2HighlightColor}">#292E34</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer2HighlightBorderColor}">#292E34</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer2IntenseHighlightColor}">#2D3135</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer2IntenseHighlightBorderColor}">#2D3135</Color>
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer2InteractionColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentColor}" />
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer2InteractionBorderColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentInteractionColor}" />
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer2InteractionForegroundColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer2InteractionColor}" ResourceKey="{x:Static adonisUi:Colors.AccentColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer2InteractionBorderColor}" ResourceKey="{x:Static adonisUi:Colors.AccentInteractionColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer2InteractionForegroundColor}" ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
 
     <Color x:Key="{x:Static adonisUi:Colors.Layer3BackgroundColor}">#25292e</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer3BorderColor}">#1c1f23</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer3HighlightColor}">#2C3036</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer3HighlightBorderColor}">#2C3036</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer3IntenseHighlightColor}">#33373E</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer3IntenseHighlightBorderColor}">#33373E</Color>
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer3InteractionColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentColor}" />
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer3InteractionBorderColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentInteractionColor}" />
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer3InteractionForegroundColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer3InteractionColor}" ResourceKey="{x:Static adonisUi:Colors.AccentColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer3InteractionBorderColor}" ResourceKey="{x:Static adonisUi:Colors.AccentInteractionColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer3InteractionForegroundColor}" ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
 
     <Color x:Key="{x:Static adonisUi:Colors.Layer4BackgroundColor}">#202428</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer4BorderColor}">#202428</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer4HighlightColor}">#292E34</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer4HighlightBorderColor}">#292E34</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer4IntenseHighlightColor}">#2D3135</Color>
     <Color x:Key="{x:Static adonisUi:Colors.Layer4IntenseHighlightBorderColor}">#2D3135</Color>
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer4InteractionColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentColor}" />
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer4InteractionBorderColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentInteractionColor}" />
-    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer4InteractionForegroundColor}"
-                     ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer4InteractionColor}" ResourceKey="{x:Static adonisUi:Colors.AccentColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer4InteractionBorderColor}" ResourceKey="{x:Static adonisUi:Colors.AccentInteractionColor}" />
+    <DynamicResource x:Key="{x:Static adonisUi:Colors.Layer4InteractionForegroundColor}" ResourceKey="{x:Static adonisUi:Colors.AccentForegroundColor}" />
 
     <Color x:Key="{x:Static adonisUi:Colors.ForegroundColor}">#f0f0f0</Color>
     <Color x:Key="{x:Static adonisUi:Colors.AccentForegroundColor}">#ffffff</Color>
@@ -97,8 +84,7 @@
 
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background"
-                        Value="{DynamicResource {x:Static adonisUi:Brushes.AccentHighlightBrush}}" />
+                <Setter Property="Background" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentHighlightBrush}}" />
             </Trigger>
             <Trigger Property="IsFocused" Value="True">
                 <Setter Property="BorderBrush" Value="#1c1f23" />
@@ -114,10 +100,8 @@
         <Style.Triggers>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background"
-                        Value="{DynamicResource {x:Static adonisUi:Brushes.AccentIntenseHighlightBrush}}" />
-                <Setter Property="BorderBrush"
-                        Value="{DynamicResource {x:Static adonisUi:Brushes.AccentHighlightBrush}}" />
+                <Setter Property="Background" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentIntenseHighlightBrush}}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentHighlightBrush}}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -129,10 +113,8 @@
         <Style.Triggers>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background"
-                        Value="{DynamicResource {x:Static adonisUi:Brushes.AccentIntenseHighlightBrush}}" />
-                <Setter Property="BorderBrush"
-                        Value="{DynamicResource {x:Static adonisUi:Brushes.AccentHighlightBrush}}" />
+                <Setter Property="Background" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentIntenseHighlightBrush}}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentHighlightBrush}}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -184,6 +166,8 @@
 
 
     <Style BasedOn="{StaticResource {x:Type ScrollBar}}" TargetType="{x:Type ScrollBar}">
+        <Setter Property="Margin" Value="4,0,0,0" />
+        <Setter Property="extensions:ScrollBarExtension.ExpansionMode" Value="AlwaysExpand" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentBrush}}" />
         <Setter Property="Background" Value="{DynamicResource {x:Static adonisUi:Brushes.Layer0BackgroundBrush}}" />
     </Style>