Refactored to a common base class for all user controls

Issue #14
AutomatedArchitecture · Apr 13, 2017 · c142178 · c142178
1 parent e8f660e
commit c142178
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 64 deletions.
diff --git a/SirenOfShame.Uwp.Ui/Controls/BuildDefinitions.xaml b/SirenOfShame.Uwp.Ui/Controls/BuildDefinitions.xaml
@@ -1,11 +1,12 @@
-<UserControl
+<controls:UserControlBase
     x:Class="SirenOfShame.Uwp.Ui.Controls.BuildDefinition"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:converters="using:SirenOfShame.Uwp.Ui.Converters"
     xmlns:watcher="using:SirenOfShame.Uwp.Watcher.Watcher"
+    xmlns:controls="using:SirenOfShame.Uwp.Ui.Controls"
     mc:Ignorable="d"
     d:DesignHeight="300"
     d:DesignWidth="400">
@@ -62,4 +63,5 @@
             >
         </GridView>
     </Grid>
-</UserControl>
+</controls:UserControlBase>
+
diff --git a/SirenOfShame.Uwp.Ui/Controls/BuildDefinitions.xaml.cs b/SirenOfShame.Uwp.Ui/Controls/BuildDefinitions.xaml.cs
@@ -1,23 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
 
 namespace SirenOfShame.Uwp.Ui.Controls
 {
-    public sealed partial class BuildDefinition : UserControl
+    public sealed partial class BuildDefinition
     {
         public BuildDefinition()
         {

diff --git a/SirenOfShame.Uwp.Ui/Controls/Leaders.xaml b/SirenOfShame.Uwp.Ui/Controls/Leaders.xaml
@@ -1,11 +1,12 @@
-<UserControl
+<controls:UserControlBase
     x:Class="SirenOfShame.Uwp.Ui.Controls.Leaders"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:SirenOfShame.Uwp.Ui.Models"
     xmlns:converters="using:SirenOfShame.Uwp.Ui.Converters"
+    xmlns:controls="using:SirenOfShame.Uwp.Ui.Controls"
     mc:Ignorable="d"
     d:DesignHeight="300"
     d:DesignWidth="400">
@@ -74,4 +75,5 @@
             >
         </GridView>
     </Grid>
-</UserControl>
+</controls:UserControlBase>
+
diff --git a/SirenOfShame.Uwp.Ui/Controls/Leaders.xaml.cs b/SirenOfShame.Uwp.Ui/Controls/Leaders.xaml.cs
@@ -1,37 +1,18 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls;
 using SirenOfShame.Uwp.Ui.Views;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
-
 namespace SirenOfShame.Uwp.Ui.Controls
 {
     public sealed partial class Leaders
     {
         public Leaders()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         private void ListViewBase_OnItemClick(object sender, ItemClickEventArgs e)
         {
-            var page = FindParent<Page>();
-            page.Frame.Navigate(typeof(ViewUser));
-        }
-
-        private T FindParent<T>() where T : FrameworkElement
-        {
-            return FindParent<T>(this);
-        }
-
-        private T FindParent<T>(FrameworkElement element) where T : FrameworkElement
-        {
-            if (element == null) return default(T);
-            var parent = element.Parent as FrameworkElement;
-            var parentAsT = parent as T;
-            if (parentAsT != null)
-                return parentAsT;
-            return FindParent<T>(parent);
+            Navigate<ViewUser>();
         }
     }
 }
diff --git a/SirenOfShame.Uwp.Ui/Controls/News.xaml b/SirenOfShame.Uwp.Ui/Controls/News.xaml
@@ -1,11 +1,12 @@
-<UserControl
+<controls:UserControlBase
     x:Class="SirenOfShame.Uwp.Ui.Controls.News"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:SirenOfShame.Uwp.Ui.Models"
     xmlns:converters="using:SirenOfShame.Uwp.Ui.Converters"
+    xmlns:controls="using:SirenOfShame.Uwp.Ui.Controls"
     mc:Ignorable="d"
     d:DesignHeight="300"
     d:DesignWidth="400">
@@ -51,4 +52,5 @@
                 >
         </GridView>
     </Grid>
-</UserControl>
+</controls:UserControlBase>
+
diff --git a/SirenOfShame.Uwp.Ui/Controls/News.xaml.cs b/SirenOfShame.Uwp.Ui/Controls/News.xaml.cs
@@ -1,23 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
-
-namespace SirenOfShame.Uwp.Ui.Controls
+namespace SirenOfShame.Uwp.Ui.Controls
 {
-    public sealed partial class News : UserControl
+    public sealed partial class News
     {
         public News()
         {

diff --git a/SirenOfShame.Uwp.Ui/Controls/UserControlBase.cs b/SirenOfShame.Uwp.Ui/Controls/UserControlBase.cs
@@ -0,0 +1,29 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace SirenOfShame.Uwp.Ui.Controls
+{
+    public class UserControlBase : UserControl
+    {
+        private T FindParent<T>() where T : FrameworkElement
+        {
+            return FindParent<T>(this);
+        }
+
+        private T FindParent<T>(FrameworkElement element) where T : FrameworkElement
+        {
+            if (element == null) return default(T);
+            var parent = element.Parent as FrameworkElement;
+            var parentAsT = parent as T;
+            if (parentAsT != null)
+                return parentAsT;
+            return FindParent<T>(parent);
+        }
+
+        protected void Navigate<T>()
+        {
+            var page = FindParent<Page>();
+            page.Frame.Navigate(typeof(T));
+        }
+    }
+}
diff --git a/SirenOfShame.Uwp.Ui/SirenOfShame.Uwp.Ui.csproj b/SirenOfShame.Uwp.Ui/SirenOfShame.Uwp.Ui.csproj
@@ -101,6 +101,7 @@
     <Compile Include="Controls\BuildDefinitions.xaml.cs">
       <DependentUpon>BuildDefinitions.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\UserControlBase.cs" />
     <Compile Include="Controls\Leaders.xaml.cs">
       <DependentUpon>Leaders.xaml</DependentUpon>
     </Compile>