Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/support readme markdown in sample viewer #113

Merged
merged 18 commits into from
Mar 10, 2024
Merged

Feature/support readme markdown in sample viewer #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1f03f0f
feat: Set the TabControl color for IsEnabled=False
davidkallesen Mar 9, 2024
fc1b582
feat: Add "Readme" tab to SampleViewerView and read markdown file to …
davidkallesen Mar 9, 2024
97fb0ad
feat: Add more examples for how to use RelayCommand and RelayCommandA…
davidkallesen Mar 9, 2024
caca8fb
feat: Add SampleViewer
davidkallesen Mar 9, 2024
b901f44
feat: Add / streamline readme's
davidkallesen Mar 9, 2024
44aad9e
chore: Cleanup
davidkallesen Mar 9, 2024
e2260ad
fix: Use TryAdd on ConcurrentDictionary instead of just Add
davidkallesen Mar 10, 2024
6bf3444
fix: Fix a minor rendering bug for PanelHelper
davidkallesen Mar 10, 2024
8723eda
feat: Add more readme's for: StaggeredPanel, UniformSpacingPanel and …
davidkallesen Mar 10, 2024
c5058ae
docs: Extend property tables with col:Type
davidkallesen Mar 10, 2024
c98e483
refac: Sample - PanelHelperView
davidkallesen Mar 10, 2024
d93ec53
docs: Fix markdown table
davidkallesen Mar 10, 2024
f5ef863
docs: Add ref from MVVM to RelayCommands
davidkallesen Mar 10, 2024
e6f198a
fix: Update link
davidkallesen Mar 10, 2024
9f2c895
chore: Streamline UniformSpacingPanel and PanelHelper sample and readme
davidkallesen Mar 10, 2024
3e7b346
docs: Update readme
davidkallesen Mar 10, 2024
aa71e23
chore: Style treeview in sample-app
davidkallesen Mar 10, 2024
bcbcc8d
fix: SA1028
davidkallesen Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 47 additions & 157 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion sample/Atc.Wpf.Sample/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,22 @@
<ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/Styles/Controls.xaml" />
</ResourceDictionary.MergedDictionaries>

<Style BasedOn="{StaticResource AtcApps.Styles.TreeViewItem}" TargetType="{x:Type TreeViewItem}">
<Setter Property="IsExpanded" Value="True" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.ThemeForeground4}" />
</Style>

<Style BasedOn="{StaticResource AtcApps.Styles.TreeViewItem}" TargetType="{x:Type atc:SampleTreeViewItem}">
<Setter Property="IsExpanded" Value="True" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.ThemeForeground}" />
</Style>

<Style BasedOn="{StaticResource AtcApps.Styles.TreeView}" TargetType="{x:Type sample:SamplesWpfTreeView}" />
<Style BasedOn="{StaticResource AtcApps.Styles.TreeView}" TargetType="{x:Type sample:SamplesWpfControlsTreeView}" />
<Style BasedOn="{StaticResource AtcApps.Styles.TreeView}" TargetType="{x:Type sample:SamplesWpfFontIconsTreeView}" />
<Style BasedOn="{StaticResource AtcApps.Styles.TreeView}" TargetType="{x:Type sample:SamplesWpfThemingTreeView}" />
<Style BasedOn="{StaticResource AtcApps.Styles.TreeViewItem}" TargetType="{x:Type atc:SampleTreeViewItem}" />

</ResourceDictionary>
</Application.Resources>
Expand Down
2 changes: 1 addition & 1 deletion sample/Atc.Wpf.Sample/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ await host

ThemeManager.Current.ChangeTheme(
Current,
"Dark.Blue");
"Light.Blue");

var mainWindow = host
.Services
Expand Down
5 changes: 4 additions & 1 deletion sample/Atc.Wpf.Sample/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
DockPanel.Dock="Top"
Focusable="True"
TextChanged="SampleFilterOnTextChanged" />
<TabControl DockPanel.Dock="Bottom" TabStripPlacement="Left">
<TabControl
Margin="0,0,5,10"
DockPanel.Dock="Bottom"
TabStripPlacement="Left">
<TabItem Header="Wpf">
<sample:SamplesWpfTreeView
x:Name="StvSampleWpf"
Expand Down
42 changes: 24 additions & 18 deletions sample/Atc.Wpf.Sample/SamplesWpf/Commands/RelayCommandAsyncView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,30 @@
<GroupBox Header="Usage">
<ScrollViewer>

<StackPanel Margin="10" Orientation="Vertical">
<StackPanel Margin="10" Orientation="Vertical">
<Button Command="{Binding Path=Test1Command}" Content="Button with no canExecute" />
</StackPanel>
<StackPanel Margin="10" Orientation="Vertical">
<CheckBox
Margin="0,0,0,10"
Content="IsTestEnabled"
IsChecked="{Binding Path=IsTestEnabled}" />
<Button Command="{Binding Path=Test2Command}" Content="Button with canExecute depend on Checkbox 'IsTestEnabled'" />
</StackPanel>
<StackPanel Margin="10" Orientation="Vertical">
<Button
Command="{Binding Path=Test3Command}"
CommandParameter="Hello"
Content="Button with no canExecute, and have a string as CommandParameter" />
</StackPanel>
</StackPanel>
<atc:UniformSpacingPanel
Margin="40"
Orientation="Vertical"
Spacing="20">

<Button Command="{Binding Path=Test1Command}" Content="Button with no canExecute" />

<CheckBox
Margin="0,0,0,10"
Content="IsTestEnabled"
IsChecked="{Binding Path=IsTestEnabled}" />
<Button Command="{Binding Path=Test2Command}" Content="Button with canExecute depend on Checkbox 'IsTestEnabled'" />

<Button
Command="{Binding Path=Test3Command}"
CommandParameter="Hello"
Content="Button with no canExecute, and have a string as CommandParameter" />

<Button
Command="{Binding Path=Test4Command}"
CommandParameter="Hello word"
Content="Button with canExecute method depend on Checkbox 'IsTestEnabled', and have a string as CommandParameter" />

</atc:UniformSpacingPanel>

</ScrollViewer>
</GroupBox>
Expand Down
13 changes: 13 additions & 0 deletions sample/Atc.Wpf.Sample/SamplesWpf/Commands/RelayCommandAsyncViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public class RelayCommandAsyncViewModel : ViewModelBase

public IRelayCommandAsync<string> Test3Command => new RelayCommandAsync<string>(Test3CommandHandler);

public IRelayCommandAsync<string> Test4Command => new RelayCommandAsync<string>(Test4CommandHandler, CanTest4CommandHandler);

public bool IsTestEnabled
{
get => isTestEnabled;
Expand Down Expand Up @@ -37,4 +39,15 @@ private async Task Test3CommandHandler(string obj)
await Task.Delay(1000, CancellationToken.None).ConfigureAwait(false);
_ = MessageBox.Show("Test3-command is hit", $"CommandParameter: {obj}", MessageBoxButton.OK);
}

private bool CanTest4CommandHandler(string obj)
{
return IsTestEnabled;
}

private async Task Test4CommandHandler(string obj)
{
await Task.Delay(1000, CancellationToken.None).ConfigureAwait(false);
_ = MessageBox.Show("Test4-command is hit", $"CommandParameter: {obj}", MessageBoxButton.OK);
}
}
42 changes: 24 additions & 18 deletions sample/Atc.Wpf.Sample/SamplesWpf/Commands/RelayCommandView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,30 @@
<GroupBox Header="Usage">
<ScrollViewer>

<StackPanel Margin="10" Orientation="Vertical">
<StackPanel Margin="10" Orientation="Vertical">
<Button Command="{Binding Path=Test1Command}" Content="Button with no canExecute" />
</StackPanel>
<StackPanel Margin="10" Orientation="Vertical">
<CheckBox
Margin="0,0,0,10"
Content="IsTestEnabled"
IsChecked="{Binding Path=IsTestEnabled}" />
<Button Command="{Binding Path=Test2Command}" Content="Button with canExecute depend on Checkbox 'IsTestEnabled'" />
</StackPanel>
<StackPanel Margin="10" Orientation="Vertical">
<Button
Command="{Binding Path=Test3Command}"
CommandParameter="Hello"
Content="Button with no canExecute, and have a string as CommandParameter" />
</StackPanel>
</StackPanel>
<atc:UniformSpacingPanel
Margin="40"
Orientation="Vertical"
Spacing="20">

<Button Command="{Binding Path=Test1Command}" Content="Button with no canExecute" />

<CheckBox
Margin="0,0,0,10"
Content="IsTestEnabled"
IsChecked="{Binding Path=IsTestEnabled}" />
<Button Command="{Binding Path=Test2Command}" Content="Button with canExecute depend on Checkbox 'IsTestEnabled'" />

<Button
Command="{Binding Path=Test3Command}"
CommandParameter="Hello"
Content="Button with no canExecute, and have a string as CommandParameter" />

<Button
Command="{Binding Path=Test4Command}"
CommandParameter="Hello word"
Content="Button with canExecute method depend on Checkbox 'IsTestEnabled', and have a string as CommandParameter" />

</atc:UniformSpacingPanel>

</ScrollViewer>
</GroupBox>
Expand Down
12 changes: 12 additions & 0 deletions sample/Atc.Wpf.Sample/SamplesWpf/Commands/RelayCommandViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public class RelayCommandViewModel : ViewModelBase

public IRelayCommand<string> Test3Command => new RelayCommand<string>(Test3CommandHandler);

public IRelayCommand<string> Test4Command => new RelayCommand<string>(Test4CommandHandler, CanTest4CommandHandler);

public bool IsTestEnabled
{
get => isTestEnabled;
Expand All @@ -34,4 +36,14 @@ private void Test3CommandHandler(string obj)
{
_ = MessageBox.Show("Test3-command is hit", $"CommandParameter: {obj}", MessageBoxButton.OK);
}

private bool CanTest4CommandHandler(string obj)
{
return IsTestEnabled;
}

private void Test4CommandHandler(string obj)
{
_ = MessageBox.Show("Test4-command is hit", $"CommandParameter: {obj}", MessageBoxButton.OK);
}
}
Loading
Loading