-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add alert banner for official communications
- Loading branch information
Showing
7 changed files
with
266 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
apps/desktop/desktop/src/main/java/bisq/desktop/main/alert/AlertBannerController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.alert; | ||
|
|
||
| import bisq.bonded_roles.security_manager.alert.AlertType; | ||
| import bisq.desktop.common.view.Controller; | ||
| import lombok.Getter; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Slf4j | ||
| public class AlertBannerController implements Controller { | ||
| private final AlertBannerModel model; | ||
| @Getter | ||
| private final AlertBannerView view; | ||
|
|
||
| public AlertBannerController() { | ||
| model = new AlertBannerModel(); | ||
| view = new AlertBannerView(model, this); | ||
| } | ||
|
|
||
| @Override | ||
| public void onActivate() { | ||
| } | ||
|
|
||
| @Override | ||
| public void onDeactivate() { | ||
| } | ||
|
|
||
| public void showAlert(String message, AlertType alertType) { | ||
| model.getMessage().set(message); | ||
| model.getAlertType().set(alertType); | ||
| model.getIsAlertVisible().set(true); | ||
| } | ||
|
|
||
| void onClose() { | ||
| model.getIsAlertVisible().set(false); | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
apps/desktop/desktop/src/main/java/bisq/desktop/main/alert/AlertBannerModel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.alert; | ||
|
|
||
| import bisq.bonded_roles.security_manager.alert.AlertType; | ||
| import bisq.desktop.common.view.Model; | ||
| import javafx.beans.property.*; | ||
| import lombok.Getter; | ||
|
|
||
| @Getter | ||
| public class AlertBannerModel implements Model { | ||
| private final BooleanProperty isAlertVisible = new SimpleBooleanProperty(); | ||
| private final StringProperty message = new SimpleStringProperty(); | ||
| private final ObjectProperty<AlertType> alertType = new SimpleObjectProperty<>(); | ||
|
|
||
| public AlertBannerModel() { | ||
| } | ||
| } |
133 changes: 133 additions & 0 deletions
133
apps/desktop/desktop/src/main/java/bisq/desktop/main/alert/AlertBannerView.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.alert; | ||
|
|
||
| import bisq.bonded_roles.security_manager.alert.AlertType; | ||
| import bisq.desktop.common.Transitions; | ||
| import bisq.desktop.common.view.View; | ||
| import bisq.desktop.components.containers.Spacer; | ||
| import bisq.desktop.components.controls.BisqIconButton; | ||
| import javafx.animation.Timeline; | ||
| import javafx.beans.value.ChangeListener; | ||
| import javafx.geometry.Insets; | ||
| import javafx.geometry.Pos; | ||
| import javafx.scene.control.Button; | ||
| import javafx.scene.control.Label; | ||
| import javafx.scene.layout.*; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.fxmisc.easybind.EasyBind; | ||
| import org.fxmisc.easybind.Subscription; | ||
|
|
||
| @Slf4j | ||
| public class AlertBannerView extends View<BorderPane, AlertBannerModel, AlertBannerController> { | ||
| public static final int DURATION = Transitions.DEFAULT_DURATION / 2; | ||
|
|
||
| Label content = new Label(); | ||
| private final Button closeButton; | ||
| private final HBox banner; | ||
| private final ChangeListener<Number> contentHeightListener; | ||
| private Timeline slideInRightTimeline, slideOutTopTimeline; | ||
| private Subscription isVisiblePin, alertTypePin; | ||
|
|
||
| public AlertBannerView(AlertBannerModel model, AlertBannerController controller) { | ||
| super(new BorderPane(), model, controller); | ||
|
|
||
| root.setManaged(false); | ||
| root.setVisible(false); | ||
|
|
||
| content.setWrapText(true); | ||
|
|
||
| closeButton = BisqIconButton.createIconButton("close-white"); | ||
|
|
||
| banner = new HBox(content, Spacer.fillHBox(), closeButton); | ||
| banner.setAlignment(Pos.TOP_CENTER); | ||
| banner.setPadding(new Insets(10, 10, 10, 15)); | ||
|
|
||
| contentHeightListener = ((observable, oldValue, newValue) -> banner.setMinHeight(newValue.doubleValue() + 25)); // padding = 25 | ||
|
|
||
| root.setCenter(banner); | ||
| root.setPadding(new Insets(20, 40, 20, 40)); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onViewAttached() { | ||
| content.textProperty().bind(model.getMessage()); | ||
|
|
||
| isVisiblePin = EasyBind.subscribe(model.getIsAlertVisible(), isVisible -> { | ||
| if (slideInRightTimeline != null) { | ||
| slideInRightTimeline.stop(); | ||
| slideInRightTimeline = null; | ||
| root.setTranslateX(0); | ||
| root.setOpacity(1); | ||
| } | ||
| if (slideOutTopTimeline != null) { | ||
| slideOutTopTimeline.stop(); | ||
| slideOutTopTimeline = null; | ||
| root.setTranslateY(0); | ||
| root.setOpacity(0); | ||
| root.setManaged(false); | ||
| root.setVisible(false); | ||
| } | ||
| if (isVisible) { | ||
| root.setManaged(true); | ||
| root.setVisible(true); | ||
| root.setTranslateY(0); | ||
| slideInRightTimeline = Transitions.slideInRight(root, DURATION, () -> { | ||
| }); | ||
| } else { | ||
| root.setTranslateX(0); | ||
| root.setTranslateY(0); | ||
| slideOutTopTimeline = Transitions.slideAndFadeOutTop(root, DURATION, () -> { | ||
| root.setManaged(false); | ||
| root.setVisible(false); | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
| alertTypePin = EasyBind.subscribe(model.getAlertType(), this::addAlertTypeStyleClass); | ||
|
|
||
| content.heightProperty().addListener(contentHeightListener); | ||
|
|
||
| closeButton.setOnAction(e -> controller.onClose()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onViewDetached() { | ||
| content.textProperty().unbind(); | ||
|
|
||
| isVisiblePin.unsubscribe(); | ||
| alertTypePin.unsubscribe(); | ||
|
|
||
| content.heightProperty().removeListener(contentHeightListener); | ||
|
|
||
| closeButton.setOnAction(null); | ||
| } | ||
|
|
||
| private void addAlertTypeStyleClass(AlertType alertType) { | ||
| banner.getStyleClass().clear(); | ||
| String alertTypeClass; | ||
| if (alertType == AlertType.INFO) { | ||
| alertTypeClass = "info-banner"; | ||
| } else if (alertType == AlertType.WARN) { | ||
| alertTypeClass = "warn-banner"; | ||
| } else { | ||
| alertTypeClass = "emergency-banner"; | ||
| } | ||
| banner.getStyleClass().addAll("alert-banner", alertTypeClass); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters