New color to brush converter

New boolean to visibility converter
Base class to handle property changes notifications for all View Models
Template selector to handle a different first item in listviews or gridviews

ModernKeePass/Pages/GroupDetailPage.xaml

@@ -5,16 +5,56 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:converters="using:ModernKeePass.Converters"
+    xmlns:local="using:ModernKeePass.Controls"
     x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.GroupDetailPage"
     mc:Ignorable="d" >
     <Page.Resources>
+        <SolidColorBrush x:Key="Transparent" Color="Transparent"/>
+        <SolidColorBrush x:Key="White" Color="White"/>
+        <converters:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
         <converters:PluralizationConverter x:Key="PluralizationConverter"/>
+        <DataTemplate x:Name="GroupFirstItem">
+            <Border 
+                BorderThickness="2" 
+                BorderBrush="DimGray" 
+                Background="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}" 
+                Margin="0,10,0,0" >
+                <Grid Height="110" Width="480" >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" />
+                    <TextBlock Grid.Column="1" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="13,0,0,5"/>
+                </Grid>
+            </Border>
+        </DataTemplate>
+        <DataTemplate x:Name="GroupOtherItem">
+            <Border 
+                BorderThickness="2" 
+                BorderBrush="DimGray" 
+                Background="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}" 
+                Margin="0,10,0,0" >
+                <Grid Height="110" Width="480" >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" />
+                    <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0" >
+                        <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
+                        <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
+                        <TextBlock Text="{Binding EntryCount, ConverterParameter=entry\,entries, Converter={StaticResource PluralizationConverter}}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
+                        <TextBlock Text="{Binding GroupCount, ConverterParameter=group\,groups, Converter={StaticResource PluralizationConverter}}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
+                    </StackPanel>
+                </Grid>
+            </Border>
+        </DataTemplate>
     </Page.Resources>
     <Page.DataContext>
         <viewModels:GroupVm />
     </Page.DataContext>
-
     <Grid>
         <Grid.Resources>
             <CollectionViewSource
@@ -47,30 +87,11 @@
                     IsSwipeEnabled="false" 
                     SelectionChanged="groups_SelectionChanged"
                     IsSynchronizedWithCurrentItem="False" >
-                    <GridView.ItemTemplate>
-                        <DataTemplate>
-                            <Border 
-                                BorderThickness="2" 
-                                BorderBrush="DimGray" 
-                                Background="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}" 
-                                Margin="0,10,0,0" >
-                                <Grid Height="110" Width="480" >
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <SymbolIcon Grid.Column="0" Symbol="{Binding IconSymbol}" Width="100" Height="100" />
-                                    <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0" Visibility="{Binding DetailsVisibility}" >
-                                        <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
-                                        <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
-                                        <TextBlock Text="{Binding EntryCount, ConverterParameter=entry\,entries, Converter={StaticResource PluralizationConverter}}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
-                                        <TextBlock Text="{Binding GroupCount, ConverterParameter=group\,groups, Converter={StaticResource PluralizationConverter}}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
-                                    </StackPanel>
-                                    <TextBlock Grid.Column="1" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Visibility="{Binding NewVisibility}" VerticalAlignment="Center" Margin="13,0,0,5"/>
-                                </Grid>
-                            </Border>
-                        </DataTemplate>
-                    </GridView.ItemTemplate>
+                    <GridView.ItemTemplateSelector>
+                        <local:FirstItemDataTemplateSelector 
+                            FirstItem="{StaticResource GroupFirstItem}" 
+                            OtherItem="{StaticResource GroupOtherItem}" />
+                        </GridView.ItemTemplateSelector>
                     <GridView.Header>
                         <ListView 
                             Height="auto" 
@@ -82,9 +103,18 @@
                             IsSynchronizedWithCurrentItem="False" >
                             <ListView.ItemTemplate>
                                 <DataTemplate>
-                                    <StackPanel Orientation="Horizontal" Background="{Binding BackgroundColor}">
+                                    <StackPanel 
+                                        Orientation="Horizontal" 
+                                        Background="{Binding BackgroundColor, ConverterParameter={StaticResource Transparent}, Converter={StaticResource ColorToBrushConverter}}">
                                         <SymbolIcon Symbol="{Binding IconSymbol}" />
-                                        <TextBlock Text="{Binding Title}" FontWeight="{Binding FontWeight}" TextWrapping="NoWrap" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Foreground="{Binding ForegroundColor}"/>
+                                        <TextBlock 
+                                            Text="{Binding Title}"
+                                            FontWeight="{Binding FontWeight}" 
+                                            TextWrapping="NoWrap" 
+                                            HorizontalAlignment="Left" 
+                                            VerticalAlignment="Center" 
+                                            Margin="30,0,0,0" 
+                                            Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource White}, Converter={StaticResource ColorToBrushConverter}}"/>
                                     </StackPanel>
                                 </DataTemplate>
                             </ListView.ItemTemplate>
@@ -117,14 +147,16 @@
                     IsSynchronizedWithCurrentItem="False" >
                     <ListView.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap"/>
+                            <TextBlock 
+                                Text="{Binding Name}" 
+                                Style="{StaticResource TitleTextBlockStyle}" 
+                                TextWrapping="NoWrap"/>
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
             </SemanticZoom.ZoomedOutView>
         </SemanticZoom>
         
-
         <!-- Back button and page title -->
         <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
@@ -132,17 +164,31 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="200"/>
             </Grid.ColumnDefinitions>
-            <Button Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
-                        Style="{StaticResource NavigationBackButtonNormalStyle}"
-                        VerticalAlignment="Top"
-                        AutomationProperties.Name="Back"
-                        AutomationProperties.AutomationId="BackButton"
-                        AutomationProperties.ItemType="Navigation Button"/>
-            <TextBlock Text="{Binding Name}" Style="{StaticResource HeaderTextBlockStyle}" Grid.Column="1" 
-                        IsHitTestVisible="false" TextWrapping="NoWrap" VerticalAlignment="Bottom" Margin="0,0,30,40"/>
-            <CommandBar Grid.Column="2" Margin="0,40,0,0" Background="Transparent" IsOpen="True">
-                <AppBarButton Icon="Edit" Label="Edit" />
-                <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="AppBarButton_Click" />
+            <Button Margin="39,59,39,0" 
+                    Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}"
+                    Style="{StaticResource NavigationBackButtonNormalStyle}"
+                    VerticalAlignment="Top"
+                    AutomationProperties.Name="Back"
+                    AutomationProperties.AutomationId="BackButton"
+                    AutomationProperties.ItemType="Navigation Button"/>
+            <TextBlock  
+                Grid.Column="1" 
+                Text="{Binding Name}" 
+                Style="{StaticResource HeaderTextBlockStyle}"
+                IsHitTestVisible="false" 
+                TextWrapping="NoWrap" 
+                VerticalAlignment="Bottom" 
+                Margin="0,0,30,40"/>
+            <CommandBar 
+                Grid.Column="2" 
+                Margin="0,40,0,0" 
+                Background="Transparent" 
+                IsOpen="True">
+                <AppBarButton Icon="Save" Label="Save" />
+                <CommandBar.SecondaryCommands>
+                    <AppBarButton Icon="Edit" Label="Edit" />
+                    <AppBarButton Icon="Delete" Label="Delete" IsEnabled="{Binding IsNotRoot}" Click="AppBarButton_Click" />
+                </CommandBar.SecondaryCommands>
             </CommandBar>
         </Grid>
     </Grid>

ModernKeePass/Pages/OpenDatabasePage.xaml.cs

@@ -63,8 +63,6 @@ namespace ModernKeePass.Pages
             if (databaseVm == null) return;
             databaseVm.SelectedVisibility = Visibility.Visible;
             databaseVm.Name = file.Name;
-            databaseVm.NotifyPropertyChanged("SelectedVisibility");
-            databaseVm.NotifyPropertyChanged("Name");
         }
 
         private void PasswordUserControl_PasswordChecked(object sender, EventArgs e)

ModernKeePass/Pages/RecentDatabasesPage.xaml

@@ -5,27 +5,29 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:local="using:ModernKeePass.Controls"
+    xmlns:Converters="using:ModernKeePass.Converters"
     x:Class="ModernKeePass.Pages.RecentDatabasesPage"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:RecentVm/>
-    </Page.DataContext>
     <Page.Resources>
+        <Converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <CollectionViewSource 
             x:Name="RecentItemsSource" 
             Source="{Binding RecentItems}" />
     </Page.Resources>
+    <Page.DataContext>
+        <viewModels:RecentVm/>
+    </Page.DataContext>
     <ListView 
         Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
         ItemsSource="{Binding Source={StaticResource RecentItemsSource}}"
         x:Name="RecentListView" 
         SelectionChanged="RecentListView_SelectionChanged"
-        IsSynchronizedWithCurrentItem="False">
+        SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
         <ListView.ItemTemplate>
             <DataTemplate>
                 <StackPanel>
                     <TextBlock Text="{Binding Name}" Width="350" Padding="5" />
-                    <local:OpenDatabaseUserControl Visibility="{Binding PasswordVisibility}" ValidationChecked="PasswordUserControl_PasswordChecked" />
+                    <local:OpenDatabaseUserControl Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecked="PasswordUserControl_PasswordChecked" />
                 </StackPanel>
             </DataTemplate>
         </ListView.ItemTemplate>
@@ -36,4 +38,4 @@
             </Style>
         </ListView.ItemContainerStyle>
     </ListView>
-</Page>
+</Page>

ModernKeePass/Pages/RecentDatabasesPage.xaml.cs

@@ -34,20 +34,17 @@ namespace ModernKeePass.Pages
             recentVm.RecentItems = new ObservableCollection<RecentItemVm>(
                 from entry in mru.Entries
                 select new RecentItemVm {Name = entry.Metadata, Token = entry.Token});
-            recentVm.NotifyPropertyChanged("RecentItems");
         }
 
         private async void RecentListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            var recentItem = e.AddedItems[0] as RecentItemVm;
+            var recentVm = DataContext as RecentVm;
+            if (recentVm.SelectedItem == null) return;
             var mru = StorageApplicationPermissions.MostRecentlyUsedList;
-            if (recentItem == null) return;
-            var file = await mru.GetFileAsync(recentItem.Token);
+            var file = await mru.GetFileAsync(recentVm.SelectedItem.Token);
 
             var app = (App)Application.Current;
             app.Database = new DatabaseHelper(file);
-            recentItem.PasswordVisibility = Visibility.Visible;
-            recentItem.NotifyPropertyChanged("PasswordVisibility");
         }
 
         private void PasswordUserControl_PasswordChecked(object sender, EventArgs e)

ModernKeePass/Pages/SaveDatabasePage.xaml.cs

@@ -41,7 +41,6 @@ namespace ModernKeePass.Pages
         private void UpdateDatabaseStatus(App app, DatabaseVm databaseVm)
         {
             databaseVm.IsOpen = app.Database.IsOpen;
-            databaseVm.NotifyPropertyChanged("IsOpen");
         }
     }
 }