Merge branch 'release/0.10.5'

TheSylence · Nov 11, 2017 · 64039f3 · 64039f3
2 parents 18c9269 + 31831e2
commit 64039f3
Show file tree

Hide file tree

Showing 259 changed files with 3,314 additions and 4,466 deletions.
diff --git a/Twice/App.config b/Twice/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />

diff --git a/Twice/App.xaml b/Twice/App.xaml
@@ -15,28 +15,46 @@
 				<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
 
 				<!-- Material Design -->
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.BlueGrey.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Blue.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.BlueGrey.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Blue.xaml" />
 
 				<!-- Material Design: MahApps Compatibility -->
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />
 
 				<!-- Material Deisng Items -->
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.CheckBox.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListBox.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PopupBox.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RadioButton.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ComboBox.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Font.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.DatePicker.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TimePicker.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.CheckBox.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListBox.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PopupBox.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RadioButton.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ComboBox.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Font.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.DatePicker.xaml" />
+				<ResourceDictionary
+					Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TimePicker.xaml" />
 
 				<ResourceDictionary Source="Resources/Converters.xaml" />
 				<ResourceDictionary Source="Resources/DataTemplates.xaml" />
@@ -86,8 +104,8 @@
 			</Style>
 
 			<Style TargetType="{x:Type TabControl}">
-				<Setter Property="Background" Value="{StaticResource MaterialDesignPaper}"/>
-				<Setter Property="BorderBrush" Value="Transparent"/>
+				<Setter Property="Background" Value="{StaticResource MaterialDesignPaper}" />
+				<Setter Property="BorderBrush" Value="Transparent" />
 			</Style>
 
 			<viewModels:ViewModelLocator x:Key="Locator" />

diff --git a/Twice/AsyncErrorHandler.cs b/Twice/AsyncErrorHandler.cs
@@ -1,6 +1,6 @@
-using Anotar.NLog;
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
+using Anotar.NLog;
 
 // ReSharper disable UnusedMember.Global
 

diff --git a/Twice/Attributes/IconAttribute.cs b/Twice/Attributes/IconAttribute.cs
@@ -1,6 +1,6 @@
-using MaterialDesignThemes.Wpf;
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
+using MaterialDesignThemes.Wpf;
 
 namespace Twice.Attributes
 {

diff --git a/Twice/Behaviors/AutoComplete.cs b/Twice/Behaviors/AutoComplete.cs
@@ -1,5 +1,4 @@
-using MaterialDesignThemes.Wpf;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -10,11 +9,12 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
+using MaterialDesignThemes.Wpf;
 
 namespace Twice.Behaviors
 {
 	/// <summary>
-	///  Behavior that can be attached to a TextBox to allow autocomplete functionality. 
+	///     Behavior that can be attached to a TextBox to allow autocomplete functionality.
 	/// </summary>
 	[ExcludeFromCodeCoverage]
 	internal class AutoComplete : BehaviorBase<TextBox>
@@ -37,13 +37,6 @@ public AutoComplete()
 			AutoCompletePopup.Closed += AutoCompletePopup_Closed;
 		}
 
-		private enum SourceMode
-		{
-			None,
-			Hashtags,
-			Users
-		}
-
 		protected override void OnAttached()
 		{
 			AssociatedObject.PreviewTextInput += AssociatedObject_TextInput;
@@ -202,17 +195,12 @@ private void InsertText()
 			AssociatedObject.CaretIndex = currentCaret + insertText.Length;
 		}
 
-		public IEnumerable<string> Hashtags
-		{
-			get { return (IEnumerable<string>)GetValue( ItemsSourceProperty ); }
-			set { SetValue( ItemsSourceProperty, value ); }
-		}
+		public static readonly DependencyProperty ItemsSourceProperty =
+			DependencyProperty.Register( "Hashtags", typeof( IEnumerable<string> ), typeof( AutoComplete ),
+				new PropertyMetadata( new string[] { } ) );
 
-		public IEnumerable<string> Users
-		{
-			get { return (IEnumerable<string>)GetValue( UsersProperty ); }
-			set { SetValue( UsersProperty, value ); }
-		}
+		public static readonly DependencyProperty UsersProperty =
+			DependencyProperty.Register( "Users", typeof( IEnumerable<string> ), typeof( AutoComplete ), new PropertyMetadata( new string[] { } ) );
 
 		private IEnumerable<string> FilteredHashtags
 		{
@@ -246,16 +234,28 @@ private IEnumerable<string> FilteredUsers
 			}
 		}
 
-		public static readonly DependencyProperty ItemsSourceProperty =
-			DependencyProperty.Register( "Hashtags", typeof( IEnumerable<string> ), typeof( AutoComplete ),
-				new PropertyMetadata( new string[] { } ) );
+		public IEnumerable<string> Hashtags
+		{
+			get => (IEnumerable<string>)GetValue( ItemsSourceProperty );
+			set => SetValue( ItemsSourceProperty, value );
+		}
 
-		public static readonly DependencyProperty UsersProperty =
-			DependencyProperty.Register( "Users", typeof( IEnumerable<string> ), typeof( AutoComplete ), new PropertyMetadata( new string[] { } ) );
+		public IEnumerable<string> Users
+		{
+			get => (IEnumerable<string>)GetValue( UsersProperty );
+			set => SetValue( UsersProperty, value );
+		}
 
 		private readonly ListView AutoCompleteBox;
 		private readonly Popup AutoCompletePopup;
 		private string FilterText;
 		private SourceMode Mode = SourceMode.None;
+
+		private enum SourceMode
+		{
+			None,
+			Hashtags,
+			Users
+		}
 	}
 }
diff --git a/Twice/Behaviors/BehaviorBase.cs b/Twice/Behaviors/BehaviorBase.cs
@@ -5,7 +5,7 @@
 namespace Twice.Behaviors
 {
 	/// <summary>
-	///  Base class for a behavior that handles proper unloading. 
+	///     Base class for a behavior that handles proper unloading.
 	/// </summary>
 	/// <typeparam name="T"></typeparam>
 	public abstract class BehaviorBase<T> : Behavior<T> where T : FrameworkElement

diff --git a/Twice/Behaviors/CallbackOnLoad.cs b/Twice/Behaviors/CallbackOnLoad.cs
@@ -5,7 +5,7 @@
 namespace Twice.Behaviors
 {
 	/// <summary>
-	///  Offers the ability to execute async code when a FrameworkElement has been loaded. 
+	///     Offers the ability to execute async code when a FrameworkElement has been loaded.
 	/// </summary>
 	[ExcludeFromCodeCoverage]
 	internal class CallbackOnLoad : BehaviorBase<FrameworkElement>
@@ -23,29 +23,29 @@ protected override void OnAttached()
 			};
 		}
 
+		public static readonly DependencyProperty CallbackProperty = DependencyProperty.Register( "Callback",
+			typeof( ILoadCallback ), typeof( CallbackOnLoad ),
+			new PropertyMetadata( null ) );
+
+		public static readonly DependencyProperty DataProperty =
+			DependencyProperty.Register( "Data", typeof( object ), typeof( CallbackOnLoad ), new PropertyMetadata( null ) );
+
 		/// <summary>
-		///  Handler to call when the element was loaded 
+		///     Handler to call when the element was loaded
 		/// </summary>
 		public ILoadCallback Callback
 		{
-			get { return (ILoadCallback)GetValue( CallbackProperty ); }
-			set { SetValue( CallbackProperty, value ); }
+			get => (ILoadCallback)GetValue( CallbackProperty );
+			set => SetValue( CallbackProperty, value );
 		}
 
 		/// <summary>
-		///  Data to pass to <see cref="ILoadCallback.OnLoad(object)" /> 
+		///     Data to pass to <see cref="ILoadCallback.OnLoad(object)" />
 		/// </summary>
 		public object Data
 		{
-			get { return GetValue( DataProperty ); }
-			set { SetValue( DataProperty, value ); }
+			get => GetValue( DataProperty );
+			set => SetValue( DataProperty, value );
 		}
-
-		public static readonly DependencyProperty CallbackProperty = DependencyProperty.Register( "Callback",
-			typeof( ILoadCallback ), typeof( CallbackOnLoad ),
-			new PropertyMetadata( null ) );
-
-		public static readonly DependencyProperty DataProperty =
-			DependencyProperty.Register( "Data", typeof( object ), typeof( CallbackOnLoad ), new PropertyMetadata( null ) );
 	}
 }
diff --git a/Twice/Behaviors/CenterAfterRender.cs b/Twice/Behaviors/CenterAfterRender.cs
@@ -3,7 +3,7 @@
 
 namespace Twice.Behaviors
 {
-	class CenterAfterRender : BehaviorBase<Window>
+	internal class CenterAfterRender : BehaviorBase<Window>
 	{
 		protected override void OnAttached()
 		{

diff --git a/Twice/Behaviors/ClickHandler.cs b/Twice/Behaviors/ClickHandler.cs
@@ -5,7 +5,7 @@
 namespace Twice.Behaviors
 {
 	/// <summary>
-	///  Executes a command when a FrameworkElement has been clicked. 
+	///     Executes a command when a FrameworkElement has been clicked.
 	/// </summary>
 	/// <remarks> Essentially this is a nicer way than using EventToCommand for the click command </remarks>
 	[ExcludeFromCodeCoverage]
@@ -30,28 +30,28 @@ private void AssociatedObject_MouseDown( object sender, MouseButtonEventArgs e )
 			}
 		}
 
+		public static readonly DependencyProperty CommandParameterProperty =
+			DependencyProperty.Register( "CommandParameter", typeof( object ), typeof( ClickHandler ), new PropertyMetadata( null ) );
+
+		public static readonly DependencyProperty CommandProperty =
+			DependencyProperty.Register( "Command", typeof( ICommand ), typeof( ClickHandler ), new PropertyMetadata( null ) );
+
 		/// <summary>
-		///  The command to execute 
+		///     The command to execute
 		/// </summary>
 		public ICommand Command
 		{
-			get { return (ICommand)GetValue( CommandProperty ); }
-			set { SetValue( CommandProperty, value ); }
+			get => (ICommand)GetValue( CommandProperty );
+			set => SetValue( CommandProperty, value );
 		}
 
 		/// <summary>
-		///  Parameter that will be passed to the command 
+		///     Parameter that will be passed to the command
 		/// </summary>
 		public object CommandParameter
 		{
-			get { return GetValue( CommandParameterProperty ); }
-			set { SetValue( CommandParameterProperty, value ); }
+			get => GetValue( CommandParameterProperty );
+			set => SetValue( CommandParameterProperty, value );
 		}
-
-		public static readonly DependencyProperty CommandParameterProperty =
-							DependencyProperty.Register( "CommandParameter", typeof( object ), typeof( ClickHandler ), new PropertyMetadata( null ) );
-
-		public static readonly DependencyProperty CommandProperty =
-			DependencyProperty.Register( "Command", typeof( ICommand ), typeof( ClickHandler ), new PropertyMetadata( null ) );
 	}
 }
diff --git a/Twice/Behaviors/CloseableFlyout.cs b/Twice/Behaviors/CloseableFlyout.cs
@@ -1,6 +1,6 @@
-using MahApps.Metro.Controls;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Windows;
+using MahApps.Metro.Controls;
 using Twice.ViewModels;
 
 namespace Twice.Behaviors

diff --git a/Twice/Behaviors/CloseableView.cs b/Twice/Behaviors/CloseableView.cs
@@ -6,7 +6,7 @@
 namespace Twice.Behaviors
 {
 	/// <summary>
-	///  Allows a window to be closed from the window's DataContext 
+	///     Allows a window to be closed from the window's DataContext
 	/// </summary>
 	[ExcludeFromCodeCoverage]
 	internal class CloseableView : BehaviorBase<Window>

diff --git a/Twice/Behaviors/ColumnHeaderHandler.cs b/Twice/Behaviors/ColumnHeaderHandler.cs
@@ -21,14 +21,14 @@ private void AssociatedObject_MouseLeftButtonUp( object sender, MouseButtonEvent
 			ActionDispatcher?.OnHeaderClicked();
 		}
 
+		public static readonly DependencyProperty ActionDispatcherProperty =
+			DependencyProperty.Register( "ActionDispatcher", typeof( IColumnActionDispatcher ), typeof( ColumnHeaderHandler ),
+				new PropertyMetadata( null ) );
+
 		public IColumnActionDispatcher ActionDispatcher
 		{
-			get { return (IColumnActionDispatcher)GetValue( ActionDispatcherProperty ); }
-			set { SetValue( ActionDispatcherProperty, value ); }
+			get => (IColumnActionDispatcher)GetValue( ActionDispatcherProperty );
+			set => SetValue( ActionDispatcherProperty, value );
 		}
-
-		public static readonly DependencyProperty ActionDispatcherProperty =
-					DependencyProperty.Register( "ActionDispatcher", typeof( IColumnActionDispatcher ), typeof( ColumnHeaderHandler ),
-				new PropertyMetadata( null ) );
 	}
 }