Merge remote-tracking branch 'origin/Update-components-to-JFoenix' into Update-components-to-JFoenix

# Conflicts:
#	client/app/src/main/java/main/CreateEventController.java

client/app/src/main/java/main/CreateEventController.java

@@ -27,9 +27,9 @@ public class CreateEventController {
     @FXML
     public JFXComboBox<String> ComboBoxPriotity;
     @FXML
-    public JFXCheckBox checkBoxIsFullDay;
+    public JFXToggleButton toggleBtnIsFullDay;
     @FXML
-    public JFXCheckBox checkBoxIsPrivate;
+    public JFXToggleButton toggleBtnIsPrivate;
     @FXML
     public Label labelError;
     @FXML
@@ -45,20 +45,11 @@ public class CreateEventController {
     public void initialize() {
 
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
+        timeStart.set24HourView(true);
+        timeStart.setConverter(defaultConverter);
 
-        JFXTimePicker timePickerStart = new JFXTimePicker();
+        timeEnd.set24HourView(true);
-        timeStart = timePickerStart;
+        timeEnd.setConverter(defaultConverter);
-        timePickerStart.set24HourView(true);
-        timePickerStart.setConverter(defaultConverter);
-        timePickerStart.getStyleClass().add("timePicker");
-        mainGrid.add(timePickerStart, 1 , 3);
-
-        JFXTimePicker timePickerEnd = new JFXTimePicker();
-        timeEnd = timePickerEnd;
-        timePickerEnd.set24HourView(true);
-        timePickerEnd.setConverter(defaultConverter);
-        timePickerEnd.getStyleClass().add("timePicker");
-        mainGrid.add(timePickerEnd, 1 , 4);
     }
 
 
@@ -72,8 +63,8 @@ public class CreateEventController {
             Event event = new Event(
                     textName.getText(),
                     ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
-                    checkBoxIsFullDay.isSelected(),
+                    toggleBtnIsFullDay.isSelected(),
-                    checkBoxIsPrivate.isSelected(),
+                    toggleBtnIsPrivate.isSelected(),
                     timeStart.getValue().toString(),
                     timeEnd.getValue().toString(),
                     datePickerDate.getValue().atStartOfDay(),

client/app/src/main/resources/main/create-event.css

@@ -61,5 +61,4 @@ JFXButton{
 
 .timePicker{
     -fx-background-color: white;
-    -fx-max-width: 200px;
 }

client/app/src/main/resources/main/create-event.fxml

@@ -40,6 +40,8 @@
 
     <JFXTextField styleClass="inputField" fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
     <JFXDatePicker styleClass="inputDate" fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
 
     <JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
@@ -50,8 +52,8 @@
             </FXCollections>
         </items>
     </JFXComboBox>
-    <JFXCheckBox styleClass="checkbox" fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    <JFXToggleButton styleClass="checkbox" fx:id="toggleBtnIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
-    <JFXCheckBox styleClass="checkbox"  fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <JFXToggleButton styleClass="checkbox"  fx:id="toggleBtnIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
     <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
     <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">

client/app/src/main/resources/main/edit-event.fxml

@@ -40,6 +40,8 @@
 
     <JFXTextField styleClass="inputField" fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
     <JFXDatePicker styleClass="inputDate" fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
 
     <JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
@@ -50,8 +52,8 @@
             </FXCollections>
         </items>
     </JFXComboBox>
-    <JFXCheckBox styleClass="checkbox" fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    <JFXToggleButton styleClass="checkbox" fx:id="toggleBtnIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
-    <JFXCheckBox styleClass="checkbox"  fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <JFXToggleButton styleClass="checkbox"  fx:id="toggleBtnIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
     <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
     <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">