From b528affedc2bec4afadab4d1393b9ad65f03d9b9 Mon Sep 17 00:00:00 2001
From: Vojtech Sazel <vsazel@gmail.com>
Date: Thu, 15 Mar 2018 09:57:41 +0100
Subject: [PATCH] renaming files, for better understanding

---
 Example/Example/Example.csproj                       | 12 +++++++++---
 .../{RootPageMaster.xaml => DrawerMenuPage.xaml}     |  4 ++--
 ...RootPageMaster.xaml.cs => DrawerMenuPage.xaml.cs} | 12 ++++++------
 .../Views/{RootPageMenuItem.cs => MenuItem.cs}       |  5 ++---
 Example/Example/Views/Pages/HomePage.xaml            |  3 ++-
 Example/Example/Views/RootPage.xaml                  |  2 +-
 Example/Example/Views/RootPage.xaml.cs               |  9 ++++++---
 7 files changed, 28 insertions(+), 19 deletions(-)
 rename Example/Example/Views/{RootPageMaster.xaml => DrawerMenuPage.xaml} (93%)
 rename Example/Example/Views/{RootPageMaster.xaml.cs => DrawerMenuPage.xaml.cs} (71%)
 rename Example/Example/Views/{RootPageMenuItem.cs => MenuItem.cs} (83%)

diff --git a/Example/Example/Example.csproj b/Example/Example/Example.csproj
index f199a4e..e2d1f93 100644
--- a/Example/Example/Example.csproj
+++ b/Example/Example/Example.csproj
@@ -26,12 +26,18 @@
     <Compile Update="Views\Pages\HttpPage.xaml.cs">
       <DependentUpon>HttpPage.xaml</DependentUpon>
     </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Views\DrawerMenuPage.cs">
+      <DependentUpon>DrawerMenuPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Views\RootPageMaster.xaml.cs">
+      <DependentUpon>DrawerMenuPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Views\DrawerMenuPage.xaml.cs">
+      <DependentUpon>DrawerMenuPage.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="Views\RootPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
     <EmbeddedResource Update="Views\RootPageMaster.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
diff --git a/Example/Example/Views/RootPageMaster.xaml b/Example/Example/Views/DrawerMenuPage.xaml
similarity index 93%
rename from Example/Example/Views/RootPageMaster.xaml
rename to Example/Example/Views/DrawerMenuPage.xaml
index 1cd44ca..b7286ad 100644
--- a/Example/Example/Views/RootPageMaster.xaml
+++ b/Example/Example/Views/DrawerMenuPage.xaml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Example.Views.RootPageMaster"
+             x:Class="Example.Views.DrawerMenuPage"
              Title="Master">
   <StackLayout>
     <ListView x:Name="MenuItemsListView"
diff --git a/Example/Example/Views/RootPageMaster.xaml.cs b/Example/Example/Views/DrawerMenuPage.xaml.cs
similarity index 71%
rename from Example/Example/Views/RootPageMaster.xaml.cs
rename to Example/Example/Views/DrawerMenuPage.xaml.cs
index 05e974f..85d9ada 100644
--- a/Example/Example/Views/RootPageMaster.xaml.cs
+++ b/Example/Example/Views/DrawerMenuPage.xaml.cs
@@ -14,11 +14,11 @@
 namespace Example.Views
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class RootPageMaster : ContentPage
+    public partial class DrawerMenuPage : ContentPage
     {
         public ListView ListView;
 
-        public RootPageMaster()
+        public DrawerMenuPage()
         {
             InitializeComponent();
 
@@ -28,14 +28,14 @@ public RootPageMaster()
 
         class RootPageMasterViewModel : INotifyPropertyChanged
         {
-            public ObservableCollection<RootPageMenuItem> MenuItems { get; set; }
+            public ObservableCollection<MenuItem> MenuItems { get; set; }
             
             public RootPageMasterViewModel()
             {
-                MenuItems = new ObservableCollection<RootPageMenuItem>(new[]
+                MenuItems = new ObservableCollection<MenuItem>(new[]
                 {
-                    new RootPageMenuItem { Id = 0, Title = StringResources.NavHome, TargetType=typeof(HomePage) },
-                    new RootPageMenuItem { Id = 1, Title = StringResources.NavHttp, TargetType=typeof(HttpPage) },                  
+                    new MenuItem { Id = 0, Title = StringResources.NavHome, TargetType=typeof(HomePage) },
+                    new MenuItem { Id = 1, Title = StringResources.NavHttp, TargetType=typeof(HttpPage) },                  
                 });
             }
             
diff --git a/Example/Example/Views/RootPageMenuItem.cs b/Example/Example/Views/MenuItem.cs
similarity index 83%
rename from Example/Example/Views/RootPageMenuItem.cs
rename to Example/Example/Views/MenuItem.cs
index fc7f709..6afe05b 100644
--- a/Example/Example/Views/RootPageMenuItem.cs
+++ b/Example/Example/Views/MenuItem.cs
@@ -6,10 +6,9 @@
 
 namespace Example.Views
 {
-
-    public class RootPageMenuItem
+    public class MenuItem
     {
-        public RootPageMenuItem()
+        public MenuItem()
         {
             TargetType = typeof(Pages.HomePage);
         }
diff --git a/Example/Example/Views/Pages/HomePage.xaml b/Example/Example/Views/Pages/HomePage.xaml
index c0f8a6e..6e00a75 100644
--- a/Example/Example/Views/Pages/HomePage.xaml
+++ b/Example/Example/Views/Pages/HomePage.xaml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!-- this page is displayed on start as first page -->
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Example.Views.Pages.HomePage"
              Title="Detail">
   <StackLayout Padding="10">
-    <Label Text="This is a detail page. To get the 'triple' line icon on each platform add a icon to each platform and update the 'Master' page with an Icon that references it."/>
+    <Label Text="Welcome to AeroGear Xamarin Example!"/>
   </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Example/Example/Views/RootPage.xaml b/Example/Example/Views/RootPage.xaml
index 49cb0e1..556120f 100644
--- a/Example/Example/Views/RootPage.xaml
+++ b/Example/Example/Views/RootPage.xaml
@@ -5,7 +5,7 @@
              xmlns:masterpages="clr-namespace:Example.Views"     
              xmlns:pages="clr-namespace:Example.Views.Pages">
   <MasterDetailPage.Master>
-    <masterpages:RootPageMaster x:Name="MasterPage" />
+    <masterpages:DrawerMenuPage x:Name="DrawerMenuPage" />
   </MasterDetailPage.Master>
   <MasterDetailPage.Detail>
     <NavigationPage>
diff --git a/Example/Example/Views/RootPage.xaml.cs b/Example/Example/Views/RootPage.xaml.cs
index 1a83db6..c108a9f 100644
--- a/Example/Example/Views/RootPage.xaml.cs
+++ b/Example/Example/Views/RootPage.xaml.cs
@@ -15,12 +15,15 @@ public partial class RootPage : MasterDetailPage
         public RootPage()
         {
             InitializeComponent();
-            MasterPage.ListView.ItemSelected += ListView_ItemSelected;
+            DrawerMenuPage.ListView.ItemSelected += ListView_ItemSelected;
         }
 
+        /// <summary>
+        /// Replaces page when item is selected in the drawer menu.
+        /// </summary>
         private void ListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
         {
-            var item = e.SelectedItem as RootPageMenuItem;
+            var item = e.SelectedItem as MenuItem;
             if (item == null)
                 return;
 
@@ -30,7 +33,7 @@ private void ListView_ItemSelected(object sender, SelectedItemChangedEventArgs e
             Detail = new NavigationPage(page);
             IsPresented = false;
 
-            MasterPage.ListView.SelectedItem = null;
+            DrawerMenuPage.ListView.SelectedItem = null;
         }
     }
 }
\ No newline at end of file