Merge pull request #1155 from jespersh/master

Fix #1153 Prevent 24th minute and second showing up as 0

Author: Keboo

MaterialDesignThemes.Wpf.Tests/ClockTests.cs

@@ -0,0 +1,63 @@
+using System.Linq;
+using System.Windows.Controls;
+using Xunit;
+
+namespace MaterialDesignThemes.Wpf.Tests
+{
+    public class ClockTests
+    {
+        [StaFact(Timeout = 500)]
+        public void CanGenerateHoursButtons()
+        {
+            var clock = new Clock();
+            clock.ApplyDefaultStyle();
+
+            Canvas hoursCanvas = clock.FindVisualChild<Canvas>(Clock.HoursCanvasPartName);
+            var buttonContents = hoursCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
+
+            var expected = Enumerable.Range(1, 12).Select(x => $"{x:0}");
+            Assert.Equal(expected.OrderBy(x => x), buttonContents.OrderBy(x => x));
+        }
+
+        [StaFact(Timeout = 500)]
+        public void CanGenerateHoursButtonsWith24Hours()
+        {
+            var clock = new Clock {Is24Hours = true};
+            clock.ApplyDefaultStyle();
+
+            Canvas hoursCanvas = clock.FindVisualChild<Canvas>(Clock.HoursCanvasPartName);
+            var buttonContents = hoursCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
+
+            var expected = Enumerable.Range(13, 11).Select(x => $"{x:00}")
+                .Concat(new [] {"00"})
+                .Concat(Enumerable.Range(1, 12).Select(x => $"{x:#}"));
+            Assert.Equal(expected.OrderBy(x => x), buttonContents.OrderBy(x => x));
+        }
+
+        [StaFact(Timeout = 500)]
+        public void CanGenerateMinuteButtons()
+        {
+            var clock = new Clock();
+            clock.ApplyDefaultStyle();
+
+            Canvas minutesCanvas = clock.FindVisualChild<Canvas>(Clock.MinutesCanvasPartName);
+            var buttonContents = minutesCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
+
+            var expected = Enumerable.Range(0, 60).Select(x => $"{x:0}");
+            Assert.Equal(expected.OrderBy(x => x), buttonContents.OrderBy(x => x));
+        }
+
+        [StaFact(Timeout = 500)]
+        public void CanGenerateSecondsButtons()
+        {
+            var clock = new Clock();
+            clock.ApplyDefaultStyle();
+
+            Canvas secondsCanvas = clock.FindVisualChild<Canvas>(Clock.SecondsCanvasPartName);
+            var buttonContents = secondsCanvas.GetVisualChildren<ClockItemButton>().Select(x => x.Content.ToString());
+
+            var expected = Enumerable.Range(0, 60).Select(x => $"{x:0}");
+            Assert.Equal(expected.OrderBy(x => x), buttonContents.OrderBy(x => x));
+        }
+    }
+}

MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj

@@ -12,6 +12,7 @@
     <AssemblyName>MaterialDesignThemes.Wpf.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
@@ -43,9 +45,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ClockTests.cs" />
     <Compile Include="DialogHostTests.cs" />
+    <Compile Include="MdixHelper.cs" />
     <Compile Include="PaletteHelperFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="VisualTreeHelper.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj">

MaterialDesignThemes.Wpf.Tests/MdixHelper.cs

@@ -0,0 +1,57 @@
+using System;
+using System.IO.Packaging;
+using System.Windows;
+using System.Windows.Controls;
+using Xunit;
+
+namespace MaterialDesignThemes.Wpf.Tests
+{
+    public static class MdixHelper
+    {
+        static MdixHelper()
+        {
+            var _ = Application.Current;
+
+            _defaultResourceDictionary = new Lazy<ResourceDictionary>(() => GetThemeResourceDictionary("Defaults"));
+            _genericResourceDictionary = new Lazy<ResourceDictionary>(GetGenericResourceDictionary);
+        }
+
+        private static readonly Lazy<ResourceDictionary> _defaultResourceDictionary;
+        private static ResourceDictionary DefaultResourceDictionary => _defaultResourceDictionary.Value;
+
+        private static readonly Lazy<ResourceDictionary> _genericResourceDictionary;
+        private static ResourceDictionary GenericResourceDictionary => _genericResourceDictionary.Value;
+
+        public static void ApplyDefaultStyle<T>(this T control) where T : FrameworkElement
+        {
+            Style style = GetDefaultStyle<T>();
+            Assert.True(style != null, $"Could not find default style for control type {typeof(T).FullName}");
+            control.Style = style;
+            Assert.True(control.ApplyTemplate(), "Failed to apply template ");
+        }
+
+        private static Style GetDefaultStyle<T>() where T : FrameworkElement
+        {
+            return DefaultResourceDictionary[typeof(T)] as Style ??
+                   GenericResourceDictionary[typeof(T)] as Style;
+        }
+
+        private static ResourceDictionary GetThemeResourceDictionary(string name)
+        {
+            var uri = new Uri(
+                $"/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.{name}.xaml", UriKind.Relative);
+            return new ResourceDictionary {
+                Source = uri
+            };
+        }
+
+        private static ResourceDictionary GetGenericResourceDictionary()
+        {
+            var uri = new Uri(
+                $"/MaterialDesignThemes.Wpf;component/Themes/Generic.xaml", UriKind.Relative);
+            return new ResourceDictionary {
+                Source = uri
+            };
+        }
+    }
+}

MaterialDesignThemes.Wpf.Tests/VisualTreeHelper.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+
+using WPFVisualTreeHelper= System.Windows.Media.VisualTreeHelper;
+
+namespace MaterialDesignThemes.Wpf.Tests
+{
+    public static class VisualTreeHelper
+    {
+        public static T FindVisualChild<T>(this DependencyObject source, string name) where T : FrameworkElement
+        {
+            return GetAllVisualChildren(source).OfType<T>().Single(x => x.Name == name);
+        }
+
+        public static IEnumerable<T> GetVisualChildren<T>(this DependencyObject source) where T : DependencyObject
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+
+            return GetVisualChildrenImplementation();
+
+            IEnumerable<T> GetVisualChildrenImplementation()
+            {
+                int count = WPFVisualTreeHelper.GetChildrenCount(source);
+                for (int i = 0; i < count; i++)
+                {
+                    if (WPFVisualTreeHelper.GetChild(source, i) is T child)
+                    {
+                        yield return child;
+                    }
+                }
+            }
+        }
+
+        private static IEnumerable<DependencyObject> GetAllVisualChildren(DependencyObject source)
+        {
+            var stack = new Queue<DependencyObject>();
+            stack.Enqueue(source);
+
+            while (stack.Any())
+            {
+                DependencyObject current = stack.Dequeue();
+                int childCount = WPFVisualTreeHelper.GetChildrenCount(current);
+                for (int i = 0; i < childCount; i++)
+                {
+                    var child = WPFVisualTreeHelper.GetChild(current, i);
+                    yield return child;
+                    stack.Enqueue(child);
+                }
+            }
+        }
+    }
+}

MaterialDesignThemes.Wpf/Clock.cs

@@ -278,13 +278,16 @@ private void GenerateButtons()
                 if (Is24Hours)
                 {
                     GenerateButtons(hoursCanvas, Enumerable.Range(13, 12).ToList(), ButtonRadiusRatio,
-                        new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "00");
+                        new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "00",
+                        ClockDisplayMode.Hours);
                     GenerateButtons(hoursCanvas, Enumerable.Range(1, 12).ToList(), ButtonRadiusInnerRatio,
-                        new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "#");
+                        new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "#",
+                        ClockDisplayMode.Hours);
                 }
                 else
                     GenerateButtons(hoursCanvas, Enumerable.Range(1, 12).ToList(), ButtonRadiusRatio,
-                        new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "0");
+                        new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Hours, Is24Hours), i => "ButtonStyle", "0",
+                        ClockDisplayMode.Hours);
             }
 
             if (GetTemplateChild(MinutesCanvasPartName) is Canvas minutesCanvas)
@@ -293,7 +296,8 @@ private void GenerateButtons()
 
                 GenerateButtons(minutesCanvas, Enumerable.Range(1, 60).ToList(), ButtonRadiusRatio,
                     new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Minutes, Is24Hours),
-                    i => ((i / 5.0) % 1) == 0.0 ? "ButtonStyle" : "LesserButtonStyle", "0");
+                    i => ((i / 5.0) % 1) == 0.0 ? "ButtonStyle" : "LesserButtonStyle", "0",
+                        ClockDisplayMode.Minutes);
             }
 
             if (GetTemplateChild(SecondsCanvasPartName) is Canvas secondsCanvas)
@@ -302,7 +306,8 @@ private void GenerateButtons()
 
                 GenerateButtons(secondsCanvas, Enumerable.Range(1, 60).ToList(), ButtonRadiusRatio,
                     new ClockItemIsCheckedConverter(() => Time, ClockDisplayMode.Seconds, Is24Hours),
-                    i => ((i / 5.0) % 1) == 0.0 ? "ButtonStyle" : "LesserButtonStyle", "0");
+                    i => ((i / 5.0) % 1) == 0.0 ? "ButtonStyle" : "LesserButtonStyle", "0",
+                        ClockDisplayMode.Seconds);
             }
 
             void RemoveExistingButtons(Canvas canvas)
@@ -333,7 +338,7 @@ private void HourReadOutPartNameOnPreviewMouseLeftButtonDown(object sender, Mous
         }
 
         private void GenerateButtons(Panel canvas, ICollection<int> range, double radiusRatio, IValueConverter isCheckedConverter, Func<int, string> stylePropertySelector,
-            string format)
+            string format, ClockDisplayMode clockDisplayMode)
         {
             var anglePerItem = 360.0 / range.Count;
             var radiansPerItem = anglePerItem * (Math.PI / 180);
@@ -359,7 +364,7 @@ private void GenerateButtons(Panel canvas, ICollection<int> range, double radius
                 button.SetBinding(Canvas.LeftProperty, GetBinding("X", button));
                 button.SetBinding(Canvas.TopProperty, GetBinding("Y", button));
 
-                button.Content = (i == 60 ? 0 : (i == 24 ? 0 : i)).ToString(format);
+                button.Content = (i == 60 ? 0 : (i == 24 && clockDisplayMode == ClockDisplayMode.Hours ? 0 : i)).ToString(format);
                 canvas.Children.Add(button);
             }
         }