Merge pull request #60 from HandyOrg/pr/59

Pr/59

HandyControlDemo/HandyControlDemo.csproj

@@ -364,6 +364,7 @@
     <Compile Include="ViewModel\Basic\ChatBoxViewModel.cs" />
     <Compile Include="ViewModel\Basic\InteractiveDialogViewModel.cs" />
     <Compile Include="ViewModel\Common\ComboBoxDemoViewModel.cs" />
+    <Compile Include="ViewModel\Controls\BadgeDemoViewModel.cs" />
     <Compile Include="ViewModel\Controls\CoverViewModel.cs" />
     <Compile Include="ViewModel\Controls\DialogDemoViewModel.cs" />
     <Compile Include="ViewModel\Controls\NotifyIconDemoViewModel.cs" />

HandyControlDemo/Properties/Langs/Lang.en.resx

@@ -561,4 +561,7 @@
   <data name="PleaseInput" xml:space="preserve">
     <value>Please input...</value>
   </data>
+  <data name="Click2Count" xml:space="preserve">
+    <value>Click to count</value>
+  </data>
 </root>

HandyControlDemo/Properties/Langs/Lang.resx

@@ -561,4 +561,7 @@
   <data name="PleaseInput" xml:space="preserve">
     <value>请输入...</value>
   </data>
+  <data name="Click2Count" xml:space="preserve">
+    <value>点击计数</value>
+  </data>
 </root>

HandyControlDemo/UserControl/Controls/BadgeDemoCtl.xaml

@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="{DynamicResource RegionBrush}">
+             Background="{DynamicResource RegionBrush}"
+             DataContext="{Binding BadgeDemo, Source={StaticResource Locator}}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <controls:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30">
@@ -12,15 +13,18 @@
             <controls:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
                 <Button Content="{x:Static langs:Lang.Comment}"/>
             </controls:Badge>
-            <controls:Badge Value="1" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgePrimary}">
-                <Button Content="{x:Static langs:Lang.Comment}"/>
+            <controls:Badge Value="{Binding Count}" BadgeMargin="0,-14,-10,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgePrimary}">
+                <Button Content="{x:Static langs:Lang.Click2Count}" Command="{Binding CountCmd}"/>
             </controls:Badge>
             <controls:Badge Value="100" BadgeMargin="0,-14,-20,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
                 <Button Content="{x:Static langs:Lang.Comment}"/>
             </controls:Badge>
-            <controls:Badge IsDot="True" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            <controls:Badge Status="Dot" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
                 <Button Content="{x:Static langs:Lang.Reply}"/>
             </controls:Badge>
+            <controls:Badge Status="Processing" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+                <Button Content="{x:Static langs:Lang.Reply}" />
+            </controls:Badge>
         </StackPanel>
     </controls:TransitioningContentControl>
 </UserControl>

HandyControlDemo/ViewModel/Controls/BadgeDemoViewModel.cs

@@ -0,0 +1,20 @@
+using System;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.CommandWpf;
+
+namespace HandyControlDemo.ViewModel.Controls
+{
+    public class BadgeDemoViewModel : ViewModelBase
+    {
+        private int _count = 1;
+
+        public int Count
+        {
+            get => _count;
+            set => Set(ref _count, value);
+        }
+
+        public RelayCommand CountCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(() => Count++)).Value;
+    }
+}

HandyControlDemo/ViewModel/ViewModelLocator.cs

@@ -5,6 +5,7 @@ using GalaSoft.MvvmLight.Ioc;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 using HandyControlDemo.ViewModel.Basic;
+using HandyControlDemo.ViewModel.Controls;
 
 namespace HandyControlDemo.ViewModel
 {
@@ -31,6 +32,7 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<SearchBarDemoViewModel>();
             SimpleIoc.Default.Register<NotifyIconDemoViewModel>();
             SimpleIoc.Default.Register<InteractiveDialogViewModel>();
+            SimpleIoc.Default.Register<BadgeDemoViewModel>();
         }
 
         public static ViewModelLocator Instance => new Lazy<ViewModelLocator>(() =>
@@ -67,6 +69,8 @@ namespace HandyControlDemo.ViewModel
         public NotifyIconDemoViewModel NotifyIconDemo => ServiceLocator.Current.GetInstance<NotifyIconDemoViewModel>();
 
         public InteractiveDialogViewModel InteractiveDialog => ServiceLocator.Current.GetInstance<InteractiveDialogViewModel>();
+
+        public BadgeDemoViewModel BadgeDemo => ServiceLocator.Current.GetInstance<BadgeDemoViewModel>();
         #endregion
     }
 }