Add mobile notifications

build.gradle

@@ -1,5 +1,6 @@
 buildscript {
     repositories {
+        mavenLocal()
         jcenter()
     }
     dependencies {
@@ -15,7 +16,7 @@ apply plugin: 'witness'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 group = 'network.bisq'
-version = '0.7.1-SNAPSHOT'
+version = '0.8.0'
 
 sourceCompatibility = 1.8
 
@@ -33,25 +34,29 @@ tasks.withType(JavaCompile) {
 sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files
 
 repositories {
+    mavenLocal()
     jcenter()
     maven { url 'https://jitpack.io' }
     maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
     maven { url 'https://dl.bintray.com/jerady/maven' }
 }
 
 dependencies {
-    compile 'network.bisq:bisq-p2p:-SNAPSHOT'
-    compile 'network.bisq:bisq-core:-SNAPSHOT'
-    compile 'network.bisq:bisq-common:-SNAPSHOT'
+    compile 'network.bisq:bisq-p2p:0.8.0'
+    compile 'network.bisq:bisq-core:0.8.0'
+    compile 'network.bisq:bisq-common:0.8.0'
     compile 'org.controlsfx:controlsfx:8.0.6_20'
     compile 'org.reactfx:reactfx:2.0-M3'
     compile 'net.glxn:qrgen:1.3'
     compile 'de.jensd:fontawesomefx:8.0.0'
     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'
+    //annotationProcessor 'org.projectlombok:lombok:1.16.16'
     testCompile('org.mockito:mockito-core:2.8.9') {
         exclude(module: 'objenesis')
     }
@@ -61,7 +66,7 @@ dependencies {
     testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
     testCompile 'com.natpryce:make-it-easy:4.0.1'
     testCompileOnly 'org.projectlombok:lombok:1.16.16'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
+    //testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
 }
 
 build.dependsOn installDist

package/linux/32bitBuild.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 set -e
 
 # Edit version
-version=0.7.1
+version=0.8.0
 
 dir="/media/sf_vm_shared_ubuntu14_32bit"
 

package/linux/64bitBuild.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 set -e
 
 # Edit version
-version=0.7.1
+version=0.8.0
 
 dir="/media/sf_vm_shared_ubuntu"
 

package/linux/Dockerfile

@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 0.7.1
+ENV version 0.8.0
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot

package/linux/rpm.sh

@@ -2,7 +2,7 @@
 
 ## From https://github.com/bisq-network/bisq-desktop/issues/401#issuecomment-372091261
 
-version=0.7.1
+version=0.8.0
 
 alien -r -g /home/$USER/Desktop/Bisq-64bit-$version.deb
 find bisq-$version -type f | while read LIB; do LDDOUT=$(ldd $LIB 2>&1); LDDRETVAL=$?;if [ \( -z "${LDDOUT%%*you do not have execution permission for*}" \) -a \( $LDDRETVAL -eq 0 \) ]; then chmod -v +x $LIB;fi;done

package/osx/Info.plist

@@ -40,7 +40,7 @@
         <key>JVMAppClasspath</key>
         <string></string>
         <key>JVMMainJarName</key>
-        <string>Bisq-0.7.1.jar</string>
+        <string>Bisq-0.8.0.jar</string>
         <key>JVMPreferencesID</key>
         <string>bisq</string>
         <key>JVMOptions</key>

package/osx/create_app.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 
 set -e
 
-version="0.7.1"
+version="0.8.0"
 
 ./gradlew --include-build ../common --include-build ../assets --include-build ../p2p --include-build ../core build -x test shadowJar
 
@@ -82,18 +82,18 @@ $JAVA_HOME/bin/javapackager \
     -Bicon=package/osx/Bisq.icns \
     -Bruntime="$JAVA_HOME/jre" \
     -native dmg \
-    -name Bisq \
-    -title Bisq \
+    -name Bisq_notifications \
+    -title Bisq_notifications \
     -vendor Bisq \
     -outdir deploy \
     -srcfiles "deploy/Bisq-$version.jar" \
     -appclass bisq.desktop.app.BisqAppMain \
-    -outfile Bisq
+    -outfile Bisq_notifications
 
 rm "deploy/Bisq.html"
 rm "deploy/Bisq.jnlp"
 
-mv "deploy/bundles/Bisq-$version.dmg" "deploy/Bisq-$version.dmg"
+mv "deploy/bundles/Bisq_notifications-$version.dmg" "deploy/Bisq_notifications-$version.dmg"
 rm -r "deploy/bundles"
 
 open deploy

package/osx/finalize.sh

@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="0.7.1"
+version="0.8.0"
 
 target_dir="releases/$version"
 

package/windows/32bitBuild.bat

@@ -5,7 +5,7 @@
 :: 32 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.7.1
+SET version=0.8.0
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows_32bit

package/windows/64bitBuild.bat

@@ -5,7 +5,7 @@
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.7.1
+SET version=0.8.0
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows

package/windows/Bisq.iss

@@ -3,7 +3,7 @@
 [Setup]
 AppId={{bisq}}
 AppName=Bisq
-AppVersion=0.7.1
+AppVersion=0.8.0
 AppVerName=Bisq
 AppPublisher=Bisq
 AppComments=Bisq

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;
     }