Merge pull request #4 from shweaver-MSFT/newNotePages

shweaver-MSFT · web-flow · commit bebd9d03f715 · 2021-05-11T11:53:00.000-07:00
Added ability to create new note pages and navigate between them
diff --git a/ContosoNotes/Models/NotePageModel.cs b/ContosoNotes/Models/NotePageModel.cs
@@ -21,23 +21,24 @@ public string PageTitle
         public ObservableCollection<NoteItemModel> NoteItems 
         {
             get => _noteItems;
-            set => SetProperty(ref _noteItems, value);
+            private set => SetProperty(ref _noteItems, value);
         }
 
         [JsonIgnore]
-        public bool IsEmpty => _noteItems == null || _noteItems.Count == 0 || (_noteItems.Count == 1 && string.IsNullOrWhiteSpace(_noteItems[0].Text));
+        public bool IsEmpty => string.IsNullOrEmpty(_pageTitle) && (_noteItems.Count == 0 || (_noteItems.Count == 1 && string.IsNullOrWhiteSpace(_noteItems[0].Text)));
 
         public NotePageModel()
         {
             Id = Guid.NewGuid().ToString();
-            NoteItems = new ObservableCollection<NoteItemModel>();
+            _pageTitle = string.Empty;
+            _noteItems = new ObservableCollection<NoteItemModel>();
         }
 
         public NotePageModel(string id = null, string pageTitle = null, IEnumerable<NoteItemModel> noteItems = null)
         {
             Id = id ?? Guid.NewGuid().ToString();
-            PageTitle = pageTitle;
-            NoteItems = noteItems != null ? new ObservableCollection<NoteItemModel>(noteItems) : new ObservableCollection<NoteItemModel>();
+            _pageTitle = pageTitle;
+            _noteItems = noteItems != null ? new ObservableCollection<NoteItemModel>(noteItems) : new ObservableCollection<NoteItemModel>();
         }
     }
 }
diff --git a/ContosoNotes/StorageManager.cs b/ContosoNotes/StorageManager.cs
@@ -119,9 +119,18 @@ public async Task<NotePageModel> GetNotePageAsync(NotesListItemModel notesListIt
         {
             var notePageFileName = GetNotePageFileName(notesListItemModel);
 
-            return _roamingStorageHelper != null
-                ? await _roamingStorageHelper.ReadFileAsync<NotePageModel>(notePageFileName)
-                : await _localStorageHelper.ReadFileAsync<NotePageModel>(notePageFileName);
+            if (_roamingStorageHelper != null)
+            {
+                try
+                {
+                    return await _roamingStorageHelper.ReadFileAsync<NotePageModel>(notePageFileName);
+                }
+                catch
+                {
+                }
+            }
+
+            return await _localStorageHelper.ReadFileAsync<NotePageModel>(notePageFileName);
         }
 
         private async Task<NotePageModel> GetCurrentNotePage(IObjectStorageHelper storageHelper, NotesListModel notesList)
diff --git a/ContosoNotes/UI/NotePageRenderer.xaml b/ContosoNotes/UI/NotePageRenderer.xaml
@@ -33,6 +33,7 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <TextBox
+            Name="TitleTextBox"
             VerticalAlignment="Center"
             BorderThickness="0"
             FontSize="16"
@@ -43,7 +44,6 @@
             Grid.Row="1"
             Name="NoteItemsListView"
             ItemTemplateSelector="{StaticResource NoteItemDataTemplateSelector}"
-            ItemsSource="{x:Bind NotePage.NoteItems, Mode=OneWay}"
             SelectionMode="None">
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListViewItem">
diff --git a/ContosoNotes/UI/NotePageRenderer.xaml.cs b/ContosoNotes/UI/NotePageRenderer.xaml.cs
@@ -7,6 +7,7 @@
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 
 namespace ContosoNotes.UI
@@ -28,6 +29,14 @@ private static void OnNotePageChanged(DependencyObject d, DependencyPropertyChan
                 if (e.NewValue is NotePageModel newNotePageModel)
                 {
                     newNotePageModel.NoteItems.CollectionChanged += notePageRenderer.OnNoteItemsCollectionChanged;
+                    notePageRenderer.NoteItemsListView.ItemsSource = newNotePageModel.NoteItems;
+
+                    notePageRenderer.TitleTextBox.SetBinding(TextBox.TextProperty, new Binding()
+                    {
+                        Source = newNotePageModel,
+                        Path = new PropertyPath(nameof(NotePageModel.PageTitle)),
+                        Mode = BindingMode.TwoWay
+                    });
                 }
             }
         }
diff --git a/ContosoNotes/Views/MainPage.xaml b/ContosoNotes/Views/MainPage.xaml
@@ -2,21 +2,21 @@
     x:Class="ContosoNotes.Views.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:graphcontrols="using:CommunityToolkit.Uwp.Graph.Controls"
     xmlns:local="using:ContosoNotes.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:ContosoNotes.Models"
-    xmlns:ui="using:ContosoNotes.UI" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:ui="using:ContosoNotes.UI" 
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" 
     d:DataContext="{d:DesignInstance Type=local:MainViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
 
     <Page.Resources>
         <x:Boolean x:Key="Boolean_True">True</x:Boolean>
         <x:Boolean x:Key="Boolean_False">False</x:Boolean>
-        
+
         <ui:LastSyncDateTimeConverter x:Key="LastSyncDateTimeConverter" />
 
         <Style x:Key="CustomButtonStyle" TargetType="Button">
@@ -64,18 +64,19 @@
                 </controls:SwitchPresenter>
             </Button>
 
-
             <StackPanel Grid.Column="1" Orientation="Horizontal">
                 <!--<Button Style="{StaticResource CustomButtonStyle}">
                     <Image Source="ms-appx:///Assets/Translate.png" />
                 </Button>
                 <Button Style="{StaticResource CustomButtonStyle}">
                     <Image Source="ms-appx:///Assets/Font.png" />
-                </Button>
-                <Button Style="{StaticResource CustomButtonStyle}">
+                </Button>-->
+                <Button
+                    Command="{x:Bind ViewModel.DeleteCurrentNotePageCommand}"
+                    Style="{StaticResource CustomButtonStyle}">
                     <Image Source="ms-appx:///Assets/Discard.png" />
                 </Button>
-                <Button Style="{StaticResource CustomButtonStyle}">
+                <!--<Button Style="{StaticResource CustomButtonStyle}">
                     <Image Source="ms-appx:///Assets/Attach.png" />
                 </Button>
                 <Button Style="{StaticResource CustomButtonStyle}">
@@ -103,7 +104,7 @@
         <!--  Notes list  -->
         <Grid
             Grid.Row="1"
-            Padding="20,0,0,12"
+            Padding="24,0,0,24"
             BorderBrush="#717171"
             BorderThickness="0,0,1,0"
             Visibility="{x:Bind ViewModel.IsPaneOpen, Mode=OneWay}"
@@ -115,7 +116,7 @@
 
             <!--  List of notes  -->
             <ListView 
-                Margin="0, 0, 4, 0"
+                SelectedIndex="{x:Bind ViewModel.CurrentNotesListItemIndex, Mode=TwoWay}"
                 ItemsSource="{x:Bind ViewModel.NotesList.Items, Mode=OneWay}">
                 <ListView.ItemTemplate>
                     <DataTemplate x:DataType="models:NotesListItemModel">
@@ -131,9 +132,17 @@
 
             <!--  Notes list footer panel  -->
             <StackPanel Grid.Row="1" Orientation="Horizontal">
-                <!--<Button Style="{StaticResource CustomButtonStyle}">
-                    <Image Source="ms-appx:///Assets/NewNote.png" />
-                </Button>-->
+                <controls:SwitchPresenter 
+                        VerticalAlignment="Bottom"
+                        Value="{x:Bind ViewModel.IsPaneOpen, Mode=OneWay}">
+                    <controls:Case Value="{StaticResource Boolean_True}">
+                        <Button 
+                            Style="{StaticResource CustomButtonStyle}"
+                            Command="{x:Bind ViewModel.CreateNotePageCommand}">
+                            <Image Source="ms-appx:///Assets/NewNote.png" />
+                        </Button>
+                    </controls:Case>
+                </controls:SwitchPresenter>
             </StackPanel>
         </Grid>
 
@@ -160,10 +169,18 @@
                 </Grid.ColumnDefinitions>
 
                 <StackPanel Orientation="Horizontal">
-                    <!--<Button Style="{StaticResource CustomButtonStyle}" Visibility="{x:Bind ViewModel.IsPaneOpen, Converter={StaticResource InverseBoolToVisibilityConverter}, Mode=OneWay}">
-                        <Image Source="ms-appx:///Assets/NewNote.png" />
-                    </Button>
-                    <Button Style="{StaticResource CustomButtonStyle}">
+                    <controls:SwitchPresenter 
+                        VerticalAlignment="Bottom"
+                        Value="{x:Bind ViewModel.IsPaneOpen, Mode=OneWay}">
+                        <controls:Case Value="{StaticResource Boolean_False}">
+                            <Button 
+                                Style="{StaticResource CustomButtonStyle}"
+                                Command="{x:Bind ViewModel.CreateNotePageCommand}">
+                                <Image Source="ms-appx:///Assets/NewNote.png" />
+                            </Button>
+                        </controls:Case>
+                    </controls:SwitchPresenter>
+                    <!--<Button Style="{StaticResource CustomButtonStyle}">
                         <Image Source="ms-appx:///Assets/Undo.png" />
                     </Button>
                     <Button Style="{StaticResource CustomButtonStyle}">
diff --git a/ContosoNotes/Views/MainViewModel.cs b/ContosoNotes/Views/MainViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -21,23 +21,24 @@ public string PageTitle`
`21`	`21`	`public ObservableCollection<NoteItemModel> NoteItems`
`22`	`22`	`{`
`23`	`23`	`get => _noteItems;`
`24`		`- set => SetProperty(ref _noteItems, value);`
	`24`	`+ private set => SetProperty(ref _noteItems, value);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`[JsonIgnore]`
`28`		`- public bool IsEmpty => _noteItems == null \|\| _noteItems.Count == 0 \|\| (_noteItems.Count == 1 && string.IsNullOrWhiteSpace(_noteItems[0].Text));`
	`28`	`+ public bool IsEmpty => string.IsNullOrEmpty(_pageTitle) && (_noteItems.Count == 0 \|\| (_noteItems.Count == 1 && string.IsNullOrWhiteSpace(_noteItems[0].Text)));`
`29`	`29`
`30`	`30`	`public NotePageModel()`
`31`	`31`	`{`
`32`	`32`	`Id = Guid.NewGuid().ToString();`
`33`		`- NoteItems = new ObservableCollection<NoteItemModel>();`
	`33`	`+ _pageTitle = string.Empty;`
	`34`	`+ _noteItems = new ObservableCollection<NoteItemModel>();`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`public NotePageModel(string id = null, string pageTitle = null, IEnumerable<NoteItemModel> noteItems = null)`
`37`	`38`	`{`
`38`	`39`	`Id = id ?? Guid.NewGuid().ToString();`
`39`		`- PageTitle = pageTitle;`
`40`		`- NoteItems = noteItems != null ? new ObservableCollection<NoteItemModel>(noteItems) : new ObservableCollection<NoteItemModel>();`
	`40`	`+ _pageTitle = pageTitle;`
	`41`	`+ _noteItems = noteItems != null ? new ObservableCollection<NoteItemModel>(noteItems) : new ObservableCollection<NoteItemModel>();`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Windows.System;`
`8`	`8`	`using Windows.UI.Xaml;`
`9`	`9`	`using Windows.UI.Xaml.Controls;`
	`10`	`+using Windows.UI.Xaml.Data;`
`10`	`11`	`using Windows.UI.Xaml.Input;`
`11`	`12`
`12`	`13`	`namespace ContosoNotes.UI`
`@@ -28,6 +29,14 @@ private static void OnNotePageChanged(DependencyObject d, DependencyPropertyChan`
`28`	`29`	`if (e.NewValue is NotePageModel newNotePageModel)`
`29`	`30`	`{`
`30`	`31`	`newNotePageModel.NoteItems.CollectionChanged += notePageRenderer.OnNoteItemsCollectionChanged;`
	`32`	`+ notePageRenderer.NoteItemsListView.ItemsSource = newNotePageModel.NoteItems;`
	`33`	`+`
	`34`	`+ notePageRenderer.TitleTextBox.SetBinding(TextBox.TextProperty, new Binding()`
	`35`	`+ {`
	`36`	`+ Source = newNotePageModel,`
	`37`	`+ Path = new PropertyPath(nameof(NotePageModel.PageTitle)),`
	`38`	`+ Mode = BindingMode.TwoWay`
	`39`	`+ });`
`31`	`40`	`}`
`32`	`41`	`}`
`33`	`42`	`}`