FInished with initial

devildog · Sep 21, 2016 · 5647cf6 · 5647cf6
1 parent 3012bd8
commit 5647cf6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/Samples/MultiplePageHeaders/ViewModels/DetailPageViewModel.cs b/Samples/MultiplePageHeaders/ViewModels/DetailPageViewModel.cs
@@ -12,14 +12,6 @@ namespace MultiplePageHeaders.ViewModels
 {
     public class DetailPageViewModel : ViewModelBase
     {
-        public DetailPageViewModel()
-        {
-            if (Windows.ApplicationModel.DesignMode.DesignModeEnabled)
-            {
-                Value = "Designtime value";
-            }
-        }
-
         private string _Value = "Default";
         public string Value { get { return _Value; } set { Set(ref _Value, value); } }
 
@@ -29,19 +21,9 @@ public override async Task OnNavigatedToAsync(object parameter, NavigationMode m
             await Task.CompletedTask;
         }
 
-        public override async Task OnNavigatedFromAsync(IDictionary<string, object> suspensionState, bool suspending)
-        {
-            if (suspending)
-            {
-                suspensionState[nameof(Value)] = Value;
-            }
-            await Task.CompletedTask;
-        }
-
-        public override async Task OnNavigatingFromAsync(NavigatingEventArgs args)
+        public async void Test()
         {
-            args.Cancel = false;
-            await Task.CompletedTask;
+            await NavigationService.NavigateAsync(typeof(Views.DetailPage), Value + " +");
         }
     }
 }

diff --git a/Samples/MultiplePageHeaders/Views/ContainerPage.xaml.cs b/Samples/MultiplePageHeaders/Views/ContainerPage.xaml.cs
@@ -10,14 +10,20 @@ public ContainerPage()
             this.InitializeComponent();
         }
 
-        private void Frame1_Loaded(object sender, RoutedEventArgs e)
+        private async void Frame1_Loaded(object sender, RoutedEventArgs e)
         {
-
+            var frame = sender as Frame;
+            var current = Template10.Common.BootStrapper.Current;
+            var nav = current.NavigationServiceFactory(Template10.Common.BootStrapper.BackButton.Ignore, Template10.Common.BootStrapper.ExistingContent.Exclude, frame);
+            await nav.NavigateAsync(typeof(DetailPage), "Frame 1");
         }
 
-        private void Frame2_Loaded(object sender, RoutedEventArgs e)
+        private async void Frame2_Loaded(object sender, RoutedEventArgs e)
         {
-
+            var frame = sender as Frame;
+            var current = Template10.Common.BootStrapper.Current;
+            var nav = current.NavigationServiceFactory(Template10.Common.BootStrapper.BackButton.Ignore, Template10.Common.BootStrapper.ExistingContent.Exclude, frame);
+            await nav.NavigateAsync(typeof(DetailPage), "Frame 2");
         }
     }
 }
diff --git a/Samples/MultiplePageHeaders/Views/DetailPage.xaml b/Samples/MultiplePageHeaders/Views/DetailPage.xaml
@@ -50,6 +50,7 @@
             <StackPanel>
                 <TextBlock Style="{StaticResource TitleTextBlockStyle}" Text="You passed:" />
                 <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{x:Bind ViewModel.Value, Mode=OneWay, FallbackValue=DesigntimeValue}" />
+                <Button Click="{x:Bind ViewModel.Test}">Test</Button>
             </StackPanel>
         </ScrollViewer>