From 14910083f4a80bccda87ee25a1f21de30684ebfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20K=C3=BChn?= Date: Thu, 20 Jan 2022 15:08:58 +0100 Subject: [PATCH] Added svgButtons to the left navigation --- .../src/main/java/helper/SvgBtnCreator.java | 2 +- .../src/main/java/main/MainController.java | 43 ++++++++++++++++++- .../app/src/main/resources/main/main-view.css | 17 +++++--- .../src/main/resources/main/main-view.fxml | 11 +---- 4 files changed, 54 insertions(+), 19 deletions(-) diff --git a/client/app/src/main/java/helper/SvgBtnCreator.java b/client/app/src/main/java/helper/SvgBtnCreator.java index a978be3..b23e366 100644 --- a/client/app/src/main/java/helper/SvgBtnCreator.java +++ b/client/app/src/main/java/helper/SvgBtnCreator.java @@ -12,7 +12,7 @@ public class SvgBtnCreator { Button btn = new Button(); Bounds boundsDel = group.getBoundsInParent(); - double scaleDel = Math.min(20 / boundsDel.getWidth(), 20 / boundsDel.getHeight()); + double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight()); group.setScaleX(scaleDel); group.setScaleY(scaleDel); btn.setGraphic(group); diff --git a/client/app/src/main/java/main/MainController.java b/client/app/src/main/java/main/MainController.java index 4968a18..937d4c2 100644 --- a/client/app/src/main/java/main/MainController.java +++ b/client/app/src/main/java/main/MainController.java @@ -27,6 +27,8 @@ import java.util.Objects; public class MainController { + @FXML + public VBox leftNav; @FXML private GridPane calendarGrid; @@ -49,8 +51,39 @@ public class MainController { public void initialize() { createWeek(); setDates(); - updateEvents(); + + leftNav.setSpacing(40); + + Group svgAdd = new Group( + SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"), + SvgBtnCreator.createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z", + "white", "lightgray") + ); + Button addBtn = SvgBtnCreator.cretaeBtn(svgAdd, 40); + addBtn.setOnAction(e -> onAddBtnClick()); + addBtn.getStyleClass().add("main-btn"); + leftNav.getChildren().add(addBtn); + + Group svgSettings = new Group( + SvgBtnCreator.createPath("M0,0h24v24H0V0z", "transparent", "transparent"), + SvgBtnCreator.createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z", + "white", "lightgray") + ); + Button settingsBtn = SvgBtnCreator.cretaeBtn(svgSettings, 40); + settingsBtn.setOnAction(e -> onSettingBtnClick()); + settingsBtn.getStyleClass().add("main-btn"); + leftNav.getChildren().add(settingsBtn); + + Group svgLogout = new Group( + SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"), + SvgBtnCreator.createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z", + "white", "lightgray") + ); + Button logoutBtn = SvgBtnCreator.cretaeBtn(svgLogout, 40); + logoutBtn.setOnAction(e -> onLogoutBtnClick()); + logoutBtn.getStyleClass().add("main-btn"); + leftNav.getChildren().add(logoutBtn); } private void updateEvents() { @@ -108,6 +141,14 @@ public class MainController { updateEvents(); } + protected void onSettingBtnClick(){ + + } + + protected void onLogoutBtnClick(){ + + } + private void createWeek() { for (int i = 0; i < 7; i++) { Label label = new Label(); diff --git a/client/app/src/main/resources/main/main-view.css b/client/app/src/main/resources/main/main-view.css index 0821874..657cac8 100644 --- a/client/app/src/main/resources/main/main-view.css +++ b/client/app/src/main/resources/main/main-view.css @@ -63,13 +63,16 @@ Label{ } .main-btn{ - -fx-background-color: #ffffff; - -fx-text-fill: -fx-main-text-color; - -fx-background-radius: 5em; - -fx-min-width: 40px; - -fx-min-height: 40px; - -fx-max-width: 40px; - -fx-max-height: 40px; + -fx-background-color: transparent; + -fx-border-color: transparent; +} + +.main-btn .svg { + -fx-fill: -fill; +} + +.main-btn:hover .svg { + -fx-fill: -hover-fill; } .navBtn{ diff --git a/client/app/src/main/resources/main/main-view.fxml b/client/app/src/main/resources/main/main-view.fxml index 758226a..825fb73 100644 --- a/client/app/src/main/resources/main/main-view.fxml +++ b/client/app/src/main/resources/main/main-view.fxml @@ -15,20 +15,11 @@ - - - ADD - - - ADD - - - ADD -