From de4e6c039e763c5e65287bc54483288c6049533d Mon Sep 17 00:00:00 2001 From: Iris De Santis Date: Thu, 11 Apr 2024 15:36:56 +0200 Subject: [PATCH 1/2] Auto stash before merge of "main" and "origin/main" --- .idea/sqldialects.xml | 6 +++++ .../bubbles/gui/SideViewApplication.java | 4 ++- .../bubbles/gui/SideViewController.java | 26 +++++++++++++++++++ .../team/elrant/bubbles/gui/SideView.fxml | 23 +++++++++++++++- 4 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 .idea/sqldialects.xml diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..8d0fef2 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/team/elrant/bubbles/gui/SideViewApplication.java b/src/main/java/team/elrant/bubbles/gui/SideViewApplication.java index 0ee8fe5..1aee9aa 100644 --- a/src/main/java/team/elrant/bubbles/gui/SideViewApplication.java +++ b/src/main/java/team/elrant/bubbles/gui/SideViewApplication.java @@ -33,7 +33,7 @@ public void start(@NotNull Stage primaryStage) throws Exception { AnchorPane root = fxmlLoader.load(); @NotNull Scene scene = new Scene(root, 320, 720); scene.getStylesheets().add(Objects.requireNonNull(getClass().getResource("fluent-light.css")).toExternalForm()); - primaryStage.setTitle("Chat"); + stage.setTitle("Sidebar"); primaryStage.setScene(scene); primaryStage.centerOnScreen(); primaryStage.setResizable(false); @@ -44,3 +44,5 @@ public void start(@NotNull Stage primaryStage) throws Exception { } } } + + \ No newline at end of file diff --git a/src/main/java/team/elrant/bubbles/gui/SideViewController.java b/src/main/java/team/elrant/bubbles/gui/SideViewController.java index 9d69084..65e4576 100644 --- a/src/main/java/team/elrant/bubbles/gui/SideViewController.java +++ b/src/main/java/team/elrant/bubbles/gui/SideViewController.java @@ -1,5 +1,31 @@ +<<<<<<< Updated upstream package team.elrant.bubbles.gui; public class SideViewController { } +======= +package team.elrant.bubbles.gui; + +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.PasswordField; +import javafx.scene.control.TextField; +import javafx.stage.Stage; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.Nullable; +import team.elrant.bubbles.xmpp.ConnectedUser; +import team.elrant.bubbles.xmpp.User; + +/** + * The SideViewController class controls the login functionality in the GUI. + * It handles user authentication and navigation to the main application. + */ +public class SideViewController { + private static final Logger logger = LogManager.getLogger(SideViewController.class); + + +} +>>>>>>> Stashed changes diff --git a/src/main/resources/team/elrant/bubbles/gui/SideView.fxml b/src/main/resources/team/elrant/bubbles/gui/SideView.fxml index 4d3fe4b..c059199 100644 --- a/src/main/resources/team/elrant/bubbles/gui/SideView.fxml +++ b/src/main/resources/team/elrant/bubbles/gui/SideView.fxml @@ -1,8 +1,29 @@ + - + + + + + + + + + + + + + + + + + + + + + From 39c614e698e04798ed288fbfc112a6a27fb6de7a Mon Sep 17 00:00:00 2001 From: Iris De Santis Date: Thu, 11 Apr 2024 15:39:23 +0200 Subject: [PATCH 2/2] Merge but it doesnt suck now --- .../bubbles/gui/ChatViewApplication.java | 14 ++++++------ .../bubbles/gui/SideViewApplication.java | 12 +++++----- .../bubbles/gui/SideViewController.java | 22 +++---------------- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/src/main/java/team/elrant/bubbles/gui/ChatViewApplication.java b/src/main/java/team/elrant/bubbles/gui/ChatViewApplication.java index 3e5ebdc..00d4f1f 100644 --- a/src/main/java/team/elrant/bubbles/gui/ChatViewApplication.java +++ b/src/main/java/team/elrant/bubbles/gui/ChatViewApplication.java @@ -48,11 +48,11 @@ public static void main(String[] args) { * The start method initializes the primary stage of the chat application. * It loads the ChatView.fxml layout, sets up the ChatViewController, and displays the stage. * - * @param primaryStage The primary stage of the application. + * @param stage The primary stage of the application. * @throws Exception If an error occurs during the initialization. */ @Override - public void start(@NotNull Stage primaryStage) throws Exception { + public void start(@NotNull Stage stage) throws Exception { try { @NotNull FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("ChatView.fxml")); @@ -71,11 +71,11 @@ public void start(@NotNull Stage primaryStage) throws Exception { AnchorPane root = fxmlLoader.load(); @NotNull Scene scene = new Scene(root, 800, 700); scene.getStylesheets().add(Objects.requireNonNull(getClass().getResource("fluent-light.css")).toExternalForm()); - primaryStage.setTitle("Chat"); - primaryStage.setScene(scene); - primaryStage.centerOnScreen(); - primaryStage.setResizable(false); - primaryStage.show(); + stage.setTitle("Chat"); + stage.setScene(scene); + stage.centerOnScreen(); + stage.setResizable(false); + stage.show(); } catch (Exception e) { logger.error("Error starting ChatViewApplication: {}", e.getMessage()); throw e; diff --git a/src/main/java/team/elrant/bubbles/gui/SideViewApplication.java b/src/main/java/team/elrant/bubbles/gui/SideViewApplication.java index 1aee9aa..1105017 100644 --- a/src/main/java/team/elrant/bubbles/gui/SideViewApplication.java +++ b/src/main/java/team/elrant/bubbles/gui/SideViewApplication.java @@ -23,21 +23,21 @@ public static void main(String[] args) { * The start method initializes the primary stage of the chat application. * It loads the SideView.fxml layout and displays the stage. * - * @param primaryStage The primary stage of the application. + * @param stage The primary stage of the application. * @throws Exception If an error occurs during the initialization. */ @Override - public void start(@NotNull Stage primaryStage) throws Exception { + public void start(@NotNull Stage stage) throws Exception { try { @NotNull FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("SideView.fxml")); AnchorPane root = fxmlLoader.load(); @NotNull Scene scene = new Scene(root, 320, 720); scene.getStylesheets().add(Objects.requireNonNull(getClass().getResource("fluent-light.css")).toExternalForm()); stage.setTitle("Sidebar"); - primaryStage.setScene(scene); - primaryStage.centerOnScreen(); - primaryStage.setResizable(false); - primaryStage.show(); + stage.setScene(scene); + stage.centerOnScreen(); + stage.setResizable(false); + stage.show(); } catch (Exception e) { logger.error("Error starting SideViewApplication: {}", e.getMessage()); throw e; diff --git a/src/main/java/team/elrant/bubbles/gui/SideViewController.java b/src/main/java/team/elrant/bubbles/gui/SideViewController.java index 65e4576..613e338 100644 --- a/src/main/java/team/elrant/bubbles/gui/SideViewController.java +++ b/src/main/java/team/elrant/bubbles/gui/SideViewController.java @@ -1,31 +1,15 @@ -<<<<<<< Updated upstream -package team.elrant.bubbles.gui; - -public class SideViewController { - -} -======= package team.elrant.bubbles.gui; -import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.Label; -import javafx.scene.control.PasswordField; -import javafx.scene.control.TextField; -import javafx.stage.Stage; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.jetbrains.annotations.Nullable; -import team.elrant.bubbles.xmpp.ConnectedUser; -import team.elrant.bubbles.xmpp.User; + /** * The SideViewController class controls the login functionality in the GUI. - * It handles user authentication and navigation to the main application. + * It handles ... */ public class SideViewController { private static final Logger logger = LogManager.getLogger(SideViewController.class); -} ->>>>>>> Stashed changes +} \ No newline at end of file