wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-03 23:50:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Finally (!) removed right margin in Group Detail page left menu

Browse Source
This commit is contained in:
Geoffroy Bonneville
2017-10-06 16:33:44 +02:00
committed by BONNEVILLE Geoffroy
parent 11fb82573b
commit f22ca4c46f
4 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePass/App.xaml
View File

@@ -2,7 +2,7 @@
x:Class="ModernKeePass.App" x:Class="ModernKeePass.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
RequestedTheme="Light"> RequestedTheme="Dark">
<Application.Resources> <Application.Resources>
<Style TargetType="ToggleButton" x:Name="HamburgerToggleButton"> <Style TargetType="ToggleButton" x:Name="HamburgerToggleButton">
<Setter Property="Template"> <Setter Property="Template">

6
ModernKeePass/MainPage.xaml
View File

@@ -7,7 +7,7 @@
xmlns:controls="using:ModernKeePass.Controls" xmlns:controls="using:ModernKeePass.Controls"
x:Class="ModernKeePass.MainPage" x:Class="ModernKeePass.MainPage"
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" > Background="{StaticResource ApplicationPageBackgroundThemeBrush}" >
<Page.DataContext> <Page.DataContext>
<viewModels:MainVm /> <viewModels:MainVm />
</Page.DataContext> </Page.DataContext>
@@ -18,7 +18,7 @@
IsSourceGrouped="True" /> IsSourceGrouped="True" />
</Page.Resources> </Page.Resources>
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" > <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="50" /> <ColumnDefinition Width="50" />
@@ -26,7 +26,9 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<controls:ListViewWithDisable Grid.Column="0" <controls:ListViewWithDisable Grid.Column="0"
x:Name="MenuListView" x:Name="MenuListView"
RequestedTheme="Light"
SelectionChanged="ListView_SelectionChanged" SelectionChanged="ListView_SelectionChanged"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
ItemsSource="{Binding Source={StaticResource MenuItemsSource}}" ItemsSource="{Binding Source={StaticResource MenuItemsSource}}"
IsSynchronizedWithCurrentItem="False"> IsSynchronizedWithCurrentItem="False">
<ListView.Header> <ListView.Header>

5
ModernKeePass/Pages/EntryDetailPage.xaml
View File

@@ -50,9 +50,9 @@
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="200"/> <ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}" <Button Margin="39,0,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
Style="{StaticResource NavigationBackButtonNormalStyle}" Style="{StaticResource NavigationBackButtonNormalStyle}"
VerticalAlignment="Top" VerticalAlignment="Center"
AutomationProperties.Name="Back" AutomationProperties.Name="Back"
AutomationProperties.AutomationId="BackButton" AutomationProperties.AutomationId="BackButton"
AutomationProperties.ItemType="Navigation Button"/> AutomationProperties.ItemType="Navigation Button"/>
@@ -60,6 +60,7 @@
Grid.Column="1" Grid.Column="1"
Text="{Binding Title, Mode=TwoWay}" Text="{Binding Title, Mode=TwoWay}"
Style="{StaticResource HeaderTextBoxStyle}" Style="{StaticResource HeaderTextBoxStyle}"
Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
IsHitTestVisible="{Binding IsEditMode}" IsHitTestVisible="{Binding IsEditMode}"
TextWrapping="NoWrap" TextWrapping="NoWrap"
VerticalAlignment="Center" VerticalAlignment="Center"

28
ModernKeePass/Pages/GroupDetailPage.xaml
View File

@@ -53,7 +53,7 @@
<DataTemplate x:Name="GroupFirstItem"> <DataTemplate x:Name="GroupFirstItem">
<Border <Border
BorderThickness="2" BorderThickness="2"
BorderBrush="{StaticResource ListViewItemFocusBorderThemeBrush}" BorderBrush="{StaticResource SystemColor}"
Background="{StaticResource HubSectionHeaderPressedForegroundThemeBrush}" Background="{StaticResource HubSectionHeaderPressedForegroundThemeBrush}"
Margin="0,10,0,0" > Margin="0,10,0,0" >
<Grid Height="110" Width="480"> <Grid Height="110" Width="480">
@@ -69,7 +69,7 @@
<DataTemplate x:Name="GroupOtherItem"> <DataTemplate x:Name="GroupOtherItem">
<Border <Border
BorderThickness="2" BorderThickness="2"
BorderBrush="{StaticResource ListViewItemFocusBorderThemeBrush}" BorderBrush="{StaticResource SystemColor}"
Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}" Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}"
Margin="0,10,0,0" > Margin="0,10,0,0" >
<Grid Height="110" Width="480" > <Grid Height="110" Width="480" >
@@ -113,19 +113,20 @@
IsSwipeEnabled="false" IsSwipeEnabled="false"
IsSynchronizedWithCurrentItem="False" IsSynchronizedWithCurrentItem="False"
DataContext="{Binding DataContext, ElementName=PageRoot}" DataContext="{Binding DataContext, ElementName=PageRoot}"
RequestedTheme="Dark" RequestedTheme="Light"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"> Foreground="{ThemeResource DefaultTextForegroundThemeBrush}">
<ListView.Resources> <ListView.Resources>
<DataTemplate x:Name="Collapsed"> <DataTemplate x:Name="Collapsed">
<StackPanel Width="30" Orientation="Horizontal" Margin="20,0,0,0" >
<SymbolIcon Symbol="{Binding IconSymbol}" /> <SymbolIcon Symbol="{Binding IconSymbol}" />
</StackPanel> <ToolTipService.ToolTip>
<ToolTip Content="{Binding Name}" />
</ToolTipService.ToolTip>
</DataTemplate> </DataTemplate>
<DataTemplate x:Name="Expanded"> <DataTemplate x:Name="Expanded">
<StackPanel Width="200" Orientation="Horizontal" > <StackPanel Orientation="Horizontal">
<SymbolIcon Symbol="{Binding IconSymbol}" Margin="20,0,0,0" /> <SymbolIcon Symbol="{Binding IconSymbol}" />
<TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,0,0" /> <TextBlock Text="{Binding Name}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" />
<!--<TextBlock Text="{Binding EntryCount}" HorizontalAlignment="Right" VerticalAlignment="Center" />--> <!--<TextBlock Text="{Binding EntryCount}" HorizontalAlignment="Right" VerticalAlignment="Center" />-->
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
@@ -135,8 +136,12 @@
</ListView.ItemsSource> </ListView.ItemsSource>
<ListView.ItemContainerStyle> <ListView.ItemContainerStyle>
<Style TargetType="ListViewItem"> <Style TargetType="ListViewItem">
<!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />--> <!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Padding" Value="0"/>
<Setter Property="BorderThickness" Value="0"/>-->
<Setter Property="VerticalContentAlignment" Value="Stretch" /> <Setter Property="VerticalContentAlignment" Value="Stretch" />
<Setter Property="Padding" Value="20,0,0,0"/>
<Setter Property="Margin" Value="0"/>
</Style> </Style>
</ListView.ItemContainerStyle> </ListView.ItemContainerStyle>
<ListView.HeaderTemplate> <ListView.HeaderTemplate>
@@ -180,10 +185,10 @@
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="200"/> <ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button Margin="39,59,39,0" <Button Margin="39,0,39,0"
Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}" Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
Style="{StaticResource NavigationBackButtonNormalStyle}" Style="{StaticResource NavigationBackButtonNormalStyle}"
VerticalAlignment="Top" VerticalAlignment="Center"
AutomationProperties.Name="Back" AutomationProperties.Name="Back"
AutomationProperties.AutomationId="BackButton" AutomationProperties.AutomationId="BackButton"
AutomationProperties.ItemType="Navigation Button"/> AutomationProperties.ItemType="Navigation Button"/>
@@ -191,6 +196,7 @@
Grid.Column="1" Grid.Column="1"
Text="{Binding Name, Mode=TwoWay}" Text="{Binding Name, Mode=TwoWay}"
Style="{StaticResource HeaderTextBoxStyle}" Style="{StaticResource HeaderTextBoxStyle}"
Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
IsHitTestVisible="{Binding IsEditMode}" IsHitTestVisible="{Binding IsEditMode}"
TextWrapping="NoWrap" TextWrapping="NoWrap"
VerticalAlignment="Center" VerticalAlignment="Center"