From adb00d82f1816a905c40294e4156b5ebc9cb79f7 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 17 Nov 2021 00:28:42 +0900
Subject: [PATCH] Redesign About Page

---
 Flow.Launcher.Infrastructure/Constant.cs |   2 +
 Flow.Launcher/Languages/en.xaml          |   2 +-
 Flow.Launcher/SettingWindow.xaml         | 270 ++++++++++++++++-------
 Flow.Launcher/SettingWindow.xaml.cs      |  10 +
 4 files changed, 203 insertions(+), 81 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index a5b89c300..594b51156 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -36,6 +36,8 @@ namespace Flow.Launcher.Infrastructure
         public const string DefaultTheme = "Darker";
 
         public const string Themes = "Themes";
+        public const string Settings = "Settings";
+        public const string Logs = "Logs";
 
         public const string Website = "https://flow-launcher.github.io";
     }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 5ca6bdbfd..b8f214538 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -134,7 +134,7 @@
         or go to https://github.com/Flow-Launcher/Flow.Launcher/releases to download updates manually.
     </system:String>
     <system:String x:Key="releaseNotes">Release Notes</system:String>
-    <system:String x:Key="documentation">Usage Tips:</system:String>
+    <system:String x:Key="documentation">Usage Tips</system:String>
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ca8a32c90..e20621c4a 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -181,21 +181,36 @@
                                         x:Name="Spacer"
                                         Width="Auto"
                                         Height="Auto"
-                                        Margin="16,0,8,8"
+                                        Margin="14,4,8,4"
                                         Padding="0,0,0,0"
                                         BorderBrush="Transparent"
                                         BorderThickness="0">
                                         <Border
                                             x:Name="border"
+                                            Height="40"
                                             Background="{StaticResource Color01B}"
                                             CornerRadius="5">
-                                            <ContentPresenter
-                                                x:Name="ContentSite"
-                                                Margin="12,11,0,11"
-                                                HorizontalAlignment="LEFT"
-                                                VerticalAlignment="Center"
-                                                ContentSource="Header"
-                                                TextBlock.Foreground="#000" />
+                                            <Grid>
+                                                <Canvas>
+                                                    <Rectangle
+                                                        x:Name="Bullet"
+                                                        Canvas.Left="0"
+                                                        Width="4"
+                                                        Height="18"
+                                                        Margin="0,11,0,11"
+                                                        Fill="{DynamicResource ToggleSwitchFillOn}"
+                                                        RadiusX="2"
+                                                        RadiusY="2"
+                                                        Visibility="Hidden" />
+                                                    <ContentPresenter
+                                                        x:Name="ContentSite"
+                                                        Margin="12,11,0,11"
+                                                        HorizontalAlignment="LEFT"
+                                                        VerticalAlignment="Center"
+                                                        ContentSource="Header"
+                                                        TextBlock.Foreground="#000" />
+                                                </Canvas>
+                                            </Grid>
                                         </Border>
                                     </Border>
                                 </Grid>
@@ -207,6 +222,7 @@
                             </Trigger>
                             <Trigger Property="IsSelected" Value="True">
                                 <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
+                                <Setter TargetName="Bullet" Property="Visibility" Value="Visible" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -2300,78 +2316,172 @@
                         </Grid>
                     </TabItem.Header>
                     <Border>
-                        <Grid Height="400" Margin="65,0">
-                            <!--<TextBlock Text="{DynamicResource about}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>  -->
-                            <Grid.Resources>
-                                <Style TargetType="{x:Type TextBlock}">
-                                    <Setter Property="Margin" Value="10,25,0,0" />
-                                    <Setter Property="FontSize" Value="14" />
-                                    <Setter Property="Foreground" Value="{StaticResource Color05B}" />
-                                </Style>
-                            </Grid.Resources>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <TextBlock
-                                Grid.Row="0"
-                                Grid.ColumnSpan="2"
-                                FontSize="12"
-                                Text="{Binding ActivatedTimes, Mode=OneWay}" />
-                            <TextBlock
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                Text="{DynamicResource website}" />
-                            <TextBlock
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                HorizontalAlignment="Left">
-                                <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                    <Run Text="{Binding Website, Mode=OneWay}" />
-                                </Hyperlink>
-                            </TextBlock>
-                            <TextBlock
-                                Grid.Row="2"
-                                Grid.Column="0"
-                                Text="Version" />
-                            <TextBlock
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Text="{Binding Version}" />
-                            <TextBlock
-                                Grid.Row="3"
-                                Grid.Column="0"
-                                Text="{DynamicResource releaseNotes}" />
-                            <TextBlock Grid.Row="3" Grid.Column="1">
-                                <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                    <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
-                                </Hyperlink>
-                            </TextBlock>
-                            <TextBlock
-                                Grid.Row="4"
-                                Grid.Column="0"
-                                Text="{DynamicResource documentation}" />
-                            <TextBlock Grid.Row="4" Grid.Column="1">
-                                <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                    <Run Text="{Binding Documentation, Mode=OneWay}" />
-                                </Hyperlink>
-                            </TextBlock>
-                            <Button
-                                Grid.Row="5"
-                                Grid.Column="0"
-                                Margin="10,30,10,10"
-                                HorizontalAlignment="Left"
-                                Click="OnCheckUpdates"
-                                Content="{DynamicResource checkUpdates}" />
-                        </Grid>
+                        <ScrollViewer
+                            Margin="0,0,0,0"
+                            Background="{StaticResource Color01B}"
+                            ScrollViewer.CanContentScroll="False">
+                            <StackPanel Margin="5,14,25,30" Orientation="Vertical">
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Margin="0,5,0,5"
+                                    FontSize="30"
+                                    Style="{StaticResource PageTitle}"
+                                    Text="{DynamicResource about}"
+                                    TextAlignment="left" />
+                                <StackPanel Orientation="Horizontal">
+                                    <Border
+                                        Width="200"
+                                        Height="120"
+                                        Margin="0,8,0,0"
+                                        Padding="24,24,24,24"
+                                        HorizontalAlignment="Left"
+                                        Style="{DynamicResource SettingGroupBox}">
+                                        <Grid>
+                                            <TextBlock
+                                                FontSize="14"
+                                                Foreground="{DynamicResource Color05B}"
+                                                Text="{DynamicResource version}"
+                                                TextWrapping="WrapWithOverflow" />
+                                            <TextBlock
+                                                HorizontalAlignment="Right"
+                                                VerticalAlignment="Bottom"
+                                                DockPanel.Dock="Bottom"
+                                                FontSize="22"
+                                                Foreground="{DynamicResource Color05B}"
+                                                Text="{Binding Version}"
+                                                TextWrapping="WrapWithOverflow" />
+                                        </Grid>
+                                    </Border>
+                                </StackPanel>
+
+                                <Border Margin="0,4,0,0" Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource update}" />
+                                        </StackPanel>
+                                        <Button
+                                            Grid.Column="1"
+                                            HorizontalAlignment="Right"
+                                            Click="OnCheckUpdates"
+                                            Content="{DynamicResource checkUpdates}"
+                                            Style="{StaticResource AccentButtonStyle}" />
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xe895;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
+
+                                <Border Margin="0,4,0,0" Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource website}" />
+                                        </StackPanel>
+                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                            <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{Binding Website, Mode=OneWay}" />
+                                            </Hyperlink>
+                                        </TextBlock>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xeb41;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
+                                <Border Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
+                                        </StackPanel>
+                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                            <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
+                                            </Hyperlink>
+                                        </TextBlock>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xe8fd;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
+                                <Border Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource documentation}" />
+                                        </StackPanel>
+                                        <TextBlock Grid.Column="1" HorizontalAlignment="Right">
+                                            <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{Binding Documentation, Mode=OneWay}" />
+                                            </Hyperlink>
+                                        </TextBlock>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xe82f;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+
+                                <Border Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Developer" />
+                                        </StackPanel>
+                                        <StackPanel
+                                            Grid.Column="1"
+                                            HorizontalAlignment="Right"
+                                            Orientation="Horizontal">
+                                            <Button
+                                                Margin="0,0,12,0"
+                                                Click="OpenSettingFolder"
+                                                Content="Setting Folder" />
+                                            <Button Click="OpenLogFolder" Content="Log Folder" />
+                                        </StackPanel>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="24,0,16,0"
+                                            VerticalAlignment="Center"
+                                            FontFamily="/Resources/#Segoe Fluent Icons"
+                                            FontSize="20"
+                                            Style="{StaticResource Glyph}">
+                                            &#xec7a;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
+                                <TextBlock
+                                    Margin="14,14,0,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Bottom"
+                                    DockPanel.Dock="Bottom"
+                                    FontSize="12"
+                                    Foreground="{DynamicResource Color15B}"
+                                    Text="{Binding ActivatedTimes, Mode=OneWay}"
+                                    TextWrapping="WrapWithOverflow" />
+
+                            </StackPanel>
+                        </ScrollViewer>
                     </Border>
                 </TabItem>
             </TabControl>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 1d969a24c..045ece8fe 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -273,6 +273,16 @@ namespace Flow.Launcher
             PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
         }
 
+        private void OpenSettingFolder(object sender, RoutedEventArgs e)
+        {
+            PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
+        }
+
+        private void OpenLogFolder(object sender, RoutedEventArgs e)
+        {
+            PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Logs));
+        }
+
         private void OnPluginStoreRefreshClick(object sender, RoutedEventArgs e)
         {
             _ = viewModel.RefreshExternalPluginsAsync();