Bump v0.2.21.0

ProJend · Feb 9, 2021 · 06d2992 · 06d2992
1 parent 88271fb
commit 06d2992
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 76 deletions.
diff --git a/True Love/Helpers/LiveTileService.cs b/True Love/Helpers/LiveTileService.cs
@@ -92,7 +92,7 @@ public void AddTile()
                             },
                         BackgroundImage = new TileBackgroundImage()
                         {
-                            Source = "Assets/Background/BG1.jpg"
+                            Source = "Assets/Background.jpg"
                         },
                         PeekImage = new TilePeekImage()
                         {

diff --git a/True Love/Package.appxmanifest b/True Love/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="Tim" Publisher="CN=True Love, O=Ben, C=CN" Version="0.2.7.0" />
+  <Identity Name="Tim" Publisher="CN=True Love, O=Ben, C=CN" Version="0.2.21.0" />
   <mp:PhoneIdentity PhoneProductId="cf0148d5-01bb-4b60-b53b-da3346bf8e5e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>True Love - Tim Bergling Foundtion</DisplayName>

diff --git a/True Love/Pages/DeviceFamily-Mobile/HomePage.xaml b/True Love/Pages/DeviceFamily-Mobile/HomePage.xaml
@@ -36,12 +36,12 @@
     </Page.Resources>
 
 
-    <FlipView SelectionChanged="FlipView_SelectionChanged" x:Name="flipview" IsTapEnabled="False" IsTabStop="False">
+    <FlipView SelectionChanged="FlipView_SelectionChanged" x:Name="flipview">
         <FlipView.Background>
             <ImageBrush ImageSource="/Assets/Background.jpg" Stretch="UniformToFill" AlignmentX="Left"/>
         </FlipView.Background>
 
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -65,7 +65,7 @@
                 </StackPanel>
             </Grid>
         </FlipViewItem>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -99,7 +99,7 @@
                 </StackPanel>
             </Grid>
         </FlipViewItem>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -127,7 +127,7 @@
                 </StackPanel>
             </Grid>
         </FlipViewItem>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX">
             <StackPanel Name="d" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 0 0 20">
                 <StackPanel.Transitions>
                     <TransitionCollection>
@@ -148,7 +148,7 @@
                 </Viewbox>
             </StackPanel>
         </FlipViewItem>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX">
             <Grid Background="Black">
                 <Image Source="/Assets/SplashScreen.png" Height="100" VerticalAlignment="Center" HorizontalAlignment="Center">
                     <Image.Transitions>

diff --git a/True Love/Pages/HomePage.xaml b/True Love/Pages/HomePage.xaml
@@ -28,11 +28,11 @@
         </ItemsPanelTemplate>
     </Page.Resources>
 
-    <FlipView SelectionChanged="FlipView_SelectionChanged" x:Name="flipview" IsTapEnabled="False" IsTabStop="False">
+    <FlipView SelectionChanged="FlipView_SelectionChanged" x:Name="flipview" IsTabStop="False">
         <FlipView.Background>
             <ImageBrush ImageSource="/Assets/Background.jpg" Stretch="UniformToFill" AlignmentX="Left"/>
         </FlipView.Background>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX" IsTabStop="False">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -56,7 +56,7 @@
                 </StackPanel>
             </Grid>
         </FlipViewItem>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX" IsTabStop="False">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -90,7 +90,7 @@
                 </StackPanel>
             </Grid>
         </FlipViewItem>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX" IsTabStop="False">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -118,7 +118,7 @@
                 </StackPanel>
             </Grid>
         </FlipViewItem>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX" IsTabStop="False">
             <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                 <ProgressRing Name="ImageIsLoading" Foreground="White" IsActive="True" Width="50" Height="50" Margin="0 0 0 30"/>
                 <TextBlock Style="{ThemeResource TitleTextBlockStyle}" VerticalAlignment="Center" HorizontalAlignment="Center">
@@ -135,7 +135,7 @@
                 </Viewbox>
             </StackPanel>
         </FlipViewItem>
-        <FlipViewItem ManipulationMode="System,TranslateX" IsTapEnabled="False" IsTabStop="False">
+        <FlipViewItem ManipulationMode="System,TranslateX" IsTabStop="False">
             <Grid Background="Black">
                 <Image Source="/Assets/SplashScreen.png" Height="150" VerticalAlignment="Center" HorizontalAlignment="Center">
                     <Image.Transitions>
@@ -146,7 +146,7 @@
                 </Image>
             </Grid>
         </FlipViewItem>
-
+    
         <FlipView.ItemsPanel>
             <ItemsPanelTemplate>
                 <VirtualizingStackPanel AreScrollSnapPointsRegular="True" Orientation="Vertical"/>

diff --git a/True Love/Pages/HomePage.xaml.cs b/True Love/Pages/HomePage.xaml.cs
@@ -58,6 +58,7 @@ private async void GetFiles()
             ImageGridView.ItemsSource = images;
             ImageIsLoading.IsActive = false;
             ImageIsLoading.Height = 0;
+            flipview.SelectionChanged -= FlipView_SelectionChanged;
         }
 
         private void FlipView_SelectionChanged(object sender, SelectionChangedEventArgs e)

diff --git a/True Love/Pages/MainPage.xaml b/True Love/Pages/MainPage.xaml
@@ -145,20 +145,24 @@
                 </CommandBar.RenderTransform>
 
                 <!--<AppBarButton Icon="Add" Label="分享故事" Style="{StaticResource AppBarButtonRevealStyle}" ToolTipService.ToolTip="分享你与 Avicii 的故事"/>-->
-                <AppBarButton x:Name="BackTopButton" IsEnabled="False" Icon="Upload" Label="Back To Top" ToolTipService.ToolTip="Back to top" Click="BackToTop_Click" Opacity="{x:Bind OpaqueIfEnabled(BackTopButton.IsEnabled), Mode=OneWay}">
+                <AppBarButton x:Name="BackTopButton" IsEnabled="False" Icon="Upload" Label="Back To Top" ToolTipService.ToolTip="Back to top" 
+                              Click="BackToTop_Click" Opacity="{x:Bind OpaqueIfEnabled(BackTopButton.IsEnabled), Mode=OneWay}">
                     <v1809:AppBarButton.OpacityTransition>
                         <ScalarTransition/>
                     </v1809:AppBarButton.OpacityTransition>
                 </AppBarButton>
-                <AppBarButton x:Name="RefreshButton" Icon="Refresh" Label="Refresh" ToolTipService.ToolTip="Refresh dates" Click="Refresh_Click" Opacity="{x:Bind OpaqueIfEnabled(RefreshButton.IsEnabled), Mode=OneWay}">
+                <AppBarButton x:Name="RefreshButton" Icon="Refresh" Label="Refresh" ToolTipService.ToolTip="Refresh dates" 
+                              Click="Refresh_Click" Opacity="{x:Bind OpaqueIfEnabled(RefreshButton.IsEnabled), Mode=OneWay}">
                     <v1809:AppBarButton.OpacityTransition>
                         <ScalarTransition/>
                     </v1809:AppBarButton.OpacityTransition>
                 </AppBarButton>
-                <AppBarButton Visibility="Collapsed" x:Name="AddButton" Icon="Add" Label="New Comment" ToolTipService.ToolTip="Share your menory" Click="AddButton_Click" Opacity="{x:Bind OpaqueIfEnabled(AddButton.IsEnabled), Mode=OneWay}">
+                <AppBarButton Visibility="Collapsed" x:Name="AddButton" Icon="Add" Label="New Comment" ToolTipService.ToolTip="Share your menory" 
+                              Click="AddButton_Click" Opacity="{x:Bind OpaqueIfEnabled(AddButton.IsEnabled), Mode=OneWay}">
                     <v1809:AppBarButton.OpacityTransition>
                         <ScalarTransition/>
                     </v1809:AppBarButton.OpacityTransition>
+
                 </AppBarButton>
                 <!--<AppBarButton Name="Settings" Icon="Setting" Label="设置" Style="{StaticResource AppBarButtonRevealStyle}" ToolTipService.ToolTip="打开设置"/>-->
                 <!--<CommandBar.SecondaryCommands>

diff --git a/True Love/Pages/MainPage.xaml.cs b/True Love/Pages/MainPage.xaml.cs
@@ -34,7 +34,7 @@ public sealed partial class MainPage : Page
         public MainPage()
         {
             this.InitializeComponent();
-            Current = this;        
+            Current = this;
         }
 
         private void Main_Loaded(object sender, RoutedEventArgs e)
@@ -48,25 +48,33 @@ private void Main_Loaded(object sender, RoutedEventArgs e)
                 CommandBar.Background = new SolidColorBrush { Color = Colors.Black, Opacity = 0.7 };
             }
             else // = PC
-            {
+            {   // Listen to the window directly so we will respond to hotkeys regardless
+                // of which element has focus.
+                Window.Current.CoreWindow.PointerPressed += this.CoreWindow_PointerPressed;
                 Window.Current.SetTitleBar(AppTitleBar);
                 BackTopButton.Style = (Style)Resources["AppBarButtonRevealStyle"];
                 RefreshButton.Style = (Style)Resources["AppBarButtonRevealStyle"];
                 if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 5))// > OS15063
-                {
-                    // 键盘快捷键
-                    MemoryPage.KeyboardAccelerators.Add(new KeyboardAccelerator { Key = VirtualKey.F1 });
-                    HomePage.KeyboardAccelerators.Add(new KeyboardAccelerator { Key = VirtualKey.F2 });
-                    ImagesPage.KeyboardAccelerators.Add(new KeyboardAccelerator { Key = VirtualKey.F3 });
+                {   // 键盘快捷键
+                    //MemoryPage.KeyboardAccelerators.Add(new KeyboardAccelerator { Key = VirtualKey.F1 });
+                    //HomePage.KeyboardAccelerators.Add(new KeyboardAccelerator { Key = VirtualKey.F2 });
+                    //ImagesPage.KeyboardAccelerators.Add(new KeyboardAccelerator { Key = VirtualKey.F3 });
                     BackTopButton.KeyboardAccelerators.Add(new KeyboardAccelerator { Key = VirtualKey.F6 });
                     RefreshButton.KeyboardAccelerators.Add(new KeyboardAccelerator { Key = VirtualKey.F5 });
+
+                    // Add keyboard accelerators for backwards navigation.
+                    var goBack = new KeyboardAccelerator { Key = VirtualKey.Escape };
+                    goBack.Invoked += BackInvoked;
+                    this.KeyboardAccelerators.Add(goBack);
                 }
             }
             #endregion
+            SystemNavigationManager.GetForCurrentView().BackRequested += MainPage_BackRequested;
 #if !DEBUG
             ImagesPage.Visibility = Visibility.Collapsed;
             AddButton.Visibility = Visibility.Collapsed;
 #endif
+            Main.Loaded -= Main_Loaded;
         }
 
         #region NavigationView
@@ -81,29 +89,17 @@ private void Main_Loaded(object sender, RoutedEventArgs e)
         };
 
         private void NavView_Loaded(object sender, RoutedEventArgs e)
-        {
-            SystemNavigationManager.GetForCurrentView().BackRequested += MainPage_BackRequested;
-            // Add handler for ContentFrame navigation.
+        {   // Add handler for ContentFrame navigation.
             ContentFrame.Navigated += On_Navigated;
 
             // NavView doesn't load any page by default, so load home page.
             NavView.SelectedItem = NavView.MenuItems[0];
+
             // If navigation occurs on SelectionChanged, this isn't needed.
             // Because we use ItemInvoked to navigate, we need to call Navigate
             // here to load the home page.
             NavView_Navigate("home", new EntranceNavigationTransitionInfo());
-
-            // Add keyboard accelerators for backwards navigation.
-            if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 5))
-            {
-                var goBack = new KeyboardAccelerator { Key = VirtualKey.Escape };
-                goBack.Invoked += BackInvoked;
-                this.KeyboardAccelerators.Add(goBack);
-            }
-
-            // Listen to the window directly so we will respond to hotkeys regardless
-            // of which element has focus.
-            Window.Current.CoreWindow.PointerPressed += this.CoreWindow_PointerPressed;
+            NavView.Loaded -= NavView_Loaded;
         }
 
         /// <summary>
@@ -181,7 +177,7 @@ private bool On_BackRequested()
         private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs e)
         {
             var properties = e.CurrentPoint.Properties;
-
+            
             // Ignore button chords with the left, right, and middle buttons
             if (properties.IsLeftButtonPressed || properties.IsRightButtonPressed ||
                 properties.IsMiddleButtonPressed) return;
@@ -195,7 +191,6 @@ private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs e)
                 if (backPressed) this.On_BackRequested();
                 //if (forwardPressed) this.TryGoForward();
             }
-
         }
 
         private void On_Navigated(object sender, NavigationEventArgs e)

diff --git a/True Love/Pages/SettingsPage.xaml b/True Love/Pages/SettingsPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d" RequestedTheme="Dark"
+    mc:Ignorable="d" RequestedTheme="Dark" x:Name="Settings"
     Background="Transparent" Loaded="Settings_Loaded"
     xmlns:v1709="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 5)"
     xmlns:v1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)">
@@ -41,8 +41,8 @@
 
             <!--标头 :
                 Header-->
-            <TextBlock Style="{ThemeResource TitleTextBlockStyle}" Margin="1,0,0,0" x:Name="Header" Grid.Row="0" Visibility="Collapsed">
-                <Run>Settings</Run><LineBreak/>
+            <TextBlock Style="{ThemeResource TitleTextBlockStyle}" Margin="1,5,0,20" x:Name="Header" Grid.Row="0" Visibility="Collapsed">
+                <Run>Settings</Run>
             </TextBlock>
 
             <!--内容 :
@@ -72,15 +72,7 @@
                             <Run>Hot Keys</Run>
                         </TextBlock>
                         <!--<TextBlock Text="Keyboard Shortcuts" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}"/>-->
-                        <TextBlock>                                                     
-                            <Run Foreground="DarkGray">Page Memory</Run><LineBreak/>
-                            <Run>F1</Run><LineBreak/><LineBreak/>
-                            <Run Foreground="DarkGray">Page Comments</Run><LineBreak/>
-                            <Run>F2</Run><LineBreak/><LineBreak/>
-                            <Run Foreground="DarkGray">Page Images</Run><LineBreak/>
-                            <Run>F3</Run><LineBreak/><LineBreak/>
-                            <!--<Run Foreground="DarkGray">Page Settings</Run><LineBreak/>
-                            <Run>F4</Run><LineBreak/><LineBreak/>-->
+                        <TextBlock>
                             <Run Foreground="DarkGray">Refresh</Run><LineBreak/>
                             <Run>F5</Run><LineBreak/><LineBreak/>
                             <Run Foreground="DarkGray">Back To Top</Run><LineBreak/>
@@ -116,10 +108,11 @@
                         <Run x:Name="releasedDate"></Run>
                     </TextBlock>
                     <TextBlock Foreground="DarkGray" Style="{ThemeResource BodyTextBlockStyle}">
-                        <Run>解决物理内存使用翻倍问题</Run><LineBreak/>
-                        <Run>解决界面处于宽屏下右滑滑出空白汉堡菜单问题</Run><LineBreak/>
-                        <Run>解决工具栏走位问题</Run><LineBreak/>
-                        <Run>解决打开应用围绕一圈白线问题</Run><LineBreak/>                        <Run>解决界面处于宽屏下右滑滑出空白汉堡菜单问题</Run><LineBreak/>
+                        <Run>🔧 解决物理内存使用翻倍问题</Run><LineBreak/>
+                        <Run>🔧 解决界面处于宽屏下右滑滑出空白汉堡菜单问题</Run><LineBreak/>
+                        <Run>🔧 解决工具栏走位问题</Run><LineBreak/>
+                        <Run>🔧 解决打开应用围绕一圈白线问题</Run><LineBreak/>
+                        <Run>🔧 删除不能正确工作的快捷键</Run><LineBreak/>
                     </TextBlock>
                     <HyperlinkButton Content="Learn More" Click="Release_Click"/>
 
@@ -139,7 +132,7 @@
                         <Run x:Name="VersionInfo" Foreground="DarkGray"></Run><LineBreak/>
                         <Run Foreground="DarkGray">2021 © ProJend</Run><LineBreak/>
                         <Run Foreground="DarkGray">Tim Bergling Foundation</Run><LineBreak/>
-                        <Run>we will comprehend Tim Bergling more and more and more...</Run>
+                        <Run>We will comprehend Tim Bergling more and more and more...</Run>
                     </TextBlock>
 
                     <!--链接 : 🔗
@@ -150,7 +143,7 @@
                         <Run Foreground="{ThemeResource SystemAccentColor}">Links</Run><LineBreak/>
                         <Run>ProJend</Run>
                     </TextBlock>
-                    <TextBlock Text="A new UWP!" Foreground="DarkGray" Style="{ThemeResource BodyTextBlockStyle}"/>
+                    <TextBlock Text="A new challenge!" Foreground="DarkGray" Style="{ThemeResource BodyTextBlockStyle}"/>
                     <TextBlock Text="Report To Author"/>
                     <StackPanel Orientation="Horizontal">
                         <Button Background="Transparent" Width="42" Height="42" Click="Links_Click" Tag="GitHub" v1709:Style="{StaticResource ButtonRevealStyle}" v1809:CornerRadius="2 0 0 2">

diff --git a/True Love/Pages/SettingsPage.xaml.cs b/True Love/Pages/SettingsPage.xaml.cs
@@ -42,6 +42,7 @@ private void Settings_Loaded(object sender, RoutedEventArgs e)
             var version = Package.Current.Id.Version;
             VersionInfo.Text = $"Version : {version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
             releasedDate.Text = $"Installation Date : {Package.Current.InstalledDate.ToLocalTime().DateTime}";
+            Settings.Loaded -= Settings_Loaded;
         }
 
         /// <summary>