diff --git a/README.md b/README.md index 13d7245e..9545f278 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,10 @@ Step 4:enjoy coding ## Latest examples +### Card + +![Card](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Card.png) + ### ButtonGroup ![ButtonGroup](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ButtonGroup.png) @@ -79,12 +83,12 @@ Step 4:enjoy coding ![NotifyIcon](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/NotifyIcon.png) +## History publication + ### Dialog ![Dialog](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Dialog.png) -## History publication - ### WaveProgressBar ![WaveProgressBar](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/WaveProgressBar.gif) diff --git a/Resources/Card.png b/Resources/Card.png new file mode 100644 index 00000000..df4358b2 Binary files /dev/null and b/Resources/Card.png differ diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index 7c273885..f9dad817 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -356,6 +356,9 @@ Resources\Img\LeftMainContent\ButtonGroup_16x.png + + Resources\Img\LeftMainContent\VSO_Card_16x.png + diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 766280db..105853a5 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -396,6 +396,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\VSO_Card_16x.png + Resources\Img\LeftMainContent\ButtonGroup_16x.png diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 58477f84..049072a0 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -458,6 +458,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\VSO_Card_16x.png + Resources\Img\LeftMainContent\ButtonGroup_16x.png diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index 72b30cf2..21daf25a 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -100,6 +100,8 @@ public static readonly string ButtonGroupDemoCtl = nameof(ButtonGroupDemoCtl); + public static readonly string CardDemoCtl = nameof(CardDemoCtl); + public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl); public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl); diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt index 56b9b0f5..5c2eff75 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -52,7 +52,8 @@ var controlList = new List "SideMenuDemoCtl", "GridDemoCtl", "RangeSliderDemoCtl", - "ButtonGroupDemoCtl" + "ButtonGroupDemoCtl", + "CardDemoCtl" }; var styleList = new List { diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs new file mode 100644 index 00000000..e8867f26 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs @@ -0,0 +1,11 @@ +namespace HandyControlDemo.Data +{ + public class CardModel + { + public string Header { get; set; } + + public string Content { get; set; } + + public string Footer { get; set; } + } +} diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index 8f0e0adb..a97f4544 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -16,6 +16,7 @@ + @@ -47,6 +48,9 @@ AnimationPathDemoCtl.xaml + + CardDemoCtl.xaml + RangeSliderDemoCtl.xaml @@ -297,6 +301,7 @@ + @@ -404,6 +409,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index 14840212..4be2f334 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -204,6 +204,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 卡片 的本地化字符串。 + /// + public static string Card { + get { + return ResourceManager.GetString("Card", resourceCulture); + } + } + /// /// 查找类似 轮播 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index c16cb5c0..e20eda66 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -621,4 +621,7 @@ ButtonGroup + + Card + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx index 3e44c0b1..4b249a86 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -621,4 +621,7 @@ 按钮组 + + 卡片 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/VSO_Card_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/VSO_Card_16x.png new file mode 100644 index 00000000..24d37c44 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/VSO_Card_16x.png differ diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml index f8673fce..679bd110 100644 --- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml +++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml @@ -76,18 +76,7 @@ - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml index 9d9003f1..06e3c936 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml @@ -109,7 +109,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Border.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Border.xaml index a7498032..8a47202a 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Border.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Border.xaml @@ -30,7 +30,7 @@ - + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Card.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Card.xaml new file mode 100644 index 00000000..60df2eec --- /dev/null +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Card.xaml @@ -0,0 +1,11 @@ + + + + + + + - - + - +