[desktop] Adopt MaterialDesign

Banyc · Dec 7, 2020 · 981c5be · 981c5be
1 parent b6de403
commit 981c5be
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/img/screenshot.mainWindow.png b/img/screenshot.mainWindow.png
diff --git a/src/UnforgettableMemo.WinDesktop/App.xaml b/src/UnforgettableMemo.WinDesktop/App.xaml
@@ -2,8 +2,14 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:UnforgettableMemo.WinDesktop"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/UnforgettableMemo.WinDesktop/MainWindow.xaml b/src/UnforgettableMemo.WinDesktop/MainWindow.xaml
@@ -11,8 +11,19 @@
         Loaded="Window_Loaded"
         Deactivated="Window_Deactivated"
         ResizeMode="CanResize"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="12"
+        TextOptions.TextFormattingMode="Ideal" 
+        TextOptions.TextRenderingMode="Auto"        
+        Background="{DynamicResource MaterialDesignPaper}"
         Title="MainWindow" Height="300" Width="300">
+        <!-- FontFamily="{DynamicResource MaterialDesignFont}" -->
     <Grid>
+        <Grid.Resources>
+            <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="Silver"/>
+        </Grid.Resources>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
@@ -25,13 +36,13 @@
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" Name="btnAdd" xml:space="preserve" Click="btnAdd_Click"> + </Button>
-            <Button Grid.Column="1" Name="topBar" PreviewMouseLeftButtonDown="topBar_PreviewMouseLeftButtonDown"></Button>
-            <Button Grid.Column="2" Name="btnRefresh" xml:space="preserve" Click="btnRefresh_Click">🔄</Button>
-            <Button Grid.Column="3" Name="btnExit" xml:space="preserve" Click="btnExit_Click"> X </Button>
+            <Button Grid.Column="0" Name="btnAdd" Style="{DynamicResource MaterialDesignFlatButton}" xml:space="preserve" Click="btnAdd_Click"> + </Button>
+            <TextBlock Grid.Column="1" Name="topBar" PreviewMouseLeftButtonDown="topBar_PreviewMouseLeftButtonDown"></TextBlock>
+            <Button Grid.Column="2" Name="btnRefresh" Style="{DynamicResource MaterialDesignFlatButton}" xml:space="preserve" Click="btnRefresh_Click">🔄</Button>
+            <Button Grid.Column="3" Name="btnExit" Style="{DynamicResource MaterialDesignFlatButton}" xml:space="preserve" Click="btnExit_Click"> X </Button>
         </Grid>
         <Grid Grid.Row="1">
-            <TextBox Name="txtContent" AcceptsReturn="True" Padding="8" FontSize="16" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Text="{Binding Path=DisplayingMemo.Content, Mode=TwoWay, UpdateSourceTrigger=Explicit}" TextChanged="txtContent_TextChanged">
+            <TextBox Name="txtContent" Style="{DynamicResource MaterialDesignOutlinedTextBox}" BorderThickness="0" AcceptsReturn="True" Padding="8" FontSize="16" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Text="{Binding Path=DisplayingMemo.Content, Mode=TwoWay, UpdateSourceTrigger=Explicit}" TextChanged="txtContent_TextChanged">
 
             </TextBox>
         </Grid>
@@ -40,8 +51,8 @@
                 <ColumnDefinition Width="*"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" Name="btnReview" Click="btnReview_Click">✔️</Button>
-            <Button Grid.Column="1" Name="btnDelete" Click="btnDelete_Click">🗑️</Button>
+            <Button Grid.Column="0" Name="btnReview" Style="{DynamicResource MaterialDesignFlatButton}" Click="btnReview_Click">✔️</Button>
+            <Button Grid.Column="1" Name="btnDelete" Style="{DynamicResource MaterialDesignFlatButton}" Click="btnDelete_Click">🗑️</Button>
         </Grid>
     </Grid>
 </Window>
diff --git a/src/UnforgettableMemo.WinDesktop/UnforgettableMemo.WinDesktop.csproj b/src/UnforgettableMemo.WinDesktop/UnforgettableMemo.WinDesktop.csproj
@@ -4,6 +4,10 @@
     <ProjectReference Include="..\UnforgettableMemo.Shared\UnforgettableMemo.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MaterialDesignThemes" Version="3.2.0" />
+  </ItemGroup>
+
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>