Skip to content

Prepare for smart hint refactor #3470

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
Keboo merged 7 commits into from
Mar 7, 2024
Merged

Prepare for smart hint refactor #3470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8be903
Fix return- and parameter types in VerticalAlignmentConverter
nicolaihenriksen Feb 27, 2024
6a3b3ee
Move VerticalAlignmentConverter into its own file under the Converter…
nicolaihenriksen Feb 27, 2024
bb888e2
Prepare demo app for SmartHint refactor by adding more test setting c…
nicolaihenriksen Feb 27, 2024
4074d10
Reset default demo app page back to "Home"
nicolaihenriksen Feb 27, 2024
3b61edd
Add character counter toggle to demo app
nicolaihenriksen Mar 4, 2024
dec7d77
Ensure container cannot grab keyboard focus
nicolaihenriksen Mar 5, 2024
9407c38
Remove binding errors on SmartHint demo page
nicolaihenriksen Mar 6, 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
146 changes: 54 additions & 92 deletions MainDemo.Wpf/Domain/SmartHintViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ internal class SmartHintViewModel : ViewModelBase
private string? _suffixText;
private double _selectedFontSize = double.NaN;
private FontFamily? _selectedFontFamily = DefaultFontFamily;
private bool _controlsEnabled = true;
private bool _rippleOnFocus = false;
private bool _textBoxAcceptsReturn = false;
private int _maxLength;

public IEnumerable<FloatingHintHorizontalAlignment> HorizontalAlignmentOptions { get; } = Enum.GetValues(typeof(FloatingHintHorizontalAlignment)).OfType<FloatingHintHorizontalAlignment>();
public IEnumerable<double> FloatingScaleOptions { get; } = new[] {0.25, 0.5, 0.75, 1.0};
Expand All @@ -42,190 +46,148 @@ internal class SmartHintViewModel : ViewModelBase
public bool FloatHint
{
get => _floatHint;
set
{
_floatHint = value;
OnPropertyChanged();
}
set => SetProperty(ref _floatHint, value);
}

public FloatingHintHorizontalAlignment SelectedAlignment
{
get => _selectedAlignment;
set
{
_selectedAlignment = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedAlignment, value);
}

public double SelectedFloatingScale
{
get => _selectedFloatingScale;
set
{
_selectedFloatingScale = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedFloatingScale, value);
}

public Point SelectedFloatingOffset
{
get => _selectedFloatingOffset;
set
{
_selectedFloatingOffset = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedFloatingOffset, value);
}

public bool ShowClearButton
{
get => _showClearButton;
set
{
_showClearButton = value;
OnPropertyChanged();
}
set => SetProperty(ref _showClearButton, value);
}

public bool ShowLeadingIcon
{
get => _showLeadingIcon;
set
{
_showLeadingIcon = value;
OnPropertyChanged();
}
set => SetProperty(ref _showLeadingIcon, value);
}

public bool ShowTrailingIcon
{
get => _showTrailingIcon;
set
{
_showTrailingIcon = value;
OnPropertyChanged();
}
set => SetProperty(ref _showTrailingIcon, value);
}

public string HintText
{
get => _hintText;
set
{
_hintText = value;
OnPropertyChanged();
}
set => SetProperty(ref _hintText, value);
}

public string HelperText
{
get => _helperText;
set
{
_helperText = value;
OnPropertyChanged();
}
set => SetProperty(ref _helperText, value);
}

public bool ApplyCustomPadding
{
get => _applyCustomPadding;
set
{
_applyCustomPadding = value;
OnPropertyChanged();
}
set => SetProperty(ref _applyCustomPadding, value);
}

public Thickness SelectedCustomPadding
{
get => _selectedCustomPadding;
set
{
_selectedCustomPadding = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedCustomPadding, value);
}

public double SelectedCustomHeight
{
get => _selectedCustomHeight;
set
{
_selectedCustomHeight = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedCustomHeight, value);
}

public VerticalAlignment SelectedVerticalAlignment
{
get => _selectedVerticalAlignment;
set
{
_selectedVerticalAlignment = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedVerticalAlignment, value);
}

public double SelectedLeadingIconSize
{
get => _selectedLeadingIconSize;
set
{
_selectedLeadingIconSize = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedLeadingIconSize, value);
}

public double SelectedTrailingIconSize
{
get => _selectedTrailingIconSize;
set
{
_selectedTrailingIconSize = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedTrailingIconSize, value);
}

public string? PrefixText
{
get => _prefixText;
set
{
_prefixText = value;
OnPropertyChanged();
}
set => SetProperty(ref _prefixText, value);
}

public string? SuffixText
{
get => _suffixText;
set
{
_suffixText = value;
OnPropertyChanged();
}
set => SetProperty(ref _suffixText, value);
}

public double SelectedFontSize
{
get => _selectedFontSize;
set
{
_selectedFontSize = value;
OnPropertyChanged();
}
set => SetProperty(ref _selectedFontSize, value);
}

public FontFamily? SelectedFontFamily
{
get => _selectedFontFamily;
set => SetProperty(ref _selectedFontFamily, value);
}

public bool ControlsEnabled
{
get => _controlsEnabled;
set => SetProperty(ref _controlsEnabled, value);
}

public bool RippleOnFocus
{
get => _rippleOnFocus;
set => SetProperty(ref _rippleOnFocus, value);
}

public bool TextBoxAcceptsReturn
{
get => _textBoxAcceptsReturn;
set => SetProperty(ref _textBoxAcceptsReturn, value);
}

public bool ShowCharacterCounter
{
get => MaxLength > 0;
set => MaxLength = value == true ? 50 : 0;
}

public int MaxLength
{
get => _maxLength;
set
{
_selectedFontFamily = value;
OnPropertyChanged();
SetProperty(ref _maxLength, value);
OnPropertyChanged(nameof(ShowCharacterCounter));
}
}
}
9 changes: 9 additions & 0 deletions MainDemo.Wpf/InputElementContentControl.cs
View file
Open in desktop
Copy link
Contributor Author

@nicolaihenriksen nicolaihenriksen Mar 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Keboo Yes this replaces the use of ShowMeTheXAML, because, as your previous stream also showed, that feature does not really work on the SmartHint page because most properties are dynamically added or set via an inherited style, and thus do not show up in the ShowMeTheXAML window. So I opted to use the UI real-estate for the control instead, and make this simple wrapper to allow setting some common properties in a style.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace MaterialDesignDemo;

/// <summary>
/// ContentControl variation simply used to capture the input elements in the "Smart Hint" demo page and apply some common properties.
/// </summary>
internal class InputElementContentControl : ContentControl
{
public InputElementContentControl() => IsTabStop = false;
}
2 changes: 1 addition & 1 deletion MainDemo.Wpf/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"profiles": {
"Demo App": {
"commandName": "Project",
"commandLineArgs": "-p 3DTest -t Inherit -f LeftToRight"
"commandLineArgs": "-p Home -t Inherit -f LeftToRight"
}
}
}
Loading