Merge branch 'master' into release

Author: ButchersBoy

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contribution Guidelines
 
-PRs to this project are welcome, but before contributing please bear in mind my thoughts below. If you want to get involved but are unsure, please ask (say hello in the [Gitter chat room](http://gitter.im/ButchersBoy/MaterialDesignInXamlToolkit)).  Also note that I wrote these guidelines several months after the library was first made available, with the benefit of hindsight.  Apologies if there are inconsistencies with what you read below and what's already in the library.
+PRs to this project are welcome, but before contributing please bear in mind my thoughts below. Whe possible please include unit tests. If you want to get involved but are unsure, please ask (say hello in the [Gitter chat room](http://gitter.im/ButchersBoy/MaterialDesignInXamlToolkit)).  Also note that I wrote these guidelines several months after the library was first made available, with the benefit of hindsight.  Apologies if there are inconsistencies with what you read below and what's already in the library.
 
 ## The purposes of this library:
 

MainDemo.Wpf/App.xaml.cs

@@ -19,6 +19,12 @@ protected override void OnStartup(StartupEventArgs e)
                         XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
             */
 
+            // test setup for Persian culture settings
+            /*System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("fa-Ir");
+            System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("fa-Ir");
+            FrameworkElement.LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(
+                        System.Windows.Markup.XmlLanguage.GetLanguage(System.Globalization.CultureInfo.CurrentCulture.IetfLanguageTag)));*/
+
             base.OnStartup(e);
         }
     }

MainDemo.Wpf/Buttons.xaml

@@ -1,8 +1,8 @@
-<UserControl x:Class="MaterialDesignColors.WpfExample.Buttons"
+<UserControl x:Class="MaterialDesignColors.WpfExample.Buttons"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
@@ -131,7 +131,8 @@
                                     <RowDefinition Height="*"/>
                                     <RowDefinition Height="*"/>
                                     <RowDefinition Height="*"/>
-                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
                                 </Grid.RowDefinitions>
                                 <TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource MaterialDesignTitleTextBlock}" Margin="8,8,8,16">OPTIONS</TextBlock>
                                 <TextBox Grid.Column="0" Grid.Row="1" materialDesign:HintAssist.Hint="Setting 1" Text="200"/>
@@ -152,6 +153,17 @@
                                     <ComboBoxItem>250%</ComboBoxItem>
                                     <ComboBoxItem>501%</ComboBoxItem>
                                 </ComboBox>
+
+                                <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                                    <Button Content="_Save" Command="{x:Static materialDesign:PopupBox.ClosePopupCommand}" />
+                                    <Button Content="_Cancel" Command="{x:Static materialDesign:PopupBox.ClosePopupCommand}">
+                                        <Button.Style>
+                                            <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignPopupBoxButton}">
+                                                <Setter Property="Foreground" Value="Red" />
+                                            </Style>
+                                        </Button.Style>
+                                    </Button>
+                                </StackPanel>
                             </Grid>
 
                         </materialDesign:PopupBox>
@@ -270,7 +282,7 @@
             <smtx:XamlDisplay Key="buttons_26" Margin="5 0 0 0">
                 <Grid Width="124">
                     <!-- raised button with progress, useful to auto dismiss/accept something -->
-                    <Button Command="{Binding DismissComand}"
+                    <Button Command="{Binding DismissCommand}"
                             Style="{StaticResource MaterialDesignRaisedButton}"
                             HorizontalAlignment="Left"
                             materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
@@ -302,7 +314,7 @@
                     <!-- floating action button with progress -->
                     <TextBlock Margin="24 0 0 0" VerticalAlignment="Center">Click Me:</TextBlock>
                     <Button Style="{StaticResource MaterialDesignFloatingActionLightButton}" Margin="8 0 0 0"
-                            Command="{Binding SaveComand}"
+                            Command="{Binding SaveCommand}"
                             materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding IsSaving}"
                             materialDesign:ButtonProgressAssist.Value="{Binding SaveProgress}">
                         <!-- simple example of toggling/animating pack icon with a data trigger-->
@@ -596,6 +608,7 @@
                 <materialDesign:RatingBar Value="3" x:Name="BasicRatingBar"  ValueChanged="BasicRatingBar_ValueChanged"/>
             </smtx:XamlDisplay>
             <TextBlock Text="{Binding ElementName=BasicRatingBar, Path=Value, StringFormat=Rating: {0}}" VerticalAlignment="Top" Margin="10,2,0,0" />
+
             <smtx:XamlDisplay Key="buttons_59" Margin="24 0 0 5">
                 <materialDesign:RatingBar x:Name="CustomRatingBar" Max="3" Value="2" Orientation="Vertical">
                     <materialDesign:RatingBar.ValueItemTemplate>
@@ -611,6 +624,11 @@
                 </materialDesign:RatingBar>
             </smtx:XamlDisplay>
             <TextBlock Text="{Binding ElementName=CustomRatingBar, Path=Value, StringFormat=Rating: {0}}" VerticalAlignment="Top" Margin="10,2,0,0" />
+
+            <smtx:XamlDisplay Key="buttons_62" VerticalContentAlignment="Top" Margin="5 0 0 5">
+                <materialDesign:RatingBar Value="4" IsReadOnly="True" x:Name="ReadOnlyRatingBar"/>
+            </smtx:XamlDisplay>
+            <TextBlock Text="{Binding ElementName=ReadOnlyRatingBar, Path=Value, StringFormat=Readonly Rating: {0}}" VerticalAlignment="Top" Margin="10,2,0,0" />
         </StackPanel>
     </Grid>
 </UserControl>

MainDemo.Wpf/ButtonsViewModel.cs

@@ -18,7 +18,7 @@ public ButtonsViewModel()
             var autoStartingActionCountdownStart = DateTime.Now;
             var demoRestartCountdownComplete = DateTime.Now;
             var dismissRequested = false;
-            DismissComand = new AnotherCommandImplementation(_ => dismissRequested = true);
+            DismissCommand = new AnotherCommandImplementation(_ => dismissRequested = true);
             ShowDismissButton = true;
 
             #region DISMISS button demo control
@@ -69,7 +69,7 @@ public ButtonsViewModel()
             OrClickMeCount = 0;
 
             //just some demo code for the SAVE button
-            SaveComand = new AnotherCommandImplementation(_ =>
+            SaveCommand = new AnotherCommandImplementation(_ =>
             {
                 if (IsSaveComplete == true)
                 {
@@ -107,7 +107,7 @@ public ButtonsViewModel()
 
         #region Dismiss button demo
 
-        public ICommand DismissComand { get; }
+        public ICommand DismissCommand { get; }
 
         public bool ShowDismissButton
         {
@@ -149,7 +149,7 @@ public int OrClickMeCount
 
         #region floating Save button demo
 
-        public ICommand SaveComand { get; }
+        public ICommand SaveCommand { get; }
 
         private bool _isSaving;
         public bool IsSaving

MainDemo.Wpf/Domain/MainWindowViewModel.cs

@@ -69,7 +69,7 @@ public MainWindowViewModel(ISnackbarMessageQueue snackbarMessageQueue)
                 new DemoItem("Sliders", new Sliders(), new []
                     {
                         DocumentationLink.DemoPageLink<Sliders>(),
-                        DocumentationLink.StyleLink("Sliders")
+                        DocumentationLink.StyleLink("Slider")
                     }),
                 new DemoItem("Chips", new Chips(), new []
                     {

MainDemo.Wpf/Domain/TextFieldsViewModel.cs

@@ -8,6 +8,7 @@ namespace MaterialDesignColors.WpfExample.Domain
     public class TextFieldsViewModel : INotifyPropertyChanged
     {
         private string _name;
+        private string _name2;
         private int? _selectedValueOne;
         private string _selectedTextTwo;
 
@@ -28,6 +29,15 @@ public string Name
             }
         }
 
+        public string Name2
+        {
+            get { return _name2; }
+            set
+            {
+                this.MutateVerbose(ref _name2, value, RaisePropertyChanged());
+            }
+        }
+
         public int? SelectedValueOne
         {
             get { return _selectedValueOne; }