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

#472 number fields have now configurable alternative symbols #475

Merged
merged 6 commits into from
May 25, 2023
Merged

#472 number fields have now configurable alternative symbols #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57a3130
#472 moved NBSP-space grouping into alternatives
vaadin-miki May 5, 2023
df07c1f
#472 in theory now allowing alternatives to some number formats
vaadin-miki May 6, 2023
84e736f
#472 added tests and public methods to modify alternative symbols
vaadin-miki May 11, 2023
f3eee21
#472 fixed allowed char pattern issues
vaadin-miki May 11, 2023
1df7f24
#472 modified demo to include alternatives
vaadin-miki May 11, 2023
e6cc76b
#472 should be ready
vaadin-miki May 25, 2023
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
8 changes: 7 additions & 1 deletion ...4/src/main/java/org/vaadin/miki/demo/builders/AbstractSuperFloatingPointFieldBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import org.vaadin.miki.demo.Order;
import org.vaadin.miki.superfields.numbers.AbstractSuperFloatingPointField;

import java.util.Collections;
import java.util.Set;
import java.util.function.Consumer;

/**
Expand All @@ -20,6 +22,10 @@ public class AbstractSuperFloatingPointFieldBuilder implements ContentBuilder<Ab
public void buildContent(AbstractSuperFloatingPointField<?, ?> component, Consumer<Component[]> callback) {
final Checkbox integerPartOptional = new Checkbox("Make integer part optional?");
integerPartOptional.addValueChangeListener(event -> component.setIntegerPartOptional(event.getValue()));
callback.accept(new Component[]{integerPartOptional});

final Checkbox allowDecimalAlternatives = new Checkbox("Allow | and : as decimal separators?");
allowDecimalAlternatives.addValueChangeListener(event -> component.setDecimalSeparatorAlternatives(event.getValue() ? Set.of('|', ':') : Collections.emptySet()));

callback.accept(new Component[]{integerPartOptional, allowDecimalAlternatives});
}
}
14 changes: 13 additions & 1 deletion demo-v24/src/main/java/org/vaadin/miki/demo/builders/AbstractSuperNumberFieldBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import org.vaadin.miki.demo.Order;
import org.vaadin.miki.superfields.numbers.AbstractSuperNumberField;

import java.util.Collections;
import java.util.Set;
import java.util.function.Consumer;

/**
Expand Down Expand Up @@ -45,6 +47,16 @@ public void buildContent(AbstractSuperNumberField<?, ?> component, Consumer<Comp
component.removeThemeVariants(TextFieldVariant.LUMO_ALIGN_RIGHT);
}
);
callback.accept(new Component[]{autoselect, separatorHidden, prefix, suffix, alignRight});

final Checkbox allowGroupAlternative = new Checkbox("Allow _ as grouping alternative?");
allowGroupAlternative.addValueChangeListener(event -> component.setGroupingSeparatorAlternatives(event.getValue() ? Set.of('_') : Collections.emptySet()));

final Checkbox allowNegativeAlternative = new Checkbox("Allow ^ and # as a negative sign?");
allowNegativeAlternative.addValueChangeListener(event -> component.setNegativeSignAlternatives(event.getValue() ? Set.of('^', '#') : Collections.emptySet()));

final Checkbox disallowAlternatives = new Checkbox("Disallow typing ^ and space?");
disallowAlternatives.addValueChangeListener(event -> component.setKeyboardDisallowedAlternatives(event.getValue() ? Set.of('^', ' ') : Collections.emptySet()));

callback.accept(new Component[]{autoselect, separatorHidden, prefix, suffix, alignRight, allowGroupAlternative, allowNegativeAlternative, disallowAlternatives});
}
}
12 changes: 12 additions & 0 deletions ...ds/src/main/java/org/vaadin/miki/superfields/numbers/AbstractSuperFloatingPointField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.vaadin.flow.function.SerializablePredicate;

import java.util.Locale;
import java.util.Set;

/**
* Base class for implementations of {@link AbstractSuperNumberField} that allow modifications to minimum and maximum number of fraction digits.
Expand Down Expand Up @@ -100,4 +101,15 @@ public final SELF withIntegerPartRequired() {
public final SELF withIntegerPartOptional() {
return this.withIntegerPartOptional(true);
}

@Override
public Set<Character> getDecimalSeparatorAlternatives() {
return super.getDecimalSeparatorAlternatives();
}

@Override
public void setDecimalSeparatorAlternatives(Set<Character> alternatives) {
super.setDecimalSeparatorAlternatives(alternatives);
}

}
Loading