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

Jump to bottom

ToggleButtons rework #375

Merged
merged 5 commits into from
Apr 28, 2024
Merged

ToggleButtons rework #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd526e3
Rework ToggleButtons #259
SKProCH Apr 28, 2024
b011988
Make default MaterialFlatButton use default color (not primary), add …
SKProCH Apr 28, 2024
0a8b36b
Update ToggleButton demo
SKProCH Apr 28, 2024
4ba5ca6
Add example of using Button's ControlTheme for ToggleButton
SKProCH Apr 28, 2024
3f4540c
Change ToggleButton theme in other controls
SKProCH Apr 28, 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
1 change: 1 addition & 0 deletions Material.Avalonia.Demo/MainView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ToggleButton Name="NavDrawerSwitch"
Theme="{StaticResource MaterialFlatButton}"
Width="32" Height="32" Padding="4">
<avalonia:MaterialIcon Kind="Menu" Width="24" Height="24" />
</ToggleButton>
Expand Down
353 changes: 178 additions & 175 deletions Material.Avalonia.Demo/Pages/ButtonsDemo.axaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions Material.Avalonia.Demo/Pages/ColorZonesDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneDemo1">
<controls:ColorZone Height="56" Padding="12">
<Grid ColumnDefinitions="Auto,24,*">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>
</Grid>
</controls:ColorZone>
Expand All @@ -33,7 +33,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneDemo2">
<controls:ColorZone Height="56" Padding="12" Mode="Inverted">
<Grid ColumnDefinitions="Auto,24,*">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>
</Grid>
</controls:ColorZone>
Expand All @@ -45,7 +45,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneDemo3">
<controls:ColorZone Height="56" Padding="12" Mode="Dark">
<Grid ColumnDefinitions="Auto,24,*">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>
</Grid>
</controls:ColorZone>
Expand All @@ -57,7 +57,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneDemo4">
<controls:ColorZone Height="56" Padding="12" Mode="Light">
<Grid ColumnDefinitions="Auto,24,*">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>
</Grid>
</controls:ColorZone>
Expand All @@ -69,7 +69,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneDemo5">
<controls:ColorZone Height="56" Padding="12" Mode="PrimaryLight">
<Grid ColumnDefinitions="Auto,24,*">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>
</Grid>
</controls:ColorZone>
Expand All @@ -81,7 +81,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneDemo6">
<controls:ColorZone Height="56" Padding="12" Mode="PrimaryMid">
<Grid ColumnDefinitions="Auto,24,*">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>
</Grid>
</controls:ColorZone>
Expand All @@ -93,7 +93,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneDemo7">
<controls:ColorZone Height="56" Padding="12" Mode="PrimaryDark">
<Grid ColumnDefinitions="Auto,24,*">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>
</Grid>
</controls:ColorZone>
Expand All @@ -105,7 +105,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneDemo8">
<controls:ColorZone Height="56" Padding="12" Mode="Accent">
<Grid ColumnDefinitions="Auto,24,*">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>
</Grid>
</controls:ColorZone>
Expand All @@ -118,7 +118,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneAdvDemo1">
<controls:ColorZone Height="56" Padding="12">
<Grid ColumnDefinitions="Auto,24,*,24,Auto">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>

<ReversibleStackPanel Grid.Column="4" Margin="0" Orientation="Horizontal">
Expand All @@ -134,7 +134,7 @@
<showMeTheXaml:XamlDisplay UniqueId="ColorZoneAdvDemo2">
<controls:ColorZone Height="56" Padding="12">
<Grid ColumnDefinitions="Auto,24,*,*,24,Auto">
<ToggleButton Grid.Column="0" Classes="Flat TransparentBack" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<ToggleButton Grid.Column="0" Theme="{StaticResource MaterialFlatToggleButton}" Padding="4" Width="{Binding $self.Bounds.Height}" Content="{icons:MaterialIconExt Menu}" />
<TextBlock Grid.Column="2" Classes="Headline6" VerticalAlignment="Center" Text="Material Design Demo"/>

<Panel Grid.Column="3" VerticalAlignment="Center">
Expand Down
10 changes: 5 additions & 5 deletions Material.Avalonia.Demo/Pages/Home.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
</Style>
</StackPanel.Styles>
<WrapPanel HorizontalAlignment="Center" MaxWidth="600">
<Button Content="PROJECT LINK" Command="{Binding Path=OpenProjectRepoLink}" />
<Button Content="USE DARK THEME" Command="{Binding Path=UseMaterialUIDarkTheme}" />
<Button Content="USE LIGHT THEME" Command="{Binding Path=UseMaterialUILightTheme}" />
<Button Content="PROJECT LINK" Classes="primary" Command="{Binding Path=OpenProjectRepoLink}" />
<Button Content="USE DARK THEME" Classes="primary" Command="{Binding Path=UseMaterialUIDarkTheme}" />
<Button Content="USE LIGHT THEME" Classes="primary" Command="{Binding Path=UseMaterialUILightTheme}" />
</WrapPanel>
<WrapPanel HorizontalAlignment="Center" MaxWidth="600">
<Button Content="SWITCH TRANSITIONS" Command="{Binding Path=SwitchTransition}" />
<Button Content="ABOUT AVALONIAUI" Command="{Binding Path=ShowAboutAvaloniaUI}" />
<Button Content="SWITCH TRANSITIONS" Classes="primary" Command="{Binding Path=SwitchTransition}" />
<Button Content="ABOUT AVALONIAUI" Classes="primary" Command="{Binding Path=ShowAboutAvaloniaUI}" />
</WrapPanel>
</StackPanel>
<!-- Features listing is disabled. -->
Expand Down
Loading