Skip to content

Add fields line up demo #444

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

Merged
merged 3 commits into from
Apr 5, 2025
Merged

Add fields line up demo #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b45ad75
added FieldsLineUpDemo page to the demo app
corvinsz Apr 4, 2025
7825f69
removed AutoSuggstBox column from FieldsLineUpDemo
corvinsz Apr 5, 2025
f75e12a
apply outline style to demo Outlined PasswordBox in demo
corvinsz Apr 5, 2025
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
4 changes: 4 additions & 0 deletions Material.Avalonia.Demo/MainView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<ListBoxItem>Dialogs</ListBoxItem>
<ListBoxItem>Expanders</ListBoxItem>
<ListBoxItem>Fields</ListBoxItem>
<ListBoxItem>Fields line up</ListBoxItem>
<ListBoxItem>Lists</ListBoxItem>
<ListBoxItem>Material Icons</ListBoxItem>
<ListBoxItem>Progress indicators</ListBoxItem>
Expand Down Expand Up @@ -179,6 +180,9 @@

<!-- Fields -->
<pages:FieldsDemo />

<!-- FieldsLline up -->
<pages:FieldsLineUpDemo />

<!-- Lists -->
<pages:ListsDemo />
Expand Down
20 changes: 10 additions & 10 deletions Material.Avalonia.Demo/Material.Avalonia.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Controls.DataGrid"/>
<PackageReference Include="Avalonia.Diagnostics"/>
<PackageReference Include="Avalonia.Themes.Simple"/>
<PackageReference Include="Material.Icons.Avalonia"/>
<PackageReference Include="DialogHost.Avalonia"/>
<PackageReference Include="ShowMeTheXaml.Avalonia"/>
<PackageReference Include="ShowMeTheXaml.Avalonia.AvaloniaEdit"/>
<PackageReference Include="ShowMeTheXaml.Avalonia.Generator" PrivateAssets="all"/>
<PackageReference Include="Avalonia.Controls.DataGrid" />
<PackageReference Include="Avalonia.Diagnostics" />
<PackageReference Include="Avalonia.Themes.Simple" />
<PackageReference Include="Material.Icons.Avalonia" />
<PackageReference Include="DialogHost.Avalonia" />
<PackageReference Include="ShowMeTheXaml.Avalonia" />
<PackageReference Include="ShowMeTheXaml.Avalonia.AvaloniaEdit" />
<PackageReference Include="ShowMeTheXaml.Avalonia.Generator" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Material.Avalonia\Material.Avalonia.csproj"/>
<ProjectReference Include="..\Material.Avalonia\Material.Avalonia.csproj" />
<ProjectReference Include="..\Material.Avalonia.Dialogs\Material.Avalonia.Dialogs.csproj" />
<ProjectReference Include="..\Material.Avalonia.DataGrid\Material.Avalonia.DataGrid.csproj" />
</ItemGroup>

<ItemGroup>
<AvaloniaResource Include="Assets\**"/>
<AvaloniaResource Include="Assets\**" />
</ItemGroup>

<ItemGroup>
Expand Down
195 changes: 195 additions & 0 deletions Material.Avalonia.Demo/Pages/FieldsLineUpDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
xmlns:wpf="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
xmlns:showMeTheXaml="clr-namespace:ShowMeTheXaml;assembly=ShowMeTheXaml.Avalonia"
xmlns:viewModels="clr-namespace:Material.Avalonia.Demo.ViewModels"
x:DataType="viewModels:FieldsLineUpDemoViewModel"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Material.Avalonia.Demo.Pages.FieldsLineUpDemo" Padding="32">
<UserControl.DataContext>
<viewModels:FieldsLineUpDemoViewModel/>
</UserControl.DataContext>
<StackPanel>
<Grid RowDefinitions="auto, *">
<Grid.Styles>
<Style Selector="TextBox">
<Setter Property="Theme" Value="{StaticResource FilledTextBox}" />
<Setter Property="Margin" Value="2" />
</Style>
</Grid.Styles>
<controls:ColorZone Mode="PrimaryMid">
<TextBlock Classes="Headline6" Text="Options"/>
</controls:ColorZone>

<WrapPanel Grid.Row="1">
<StackPanel>
<TextBox wpf:TextFieldAssist.Label="wpf:TextFieldAssist.Label"
Text="{Binding AssistLabel}"
Margin="0 2" />
<TextBox wpf:TextFieldAssist.Label="Watermark"
Text="{Binding Watermark}"
Margin="0 2" />
</StackPanel>
</WrapPanel>

</Grid>
<Grid x:Name="FieldsLineUpGrid" HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.Styles>
<!--TextBlocks-->
<Style Selector="TextBlock">
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
<!--TextBoxes-->
<Style Selector="TextBox">
<Setter Property="Text" Value="Text" />
<Setter Property="wpf:TextFieldAssist.Label" Value="{Binding AssistLabel}" />
<Setter Property="Watermark" Value="{Binding Watermark}" />
</Style>
<!--ComboBoxes-->
<Style Selector="ComboBox">
<Setter Property="ItemsSource" Value="{Binding ComboBoxItems}" />
</Style>
</Grid.Styles>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition MinWidth="100" />
<ColumnDefinition MinWidth="100" />
<ColumnDefinition MinWidth="100" />
<ColumnDefinition MinWidth="100" />
<ColumnDefinition MinWidth="100" />
<ColumnDefinition MinWidth="100" />
</Grid.ColumnDefinitions>

<TextBlock Grid.Row="1"
Grid.Column="0"
Text="Default" />
<TextBlock Grid.Row="2"
Grid.Column="0"
Text="Floating" />
<TextBlock Grid.Row="3"
Grid.Column="0"
Text="Filled" />
<TextBlock Grid.Row="4"
Grid.Column="0"
Text="Outlined" />

<TextBlock Grid.Row="0"
Grid.Column="1"
Text="TextField" />
<TextBlock Grid.Row="0"
Grid.Column="2"
Text="PasswordBox" />
<TextBlock Grid.Row="0"
Grid.Column="3"
Text="ComboBox" />
<TextBlock Grid.Row="0"
Grid.Column="4"
Text="DatePicker" />
<TextBlock Grid.Row="0"
Grid.Column="5"
Text="TimePicker" />
<TextBlock Grid.Row="0"
Grid.Column="6"
Text="NumericUpDown" />

<TextBox Grid.Row="1"
Grid.Column="1"
wpf:TextFieldAssist.Label="{x:Null}"
/>
<TextBox Grid.Row="2"
Grid.Column="1"
UseFloatingWatermark="True" />
<TextBox Grid.Row="3"
Grid.Column="1"
Theme="{StaticResource FilledTextBox}"
/>
<TextBox Grid.Row="4"
Grid.Column="1"
Theme="{StaticResource OutlineTextBox}"
UseFloatingWatermark="True"
Classes="outline"
/>

<TextBox Classes="revealPasswordButton"
Grid.Row="1"
Grid.Column="2"
wpf:TextFieldAssist.Label="{x:Null}"
/>
<TextBox Classes="revealPasswordButton"
Grid.Row="2"
Grid.Column="2"
UseFloatingWatermark="True"/>
<TextBox Classes="revealPasswordButton"
Grid.Row="3"
Grid.Column="2"
Theme="{StaticResource FilledTextBox}" />
<TextBox Classes="revealPasswordButton outline"
Grid.Row="4"
Grid.Column="2"
Theme="{StaticResource OutlineTextBox}"
UseFloatingWatermark="True" />

<ComboBox Grid.Row="1"
Grid.Column="3" />
<ComboBox Grid.Row="2"
Grid.Column="3"
wpf:ComboBoxAssist.Label="{Binding AssistLabel}" />
<ComboBox Grid.Row="3"
Grid.Column="3"
wpf:ComboBoxAssist.Label="{Binding AssistLabel}"
Theme="{StaticResource MaterialFilledComboBox}" />
<ComboBox Grid.Row="4"
Grid.Column="3"
wpf:ComboBoxAssist.Label="{Binding AssistLabel}"
Theme="{StaticResource MaterialOutlineComboBox}" />

<DatePicker Grid.Row="1"
Grid.Column="4" />
<DatePicker Grid.Row="2"
Grid.Column="4"
wpf:TextFieldAssist.Label="{Binding AssistLabel}" />
<DatePicker Grid.Row="3"
Grid.Column="4"
wpf:TextFieldAssist.Label="{Binding AssistLabel}" />
<DatePicker Grid.Row="4"
Grid.Column="4"
wpf:TextFieldAssist.Label="{Binding AssistLabel}" />

<TimePicker Grid.Row="1"
Grid.Column="5" />
<TimePicker Grid.Row="2"
Grid.Column="5" />
<TimePicker Grid.Row="3"
Grid.Column="5" />
<TimePicker Grid.Row="4"
Grid.Column="5" />

<NumericUpDown Grid.Row="1"
Grid.Column="6"
wpf:TextFieldAssist.Label="{Binding AssistLabel}" />
<NumericUpDown Grid.Row="2"
Grid.Column="6"
wpf:TextFieldAssist.Label="{Binding AssistLabel}" />
<NumericUpDown Grid.Row="3"
Grid.Column="6"
wpf:TextFieldAssist.Label="{Binding AssistLabel}"
Theme="{StaticResource FilledNumericUpDown}" />
<NumericUpDown Grid.Row="4"
Grid.Column="6"
wpf:TextFieldAssist.Label="{Binding AssistLabel}"
Theme="{StaticResource OutlineNumericUpDown}" />

</Grid>
</StackPanel>
</UserControl>
13 changes: 13 additions & 0 deletions Material.Avalonia.Demo/Pages/FieldsLineUpDemo.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Markup.Xaml;
using Material.Avalonia.Demo.ViewModels;

namespace Material.Avalonia.Demo.Pages;

public partial class FieldsLineUpDemo : UserControl {
public FieldsLineUpDemo() {
InitializeComponent();
}
}
40 changes: 40 additions & 0 deletions Material.Avalonia.Demo/ViewModels/FieldsLineUpDemoViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Material.Avalonia.Demo.ViewModels;
internal class FieldsLineUpDemoViewModel : ViewModelBase {
private string? _assistLabel = "My assist label";
public string? AssistLabel {
get => _assistLabel;
set {
if (_assistLabel != value) {
_assistLabel = value;
OnPropertyChanged();
}
}
}

private string? _watermark = "My watermark";
public string? Watermark {
get => _watermark;
set {
if (_watermark != value) {
_watermark = value;
OnPropertyChanged();
}
}
}



public IList<string> ComboBoxItems { get; } = [
"Item 1",
"Item 2",
"Item 3",
"Item 4",
"Item 5"
];
}