Skip to content

Commit

Permalink
refactor: altered Controller structure for better coupling
Browse files Browse the repository at this point in the history
  • Loading branch information
emilfa committed Mar 12, 2026
1 parent ea35d89 commit 05bb334
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 12 deletions.
7 changes: 2 additions & 5 deletions src/main/java/edu/group5/app/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import edu.group5.app.control.MainController;
import edu.group5.app.control.OrgAPIWrapper;
import edu.group5.app.view.MainView;
import javafx.application.Application;
import javafx.scene.Scene;
import javafx.scene.image.Image;
Expand All @@ -18,12 +17,10 @@
public class App extends Application {
@Override
public void start(Stage stage) {
// AppModel model = new AppModel();
MainController controller = new MainController();
MainView view = new MainView(controller);

controller.setMainView(view);
Scene scene = view.createView();
Scene scene = controller.getMainView().getScene();
controller.showBrowsePage();

stage.getIcons().add(new Image(getClass().getResource("/header/images/hmh-logo.png").toExternalForm()));
stage.setTitle("Help-Me-Help");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package edu.group5.app.control;

public class BrowseOrgController {
public class BrowseCardController {
private final MainController controller;

public BrowseOrgController(MainController mainController) {
public BrowseCardController(MainController mainController) {
this.controller = mainController;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
package edu.group5.app.control;

public class BrowsePageController {
private final MainController controller;

public BrowsePageController(MainController mainController) {
this.controller = mainController;
}
}
1 change: 1 addition & 0 deletions src/main/java/edu/group5/app/control/HeaderController.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public void handleHomeBtn() {

public void handleCausesBtn() {
System.out.println("Causes button pressed");
controller.showBrowsePage();
}

public void handleAboutBtn() {
Expand Down
22 changes: 17 additions & 5 deletions src/main/java/edu/group5/app/control/MainController.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,34 @@
import edu.group5.app.view.MainView;

public class MainController {
private MainView view;
private final MainView view;
private final HeaderController headerController;
private final HomePageController homePageController;
private final BrowsePageController browsePageController;
private final BrowseCardController browseCardController;

public void setMainView(MainView view) {
this.view = view;
public MainController() {
this.view = new MainView();
this.headerController = new HeaderController(this);
this.homePageController = new HomePageController(this);
this.browsePageController = new BrowsePageController(this);
this.browseCardController = new BrowseCardController(this);
}

public MainView getMainView() {
return view;
}

public void showHomePage() {
view.showHomePage();
view.showHomePage(homePageController, headerController);
}

public void showLoginPage() {
view.showLoginPage();
}

public void showBrowsePage() {
view.showBrowsePage();
view.showBrowsePage(browsePageController, browseCardController, headerController);
}

public void showAboutUsPage() {}
Expand Down

0 comments on commit 05bb334

Please sign in to comment.