Add mobile notifications

build.gradle

@@ -50,6 +50,9 @@ dependencies {
     compile 'de.jensd:fontawesomefx-commons:8.15'
     compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
     compile 'com.googlecode.jcsv:jcsv:1.4.0'
+    compile 'com.github.sarxos:webcam-capture:0.3.12'
+
+
     compileOnly 'org.projectlombok:lombok:1.16.16'
     annotationProcessor 'org.projectlombok:lombok:1.16.16'
     testCompile('org.mockito:mockito-core:2.8.9') {

src/main/java/bisq/desktop/bisq.css

@@ -64,6 +64,7 @@ bg color of non edit textFields: fafafa
 
     -bs-red: red; /* 5 usages */
     -bs-error-red: #dd0000; /* 5 usages */
+    -bs-soft-red: #ee6664; /* 1 usages */
     -bs-pink: #ff8986; /* 2 usages */
     -bs-orange: #ff8a2b; /* 2 usages */
     -bs-orange2: #dd6900; /* 1 usages */
@@ -1337,3 +1338,13 @@ textfield */
     -fx-background-insets: 0, 0 0 0 0
 }
 
+/********************************************************************************************************************
+ *                                                                                                                  *
+ * Notifications                                                                                                              *
+ *                                                                                                                  *
+ ********************************************************************************************************************/
+
+#notification-erase-button {
+    -fx-background-color: -bs-soft-red;
+    -fx-text-fill: #ffffff;
+}

src/main/java/bisq/desktop/components/InfoInputTextField.java

@@ -32,14 +32,19 @@
 
 import java.util.concurrent.TimeUnit;
 
+import lombok.Getter;
+
 import static bisq.desktop.util.FormBuilder.getIcon;
 
 public class InfoInputTextField extends AnchorPane {
 
     private final StringProperty text = new SimpleStringProperty();
 
-    private final InputTextField textField;
+    @Getter
+    private final InputTextField inputTextField;
+    @Getter
     private final Label infoIcon;
+    @Getter
     private final Label warningIcon;
     private Label currentIcon;
     private PopOver popover;
@@ -48,7 +53,7 @@ public class InfoInputTextField extends AnchorPane {
     public InfoInputTextField() {
         super();
 
-        textField = new InputTextField();
+        inputTextField = new InputTextField();
 
         infoIcon = getIcon(AwesomeIcon.INFO_SIGN);
         infoIcon.setLayoutY(3);
@@ -60,12 +65,12 @@ public InfoInputTextField() {
 
         AnchorPane.setLeftAnchor(infoIcon, 7.0);
         AnchorPane.setLeftAnchor(warningIcon, 7.0);
-        AnchorPane.setRightAnchor(textField, 0.0);
-        AnchorPane.setLeftAnchor(textField, 0.0);
+        AnchorPane.setRightAnchor(inputTextField, 0.0);
+        AnchorPane.setLeftAnchor(inputTextField, 0.0);
 
         hideIcons();
 
-        getChildren().addAll(textField, infoIcon, warningIcon);
+        getChildren().addAll(inputTextField, infoIcon, warningIcon);
     }
 
     private void hideIcons() {
@@ -93,6 +98,35 @@ public void setContentForWarningPopOver(Node node) {
         setActionHandlers(node);
     }
 
+    public void setIconsRightAligned() {
+        AnchorPane.clearConstraints(infoIcon);
+        AnchorPane.clearConstraints(warningIcon);
+        AnchorPane.clearConstraints(inputTextField);
+
+        AnchorPane.setRightAnchor(infoIcon, 7.0);
+        AnchorPane.setRightAnchor(warningIcon, 7.0);
+        AnchorPane.setLeftAnchor(inputTextField, 0.0);
+        AnchorPane.setRightAnchor(inputTextField, 0.0);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters/Setters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void setText(String text) {
+        this.text.set(text);
+    }
+
+    public String getText() {
+        return text.get();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Private
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
     private void setActionHandlers(Node node) {
 
         currentIcon.setManaged(true);
@@ -116,10 +150,6 @@ private void setActionHandlers(Node node) {
         });
     }
 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Private
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
     private void showPopOver(Node node) {
         node.getStyleClass().add("default-text");
 
@@ -132,19 +162,4 @@ private void showPopOver(Node node) {
             popover.show(currentIcon, -17);
         }
     }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Getters/Setters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public InputTextField getTextField() { return textField; }
-
-    public void setText(String text) {
-        this.text.set(text);
-    }
-
-    public String getText() {
-        return text.get();
-    }
-
 }

src/main/java/bisq/desktop/main/account/AccountView.java

@@ -49,7 +49,7 @@
 import javafx.event.EventHandler;
 
 @FxmlView
-public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
+public class AccountView extends ActivatableView<TabPane, Void> {
 
     @FXML
     Tab accountSettingsTab;
@@ -67,8 +67,8 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
     private EventHandler<KeyEvent> keyEventEventHandler;
 
     @Inject
-    private AccountView(AccountViewModel model, CachingViewLoader viewLoader, Navigation navigation) {
-        super(model);
+    private AccountView(CachingViewLoader viewLoader, Navigation navigation) {
+        super();
         this.viewLoader = viewLoader;
         this.navigation = navigation;
     }

src/main/java/bisq/desktop/main/account/content/notifications/ManageMarketAlertsWindow.java

@@ -0,0 +1,211 @@
+/*
+ * 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.account.content.notifications;
+
+import bisq.desktop.components.AutoTooltipButton;
+import bisq.desktop.components.AutoTooltipLabel;
+import bisq.desktop.components.AutoTooltipTableColumn;
+import bisq.desktop.main.overlays.Overlay;
+import bisq.desktop.util.ImageUtil;
+
+import bisq.core.locale.Res;
+import bisq.core.notifications.alerts.market.MarketAlertFilter;
+import bisq.core.notifications.alerts.market.MarketAlerts;
+import bisq.core.util.BSFormatter;
+
+import bisq.common.UserThread;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.Tooltip;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.GridPane;
+
+import javafx.geometry.Insets;
+
+import javafx.beans.property.ReadOnlyObjectWrapper;
+
+import javafx.collections.FXCollections;
+
+import javafx.util.Callback;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ManageMarketAlertsWindow extends Overlay<ManageMarketAlertsWindow> {
+
+    private final MarketAlerts marketAlerts;
+    private final BSFormatter formatter;
+
+    ManageMarketAlertsWindow(MarketAlerts marketAlerts, BSFormatter formatter) {
+        this.marketAlerts = marketAlerts;
+        this.formatter = formatter;
+        type = Type.Attention;
+    }
+
+    @Override
+    public void show() {
+        if (headLine == null)
+            headLine = Res.get("account.notifications.marketAlert.manageAlerts.title");
+
+        width = 900;
+        createGridPane();
+        addHeadLine();
+        addContent();
+        addCloseButton();
+        applyStyles();
+        display();
+    }
+
+    @Override
+    protected void applyStyles() {
+        super.applyStyles();
+        gridPane.setId("popup-grid-pane-bg");
+    }
+
+    private void addContent() {
+        TableView<MarketAlertFilter> tableView = new TableView<>();
+        GridPane.setRowIndex(tableView, ++rowIndex);
+        GridPane.setColumnSpan(tableView, 2);
+        GridPane.setMargin(tableView, new Insets(10, 0, 0, 0));
+        gridPane.getChildren().add(tableView);
+        Label placeholder = new AutoTooltipLabel(Res.get("table.placeholder.noData"));
+        placeholder.setWrapText(true);
+        tableView.setPlaceholder(placeholder);
+        tableView.setPrefHeight(300);
+        tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+
+        setColumns(tableView);
+        tableView.setItems(FXCollections.observableArrayList(marketAlerts.getMarketAlertFilters()));
+    }
+
+    private void removeMarketAlertFilter(MarketAlertFilter marketAlertFilter, TableView<MarketAlertFilter> tableView) {
+        marketAlerts.removeMarketAlertFilter(marketAlertFilter);
+        UserThread.execute(() -> tableView.setItems(FXCollections.observableArrayList(marketAlerts.getMarketAlertFilters())));
+    }
+
+    private void setColumns(TableView<MarketAlertFilter> tableView) {
+        TableColumn<MarketAlertFilter, MarketAlertFilter> column;
+
+        column = new AutoTooltipTableColumn<>(Res.get("account.notifications.marketAlert.manageAlerts.header.paymentAccount"));
+        column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
+        column.setCellFactory(
+                new Callback<TableColumn<MarketAlertFilter, MarketAlertFilter>, TableCell<MarketAlertFilter, MarketAlertFilter>>() {
+                    @Override
+                    public TableCell<MarketAlertFilter, MarketAlertFilter> call(TableColumn<MarketAlertFilter, MarketAlertFilter> column) {
+                        return new TableCell<MarketAlertFilter, MarketAlertFilter>() {
+
+                            @Override
+                            public void updateItem(final MarketAlertFilter item, boolean empty) {
+                                super.updateItem(item, empty);
+                                if (item != null && !empty) {
+                                    setText(item.getPaymentAccount().getAccountName());
+                                } else {
+                                    setText("");
+                                }
+                            }
+                        };
+                    }
+                });
+        tableView.getColumns().add(column);
+
+
+        column = new AutoTooltipTableColumn<>(Res.get("account.notifications.marketAlert.manageAlerts.header.trigger"));
+        column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
+        column.setCellFactory(
+                new Callback<TableColumn<MarketAlertFilter, MarketAlertFilter>, TableCell<MarketAlertFilter, MarketAlertFilter>>() {
+                    @Override
+                    public TableCell<MarketAlertFilter, MarketAlertFilter> call(TableColumn<MarketAlertFilter, MarketAlertFilter> column) {
+                        return new TableCell<MarketAlertFilter, MarketAlertFilter>() {
+
+                            @Override
+                            public void updateItem(final MarketAlertFilter item, boolean empty) {
+                                super.updateItem(item, empty);
+                                if (item != null && !empty) {
+                                    setText(formatter.formatPercentagePrice(item.getTriggerValue() / 10000d));
+                                } else {
+                                    setText("");
+                                }
+                            }
+                        };
+                    }
+                });
+        tableView.getColumns().add(column);
+
+
+        column = new AutoTooltipTableColumn<>(Res.get("account.notifications.marketAlert.manageAlerts.header.offerType"));
+        column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
+        column.setCellFactory(
+                new Callback<TableColumn<MarketAlertFilter, MarketAlertFilter>, TableCell<MarketAlertFilter, MarketAlertFilter>>() {
+                    @Override
+                    public TableCell<MarketAlertFilter, MarketAlertFilter> call(TableColumn<MarketAlertFilter, MarketAlertFilter> column) {
+                        return new TableCell<MarketAlertFilter, MarketAlertFilter>() {
+
+                            @Override
+                            public void updateItem(final MarketAlertFilter item, boolean empty) {
+                                super.updateItem(item, empty);
+                                if (item != null && !empty) {
+                                    setText(item.isBuyOffer() ? Res.get("shared.buyBitcoin") : Res.get("shared.sellBitcoin"));
+                                } else {
+                                    setText("");
+                                }
+                            }
+                        };
+                    }
+                });
+        tableView.getColumns().add(column);
+
+        column = new TableColumn<>();
+        column.setMinWidth(40);
+        column.setMaxWidth(column.getMinWidth());
+        column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
+        column.setCellFactory(
+                new Callback<TableColumn<MarketAlertFilter, MarketAlertFilter>, TableCell<MarketAlertFilter, MarketAlertFilter>>() {
+                    @Override
+                    public TableCell<MarketAlertFilter, MarketAlertFilter> call(TableColumn<MarketAlertFilter, MarketAlertFilter> column) {
+                        return new TableCell<MarketAlertFilter, MarketAlertFilter>() {
+                            final ImageView icon = ImageUtil.getImageViewById(ImageUtil.REMOVE_ICON);
+                            final Button removeButton = new AutoTooltipButton("", icon);
+
+                            {
+                                removeButton.setId("icon-button");
+                                removeButton.setTooltip(new Tooltip(Res.get("shared.remove")));
+                            }
+
+                            @Override
+                            public void updateItem(final MarketAlertFilter item, boolean empty) {
+                                super.updateItem(item, empty);
+
+                                if (item != null && !empty) {
+                                    removeButton.setOnAction(e -> removeMarketAlertFilter(item, tableView));
+                                    setGraphic(removeButton);
+                                } else {
+                                    setGraphic(null);
+                                    removeButton.setOnAction(null);
+                                }
+                            }
+                        };
+                    }
+                });
+
+        tableView.getColumns().add(column);
+    }
+}