Merge branch 'master' of https://github.com/thimmy687/MaterialDesignInXamlToolkit into thimmy687-master

ButchersBoy · ButchersBoy · commit 4ab8b587809b · 2017-04-19T11:49:04.000+01:00
diff --git a/MainDemo.Wpf/App.config b/MainDemo.Wpf/App.config
@@ -3,4 +3,7 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
+  <appSettings>
+    <add key="GitHub" value="https://github.com/ButchersBoy/MaterialDesignInXamlToolkit"/>
+  </appSettings>
 </configuration>
diff --git a/MainDemo.Wpf/Domain/DocumentationLink.cs b/MainDemo.Wpf/Domain/DocumentationLink.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Configuration;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -22,14 +23,14 @@ public DocumentationLink(DocumentationLinkType type, string url, string label)
         public static DocumentationLink WikiLink(string page, string label)
         {
             return new DocumentationLink(DocumentationLinkType.Wiki,
-                "https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/wiki/" + page, label);
+                $"{ConfigurationManager.AppSettings["GitHub"]}/wiki/" + page, label);
         }
 
         public static DocumentationLink StyleLink(string nameChunk)
         {            
             return new DocumentationLink(
                 DocumentationLinkType.StyleSource,
-                $"https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/blob/master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.{nameChunk}.xaml",
+                $"{ConfigurationManager.AppSettings["GitHub"]}/blob/master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.{nameChunk}.xaml",
                 nameChunk);
         }
 
@@ -39,7 +40,7 @@ public static DocumentationLink ApiLink<TClass>(string subNamespace)
 
             return new DocumentationLink(
                 DocumentationLinkType.ControlSource,
-                $"https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/blob/master/MaterialDesignThemes.Wpf/{subNamespace}/{typeName}.cs",
+                $"{ConfigurationManager.AppSettings["GitHub"]}/blob/master/MaterialDesignThemes.Wpf/{subNamespace}/{typeName}.cs",
                 typeName);
         }
 
@@ -50,7 +51,7 @@ public static DocumentationLink ApiLink<TClass>()
 
             return new DocumentationLink(
                 DocumentationLinkType.ControlSource,
-                $"https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/blob/master/MaterialDesignThemes.Wpf/{typeName}.cs",
+                $"{ConfigurationManager.AppSettings["GitHub"]}/blob/master/MaterialDesignThemes.Wpf/{typeName}.cs",
                 typeName);
         }
 
@@ -67,7 +68,7 @@ public static DocumentationLink DemoPageLink<TDemoPage>(string label)
 
             return new DocumentationLink(
                 DocumentationLinkType.DemoPageSource,
-                $"https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/blob/master/MainDemo.Wpf/{typeof(TDemoPage).Name}.{ext}",
+                $"{ConfigurationManager.AppSettings["GitHub"]}/blob/master/MainDemo.Wpf/{typeof(TDemoPage).Name}.{ext}",
                 label ?? typeof(TDemoPage).Name);
         }
 
diff --git a/MainDemo.Wpf/Domain/ListsAndGridsViewModel.cs b/MainDemo.Wpf/Domain/ListsAndGridsViewModel.cs
@@ -2,9 +2,9 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using System.Windows.Controls;
+using MaterialDesignColors.WpfExample.Domain;
 
-namespace MaterialDesignColors.WpfExample.Domain
+namespace MaterialDesignDemo.Domain
 {
     public class ListsAndGridsViewModel : INotifyPropertyChanged
     {
@@ -36,7 +36,7 @@ public bool? IsAllItems3Selected
             }
         }
 
-        private void SelectAll(bool select, IEnumerable<SelectableViewModel> models)
+        private static void SelectAll(bool select, IEnumerable<SelectableViewModel> models)
         {
             foreach (var model in models)
             {
@@ -70,28 +70,16 @@ private static ObservableCollection<SelectableViewModel> CreateData()
             };
         }
 
-        public ObservableCollection<SelectableViewModel> Items1
-        {
-            get { return _items1; }
-        }
+        public ObservableCollection<SelectableViewModel> Items1 => _items1;
+        public ObservableCollection<SelectableViewModel> Items2 => _items2;
 
-        public ObservableCollection<SelectableViewModel> Items2
-        {
-            get { return _items2; }
-        }
-
-        public ObservableCollection<SelectableViewModel> Items3
-        {
-            get { return _items3; }
-        }
+        public ObservableCollection<SelectableViewModel> Items3 => _items3;
 
         public event PropertyChangedEventHandler PropertyChanged;
 
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            if (PropertyChanged != null)
-                PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
-            //PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         public IEnumerable<string> Foods
diff --git a/MainDemo.Wpf/Domain/MainWindowViewModel.cs b/MainDemo.Wpf/Domain/MainWindowViewModel.cs
@@ -1,4 +1,5 @@
-﻿using MaterialDesignDemo;
+﻿using System.Configuration;
+using MaterialDesignDemo;
 using MaterialDesignDemo.Domain;
 using MaterialDesignThemes.Wpf;
 using MaterialDesignThemes.Wpf.Transitions;
@@ -15,7 +16,7 @@ public MainWindowViewModel()
                 new DemoItem("Home", new Home(),
                     new []
                     {
-                        new DocumentationLink(DocumentationLinkType.Wiki, "https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/wiki", "WIKI"),
+                        new DocumentationLink(DocumentationLinkType.Wiki, $"{ConfigurationManager.AppSettings["GitHub"]}/wiki", "WIKI"),
                         DocumentationLink.DemoPageLink<Home>()
                     }
                 ),
diff --git a/MainDemo.Wpf/Home.xaml.cs b/MainDemo.Wpf/Home.xaml.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
@@ -28,7 +29,7 @@ public Home()
 
         private void GitHubButton_OnClick(object sender, RoutedEventArgs e)
         {
-            Process.Start("https://github.com/ButchersBoy/MaterialDesignInXamlToolkit");
+            Process.Start(ConfigurationManager.AppSettings["GitHub"]);
         }
 
         private void TwitterButton_OnClick(object sender, RoutedEventArgs e)
diff --git a/MainDemo.Wpf/MaterialDesignDemo.csproj b/MainDemo.Wpf/MaterialDesignDemo.csproj
@@ -53,6 +53,7 @@
     </Compile>
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -99,7 +100,7 @@
     <Compile Include="Domain\NotifyPropertyChangedExtension.cs" />
     <Compile Include="Domain\DemoItem.cs" />
     <Compile Include="Domain\DialogsViewModel.cs" />
-    <Compile Include="Domain\ListFieldsViewModel.cs" />
+    <Compile Include="Domain\ListsAndGridsViewModel.cs" />
     <Compile Include="Domain\Sample4Dialog.xaml.cs">
       <DependentUpon>Sample4Dialog.xaml</DependentUpon>
     </Compile>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Configuration;`
`2`	`3`	`using System.Windows;`
`3`	`4`	`using System.Windows.Controls;`
`4`	`5`	`using System.Windows.Input;`
`@@ -22,14 +23,14 @@ public DocumentationLink(DocumentationLinkType type, string url, string label)`
`22`	`23`	`public static DocumentationLink WikiLink(string page, string label)`
`23`	`24`	`{`
`24`	`25`	`return new DocumentationLink(DocumentationLinkType.Wiki,`
`25`		`- "https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/wiki/" + page, label);`
	`26`	`+ $"{ConfigurationManager.AppSettings["GitHub"]}/wiki/" + page, label);`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public static DocumentationLink StyleLink(string nameChunk)`
`29`	`30`	`{`
`30`	`31`	`return new DocumentationLink(`
`31`	`32`	`DocumentationLinkType.StyleSource,`
`32`		`- $"https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/blob/master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.{nameChunk}.xaml",`
	`33`	`+ $"{ConfigurationManager.AppSettings["GitHub"]}/blob/master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.{nameChunk}.xaml",`
`33`	`34`	`nameChunk);`
`34`	`35`	`}`
`35`	`36`
`@@ -39,7 +40,7 @@ public static DocumentationLink ApiLink<TClass>(string subNamespace)`
`39`	`40`
`40`	`41`	`return new DocumentationLink(`
`41`	`42`	`DocumentationLinkType.ControlSource,`
`42`		`- $"https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/blob/master/MaterialDesignThemes.Wpf/{subNamespace}/{typeName}.cs",`
	`43`	`+ $"{ConfigurationManager.AppSettings["GitHub"]}/blob/master/MaterialDesignThemes.Wpf/{subNamespace}/{typeName}.cs",`
`43`	`44`	`typeName);`
`44`	`45`	`}`
`45`	`46`
`@@ -50,7 +51,7 @@ public static DocumentationLink ApiLink<TClass>()`
`50`	`51`
`51`	`52`	`return new DocumentationLink(`
`52`	`53`	`DocumentationLinkType.ControlSource,`
`53`		`- $"https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/blob/master/MaterialDesignThemes.Wpf/{typeName}.cs",`
	`54`	`+ $"{ConfigurationManager.AppSettings["GitHub"]}/blob/master/MaterialDesignThemes.Wpf/{typeName}.cs",`
`54`	`55`	`typeName);`
`55`	`56`	`}`
`56`	`57`
`@@ -67,7 +68,7 @@ public static DocumentationLink DemoPageLink<TDemoPage>(string label)`
`67`	`68`
`68`	`69`	`return new DocumentationLink(`
`69`	`70`	`DocumentationLinkType.DemoPageSource,`
`70`		`- $"https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/blob/master/MainDemo.Wpf/{typeof(TDemoPage).Name}.{ext}",`
	`71`	`+ $"{ConfigurationManager.AppSettings["GitHub"]}/blob/master/MainDemo.Wpf/{typeof(TDemoPage).Name}.{ext}",`
`71`	`72`	`label ?? typeof(TDemoPage).Name);`
`72`	`73`	`}`
`73`	`74`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`using System.Collections.ObjectModel;`
`3`	`3`	`using System.ComponentModel;`
`4`	`4`	`using System.Runtime.CompilerServices;`
`5`		`-using System.Windows.Controls;`
	`5`	`+using MaterialDesignColors.WpfExample.Domain;`
`6`	`6`
`7`		`-namespace MaterialDesignColors.WpfExample.Domain`
	`7`	`+namespace MaterialDesignDemo.Domain`
`8`	`8`	`{`
`9`	`9`	`public class ListsAndGridsViewModel : INotifyPropertyChanged`
`10`	`10`	`{`
`@@ -36,7 +36,7 @@ public bool? IsAllItems3Selected`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- private void SelectAll(bool select, IEnumerable<SelectableViewModel> models)`
	`39`	`+ private static void SelectAll(bool select, IEnumerable<SelectableViewModel> models)`
`40`	`40`	`{`
`41`	`41`	`foreach (var model in models)`
`42`	`42`	`{`
`@@ -70,28 +70,16 @@ private static ObservableCollection<SelectableViewModel> CreateData()`
`70`	`70`	`};`
`71`	`71`	`}`
`72`	`72`
`73`		`- public ObservableCollection<SelectableViewModel> Items1`
`74`		`- {`
`75`		`- get { return _items1; }`
`76`		`- }`
	`73`	`+ public ObservableCollection<SelectableViewModel> Items1 => _items1;`
	`74`	`+ public ObservableCollection<SelectableViewModel> Items2 => _items2;`
`77`	`75`
`78`		`- public ObservableCollection<SelectableViewModel> Items2`
`79`		`- {`
`80`		`- get { return _items2; }`
`81`		`- }`
`82`		`-`
`83`		`- public ObservableCollection<SelectableViewModel> Items3`
`84`		`- {`
`85`		`- get { return _items3; }`
`86`		`- }`
	`76`	`+ public ObservableCollection<SelectableViewModel> Items3 => _items3;`
`87`	`77`
`88`	`78`	`public event PropertyChangedEventHandler PropertyChanged;`
`89`	`79`
`90`	`80`	`protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
`91`	`81`	`{`
`92`		`- if (PropertyChanged != null)`
`93`		`- PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`94`		`- //PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
	`82`	`+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`95`	`83`	`}`
`96`	`84`
`97`	`85`	`public IEnumerable<string> Foods`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Configuration;`
`3`	`4`	`using System.Diagnostics;`
`4`	`5`	`using System.Linq;`
`5`	`6`	`using System.Text;`
`@@ -28,7 +29,7 @@ public Home()`
`28`	`29`
`29`	`30`	`private void GitHubButton_OnClick(object sender, RoutedEventArgs e)`
`30`	`31`	`{`
`31`		`- Process.Start("https://github.com/ButchersBoy/MaterialDesignInXamlToolkit");`
	`32`	`+ Process.Start(ConfigurationManager.AppSettings["GitHub"]);`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`private void TwitterButton_OnClick(object sender, RoutedEventArgs e)`