Update version to 1.20

Clicking new group button while collapsed will expand the menu Use of space freed by hidden hamburger menu
2025-10-03 07:30:15 -04:00 · 2020-06-04 15:31:38 +02:00
parent 1c6fb0f2bb
commit 5c1dfa1b0e
12 changed files with 63 additions and 32 deletions
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.19.0.12" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.20.0.12" />
  <Properties>
    <DisplayName>ModernKeePass</DisplayName>
    <PublisherDisplayName>wismna</PublisherDisplayName>
--- a/ModernKeePass/Views/EntryDetailPage.xaml
+++ b/ModernKeePass/Views/EntryDetailPage.xaml
@@ -32,14 +32,8 @@
                <ColumnDefinition Width="Auto" />
                <ColumnDefinition Width="*" />
            </Grid.ColumnDefinitions>
-            <controls:HamburgerMenuUserControl 
-                x:Name="HamburgerMenu"
-                x:Uid="HistoryLeftListView" 
-                ItemsSource="{Binding History}" 
-                SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" 
-                SelectedItem="{Binding SelectedItem, Mode=TwoWay}" />
            <Grid Grid.Column="1">
-                <Hub Padding="0">
+                <Hub x:Name="Hub" Padding="0">
                    <Hub.Resources>
                        <Style TargetType="TextBlock" x:Key="EntryTextBlockStyle">
                            <Setter Property="Margin" Value="0,20,0,0"/>
@@ -209,6 +203,13 @@
                    </HubSection>
                </Hub>
            </Grid>
+            <controls:HamburgerMenuUserControl 
+                Grid.Column="0"
+                x:Name="HamburgerMenu"
+                x:Uid="HistoryLeftListView" 
+                ItemsSource="{Binding History}" 
+                SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}" 
+                SelectedItem="{Binding SelectedItem, Mode=TwoWay}" />
        </Grid>
        <!-- Bouton Précédent et titre de la page -->
        <Grid Grid.Row="0" Background="{ThemeResource AppBarBackgroundThemeBrush}">
@@ -278,5 +279,30 @@
                </interactivity:Interaction.Behaviors>
            </controls:TopMenuUserControl>
        </Grid>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="PageLayout">
+                <VisualState x:Name="Small">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Hub" Storyboard.TargetProperty="Margin">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="-30,0,0,0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Medium">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Hub" Storyboard.TargetProperty="Margin">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0,0,0,0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Large">
+                    <Storyboard>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Hub" Storyboard.TargetProperty="Margin">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0,0,0,0"/>
+                        </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
    </Grid>
 </Page>
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -41,14 +41,6 @@
                <ColumnDefinition Width="Auto" />
                <ColumnDefinition Width="*" />
            </Grid.ColumnDefinitions>
-            <userControls:HamburgerMenuUserControl 
-                x:Name="HamburgerMenu"
-                x:Uid="GroupsLeftListView" 
-                ItemsSource="{Binding Groups}" 
-                CanDragItems="{Binding IsEditMode}"
-                SelectionChanged="groups_SelectionChanged" 
-                ActionButtonCommand="{Binding CreateGroupCommand}"
-                IsButtonVisible="Visible" />
            <Grid Grid.Column="1">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="Auto" />
@@ -71,7 +63,7 @@
                    </StackPanel>
                </HyperlinkButton>

-                <SemanticZoom Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" ScrollViewer.HorizontalScrollBarVisibility="Visible">
+                <SemanticZoom x:Name="SemanticZoom" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" ScrollViewer.HorizontalScrollBarVisibility="Visible">
                    <SemanticZoom.ZoomedInView>
                        <!-- Horizontal scrolling grid -->
                        <GridView
@@ -176,6 +168,15 @@
                    </SemanticZoom.ZoomedOutView>
                </SemanticZoom>
            </Grid>
+            <userControls:HamburgerMenuUserControl 
+                Grid.Column="0"
+                x:Name="HamburgerMenu"
+                x:Uid="GroupsLeftListView" 
+                ItemsSource="{Binding Groups}" 
+                CanDragItems="{Binding IsEditMode}"
+                SelectionChanged="groups_SelectionChanged" 
+                ActionButtonCommand="{Binding CreateGroupCommand}"
+                IsButtonVisible="Visible"  />
        </Grid>
        <!-- Back button and page title -->
        <Grid Grid.Row="0" Background="{ThemeResource AppBarBackgroundThemeBrush}">
@@ -258,6 +259,9 @@
                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HamburgerMenu" Storyboard.TargetProperty="IsOpen">
                            <DiscreteObjectKeyFrame KeyTime="0" Value="False"/>
                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SemanticZoom" Storyboard.TargetProperty="Margin">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="-60,0,0,0"/>
+                        </ObjectAnimationUsingKeyFrames>
                    </Storyboard>
                </VisualState>
                <VisualState x:Name="Medium">
@@ -265,6 +269,9 @@
                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HamburgerMenu" Storyboard.TargetProperty="IsOpen">
                            <DiscreteObjectKeyFrame KeyTime="0" Value="False"/>
                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SemanticZoom" Storyboard.TargetProperty="Margin">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0,0,0,0"/>
+                        </ObjectAnimationUsingKeyFrames>
                    </Storyboard>
                </VisualState>
                <VisualState x:Name="Large">
@@ -275,6 +282,9 @@
                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HamburgerMenu" Storyboard.TargetProperty="IsOpen">
                            <DiscreteObjectKeyFrame KeyTime="0" Value="True"/>
                        </ObjectAnimationUsingKeyFrames>
+                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SemanticZoom" Storyboard.TargetProperty="Margin">
+                            <DiscreteObjectKeyFrame KeyTime="0" Value="0,0,0,0"/>
+                        </ObjectAnimationUsingKeyFrames>
                    </Storyboard>
                </VisualState>
            </VisualStateGroup>
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
@@ -60,7 +60,7 @@
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
        <StackPanel Orientation="Horizontal">
-            <ToggleButton Style="{StaticResource HamburgerToggleButton}" IsChecked="{Binding IsOpen, ElementName=UserControl}" Unchecked="ToggleButton_OnUnchecked">
+            <ToggleButton x:Name="HamburgerButton" Style="{StaticResource HamburgerToggleButton}" IsChecked="{Binding IsOpen, ElementName=UserControl, Mode=TwoWay}" Unchecked="ToggleButton_OnUnchecked">
                <interactivity:Interaction.Behaviors>
                    <core:EventTriggerBehavior EventName="Checked">
                        <core:GoToStateAction StateName="Expanded" />
@@ -125,6 +125,7 @@
                            </StackPanel>
                            <interactivity:Interaction.Behaviors>
                                <core:EventTriggerBehavior EventName="Click">
+                                    <core:ChangePropertyAction TargetObject="{Binding ElementName=UserControl}" PropertyName="IsOpen" Value="True" />
                                    <core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupTextBox}" PropertyName="Visibility" Value="Visible" />
                                    <core:ChangePropertyAction TargetObject="{Binding ElementName=NewGroupButton}" PropertyName="Visibility" Value="Collapsed" />
                                    <actions:SetupFocusAction TargetObject="{Binding ElementName=NewGroupTextBox}" />
--- a/ModernKeePass/Win81App.csproj
+++ b/ModernKeePass/Win81App.csproj
@@ -189,10 +189,6 @@
      <SubType>Designer</SubType>
    </None>
    <None Include="Win81App_StoreKey.pfx" />
-    <PRIResource Include="Strings\fr-FR\Resources.resw" />
-    <PRIResource Include="Strings\fr-FR\CodeBehind.resw" />
-    <PRIResource Include="Strings\en-US\CodeBehind.resw" />
-    <PRIResource Include="Strings\en-US\Resources.resw" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Package.StoreAssociation.xml" />
--- a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
@@ -1,5 +1 @@
-Data is now protected in memory as well as at rest
-Improved zoomed-out Semantic view
-Having a custom entry color doesn't automatically trigger a change
-Fix clipboard copy expiration issue
-Fix a resume bug
+Design improvements
--- a/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
@@ -1,5 +1 @@
-Protection des donnees en memoire en plus du chiffrement de la base de donnees
-Amelioration du rendu de la vue Semantique dezoomee
-Avoir une couleur personnalisee ne declenche plus automatiquement un changement
-Correction d'un bug dans l'expiration des donnees copiees
-Correction d'un bug de resume de l'app
+Ameliorations de design
--- a/ModernKeePass/Strings/en-US/CodeBehind.resw
+++ b/ModernKeePass/Strings/en-US/CodeBehind.resw
--- a/ModernKeePass/Strings/en-US/Resources.resw
+++ b/ModernKeePass/Strings/en-US/Resources.resw
--- a/ModernKeePass/Strings/fr-FR/CodeBehind.resw
+++ b/ModernKeePass/Strings/fr-FR/CodeBehind.resw
--- a/ModernKeePass/Strings/fr-FR/Resources.resw
+++ b/ModernKeePass/Strings/fr-FR/Resources.resw
--- a/WinAppCommon/WinAppCommon.projitems
+++ b/WinAppCommon/WinAppCommon.projitems
@@ -64,4 +64,10 @@
    <Compile Include="$(MSBuildThisFileDirectory)ViewModels\UserControls\SetCredentialsVm.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ViewModels\UserControls\TopMenuVm.cs" />
  </ItemGroup>
+  <ItemGroup>
+    <PRIResource Include="$(MSBuildThisFileDirectory)Strings\en-US\CodeBehind.resw" />
+    <PRIResource Include="$(MSBuildThisFileDirectory)Strings\en-US\Resources.resw" />
+    <PRIResource Include="$(MSBuildThisFileDirectory)Strings\fr-FR\CodeBehind.resw" />
+    <PRIResource Include="$(MSBuildThisFileDirectory)Strings\fr-FR\Resources.resw" />
+  </ItemGroup>
 </Project>