From 658517540edff55b23b2df3627a6b20bd2fdd136 Mon Sep 17 00:00:00 2001
From: MeshackMusundi <meshackmusundi@gmail.com>
Date: Tue, 25 Aug 2020 23:00:17 +0300
Subject: [PATCH] Update to match article

---
 App.xaml           | 18 ++++++++++++++++++
 MainWindow.xaml    | 13 ++-----------
 MainWindow.xaml.cs |  4 ----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/App.xaml b/App.xaml
index 3ee4aa1..56c63c9 100644
--- a/App.xaml
+++ b/App.xaml
@@ -2,7 +2,9 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:CompactNavigationMenu"
+             xmlns:views="clr-namespace:CompactNavigationMenu.Views"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             xmlns:system="clr-namespace:System;assembly=System.Runtime"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <SolidColorBrush x:Key="PrimaryDarkBrush" Color="#FF0D2738"/>
@@ -92,5 +94,21 @@
                 </DataTrigger>
             </DataTemplate.Triggers>
         </DataTemplate>
+
+        <x:Array x:Key="NavigationMenuItems" Type="system:String">
+            <system:String>Home</system:String>
+            <system:String>Email</system:String>
+            <system:String>Cloud</system:String>
+        </x:Array>
+
+        <DataTemplate x:Key="HomeViewTemplate">
+            <views:HomeView/>
+        </DataTemplate>
+        <DataTemplate x:Key="EmailViewTemplate">
+            <views:EmailView/>
+        </DataTemplate>
+        <DataTemplate x:Key="CloudViewTemplate">
+            <views:CloudView/>
+        </DataTemplate>
     </Application.Resources>
 </Application>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 7c95f08..84a8858 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -10,16 +10,6 @@
         Title="Nav" WindowStartupLocation="CenterScreen">
 
     <Window.Resources>
-        <DataTemplate x:Key="HomeViewTemplate">
-            <views:HomeView/>
-        </DataTemplate>
-        <DataTemplate x:Key="EmailViewTemplate">
-            <views:EmailView/>
-        </DataTemplate>
-        <DataTemplate x:Key="CloudViewTemplate">
-            <views:CloudView/>
-        </DataTemplate>
-
         <Style x:Key="NavigationContentStyle" TargetType="ContentControl">
             <Setter Property="ContentTemplate" Value="{StaticResource HomeViewTemplate}"/>
             <Style.Triggers>
@@ -43,8 +33,9 @@
 
         <ListBox x:Name="NavigationMenuListBox" 
                  Style="{StaticResource NavigationListBoxStyle}"
+                 ItemContainerStyle="{DynamicResource NavigationListBoxItemStyle}"
                  ItemTemplate="{DynamicResource NavigationDataTemplate}"
-                 ItemContainerStyle="{DynamicResource NavigationListBoxItemStyle}"/>
+                 ItemsSource="{StaticResource NavigationMenuItems}"/>
 
         <ContentControl Grid.Column="1" Style="{StaticResource NavigationContentStyle}"/>
     </Grid>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 505fe06..4f1503c 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -10,10 +10,6 @@ namespace CompactNavigationMenu
         public MainWindow()
         {
             InitializeComponent();
-
-            NavigationMenuListBox.Items.Add("Home");
-            NavigationMenuListBox.Items.Add("Email");
-            NavigationMenuListBox.Items.Add("Cloud");
         }
     }
 }