Merge pull request #93 from gldiazcardenas/issue-88-phonnumberfield

PhoneNumberField - Improvements
dlsc-software-consulting-gmbh · Oct 26, 2023 · 54b4a10 · 54b4a10
2 parents 984f590 + 351d8f0
commit 54b4a10
Show file tree

Hide file tree

Showing 4 changed files with 619 additions and 225 deletions.
diff --git a/gemsfx-demo/src/main/java/com/dlsc/gemsfx/demo/PhoneNumberFieldApp.java b/gemsfx-demo/src/main/java/com/dlsc/gemsfx/demo/PhoneNumberFieldApp.java
@@ -36,40 +36,33 @@ public void start(Stage stage) throws Exception {
         PhoneNumberField field = new PhoneNumberField();
 
         VBox controls = new VBox(10);
-        addControl("Default Country", defaultCountrySelector(field), controls);
         addControl("Available Countries", availableCountriesSelector(field), controls);
         addControl("Preferred Countries", preferredCountriesSelector(field), controls);
+        addControl("Default Country", defaultCountrySelector(field), controls);
+        addControl("Disable Country", disableCountryCheck(field), controls);
         addControl("Force Local Phone", forceLocalPhoneNumberCheck(field), controls);
-        addControl("Fixed Country", fixedCountrySelector(field), controls);
+        addControl("Strict Mode", strictModeCheck(field), controls);
+        addControl("Unmasked", unmaskedModeCheck(field), controls);
 
         VBox fields = new VBox(10);
-        addField(fields, "Country Code", field.countryCodeProperty(), COUNTRY_CODE_CONVERTER);
+        addField(fields, "Country Code", field.countryCallingCodeProperty(), COUNTRY_CODE_CONVERTER);
         addField(fields, "Phone Number", field.phoneNumberProperty());
         addField(fields, "Local Number", field.localPhoneNumberProperty());
+        addField(fields, "Formatted Local Number", field.formattedLocalPhoneNumberProperty());
         addField(fields, "Mask", field.maskProperty());
 
         VBox vBox = new VBox(20);
         vBox.setPadding(new Insets(20));
         vBox.setAlignment(Pos.CENTER);
         vBox.getChildren().addAll(controls, new Separator(), field, new Separator(), fields);
 
-        Scene scene = new Scene(vBox, 500, 400);
-
         stage.setTitle("PhoneNumberField");
-        stage.setScene(scene);
+        stage.setScene(new Scene(vBox, 500, 500));
         stage.sizeToScene();
         stage.centerOnScreen();
         stage.show();
     }
 
-    private Node defaultCountrySelector(PhoneNumberField view) {
-        ComboBox<PhoneNumberField.CountryCallingCode> comboBox = new ComboBox<>();
-        comboBox.getItems().add(null);
-        comboBox.getItems().addAll(PhoneNumberField.CountryCallingCode.Defaults.values());
-        comboBox.valueProperty().bindBidirectional(view.defaultCountryCodeProperty());
-        return comboBox;
-    }
-
     private Node availableCountriesSelector(PhoneNumberField field) {
         CheckBox allCountries = new CheckBox("All");
 
@@ -105,20 +98,44 @@ private Node preferredCountriesSelector(PhoneNumberField view) {
         return comboBox;
     }
 
-    private Node forceLocalPhoneNumberCheck(PhoneNumberField field) {
-        CheckBox localCheck = new CheckBox();
-        localCheck.selectedProperty().bindBidirectional(field.forceLocalPhoneNumberProperty());
-        return localCheck;
-    }
-
-    private Node fixedCountrySelector(PhoneNumberField view) {
+    private Node defaultCountrySelector(PhoneNumberField view) {
         ComboBox<PhoneNumberField.CountryCallingCode> comboBox = new ComboBox<>();
         comboBox.getItems().add(null);
         comboBox.getItems().addAll(PhoneNumberField.CountryCallingCode.Defaults.values());
-        comboBox.valueProperty().bindBidirectional(view.fixedCountryCodeProperty());
+        comboBox.valueProperty().bindBidirectional(view.countryCallingCodeProperty());
         return comboBox;
     }
 
+    private Node disableCountryCheck(PhoneNumberField field) {
+        CheckBox check = new CheckBox();
+        check.selectedProperty().bindBidirectional(field.disableCountryCodeProperty());
+        return check;
+    }
+
+    private Node forceLocalPhoneNumberCheck(PhoneNumberField field) {
+        CheckBox check = new CheckBox();
+        check.selectedProperty().bindBidirectional(field.forceLocalNumberProperty());
+        return check;
+    }
+
+    private Node strictModeCheck(PhoneNumberField field) {
+        CheckBox check = new CheckBox();
+        check.selectedProperty().bindBidirectional(field.strictModeProperty());
+        return check;
+    }
+
+    private Node unmaskedModeCheck(PhoneNumberField field) {
+        CheckBox check = new CheckBox();
+        check.selectedProperty().addListener((obs, oldV, newV) -> {
+            if (newV) {
+                field.setMaskProvider(null);
+            } else {
+                field.setMaskProvider(PhoneNumberField.DEFAULT_MASK_PROVIDER);
+            }
+        });
+        return check;
+    }
+
     private void addControl(String name, Node control, VBox controls) {
         Label label = new Label(name);
         label.setPrefWidth(150);
@@ -143,7 +160,7 @@ private void addField(VBox fields, String label, ObservableValue property, Funct
         }
 
         Label myLabel = new Label(label + ": ");
-        myLabel.setPrefWidth(100);
+        myLabel.setPrefWidth(150);
 
         HBox hBox = new HBox();
         hBox.setAlignment(Pos.CENTER_LEFT);