MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '0300-Kalender' into merge

Browse Source 
# Conflicts:
#	hellofx/app/build/resources/main/client/style.css
#	hellofx/app/src/main/resources/client/style.css
This commit is contained in:
Marco Kühn 2021-11-26 13:25:05 +01:00
commit dc1b1643d8
5 changed files with 118 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -70,7 +70,5 @@ crashlytics-build.properties
# by github https://github.com/github/gitignore/blob/master/Java.gitignore # by github https://github.com/github/gitignore/blob/master/Java.gitignore
hellofx/.gradle/ .gradle/
hellofx/app/build/ build/
hellofx/data/build/
hellofx/.gradle/buildOutputCleanup/

2
hellofx/app/src/main/java/client/MainApplication.java
View File

@ -13,7 +13,7 @@ public class MainApplication extends Application {
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 1200, 700); Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("style.css")).toExternalForm()); scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
stage.setTitle("Hello!"); stage.setTitle("Hello!");
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();

51
hellofx/app/src/main/resources/client/main-view.css Normal file
View File

@ -0,0 +1,51 @@
GridPane{
-fx-background-color: #2B2D42;
}
.main-panel{
-fx-background-color: #282C34;
}
.vbox-main{
-fx-background-color: #333333;
-fx-alignment: top-center;
}
.gridCalendar Line{
-fx-stroke: #B0B0B0;
}
.gridCalender{
-fx-background-color: #2B2D42;
-fx-min-height: 80px;
-fx-max-height: 80px;
}
.labelMonth{
-fx-padding: 0 0 0 20;
-fx-background-color: #77859E;
-fx-font-size: 35px;
-fx-font-weight: bold;
}
.labelDays{
-fx-alignment: center;
-fx-background-color: #525E74;
-fx-font-size: 25px;
}
Label{
-fx-text-fill: white;
}
.main-btn{
-fx-background-color: #ffffff;
-fx-text-fill: white;
-fx-background-radius: 5em;
-fx-min-width: 40px;
-fx-min-height: 40px;
-fx-max-width: 40px;
-fx-max-height: 40px;
}

141
hellofx/app/src/main/resources/client/main-view.fxml
View File

@ -5,7 +5,7 @@
<?import javafx.scene.image.*?> <?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane gridLinesVisible="true" style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController"> <GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" /> <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
<ColumnConstraints hgrow="ALWAYS" /> <ColumnConstraints hgrow="ALWAYS" />
@ -13,7 +13,7 @@
<rowConstraints> <rowConstraints>
<RowConstraints vgrow="SOMETIMES" /> <RowConstraints vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #333333;"> <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #525E74;">
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
</ImageView> </ImageView>
@ -27,91 +27,78 @@
ADD ADD
</Button> </Button>
</VBox> </VBox>
<GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1"> <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" /> <ColumnConstraints hgrow="ALWAYS" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" /> <ColumnConstraints />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" /> <RowConstraints />
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
<RowConstraints vgrow="ALWAYS" /> <RowConstraints vgrow="ALWAYS" />
</rowConstraints> </rowConstraints>
<Label textFill="WHITE"> <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
Monat Monat
<padding> <padding>
<Insets left="5" /> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1"> <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1">
Mo <columnConstraints>
<padding> <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="14.2857142857" />
<Insets left="5" /> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
</padding> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
</Label> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1"> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
Di <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<padding> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<Insets left="5" /> </columnConstraints>
</padding> <rowConstraints>
</Label> <RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER" />
<Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1"> <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS" />
Mi </rowConstraints>
<padding> <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
<Insets left="5" /> Montag
</padding> <padding>
</Label> <Insets left="5" />
<Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1"> </padding>
Do </Label>
<padding> <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="0">
<Insets left="5" /> Dienstag
</padding> <padding>
</Label> <Insets left="5" />
<Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1"> </padding>
Fr </Label>
<padding> <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="0">
<Insets left="5" /> Mittwoch
</padding> <padding>
</Label> <Insets left="5" />
<Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1"> </padding>
Sa </Label>
<padding> <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="0">
<Insets left="5" /> Donnerstag
</padding> <padding>
</Label> <Insets left="5" />
<Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1"> </padding>
So </Label>
<padding> <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="0">
<Insets left="5" /> Freitag
</padding> <padding>
</Label> <Insets left="5" />
</padding>
<VBox fx:id="vBoxMon" spacing="5.0" GridPane.columnIndex="0" GridPane.rowIndex="2"> </Label>
<Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="0">
</VBox> Samstag
<VBox fx:id="vBoxTue" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2"> <padding>
<Insets left="5" />
</VBox> </padding>
<VBox fx:id="vBoxWen" spacing="5.0" GridPane.columnIndex="2" GridPane.rowIndex="2"> </Label>
<Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="0">
</VBox> Sonntag
<VBox fx:id="vBoxThu" spacing="5.0" GridPane.columnIndex="3" GridPane.rowIndex="2"> <padding>
<Insets left="5" />
</VBox> </padding>
<VBox fx:id="vBoxFri" spacing="5.0" GridPane.columnIndex="4" GridPane.rowIndex="2"> </Label>
</GridPane>
</VBox>
<VBox fx:id="vBoxSat" spacing="5.0" GridPane.columnIndex="5" GridPane.rowIndex="2">
</VBox>
<VBox fx:id="vBoxSun" spacing="5.0" GridPane.columnIndex="6" GridPane.rowIndex="2">
</VBox>
</GridPane> </GridPane>
</GridPane> </GridPane>

18
hellofx/app/src/main/resources/client/style.css
View File

@ -1,18 +0,0 @@
GridPane{
-fx-background-color: #282C34;
-fx-margin: 10px;
}
Label{
-fx-text-fill: white;
}
.main-btn{
-fx-background-color: #ffffff;
-fx-text-fill: white;
-fx-background-radius: 5em;
-fx-min-width: 40px;
-fx-min-height: 40px;
-fx-max-width: 40px;
-fx-max-height: 40px;
}