mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 09:52:23 +01:00
Merge pull request #1454 from cbeams/repackage
Rename and repackage bisq-desktop
This commit is contained in:
Manfred Karrer
GitHub
commit
5ec8782ea8
@ -8,3 +8,6 @@ end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
|
||||
[.idea/codeStyles/*.xml]
|
||||
indent_size = 2
|
||||
|
||||
162
.idea/codeStyles/Project.xml
Normal file
162
.idea/codeStyles/Project.xml
Normal file
@ -0,0 +1,162 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<HTMLCodeStyleSettings>
|
||||
<option name="HTML_ATTRIBUTE_WRAP" value="0" />
|
||||
<option name="HTML_TEXT_WRAP" value="0" />
|
||||
<option name="HTML_ALIGN_ATTRIBUTES" value="false" />
|
||||
</HTMLCodeStyleSettings>
|
||||
<JavaCodeStyleSettings>
|
||||
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
|
||||
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="5" />
|
||||
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
|
||||
<value />
|
||||
</option>
|
||||
<option name="IMPORT_LAYOUT_TABLE">
|
||||
<value>
|
||||
<package name="bisq.desktop" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="bisq.monitor" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="bisq.core" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="bisq.network" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="bisq.common" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="io.bisq.generated" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.google.protobuf" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="net.gpedro.integrations.slack" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.springframework" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.libdohj" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.bitcoinj" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.neemre.btcdcli4j" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="net.glxn.qrgen" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.apache.http" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.berndpruenster.netlayer" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.runjva" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.fasterxml" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.google.gson" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.googlecode.jcsv" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="joptsimple" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.google.inject" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javax.inject" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.google.common" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.apache.commons" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="de.jensd.fx.fontawesome" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.controlsfx" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.reactfx" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.application" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.fxml" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.animation" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.stage" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.scene" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.sun.javafx.scene" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.sun.javafx.tk.quantum" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.css" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.sun.javafx.css" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.geometry" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.fxmisc.easybind" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.beans" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.event" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.collections" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.sun.javafx.collections" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javafx.util" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.awt" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javax.imageio" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.spongycastle" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.bouncycastle" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.security" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javax.crypto" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.nio" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.io" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javax.net" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.net" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.text" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.util" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.time" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.math" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="java.lang" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.slf4j" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="ch.qos.logback" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="lombok" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.jetbrains.annotations" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="javax.annotation" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="com.natpryce.makeiteasy" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.powermock" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="mockit" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="org.junit" withSubpackages="true" static="false" />
|
||||
<emptyLine />
|
||||
<package name="" withSubpackages="true" static="true" />
|
||||
<emptyLine />
|
||||
<emptyLine />
|
||||
<emptyLine />
|
||||
<package name="" withSubpackages="true" static="false" />
|
||||
</value>
|
||||
</option>
|
||||
</JavaCodeStyleSettings>
|
||||
<codeStyleSettings language="JAVA">
|
||||
<option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
|
||||
</codeStyleSettings>
|
||||
</code_scheme>
|
||||
</component>
|
||||
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<state>
|
||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||
</state>
|
||||
</component>
|
||||
@ -11,7 +11,7 @@ That interpretation is also confirmed by the Java FX reference: "A controller is
|
||||
|
||||
|
||||
The described pattern is only applied yet to that package:
|
||||
io.bisq.gui.main.offer.createoffer;
|
||||
bisq.desktop.main.offer.createoffer;
|
||||
For prototyping the UI we stick first with a more rapid development style approach.
|
||||
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ $JAVA_HOME/bin/javapackager \
|
||||
-srcfiles "$dir/bcpg-jdk15on.jar" \
|
||||
-srcfiles "$dir/bcprov-jdk15on.jar" \
|
||||
-srcfiles package/linux/LICENSE \
|
||||
-appclass io.bisq.gui.app.BisqAppMain \
|
||||
-appclass bisq.desktop.app.BisqAppMain \
|
||||
-BjvmOptions=-Xss1280k \
|
||||
-outfile Bisq
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ $JAVA_HOME/bin/javapackager \
|
||||
-srcfiles "$dir/bcpg-jdk15on.jar" \
|
||||
-srcfiles "$dir/bcprov-jdk15on.jar" \
|
||||
-srcfiles package/linux/LICENSE \
|
||||
-appclass io.bisq.gui.app.BisqAppMain \
|
||||
-appclass bisq.desktop.app.BisqAppMain \
|
||||
-BjvmOptions=-Xss1280k \
|
||||
-outfile Bisq
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<key>CFBundleName</key>
|
||||
<string>Bisq</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>io.bisq.Bisq</string>
|
||||
<string>bisq.Bisq</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
@ -36,7 +36,7 @@
|
||||
<key>JVMRuntime</key>
|
||||
<string>..</string>
|
||||
<key>JVMMainClassName</key>
|
||||
<string>io.bisq.app.core.BisqAppMain</string>
|
||||
<string>bisq.desktop.app.BisqAppMain</string>
|
||||
<key>JVMAppClasspath</key>
|
||||
<string></string>
|
||||
<key>JVMMainJarName</key>
|
||||
@ -49,6 +49,6 @@
|
||||
<key>JVMUserOptions</key>
|
||||
<dict>
|
||||
</dict>
|
||||
|
||||
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@ -41,7 +41,7 @@ echo "Using JAVA_HOME: $JAVA_HOME"
|
||||
$JAVA_HOME/bin/javapackager \
|
||||
-deploy \
|
||||
-BappVersion=$version \
|
||||
-Bmac.CFBundleIdentifier=io.bisq \
|
||||
-Bmac.CFBundleIdentifier=bisq \
|
||||
-Bmac.CFBundleName=Bisq \
|
||||
-Bicon=package/osx/Bisq.icns \
|
||||
-Bruntime="$JAVA_HOME/jre" \
|
||||
@ -53,7 +53,7 @@ $JAVA_HOME/bin/javapackager \
|
||||
-srcfiles "deploy/Bisq-$version.jar" \
|
||||
-srcfiles "target/lib/bcpg-jdk15on.jar" \
|
||||
-srcfiles "target/lib/bcprov-jdk15on.jar" \
|
||||
-appclass io.bisq.gui.app.BisqAppMain \
|
||||
-appclass bisq.desktop.app.BisqAppMain \
|
||||
-outfile Bisq
|
||||
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
|
||||
-title Bisq ^
|
||||
-vendor Bisq ^
|
||||
-outdir %outdir% ^
|
||||
-appclass io.bisq.gui.app.BisqAppMain ^
|
||||
-appclass bisq.desktop.app.BisqAppMain ^
|
||||
-srcfiles %outdir%\Bisq.jar ^
|
||||
-srcfiles %outdir%\bcpg-jdk15on.jar ^
|
||||
-srcfiles %outdir%\bcprov-jdk15on.jar ^
|
||||
|
||||
@ -19,7 +19,7 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
|
||||
-title Bisq ^
|
||||
-vendor Bisq ^
|
||||
-outdir %outdir% ^
|
||||
-appclass io.bisq.gui.app.BisqAppMain ^
|
||||
-appclass bisq.desktop.app.BisqAppMain ^
|
||||
-srcfiles %outdir%\Bisq.jar ^
|
||||
-srcfiles %outdir%\bcpg-jdk15on.jar ^
|
||||
-srcfiles %outdir%\bcprov-jdk15on.jar ^
|
||||
|
||||
8
pom.xml
8
pom.xml
@ -20,7 +20,7 @@
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>io.bisq</groupId>
|
||||
<groupId>network.bisq</groupId>
|
||||
<artifactId>bisq-desktop</artifactId>
|
||||
<version>-SNAPSHOT</version>
|
||||
|
||||
@ -111,7 +111,7 @@
|
||||
<transformers>
|
||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||
<manifestEntries>
|
||||
<Main-Class>io.bisq.gui.app.BisqAppMain</Main-Class>
|
||||
<Main-Class>bisq.desktop.app.BisqAppMain</Main-Class>
|
||||
<!-- the specified bouncy castle jar classes -->
|
||||
<Class-Path>lib/bcpg-jdk15on.jar lib/bcprov-jdk15on.jar</Class-Path>
|
||||
</manifestEntries>
|
||||
@ -357,9 +357,9 @@
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.bisq</groupId>
|
||||
<groupId>network.bisq</groupId>
|
||||
<artifactId>bisq-core</artifactId>
|
||||
<version>975d446</version>
|
||||
<version>-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@ -15,37 +15,42 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui;
|
||||
package bisq.desktop;
|
||||
|
||||
import bisq.desktop.common.fxml.FxmlViewLoader;
|
||||
import bisq.desktop.common.view.CachingViewLoader;
|
||||
import bisq.desktop.common.view.ViewFactory;
|
||||
import bisq.desktop.common.view.ViewLoader;
|
||||
import bisq.desktop.common.view.guice.InjectorViewFactory;
|
||||
import bisq.desktop.main.funds.transactions.DisplayedTransactionsFactory;
|
||||
import bisq.desktop.main.funds.transactions.TradableRepository;
|
||||
import bisq.desktop.main.funds.transactions.TransactionAwareTradableFactory;
|
||||
import bisq.desktop.main.funds.transactions.TransactionListItemFactory;
|
||||
import bisq.desktop.main.offer.offerbook.OfferBook;
|
||||
import bisq.desktop.main.overlays.windows.TorNetworkSettingsWindow;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.BsqFormatter;
|
||||
import bisq.desktop.util.Transitions;
|
||||
|
||||
import bisq.core.app.AppOptionKeys;
|
||||
|
||||
import bisq.common.app.AppModule;
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import org.springframework.core.env.Environment;
|
||||
|
||||
import com.google.inject.Singleton;
|
||||
import com.google.inject.name.Names;
|
||||
import io.bisq.common.app.AppModule;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.core.app.AppOptionKeys;
|
||||
import io.bisq.gui.common.fxml.FxmlViewLoader;
|
||||
import io.bisq.gui.common.view.CachingViewLoader;
|
||||
import io.bisq.gui.common.view.ViewFactory;
|
||||
import io.bisq.gui.common.view.ViewLoader;
|
||||
import io.bisq.gui.common.view.guice.InjectorViewFactory;
|
||||
import io.bisq.gui.main.funds.transactions.DisplayedTransactionsFactory;
|
||||
import io.bisq.gui.main.funds.transactions.TradableRepository;
|
||||
import io.bisq.gui.main.funds.transactions.TransactionAwareTradableFactory;
|
||||
import io.bisq.gui.main.funds.transactions.TransactionListItemFactory;
|
||||
import io.bisq.gui.main.offer.offerbook.OfferBook;
|
||||
import io.bisq.gui.main.overlays.windows.TorNetworkSettingsWindow;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.BsqFormatter;
|
||||
import io.bisq.gui.util.Transitions;
|
||||
|
||||
import javafx.stage.Stage;
|
||||
import org.springframework.core.env.Environment;
|
||||
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
public class GuiModule extends AppModule {
|
||||
public class DesktopModule extends AppModule {
|
||||
|
||||
private final Stage primaryStage;
|
||||
|
||||
public GuiModule(Environment environment, Stage primaryStage) {
|
||||
public DesktopModule(Environment environment, Stage primaryStage) {
|
||||
super(environment);
|
||||
this.primaryStage = primaryStage;
|
||||
}
|
||||
@ -15,25 +15,28 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui;
|
||||
package bisq.desktop;
|
||||
|
||||
import bisq.desktop.common.view.View;
|
||||
import bisq.desktop.common.view.ViewPath;
|
||||
import bisq.desktop.main.MainView;
|
||||
import bisq.desktop.main.market.MarketView;
|
||||
|
||||
import bisq.common.proto.persistable.NavigationPath;
|
||||
import bisq.common.proto.persistable.PersistedDataHost;
|
||||
import bisq.common.storage.Storage;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import io.bisq.common.proto.persistable.NavigationPath;
|
||||
import io.bisq.common.proto.persistable.PersistedDataHost;
|
||||
import io.bisq.common.storage.Storage;
|
||||
import io.bisq.gui.common.view.View;
|
||||
import io.bisq.gui.common.view.ViewPath;
|
||||
import io.bisq.gui.main.MainView;
|
||||
import io.bisq.gui.main.market.MarketView;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CopyOnWriteArraySet;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
public final class Navigation implements PersistedDataHost {
|
||||
private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, MarketView.class);
|
||||
@ -15,24 +15,35 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui;
|
||||
package bisq.desktop;
|
||||
|
||||
import bisq.desktop.util.GUIUtil;
|
||||
import bisq.desktop.util.ImageUtil;
|
||||
|
||||
import bisq.core.exceptions.BisqException;
|
||||
|
||||
import bisq.common.UserThread;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import io.bisq.common.UserThread;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Utilities;
|
||||
import io.bisq.core.exceptions.BisqException;
|
||||
import io.bisq.gui.util.GUIUtil;
|
||||
import io.bisq.gui.util.ImageUtil;
|
||||
import javafx.application.Platform;
|
||||
|
||||
import javafx.stage.Stage;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.awt.AWTException;
|
||||
import java.awt.Image;
|
||||
import java.awt.MenuItem;
|
||||
import java.awt.PopupMenu;
|
||||
import java.awt.TrayIcon;
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import java.awt.*;
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* There is no JavaFX support yet, so we need to use AWT.
|
||||
*/
|
||||
@ -15,62 +15,84 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.app;
|
||||
package bisq.desktop.app;
|
||||
|
||||
import bisq.desktop.Navigation;
|
||||
import bisq.desktop.SystemTray;
|
||||
import bisq.desktop.common.UITimer;
|
||||
import bisq.desktop.common.view.CachingViewLoader;
|
||||
import bisq.desktop.common.view.View;
|
||||
import bisq.desktop.common.view.ViewLoader;
|
||||
import bisq.desktop.common.view.guice.InjectorViewFactory;
|
||||
import bisq.desktop.components.AutoTooltipLabel;
|
||||
import bisq.desktop.main.MainView;
|
||||
import bisq.desktop.main.debug.DebugView;
|
||||
import bisq.desktop.main.overlays.popups.Popup;
|
||||
import bisq.desktop.main.overlays.windows.EmptyWalletWindow;
|
||||
import bisq.desktop.main.overlays.windows.FilterWindow;
|
||||
import bisq.desktop.main.overlays.windows.ManualPayoutTxWindow;
|
||||
import bisq.desktop.main.overlays.windows.SendAlertMessageWindow;
|
||||
import bisq.desktop.main.overlays.windows.ShowWalletDataWindow;
|
||||
import bisq.desktop.util.ImageUtil;
|
||||
|
||||
import bisq.core.alert.AlertManager;
|
||||
import bisq.core.app.AppOptionKeys;
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.arbitration.ArbitratorManager;
|
||||
import bisq.core.arbitration.DisputeManager;
|
||||
import bisq.core.btc.AddressEntryList;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.wallet.BsqWalletService;
|
||||
import bisq.core.btc.wallet.BtcWalletService;
|
||||
import bisq.core.btc.wallet.WalletService;
|
||||
import bisq.core.btc.wallet.WalletsManager;
|
||||
import bisq.core.btc.wallet.WalletsSetup;
|
||||
import bisq.core.dao.DaoManager;
|
||||
import bisq.core.dao.request.compensation.CompensationRequestManager;
|
||||
import bisq.core.dao.vote.VotingManager;
|
||||
import bisq.core.filter.FilterManager;
|
||||
import bisq.core.offer.OpenOfferManager;
|
||||
import bisq.core.trade.TradeManager;
|
||||
import bisq.core.trade.closed.ClosedTradableManager;
|
||||
import bisq.core.trade.failed.FailedTradesManager;
|
||||
import bisq.core.user.Preferences;
|
||||
import bisq.core.user.User;
|
||||
|
||||
import bisq.network.p2p.P2PService;
|
||||
|
||||
import bisq.common.CommonOptionKeys;
|
||||
import bisq.common.UserThread;
|
||||
import bisq.common.app.Capabilities;
|
||||
import bisq.common.app.DevEnv;
|
||||
import bisq.common.app.Log;
|
||||
import bisq.common.app.Version;
|
||||
import bisq.common.crypto.LimitedKeyStrengthException;
|
||||
import bisq.common.handlers.ResultHandler;
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.proto.persistable.PersistedDataHost;
|
||||
import bisq.common.storage.Storage;
|
||||
import bisq.common.util.Profiler;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import org.bitcoinj.store.BlockStoreException;
|
||||
|
||||
import ch.qos.logback.classic.Level;
|
||||
import ch.qos.logback.classic.Logger;
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
import com.google.inject.Key;
|
||||
import com.google.inject.name.Names;
|
||||
import io.bisq.common.CommonOptionKeys;
|
||||
import io.bisq.common.UserThread;
|
||||
import io.bisq.common.app.Capabilities;
|
||||
import io.bisq.common.app.DevEnv;
|
||||
import io.bisq.common.app.Log;
|
||||
import io.bisq.common.app.Version;
|
||||
import io.bisq.common.crypto.LimitedKeyStrengthException;
|
||||
import io.bisq.common.handlers.ResultHandler;
|
||||
import io.bisq.common.locale.CurrencyUtil;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.proto.persistable.PersistedDataHost;
|
||||
import io.bisq.common.storage.Storage;
|
||||
import io.bisq.common.util.Profiler;
|
||||
import io.bisq.common.util.Utilities;
|
||||
import io.bisq.core.alert.AlertManager;
|
||||
import io.bisq.core.app.AppOptionKeys;
|
||||
import io.bisq.core.app.BisqEnvironment;
|
||||
import io.bisq.core.arbitration.ArbitratorManager;
|
||||
import io.bisq.core.arbitration.DisputeManager;
|
||||
import io.bisq.core.btc.AddressEntryList;
|
||||
import io.bisq.core.btc.BaseCurrencyNetwork;
|
||||
import io.bisq.core.btc.wallet.*;
|
||||
import io.bisq.core.dao.DaoManager;
|
||||
import io.bisq.core.dao.request.compensation.CompensationRequestManager;
|
||||
import io.bisq.core.dao.vote.VotingManager;
|
||||
import io.bisq.core.filter.FilterManager;
|
||||
import io.bisq.core.offer.OpenOfferManager;
|
||||
import io.bisq.core.trade.TradeManager;
|
||||
import io.bisq.core.trade.closed.ClosedTradableManager;
|
||||
import io.bisq.core.trade.failed.FailedTradesManager;
|
||||
import io.bisq.core.user.Preferences;
|
||||
import io.bisq.core.user.User;
|
||||
import io.bisq.gui.Navigation;
|
||||
import io.bisq.gui.SystemTray;
|
||||
import io.bisq.gui.common.UITimer;
|
||||
import io.bisq.gui.common.view.CachingViewLoader;
|
||||
import io.bisq.gui.common.view.View;
|
||||
import io.bisq.gui.common.view.ViewLoader;
|
||||
import io.bisq.gui.common.view.guice.InjectorViewFactory;
|
||||
import io.bisq.gui.components.AutoTooltipLabel;
|
||||
import io.bisq.gui.main.MainView;
|
||||
import io.bisq.gui.main.debug.DebugView;
|
||||
import io.bisq.gui.main.overlays.popups.Popup;
|
||||
import io.bisq.gui.main.overlays.windows.*;
|
||||
import io.bisq.gui.util.ImageUtil;
|
||||
import io.bisq.network.p2p.P2PService;
|
||||
|
||||
import org.apache.commons.lang3.exception.ExceptionUtils;
|
||||
|
||||
import org.reactfx.EventStreams;
|
||||
|
||||
import javafx.application.Application;
|
||||
import javafx.application.Platform;
|
||||
|
||||
import javafx.stage.Modality;
|
||||
import javafx.stage.Stage;
|
||||
import javafx.stage.StageStyle;
|
||||
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.Label;
|
||||
@ -79,26 +101,28 @@ import javafx.scene.input.KeyCode;
|
||||
import javafx.scene.input.KeyEvent;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.scene.layout.StackPane;
|
||||
import javafx.stage.Modality;
|
||||
import javafx.stage.Stage;
|
||||
import javafx.stage.StageStyle;
|
||||
import org.apache.commons.lang3.exception.ExceptionUtils;
|
||||
import org.bitcoinj.store.BlockStoreException;
|
||||
import org.bouncycastle.jce.provider.BouncyCastleProvider;
|
||||
import org.reactfx.EventStreams;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Paths;
|
||||
import org.bouncycastle.jce.provider.BouncyCastleProvider;
|
||||
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.Security;
|
||||
|
||||
import java.nio.file.Paths;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static io.bisq.gui.util.Layout.INITIAL_SCENE_HEIGHT;
|
||||
import static io.bisq.gui.util.Layout.INITIAL_SCENE_WIDTH;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.qos.logback.classic.Level;
|
||||
import ch.qos.logback.classic.Logger;
|
||||
|
||||
import static bisq.desktop.util.Layout.INITIAL_SCENE_HEIGHT;
|
||||
import static bisq.desktop.util.Layout.INITIAL_SCENE_WIDTH;
|
||||
|
||||
public class BisqApp extends Application {
|
||||
private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BisqApp.class);
|
||||
@ -240,9 +264,9 @@ public class BisqApp extends Application {
|
||||
scene = new Scene(mainView.getRoot(), INITIAL_SCENE_WIDTH, INITIAL_SCENE_HEIGHT);
|
||||
|
||||
scene.getStylesheets().setAll(
|
||||
"/io/bisq/gui/bisq.css",
|
||||
"/io/bisq/gui/images.css",
|
||||
"/io/bisq/gui/CandleStickChart.css");
|
||||
"/bisq/desktop/bisq.css",
|
||||
"/bisq/desktop/images.css",
|
||||
"/bisq/desktop/CandleStickChart.css");
|
||||
|
||||
// configure the system tray
|
||||
SystemTray.create(primaryStage, shutDownHandler);
|
||||
@ -356,8 +380,8 @@ public class BisqApp extends Application {
|
||||
log.warn("Scene not available yet, we create a new scene. The bug might be caused by an exception in a constructor or by a circular dependency in guice. throwable=" + throwable.toString());
|
||||
scene = new Scene(new StackPane(), 1000, 650);
|
||||
scene.getStylesheets().setAll(
|
||||
"/io/bisq/gui/bisq.css",
|
||||
"/io/bisq/gui/images.css");
|
||||
"/bisq/desktop/bisq.css",
|
||||
"/bisq/desktop/images.css");
|
||||
primaryStage.setScene(scene);
|
||||
primaryStage.show();
|
||||
}
|
||||
@ -15,18 +15,20 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.app;
|
||||
package bisq.desktop.app;
|
||||
|
||||
import bisq.core.app.AppOptionKeys;
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.app.BisqExecutable;
|
||||
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import io.bisq.common.util.Utilities;
|
||||
import io.bisq.core.app.AppOptionKeys;
|
||||
import io.bisq.core.app.BisqEnvironment;
|
||||
import io.bisq.core.app.BisqExecutable;
|
||||
import joptsimple.OptionException;
|
||||
import joptsimple.OptionParser;
|
||||
import joptsimple.OptionSet;
|
||||
|
||||
import static io.bisq.core.app.BisqEnvironment.DEFAULT_APP_NAME;
|
||||
import static io.bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
|
||||
import static bisq.core.app.BisqEnvironment.DEFAULT_APP_NAME;
|
||||
import static bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
|
||||
|
||||
public class BisqAppMain extends BisqExecutable {
|
||||
|
||||
@ -15,41 +15,47 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.app;
|
||||
package bisq.desktop.app;
|
||||
|
||||
import bisq.desktop.DesktopModule;
|
||||
import bisq.desktop.common.view.CachingViewLoader;
|
||||
import bisq.desktop.main.overlays.notifications.NotificationCenter;
|
||||
|
||||
import bisq.core.alert.AlertModule;
|
||||
import bisq.core.app.AppOptionKeys;
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.arbitration.ArbitratorModule;
|
||||
import bisq.core.btc.BitcoinModule;
|
||||
import bisq.core.dao.DaoModule;
|
||||
import bisq.core.filter.FilterModule;
|
||||
import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
|
||||
import bisq.core.network.p2p.seed.SeedNodeAddressLookup;
|
||||
import bisq.core.offer.OfferModule;
|
||||
import bisq.core.proto.network.CoreNetworkProtoResolver;
|
||||
import bisq.core.proto.persistable.CorePersistenceProtoResolver;
|
||||
import bisq.core.trade.TradeModule;
|
||||
import bisq.core.user.Preferences;
|
||||
import bisq.core.user.User;
|
||||
|
||||
import bisq.network.crypto.EncryptionServiceModule;
|
||||
import bisq.network.p2p.P2PModule;
|
||||
import bisq.network.p2p.network.BridgeAddressProvider;
|
||||
import bisq.network.p2p.seed.SeedNodeRepository;
|
||||
|
||||
import bisq.common.Clock;
|
||||
import bisq.common.app.AppModule;
|
||||
import bisq.common.crypto.KeyRing;
|
||||
import bisq.common.crypto.KeyStorage;
|
||||
import bisq.common.proto.network.NetworkProtoResolver;
|
||||
import bisq.common.proto.persistable.PersistenceProtoResolver;
|
||||
import bisq.common.storage.Storage;
|
||||
|
||||
import org.springframework.core.env.Environment;
|
||||
|
||||
import com.google.inject.Singleton;
|
||||
import com.google.inject.name.Names;
|
||||
import io.bisq.common.Clock;
|
||||
import io.bisq.common.app.AppModule;
|
||||
import io.bisq.common.crypto.KeyRing;
|
||||
import io.bisq.common.crypto.KeyStorage;
|
||||
import io.bisq.common.proto.network.NetworkProtoResolver;
|
||||
import io.bisq.common.proto.persistable.PersistenceProtoResolver;
|
||||
import io.bisq.common.storage.Storage;
|
||||
import io.bisq.core.alert.AlertModule;
|
||||
import io.bisq.core.app.AppOptionKeys;
|
||||
import io.bisq.core.app.BisqEnvironment;
|
||||
import io.bisq.core.arbitration.ArbitratorModule;
|
||||
import io.bisq.core.btc.BitcoinModule;
|
||||
import io.bisq.core.dao.DaoModule;
|
||||
import io.bisq.core.filter.FilterModule;
|
||||
import io.bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
|
||||
import io.bisq.core.network.p2p.seed.SeedNodeAddressLookup;
|
||||
import io.bisq.core.offer.OfferModule;
|
||||
import io.bisq.core.proto.network.CoreNetworkProtoResolver;
|
||||
import io.bisq.core.proto.persistable.CorePersistenceProtoResolver;
|
||||
import io.bisq.core.trade.TradeModule;
|
||||
import io.bisq.core.user.Preferences;
|
||||
import io.bisq.core.user.User;
|
||||
import io.bisq.gui.GuiModule;
|
||||
import io.bisq.gui.common.view.CachingViewLoader;
|
||||
import io.bisq.gui.main.overlays.notifications.NotificationCenter;
|
||||
import io.bisq.network.crypto.EncryptionServiceModule;
|
||||
import io.bisq.network.p2p.P2PModule;
|
||||
import io.bisq.network.p2p.network.BridgeAddressProvider;
|
||||
import io.bisq.network.p2p.seed.SeedNodeRepository;
|
||||
|
||||
import javafx.stage.Stage;
|
||||
import org.springframework.core.env.Environment;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@ -144,7 +150,7 @@ public class BisqAppModule extends AppModule {
|
||||
return new DaoModule(environment);
|
||||
}
|
||||
|
||||
private GuiModule guiModule() {
|
||||
return new GuiModule(environment, primaryStage);
|
||||
private DesktopModule guiModule() {
|
||||
return new DesktopModule(environment, primaryStage);
|
||||
}
|
||||
}
|
||||
@ -1,12 +1,31 @@
|
||||
package io.bisq.gui.common;
|
||||
/*
|
||||
* 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.common;
|
||||
|
||||
import bisq.common.Timer;
|
||||
|
||||
import io.bisq.common.Timer;
|
||||
import org.reactfx.util.FxTimer;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class UITimer implements Timer {
|
||||
private final Logger log = LoggerFactory.getLogger(UITimer.class);
|
||||
private org.reactfx.util.Timer timer;
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common;
|
||||
package bisq.desktop.common;
|
||||
|
||||
import static java.lang.String.format;
|
||||
|
||||
@ -15,19 +15,24 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.fxml;
|
||||
package bisq.desktop.common.fxml;
|
||||
|
||||
import bisq.desktop.common.ViewfxException;
|
||||
import bisq.desktop.common.view.FxmlView;
|
||||
import bisq.desktop.common.view.View;
|
||||
import bisq.desktop.common.view.ViewFactory;
|
||||
import bisq.desktop.common.view.ViewLoader;
|
||||
|
||||
import io.bisq.gui.common.ViewfxException;
|
||||
import io.bisq.gui.common.view.FxmlView;
|
||||
import io.bisq.gui.common.view.View;
|
||||
import io.bisq.gui.common.view.ViewFactory;
|
||||
import io.bisq.gui.common.view.ViewLoader;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import org.springframework.core.annotation.AnnotationUtils;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import javafx.fxml.FXMLLoader;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.model;
|
||||
package bisq.desktop.common.model;
|
||||
|
||||
public interface Activatable {
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.model;
|
||||
package bisq.desktop.common.model;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.model;
|
||||
package bisq.desktop.common.model;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.model;
|
||||
package bisq.desktop.common.model;
|
||||
|
||||
public class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable {
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.model;
|
||||
package bisq.desktop.common.model;
|
||||
|
||||
public interface DataModel extends Model {
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.model;
|
||||
package bisq.desktop.common.model;
|
||||
|
||||
public interface Model {
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.model;
|
||||
package bisq.desktop.common.model;
|
||||
|
||||
public interface ViewModel extends Model {
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.model;
|
||||
package bisq.desktop.common.model;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -15,10 +15,12 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import javafx.fxml.FXML;
|
||||
|
||||
import javafx.scene.Node;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import javafx.scene.Node;
|
||||
|
||||
@ -15,9 +15,10 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import bisq.desktop.common.model.Activatable;
|
||||
|
||||
import io.bisq.gui.common.model.Activatable;
|
||||
import javafx.scene.Node;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
@ -15,9 +15,10 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
public class CachingViewLoader implements ViewLoader {
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import org.springframework.util.ClassUtils;
|
||||
|
||||
@ -15,13 +15,14 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
import java.util.function.Function;
|
||||
|
||||
@Target(ElementType.TYPE)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@ -15,12 +15,14 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import javafx.fxml.Initializable;
|
||||
|
||||
import javafx.scene.Node;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
public abstract class InitializableView<R extends Node, M> extends AbstractView<R, M> implements Initializable {
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import javafx.scene.Node;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import javafx.util.Callback;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
public interface ViewLoader {
|
||||
View load(Class<? extends View> viewClass);
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view;
|
||||
package bisq.desktop.common.view;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
@ -15,11 +15,13 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.common.view.guice;
|
||||
package bisq.desktop.common.view.guice;
|
||||
|
||||
import bisq.desktop.common.view.ViewFactory;
|
||||
|
||||
import com.google.inject.Injector;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.inject.Injector;
|
||||
import io.bisq.gui.common.view.ViewFactory;
|
||||
|
||||
public class InjectorViewFactory implements ViewFactory {
|
||||
|
||||
@ -15,28 +15,34 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.desktop.main.overlays.popups.Popup;
|
||||
import bisq.desktop.util.GUIUtil;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import org.bitcoinj.core.Coin;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Utilities;
|
||||
import io.bisq.gui.main.overlays.popups.Popup;
|
||||
import io.bisq.gui.util.GUIUtil;
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import org.bitcoinj.core.Coin;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class AddressTextField extends AnchorPane {
|
||||
private static final Logger log = LoggerFactory.getLogger(AddressTextField.class);
|
||||
|
||||
@ -1,16 +1,37 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.event.EventHandler;
|
||||
import javafx.geometry.Insets;
|
||||
|
||||
import javafx.scene.control.Hyperlink;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Priority;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.event.EventHandler;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,11 +1,29 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import com.sun.javafx.scene.control.skin.ButtonSkin;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.Skin;
|
||||
|
||||
import static io.bisq.gui.components.TooltipUtil.showTooltipIfTruncated;
|
||||
import com.sun.javafx.scene.control.skin.ButtonSkin;
|
||||
|
||||
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
|
||||
|
||||
public class AutoTooltipButton extends Button {
|
||||
|
||||
@ -1,10 +1,28 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import com.sun.javafx.scene.control.skin.CheckBoxSkin;
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.Skin;
|
||||
|
||||
import static io.bisq.gui.components.TooltipUtil.showTooltipIfTruncated;
|
||||
import com.sun.javafx.scene.control.skin.CheckBoxSkin;
|
||||
|
||||
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
|
||||
|
||||
public class AutoTooltipCheckBox extends CheckBox {
|
||||
|
||||
54
src/main/java/bisq/desktop/components/AutoTooltipLabel.java
Normal file
54
src/main/java/bisq/desktop/components/AutoTooltipLabel.java
Normal file
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.Skin;
|
||||
|
||||
import com.sun.javafx.scene.control.skin.LabelSkin;
|
||||
|
||||
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
|
||||
|
||||
public class AutoTooltipLabel extends Label {
|
||||
|
||||
public AutoTooltipLabel() {
|
||||
super();
|
||||
}
|
||||
|
||||
public AutoTooltipLabel(String text) {
|
||||
super(text);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Skin<?> createDefaultSkin() {
|
||||
return new AutoTooltipLabelSkin(this);
|
||||
}
|
||||
|
||||
private class AutoTooltipLabelSkin extends LabelSkin {
|
||||
|
||||
public AutoTooltipLabelSkin(Label label) {
|
||||
super(label);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void layoutChildren(double x, double y, double w, double h) {
|
||||
super.layoutChildren(x, y, w, h);
|
||||
showTooltipIfTruncated(this, getSkinnable());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,10 +1,28 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import com.sun.javafx.scene.control.skin.RadioButtonSkin;
|
||||
import javafx.scene.control.RadioButton;
|
||||
import javafx.scene.control.Skin;
|
||||
|
||||
import static io.bisq.gui.components.TooltipUtil.showTooltipIfTruncated;
|
||||
import com.sun.javafx.scene.control.skin.RadioButtonSkin;
|
||||
|
||||
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
|
||||
|
||||
public class AutoTooltipRadioButton extends RadioButton {
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import javafx.scene.control.TableColumn;
|
||||
|
||||
public class AutoTooltipTableColumn<S,T> extends TableColumn<S,T> {
|
||||
|
||||
public AutoTooltipTableColumn(String text) {
|
||||
super();
|
||||
|
||||
setGraphic(new AutoTooltipLabel(text));
|
||||
}
|
||||
}
|
||||
@ -1,11 +1,29 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import com.sun.javafx.scene.control.skin.ToggleButtonSkin;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.control.Skin;
|
||||
import javafx.scene.control.ToggleButton;
|
||||
|
||||
import static io.bisq.gui.components.TooltipUtil.showTooltipIfTruncated;
|
||||
import com.sun.javafx.scene.control.skin.ToggleButtonSkin;
|
||||
|
||||
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
|
||||
|
||||
public class AutoTooltipToggleButton extends ToggleButton {
|
||||
|
||||
@ -15,16 +15,19 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
|
||||
import org.bitcoinj.core.Coin;
|
||||
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.effect.BlurType;
|
||||
import javafx.scene.effect.DropShadow;
|
||||
import javafx.scene.effect.Effect;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.paint.Color;
|
||||
import org.bitcoinj.core.Coin;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class BalanceTextField extends AnchorPane {
|
||||
@ -15,14 +15,21 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.desktop.components.indicator.TxConfidenceIndicator;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.GUIUtil;
|
||||
|
||||
import bisq.core.btc.listeners.AddressConfidenceListener;
|
||||
import bisq.core.btc.listeners.BalanceListener;
|
||||
import bisq.core.btc.wallet.BtcWalletService;
|
||||
|
||||
import org.bitcoinj.core.Address;
|
||||
import org.bitcoinj.core.Coin;
|
||||
import org.bitcoinj.core.Transaction;
|
||||
import org.bitcoinj.core.TransactionConfidence;
|
||||
|
||||
import io.bisq.core.btc.listeners.AddressConfidenceListener;
|
||||
import io.bisq.core.btc.listeners.BalanceListener;
|
||||
import io.bisq.core.btc.wallet.BtcWalletService;
|
||||
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.GUIUtil;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.effect.BlurType;
|
||||
@ -30,10 +37,6 @@ import javafx.scene.effect.DropShadow;
|
||||
import javafx.scene.effect.Effect;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.paint.Color;
|
||||
import org.bitcoinj.core.Address;
|
||||
import org.bitcoinj.core.Coin;
|
||||
import org.bitcoinj.core.Transaction;
|
||||
import org.bitcoinj.core.TransactionConfidence;
|
||||
|
||||
public class BalanceWithConfirmationTextField extends AnchorPane {
|
||||
|
||||
@ -15,23 +15,28 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.desktop.main.overlays.notifications.Notification;
|
||||
import bisq.desktop.util.GUIUtil;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import org.bitcoinj.core.Coin;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Utilities;
|
||||
import io.bisq.gui.main.overlays.notifications.Notification;
|
||||
import io.bisq.gui.util.GUIUtil;
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import org.bitcoinj.core.Coin;
|
||||
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
public class BsqAddressTextField extends AnchorPane {
|
||||
private final StringProperty address = new SimpleStringProperty();
|
||||
@ -1,10 +1,29 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import bisq.common.Timer;
|
||||
import bisq.common.UserThread;
|
||||
|
||||
import javafx.scene.image.ImageView;
|
||||
|
||||
import io.bisq.common.Timer;
|
||||
import io.bisq.common.UserThread;
|
||||
import javafx.beans.property.BooleanProperty;
|
||||
import javafx.beans.property.SimpleBooleanProperty;
|
||||
import javafx.scene.image.ImageView;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@ -81,4 +100,4 @@ public class BusyAnimation extends ImageView {
|
||||
setVisible(isRunning());
|
||||
setManaged(isRunning());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,15 +1,31 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import bisq.desktop.util.GUIUtil;
|
||||
|
||||
import bisq.common.util.Tuple2;
|
||||
|
||||
import io.bisq.common.util.Tuple2;
|
||||
import io.bisq.gui.util.GUIUtil;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.text.Text;
|
||||
import javafx.scene.text.TextAlignment;
|
||||
import javafx.scene.text.TextBoundsType;
|
||||
import javafx.scene.text.TextFlow;
|
||||
|
||||
import javafx.geometry.Pos;
|
||||
|
||||
public class ColoredDecimalPlacesWithZerosText extends HBox {
|
||||
|
||||
@ -15,27 +15,25 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import io.bisq.common.UserThread;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Utilities;
|
||||
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
|
||||
import javafx.beans.binding.Bindings;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import org.controlsfx.control.PopOver;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class FundsTextField extends InfoTextField {
|
||||
public static final Logger log = LoggerFactory.getLogger(FundsTextField.class);
|
||||
|
||||
@ -1,12 +1,31 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import javafx.geometry.Insets;
|
||||
|
||||
import javafx.scene.control.ContentDisplay;
|
||||
import javafx.scene.control.Hyperlink;
|
||||
import javafx.scene.control.Label;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
|
||||
public class HyperlinkWithIcon extends Hyperlink {
|
||||
|
||||
public HyperlinkWithIcon(String text) {
|
||||
@ -15,18 +15,14 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.common.UserThread;
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import io.bisq.common.UserThread;
|
||||
import io.bisq.common.locale.Res;
|
||||
import javafx.beans.property.*;
|
||||
import javafx.beans.value.ChangeListener;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.event.EventHandler;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.control.Hyperlink;
|
||||
import javafx.scene.control.Label;
|
||||
@ -34,6 +30,20 @@ import javafx.scene.control.OverrunStyle;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.text.TextFlow;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
|
||||
import javafx.beans.property.IntegerProperty;
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleIntegerProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
import javafx.beans.value.ChangeListener;
|
||||
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.event.EventHandler;
|
||||
|
||||
/**
|
||||
* Convenience Component for info icon, info text and link display in a GridPane.
|
||||
* Only the properties needed are supported.
|
||||
@ -1,21 +1,42 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import bisq.common.UserThread;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import io.bisq.common.UserThread;
|
||||
import io.bisq.common.locale.Res;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
import org.controlsfx.control.PopOver;
|
||||
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import org.controlsfx.control.PopOver;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class InfoTextField extends AnchorPane {
|
||||
public static final Logger log = LoggerFactory.getLogger(InfoTextField.class);
|
||||
|
||||
@ -15,14 +15,16 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import org.controlsfx.control.PopOver;
|
||||
|
||||
import javafx.stage.Window;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Point2D;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.effect.BlurType;
|
||||
@ -30,8 +32,12 @@ import javafx.scene.effect.DropShadow;
|
||||
import javafx.scene.effect.Effect;
|
||||
import javafx.scene.layout.Region;
|
||||
import javafx.scene.paint.Color;
|
||||
import javafx.stage.Window;
|
||||
import org.controlsfx.control.PopOver;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Point2D;
|
||||
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
|
||||
/**
|
||||
* TextField with validation support.
|
||||
@ -15,14 +15,16 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import org.controlsfx.control.PopOver;
|
||||
|
||||
import javafx.stage.Window;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Point2D;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.PasswordField;
|
||||
import javafx.scene.effect.BlurType;
|
||||
@ -30,8 +32,12 @@ import javafx.scene.effect.DropShadow;
|
||||
import javafx.scene.effect.Effect;
|
||||
import javafx.scene.layout.Region;
|
||||
import javafx.scene.paint.Color;
|
||||
import javafx.stage.Window;
|
||||
import org.controlsfx.control.PopOver;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Point2D;
|
||||
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
|
||||
public class PasswordTextField extends PasswordField {
|
||||
|
||||
@ -1,15 +1,35 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import bisq.desktop.main.overlays.editor.PeerInfoWithTagEditor;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
|
||||
import bisq.core.alert.PrivateNotificationManager;
|
||||
import bisq.core.offer.Offer;
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.user.Preferences;
|
||||
|
||||
import bisq.network.p2p.NodeAddress;
|
||||
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import io.bisq.common.locale.CurrencyUtil;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.core.alert.PrivateNotificationManager;
|
||||
import io.bisq.core.offer.Offer;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.user.Preferences;
|
||||
import io.bisq.gui.main.overlays.editor.PeerInfoWithTagEditor;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.network.p2p.NodeAddress;
|
||||
import javafx.geometry.Point2D;
|
||||
import javafx.scene.Group;
|
||||
import javafx.scene.canvas.Canvas;
|
||||
import javafx.scene.canvas.GraphicsContext;
|
||||
@ -18,13 +38,17 @@ import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.scene.paint.Color;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import javafx.geometry.Point2D;
|
||||
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
public class PeerInfoIcon extends Group {
|
||||
private final String tooltipText;
|
||||
@ -1,10 +1,29 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import bisq.common.UserThread;
|
||||
|
||||
import javafx.scene.control.ComboBox;
|
||||
|
||||
import io.bisq.common.UserThread;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.collections.ObservableList;
|
||||
import javafx.collections.transformation.FilteredList;
|
||||
import javafx.scene.control.ComboBox;
|
||||
|
||||
public class SearchComboBox<T> extends ComboBox<T> {
|
||||
@SuppressWarnings("CanBeFinal")
|
||||
@ -36,4 +55,4 @@ public class SearchComboBox<T> extends ComboBox<T> {
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,25 +1,47 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import bisq.core.dao.DaoPeriodService;
|
||||
|
||||
import bisq.common.UserThread;
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import io.bisq.common.UserThread;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.core.dao.DaoPeriodService;
|
||||
import javafx.beans.property.DoubleProperty;
|
||||
import javafx.beans.property.IntegerProperty;
|
||||
import javafx.beans.property.SimpleDoubleProperty;
|
||||
import javafx.beans.property.SimpleIntegerProperty;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.ProgressBar;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.VBox;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Pos;
|
||||
|
||||
import javafx.beans.property.DoubleProperty;
|
||||
import javafx.beans.property.IntegerProperty;
|
||||
import javafx.beans.property.SimpleDoubleProperty;
|
||||
import javafx.beans.property.SimpleIntegerProperty;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
public class SeparatedPhaseBars extends HBox {
|
||||
|
||||
@ -15,15 +15,18 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.scene.layout.StackPane;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
@ -15,19 +15,22 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Utilities;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
public class TextFieldWithCopyIcon extends AnchorPane {
|
||||
|
||||
private final StringProperty text = new SimpleStringProperty();
|
||||
@ -15,15 +15,17 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.Pane;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
|
||||
public class TitledGroupBg extends Pane {
|
||||
|
||||
private final Label label;
|
||||
@ -1,4 +1,21 @@
|
||||
package io.bisq.gui.components;
|
||||
/*
|
||||
* 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.components;
|
||||
|
||||
import javafx.scene.control.Labeled;
|
||||
import javafx.scene.control.SkinBase;
|
||||
@ -15,22 +15,28 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components;
|
||||
package bisq.desktop.components;
|
||||
|
||||
import bisq.desktop.components.indicator.TxConfidenceIndicator;
|
||||
import bisq.desktop.util.GUIUtil;
|
||||
|
||||
import bisq.core.btc.listeners.TxConfidenceListener;
|
||||
import bisq.core.btc.wallet.BtcWalletService;
|
||||
import bisq.core.user.Preferences;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import org.bitcoinj.core.TransactionConfidence;
|
||||
|
||||
import de.jensd.fx.fontawesome.AwesomeDude;
|
||||
import de.jensd.fx.fontawesome.AwesomeIcon;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Utilities;
|
||||
import io.bisq.core.btc.listeners.TxConfidenceListener;
|
||||
import io.bisq.core.btc.wallet.BtcWalletService;
|
||||
import io.bisq.core.user.Preferences;
|
||||
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
|
||||
import io.bisq.gui.util.GUIUtil;
|
||||
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import org.bitcoinj.core.TransactionConfidence;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -1,3 +1,20 @@
|
||||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
@ -23,17 +40,20 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.indicator;
|
||||
package bisq.desktop.components.indicator;
|
||||
|
||||
import bisq.desktop.components.indicator.skin.StaticProgressIndicatorSkin;
|
||||
|
||||
import javafx.scene.control.Control;
|
||||
import javafx.scene.control.Skin;
|
||||
|
||||
import javafx.css.PseudoClass;
|
||||
import javafx.css.StyleableProperty;
|
||||
|
||||
import io.bisq.gui.components.indicator.skin.StaticProgressIndicatorSkin;
|
||||
import javafx.beans.property.DoubleProperty;
|
||||
import javafx.beans.property.DoublePropertyBase;
|
||||
import javafx.beans.property.ReadOnlyBooleanProperty;
|
||||
import javafx.beans.property.ReadOnlyBooleanWrapper;
|
||||
import javafx.css.PseudoClass;
|
||||
import javafx.css.StyleableProperty;
|
||||
import javafx.scene.control.Control;
|
||||
import javafx.scene.control.Skin;
|
||||
|
||||
// TODO Copied form OpenJFX, check license issues and way how we integrated it
|
||||
// We changed behaviour which was not exposed via APIs
|
||||
@ -1,3 +1,20 @@
|
||||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
@ -23,10 +40,11 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.indicator.behavior;
|
||||
package bisq.desktop.components.indicator.behavior;
|
||||
|
||||
import bisq.desktop.components.indicator.TxConfidenceIndicator;
|
||||
|
||||
import com.sun.javafx.scene.control.behavior.BehaviorBase;
|
||||
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
@ -1,3 +1,20 @@
|
||||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
@ -23,21 +40,11 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.indicator.skin;
|
||||
package bisq.desktop.components.indicator.skin;
|
||||
|
||||
import bisq.desktop.components.indicator.TxConfidenceIndicator;
|
||||
import bisq.desktop.components.indicator.behavior.StaticProgressIndicatorBehavior;
|
||||
|
||||
import com.sun.javafx.css.converters.BooleanConverter;
|
||||
import com.sun.javafx.css.converters.PaintConverter;
|
||||
import com.sun.javafx.css.converters.SizeConverter;
|
||||
import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
|
||||
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
|
||||
import io.bisq.gui.components.indicator.behavior.StaticProgressIndicatorBehavior;
|
||||
import javafx.beans.InvalidationListener;
|
||||
import javafx.beans.property.BooleanProperty;
|
||||
import javafx.beans.property.IntegerProperty;
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
import javafx.css.*;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.NodeOrientation;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.control.SkinBase;
|
||||
import javafx.scene.layout.Pane;
|
||||
@ -50,6 +57,28 @@ import javafx.scene.shape.ArcType;
|
||||
import javafx.scene.shape.Circle;
|
||||
import javafx.scene.transform.Scale;
|
||||
|
||||
import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
|
||||
|
||||
import javafx.css.CssMetaData;
|
||||
import javafx.css.StyleOrigin;
|
||||
import javafx.css.Styleable;
|
||||
import javafx.css.StyleableBooleanProperty;
|
||||
import javafx.css.StyleableIntegerProperty;
|
||||
import javafx.css.StyleableObjectProperty;
|
||||
import javafx.css.StyleableProperty;
|
||||
|
||||
import com.sun.javafx.css.converters.BooleanConverter;
|
||||
import com.sun.javafx.css.converters.PaintConverter;
|
||||
import com.sun.javafx.css.converters.SizeConverter;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.NodeOrientation;
|
||||
|
||||
import javafx.beans.InvalidationListener;
|
||||
import javafx.beans.property.BooleanProperty;
|
||||
import javafx.beans.property.IntegerProperty;
|
||||
import javafx.beans.property.ObjectProperty;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
@ -15,27 +15,34 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.AliPayValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.AliPayAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.AliPayAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.AliPayAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.AliPayAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.AliPayValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class AliPayForm extends PaymentMethodForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(AliPayForm.class);
|
||||
@ -15,36 +15,50 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.main.overlays.popups.Popup;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.AccountNrValidator;
|
||||
import bisq.desktop.util.validation.BankIdValidator;
|
||||
import bisq.desktop.util.validation.BranchIdValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.BankAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.BankUtil;
|
||||
import bisq.common.locale.Country;
|
||||
import bisq.common.locale.CountryUtil;
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.FiatCurrency;
|
||||
import bisq.common.locale.Region;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
import bisq.common.util.Tuple2;
|
||||
import bisq.common.util.Tuple3;
|
||||
import bisq.common.util.Tuple4;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.*;
|
||||
import io.bisq.common.util.Tuple2;
|
||||
import io.bisq.common.util.Tuple3;
|
||||
import io.bisq.common.util.Tuple4;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.BankAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.main.overlays.popups.Popup;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.AccountNrValidator;
|
||||
import io.bisq.gui.util.validation.BankIdValidator;
|
||||
import io.bisq.gui.util.validation.BranchIdValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import javafx.collections.FXCollections;
|
||||
|
||||
import javafx.util.StringConverter;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import static bisq.desktop.util.FormBuilder.*;
|
||||
|
||||
abstract class BankForm extends PaymentMethodForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(BankForm.class);
|
||||
@ -15,25 +15,31 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.CashAppValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CashAppAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.CashAppAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CashAppAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.CashAppAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.CashAppValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class CashAppForm extends PaymentMethodForm {
|
||||
private final CashAppAccount account;
|
||||
@ -15,31 +15,49 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.main.overlays.popups.Popup;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.FormBuilder;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.AccountNrValidator;
|
||||
import bisq.desktop.util.validation.BankIdValidator;
|
||||
import bisq.desktop.util.validation.BranchIdValidator;
|
||||
import bisq.desktop.util.validation.EmailValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.CashDepositAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.BankUtil;
|
||||
import bisq.common.locale.Country;
|
||||
import bisq.common.locale.CountryUtil;
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.FiatCurrency;
|
||||
import bisq.common.locale.Region;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
import bisq.common.util.Tuple2;
|
||||
import bisq.common.util.Tuple3;
|
||||
import bisq.common.util.Tuple4;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.*;
|
||||
import io.bisq.common.util.Tuple2;
|
||||
import io.bisq.common.util.Tuple3;
|
||||
import io.bisq.common.util.Tuple4;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.CashDepositAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.main.overlays.popups.Popup;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.FormBuilder;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.*;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextArea;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import javafx.collections.FXCollections;
|
||||
|
||||
import javafx.util.StringConverter;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -15,24 +15,29 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.FormBuilder;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.ChaseQuickPayValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.ChaseQuickPayAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.ChaseQuickPayAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.ChaseQuickPayAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.ChaseQuickPayAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.FormBuilder;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.ChaseQuickPayValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -15,24 +15,28 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.FormBuilder;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.ClearXchangeValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.ClearXchangeAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.ClearXchangeAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.ClearXchangeAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.ClearXchangeAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.FormBuilder;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.ClearXchangeValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
public class ClearXchangeForm extends PaymentMethodForm {
|
||||
private final ClearXchangeAccount clearXchangeAccount;
|
||||
@ -15,35 +15,45 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.AltCoinAddressValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CryptoCurrencyAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.CryptoCurrencyAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
import bisq.common.util.Tuple2;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.CurrencyUtil;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.common.util.Tuple2;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CryptoCurrencyAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.CryptoCurrencyAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.AltCoinAddressValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import javafx.collections.FXCollections;
|
||||
|
||||
import javafx.util.StringConverter;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelSearchComboBox;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class CryptoCurrencyForm extends PaymentMethodForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(CryptoCurrencyForm.class);
|
||||
@ -15,29 +15,34 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.AccountNrValidator;
|
||||
import bisq.desktop.util.validation.BranchIdValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.FasterPaymentsAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.FasterPaymentsAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.FasterPaymentsAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.FasterPaymentsAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.AccountNrValidator;
|
||||
import io.bisq.gui.util.validation.BranchIdValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelInputTextField;
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
|
||||
public class FasterPaymentsForm extends PaymentMethodForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(FasterPaymentsForm.class);
|
||||
@ -15,23 +15,28 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.FormBuilder;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.InteracETransferValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.InteracETransferAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.InteracETransferAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.InteracETransferAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.InteracETransferAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.FormBuilder;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.InteracETransferValidator;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -15,25 +15,31 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.MoneyBeamValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.MoneyBeamAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.MoneyBeamAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.MoneyBeamAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.MoneyBeamAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.MoneyBeamValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class MoneyBeamForm extends PaymentMethodForm {
|
||||
private final MoneyBeamAccount account;
|
||||
@ -15,13 +15,15 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
public class NationalBankForm extends BankForm {
|
||||
@ -15,34 +15,43 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.AutoTooltipCheckBox;
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.OKPayValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.OKPayAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.OKPayAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.CurrencyUtil;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.OKPayAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.OKPayAccountPayload;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.AutoTooltipCheckBox;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.OKPayValidator;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.FlowPane;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import static bisq.desktop.util.FormBuilder.addLabel;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class OKPayForm extends PaymentMethodForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(OKPayForm.class);
|
||||
@ -15,34 +15,42 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InfoTextField;
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.main.overlays.popups.Popup;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.offer.Offer;
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CryptoCurrencyAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
import bisq.common.util.Tuple3;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import org.bitcoinj.core.Coin;
|
||||
|
||||
import io.bisq.common.locale.CurrencyUtil;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.common.util.Tuple3;
|
||||
import io.bisq.common.util.Utilities;
|
||||
import io.bisq.core.offer.Offer;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CryptoCurrencyAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.gui.components.InfoTextField;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.main.overlays.popups.Popup;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.beans.property.BooleanProperty;
|
||||
import javafx.beans.property.SimpleBooleanProperty;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.util.StringConverter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.bitcoinj.core.Coin;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import javafx.beans.property.BooleanProperty;
|
||||
import javafx.beans.property.SimpleBooleanProperty;
|
||||
|
||||
import javafx.collections.FXCollections;
|
||||
|
||||
import javafx.util.StringConverter;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.*;
|
||||
|
||||
@Slf4j
|
||||
public abstract class PaymentMethodForm {
|
||||
@ -15,29 +15,37 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.PerfectMoneyValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.PerfectMoneyAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.PerfectMoneyAccountPayload;
|
||||
|
||||
import bisq.common.locale.FiatCurrency;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.FiatCurrency;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.PerfectMoneyAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.PerfectMoneyAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.PerfectMoneyValidator;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import javafx.collections.FXCollections;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class PerfectMoneyForm extends PaymentMethodForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(PerfectMoneyForm.class);
|
||||
@ -15,25 +15,31 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.PopmoneyValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.PopmoneyAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.PopmoneyAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.PopmoneyAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.PopmoneyAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.PopmoneyValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class PopmoneyForm extends PaymentMethodForm {
|
||||
private final PopmoneyAccount account;
|
||||
@ -15,31 +15,39 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.RevolutValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.RevolutAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.RevolutAccountPayload;
|
||||
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.CurrencyUtil;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.RevolutAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.RevolutAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.RevolutValidator;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.FlowPane;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabel;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class RevolutForm extends PaymentMethodForm {
|
||||
private final RevolutAccount account;
|
||||
@ -15,26 +15,30 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
|
||||
import bisq.common.locale.BankUtil;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Tuple2;
|
||||
|
||||
import io.bisq.common.locale.BankUtil;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Tuple2;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelInputTextField;
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
|
||||
public class SameBankForm extends BankForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(SameBankForm.class);
|
||||
@ -15,39 +15,54 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import io.bisq.common.locale.*;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.SepaAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.SepaAccountPayload;
|
||||
import io.bisq.gui.components.AutoTooltipCheckBox;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.FormBuilder;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.BICValidator;
|
||||
import io.bisq.gui.util.validation.IBANValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.geometry.HPos;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
import javafx.scene.control.*;
|
||||
import bisq.desktop.components.AutoTooltipCheckBox;
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.FormBuilder;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.BICValidator;
|
||||
import bisq.desktop.util.validation.IBANValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.SepaAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.SepaAccountPayload;
|
||||
|
||||
import bisq.common.locale.Country;
|
||||
import bisq.common.locale.CountryUtil;
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.FlowPane;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.text.TextAlignment;
|
||||
|
||||
import javafx.geometry.HPos;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
|
||||
import javafx.collections.FXCollections;
|
||||
|
||||
import javafx.util.StringConverter;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class SepaForm extends PaymentMethodForm {
|
||||
public static int addFormForBuyer(GridPane gridPane, int gridRow,
|
||||
@ -15,39 +15,54 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import io.bisq.common.locale.*;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.SepaInstantAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.SepaInstantAccountPayload;
|
||||
import io.bisq.gui.components.AutoTooltipCheckBox;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.FormBuilder;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.BICValidator;
|
||||
import io.bisq.gui.util.validation.IBANValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.geometry.HPos;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
import javafx.scene.control.*;
|
||||
import bisq.desktop.components.AutoTooltipCheckBox;
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.FormBuilder;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.BICValidator;
|
||||
import bisq.desktop.util.validation.IBANValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.SepaInstantAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.SepaInstantAccountPayload;
|
||||
|
||||
import bisq.common.locale.Country;
|
||||
import bisq.common.locale.CountryUtil;
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.FlowPane;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.text.TextAlignment;
|
||||
|
||||
import javafx.geometry.HPos;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
|
||||
import javafx.collections.FXCollections;
|
||||
|
||||
import javafx.util.StringConverter;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class SepaInstantForm extends PaymentMethodForm {
|
||||
public static int addFormForBuyer(GridPane gridPane, int gridRow,
|
||||
@ -15,26 +15,33 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.SpecificBanksAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Tuple3;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Tuple3;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.SpecificBanksAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.beans.binding.Bindings;
|
||||
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import javafx.beans.binding.Bindings;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextFieldButton;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldButton;
|
||||
|
||||
public class SpecificBankForm extends BankForm {
|
||||
private final SpecificBanksAccountPayload specificBanksAccountPayload;
|
||||
@ -15,28 +15,33 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.SwishValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.SwishAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.SwishAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.SwishAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.SwishAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.SwishValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelInputTextField;
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
|
||||
public class SwishForm extends PaymentMethodForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(SwishForm.class);
|
||||
@ -15,27 +15,35 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.USPostalMoneyOrderValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.USPostalMoneyOrderAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.USPostalMoneyOrderAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.USPostalMoneyOrderAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.USPostalMoneyOrderValidator;
|
||||
import javafx.scene.control.TextArea;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextArea;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class USPostalMoneyOrderForm extends PaymentMethodForm {
|
||||
private static final Logger log = LoggerFactory.getLogger(USPostalMoneyOrderForm.class);
|
||||
@ -15,31 +15,39 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.UpholdValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.UpholdAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.UpholdAccountPayload;
|
||||
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.Res;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.CurrencyUtil;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.UpholdAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.UpholdAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.UpholdValidator;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.layout.FlowPane;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.VPos;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabel;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class UpholdForm extends PaymentMethodForm {
|
||||
private final UpholdAccount upholdAccount;
|
||||
@ -15,25 +15,31 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
import bisq.desktop.util.validation.VenmoValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.VenmoAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.VenmoAccountPayload;
|
||||
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.locale.TradeCurrency;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.VenmoAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.VenmoAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import io.bisq.gui.util.validation.VenmoValidator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.*;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.GridPane;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabelInputTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextField;
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
public class VenmoForm extends PaymentMethodForm {
|
||||
private final VenmoAccount account;
|
||||
@ -15,32 +15,46 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.components.paymentmethods;
|
||||
package bisq.desktop.components.paymentmethods;
|
||||
|
||||
import bisq.desktop.components.InputTextField;
|
||||
import bisq.desktop.main.overlays.popups.Popup;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.FormBuilder;
|
||||
import bisq.desktop.util.Layout;
|
||||
import bisq.desktop.util.validation.EmailValidator;
|
||||
import bisq.desktop.util.validation.InputValidator;
|
||||
|
||||
import bisq.core.payment.AccountAgeWitnessService;
|
||||
import bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import bisq.core.payment.PaymentAccount;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.WesternUnionAccountPayload;
|
||||
|
||||
import bisq.common.locale.BankUtil;
|
||||
import bisq.common.locale.Country;
|
||||
import bisq.common.locale.CountryUtil;
|
||||
import bisq.common.locale.CurrencyUtil;
|
||||
import bisq.common.locale.FiatCurrency;
|
||||
import bisq.common.locale.Region;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.locale.TradeCurrency;
|
||||
import bisq.common.util.Tuple2;
|
||||
import bisq.common.util.Tuple3;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import io.bisq.common.locale.*;
|
||||
import io.bisq.common.util.Tuple2;
|
||||
import io.bisq.common.util.Tuple3;
|
||||
import io.bisq.core.payment.AccountAgeWitnessService;
|
||||
import io.bisq.core.payment.CountryBasedPaymentAccount;
|
||||
import io.bisq.core.payment.PaymentAccount;
|
||||
import io.bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import io.bisq.core.payment.payload.WesternUnionAccountPayload;
|
||||
import io.bisq.gui.components.InputTextField;
|
||||
import io.bisq.gui.main.overlays.popups.Popup;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.FormBuilder;
|
||||
import io.bisq.gui.util.Layout;
|
||||
import io.bisq.gui.util.validation.EmailValidator;
|
||||
import io.bisq.gui.util.validation.InputValidator;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.util.StringConverter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import static io.bisq.gui.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
import javafx.collections.FXCollections;
|
||||
|
||||
import javafx.util.StringConverter;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import static bisq.desktop.util.FormBuilder.addLabelTextFieldWithCopyIcon;
|
||||
|
||||
@Slf4j
|
||||
public class WesternUnionForm extends PaymentMethodForm {
|
||||
303
src/main/java/bisq/desktop/images.css
Normal file
303
src/main/java/bisq/desktop/images.css
Normal file
@ -0,0 +1,303 @@
|
||||
/* splash screen */
|
||||
/*noinspection CssUnknownTarget*/
|
||||
#image-splash-logo {
|
||||
-fx-image: url("../../images/logo_splash.png");
|
||||
}
|
||||
|
||||
/* shared*/
|
||||
#image-info {
|
||||
-fx-image: url("../../images/info.png");
|
||||
}
|
||||
|
||||
#light_close {
|
||||
-fx-image: url("../../images/light_close.png");
|
||||
}
|
||||
|
||||
#image-alert-round {
|
||||
-fx-image: url("../../images/alert_round.png");
|
||||
}
|
||||
|
||||
#image-green_circle {
|
||||
-fx-image: url("../../images/green_circle.png");
|
||||
}
|
||||
|
||||
#image-blue_circle {
|
||||
-fx-image: url("../../images/blue_circle.png");
|
||||
}
|
||||
|
||||
#image-remove {
|
||||
-fx-image: url("../../images/remove.png");
|
||||
}
|
||||
|
||||
#image-buy {
|
||||
-fx-image: url("../../images/buy.png");
|
||||
}
|
||||
|
||||
#image-buy-white {
|
||||
-fx-image: url("../../images/buy_white.png");
|
||||
}
|
||||
|
||||
#image-sell {
|
||||
-fx-image: url("../../images/sell.png");
|
||||
}
|
||||
|
||||
#image-sell-white {
|
||||
-fx-image: url("../../images/sell_white.png");
|
||||
}
|
||||
|
||||
#image-expand {
|
||||
-fx-image: url("../../images/expand.png");
|
||||
}
|
||||
|
||||
#image-collapse {
|
||||
-fx-image: url("../../images/collapse.png");
|
||||
}
|
||||
|
||||
#image-buy-large {
|
||||
-fx-image: url("../../images/buy_large.png");
|
||||
}
|
||||
|
||||
#image-sell-large {
|
||||
-fx-image: url("../../images/sell_large.png");
|
||||
}
|
||||
|
||||
/* navigation buttons */
|
||||
#image-nav-market {
|
||||
-fx-image: url("../../images/nav/market.png");
|
||||
}
|
||||
|
||||
#image-nav-market-active {
|
||||
-fx-image: url("../../images/nav/market_active.png");
|
||||
}
|
||||
|
||||
#image-nav-buyoffer {
|
||||
-fx-image: url("../../images/nav/buyoffer.png");
|
||||
}
|
||||
|
||||
#image-nav-buyoffer-active {
|
||||
-fx-image: url("../../images/nav/buyoffer_active.png");
|
||||
}
|
||||
|
||||
#image-nav-selloffer {
|
||||
-fx-image: url("../../images/nav/selloffer.png");
|
||||
}
|
||||
|
||||
#image-nav-selloffer-active {
|
||||
-fx-image: url("../../images/nav/selloffer_active.png");
|
||||
}
|
||||
|
||||
#image-nav-portfolio {
|
||||
-fx-image: url("../../images/nav/portfolio.png");
|
||||
}
|
||||
|
||||
#image-nav-portfolio-active {
|
||||
-fx-image: url("../../images/nav/portfolio_active.png");
|
||||
}
|
||||
|
||||
#image-nav-funds {
|
||||
-fx-image: url("../../images/nav/funds.png");
|
||||
}
|
||||
|
||||
#image-nav-funds-active {
|
||||
-fx-image: url("../../images/nav/funds_active.png");
|
||||
}
|
||||
|
||||
#image-nav-disputes {
|
||||
-fx-image: url("../../images/nav/disputes.png");
|
||||
}
|
||||
|
||||
#image-nav-disputes-active {
|
||||
-fx-image: url("../../images/nav/disputes_active.png");
|
||||
}
|
||||
|
||||
#image-nav-settings {
|
||||
-fx-image: url("../../images/nav/settings.png");
|
||||
}
|
||||
|
||||
#image-nav-settings-active {
|
||||
-fx-image: url("../../images/nav/settings_active.png");
|
||||
}
|
||||
|
||||
#image-nav-account {
|
||||
-fx-image: url("../../images/nav/account.png");
|
||||
}
|
||||
|
||||
#image-nav-account-active {
|
||||
-fx-image: url("../../images/nav/account_active.png");
|
||||
}
|
||||
|
||||
#image-nav-dao {
|
||||
-fx-image: url("../../images/nav/dao.png");
|
||||
}
|
||||
|
||||
#image-nav-dao-active {
|
||||
-fx-image: url("../../images/nav/dao_active.png");
|
||||
}
|
||||
|
||||
/* account*/
|
||||
#image-tick {
|
||||
-fx-image: url("../../images/tick.png");
|
||||
}
|
||||
|
||||
#image-arrow-blue {
|
||||
-fx-image: url("../../images/arrow_blue.png");
|
||||
}
|
||||
|
||||
#image-arrow-grey {
|
||||
-fx-image: url("../../images/arrow_grey.png");
|
||||
}
|
||||
|
||||
/* connection state*/
|
||||
#image-connection-tor {
|
||||
-fx-image: url("../../images/connection/tor.png");
|
||||
}
|
||||
|
||||
#image-connection-direct {
|
||||
-fx-image: url("../../images/connection/direct.png");
|
||||
}
|
||||
|
||||
#image-connection-nat {
|
||||
-fx-image: url("../../images/connection/nat.png");
|
||||
}
|
||||
|
||||
#image-connection-relay {
|
||||
-fx-image: url("../../images/connection/relay.png");
|
||||
}
|
||||
|
||||
#image-connection-synced {
|
||||
-fx-image: url("../../images/connection/synced.png");
|
||||
}
|
||||
|
||||
/* software update*/
|
||||
|
||||
#image-update-in-progress {
|
||||
-fx-image: url("../../images/update/update_in_progress.png");
|
||||
}
|
||||
|
||||
#image-update-up-to-date {
|
||||
-fx-image: url("../../images/update/update_up_to_date.png");
|
||||
}
|
||||
|
||||
#image-update-available {
|
||||
-fx-image: url("../../images/update/update_available.png");
|
||||
}
|
||||
|
||||
#image-update-failed {
|
||||
-fx-image: url("../../images/update/update_failed.png");
|
||||
}
|
||||
|
||||
/* offer state */
|
||||
#image-offer_state_unknown {
|
||||
-fx-image: url("../../images/offer/offer_state_unknown.png");
|
||||
}
|
||||
|
||||
#image-offer_state_available {
|
||||
-fx-image: url("../../images/offer/offer_state_available.png");
|
||||
}
|
||||
|
||||
#image-offer_state_not_available {
|
||||
-fx-image: url("../../images/offer/offer_state_not_available.png");
|
||||
}
|
||||
|
||||
#image-attachment {
|
||||
-fx-image: url("../../images/attachment.png");
|
||||
}
|
||||
|
||||
#bubble_arrow_grey_left {
|
||||
-fx-image: url("../../images/bubble_arrow_grey_left.png");
|
||||
}
|
||||
|
||||
#bubble_arrow_blue_left {
|
||||
-fx-image: url("../../images/bubble_arrow_blue_left.png");
|
||||
}
|
||||
|
||||
#bubble_arrow_grey_right {
|
||||
-fx-image: url("../../images/bubble_arrow_grey_right.png");
|
||||
}
|
||||
|
||||
#bubble_arrow_blue_right {
|
||||
-fx-image: url("../../images/bubble_arrow_blue_right.png");
|
||||
}
|
||||
|
||||
#link {
|
||||
-fx-image: url("../../images/link.png");
|
||||
}
|
||||
|
||||
#invert {
|
||||
-fx-image: url("../../images/invert.png");
|
||||
}
|
||||
|
||||
#avatar_1 {
|
||||
-fx-image: url("../../images/avatars/avatar_1.png");
|
||||
}
|
||||
|
||||
#avatar_2 {
|
||||
-fx-image: url("../../images/avatars/avatar_2.png");
|
||||
}
|
||||
|
||||
#avatar_3 {
|
||||
-fx-image: url("../../images/avatars/avatar_3.png");
|
||||
}
|
||||
|
||||
#avatar_4 {
|
||||
-fx-image: url("../../images/avatars/avatar_4.png");
|
||||
}
|
||||
|
||||
#avatar_5 {
|
||||
-fx-image: url("../../images/avatars/avatar_5.png");
|
||||
}
|
||||
|
||||
#avatar_6 {
|
||||
-fx-image: url("../../images/avatars/avatar_6.png");
|
||||
}
|
||||
|
||||
#avatar_7 {
|
||||
-fx-image: url("../../images/avatars/avatar_7.png");
|
||||
}
|
||||
|
||||
#avatar_8 {
|
||||
-fx-image: url("../../images/avatars/avatar_8.png");
|
||||
}
|
||||
|
||||
#avatar_9 {
|
||||
-fx-image: url("../../images/avatars/avatar_9.png");
|
||||
}
|
||||
|
||||
#avatar_10 {
|
||||
-fx-image: url("../../images/avatars/avatar_10.png");
|
||||
}
|
||||
|
||||
#avatar_11 {
|
||||
-fx-image: url("../../images/avatars/avatar_11.png");
|
||||
}
|
||||
|
||||
#avatar_12 {
|
||||
-fx-image: url("../../images/avatars/avatar_12.png");
|
||||
}
|
||||
|
||||
#avatar_13 {
|
||||
-fx-image: url("../../images/avatars/avatar_13.png");
|
||||
}
|
||||
|
||||
#avatar_14 {
|
||||
-fx-image: url("../../images/avatars/avatar_14.png");
|
||||
}
|
||||
|
||||
#avatar_15 {
|
||||
-fx-image: url("../../images/avatars/avatar_15.png");
|
||||
}
|
||||
|
||||
#poloniex {
|
||||
-fx-image: url("../../images/poloniex.png");
|
||||
}
|
||||
|
||||
#btcaverage {
|
||||
-fx-image: url("../../images/btcaverage.png");
|
||||
}
|
||||
|
||||
#spinner {
|
||||
-fx-image: url("../../images/spinner.png");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -17,6 +17,6 @@
|
||||
-->
|
||||
|
||||
<?import javafx.scene.layout.StackPane?>
|
||||
<StackPane fx:id="root" fx:controller="io.bisq.gui.main.MainView"
|
||||
<StackPane fx:id="root" fx:controller="bisq.desktop.main.MainView"
|
||||
xmlns:fx="http://javafx.com/fxml">
|
||||
</StackPane>
|
||||
@ -15,53 +15,82 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.main;
|
||||
package bisq.desktop.main;
|
||||
|
||||
import io.bisq.common.Timer;
|
||||
import io.bisq.common.UserThread;
|
||||
import io.bisq.common.app.DevEnv;
|
||||
import io.bisq.common.app.Version;
|
||||
import io.bisq.common.locale.Res;
|
||||
import io.bisq.common.util.Tuple2;
|
||||
import io.bisq.common.util.Utilities;
|
||||
import io.bisq.core.app.BisqEnvironment;
|
||||
import io.bisq.core.exceptions.BisqException;
|
||||
import io.bisq.gui.Navigation;
|
||||
import io.bisq.gui.common.view.*;
|
||||
import io.bisq.gui.components.AutoTooltipButton;
|
||||
import io.bisq.gui.components.AutoTooltipLabel;
|
||||
import io.bisq.gui.components.AutoTooltipToggleButton;
|
||||
import io.bisq.gui.components.BusyAnimation;
|
||||
import io.bisq.gui.main.account.AccountView;
|
||||
import io.bisq.gui.main.dao.DaoView;
|
||||
import io.bisq.gui.main.disputes.DisputesView;
|
||||
import io.bisq.gui.main.funds.FundsView;
|
||||
import io.bisq.gui.main.market.MarketView;
|
||||
import io.bisq.gui.main.offer.BuyOfferView;
|
||||
import io.bisq.gui.main.offer.SellOfferView;
|
||||
import io.bisq.gui.main.overlays.popups.Popup;
|
||||
import io.bisq.gui.main.portfolio.PortfolioView;
|
||||
import io.bisq.gui.main.settings.SettingsView;
|
||||
import io.bisq.gui.util.BSFormatter;
|
||||
import io.bisq.gui.util.GUIUtil;
|
||||
import io.bisq.gui.util.Transitions;
|
||||
import javafx.beans.value.ChangeListener;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.control.*;
|
||||
import bisq.desktop.Navigation;
|
||||
import bisq.desktop.common.view.CachingViewLoader;
|
||||
import bisq.desktop.common.view.FxmlView;
|
||||
import bisq.desktop.common.view.InitializableView;
|
||||
import bisq.desktop.common.view.View;
|
||||
import bisq.desktop.common.view.ViewLoader;
|
||||
import bisq.desktop.components.AutoTooltipButton;
|
||||
import bisq.desktop.components.AutoTooltipLabel;
|
||||
import bisq.desktop.components.AutoTooltipToggleButton;
|
||||
import bisq.desktop.components.BusyAnimation;
|
||||
import bisq.desktop.main.account.AccountView;
|
||||
import bisq.desktop.main.dao.DaoView;
|
||||
import bisq.desktop.main.disputes.DisputesView;
|
||||
import bisq.desktop.main.funds.FundsView;
|
||||
import bisq.desktop.main.market.MarketView;
|
||||
import bisq.desktop.main.offer.BuyOfferView;
|
||||
import bisq.desktop.main.offer.SellOfferView;
|
||||
import bisq.desktop.main.overlays.popups.Popup;
|
||||
import bisq.desktop.main.portfolio.PortfolioView;
|
||||
import bisq.desktop.main.settings.SettingsView;
|
||||
import bisq.desktop.util.BSFormatter;
|
||||
import bisq.desktop.util.GUIUtil;
|
||||
import bisq.desktop.util.Transitions;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.exceptions.BisqException;
|
||||
|
||||
import bisq.common.Timer;
|
||||
import bisq.common.UserThread;
|
||||
import bisq.common.app.DevEnv;
|
||||
import bisq.common.app.Version;
|
||||
import bisq.common.locale.Res;
|
||||
import bisq.common.util.Tuple2;
|
||||
import bisq.common.util.Utilities;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.ContentDisplay;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.ListCell;
|
||||
import javafx.scene.control.ProgressBar;
|
||||
import javafx.scene.control.Separator;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.ToggleButton;
|
||||
import javafx.scene.control.ToggleGroup;
|
||||
import javafx.scene.control.Tooltip;
|
||||
import javafx.scene.effect.DropShadow;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.input.KeyCode;
|
||||
import javafx.scene.input.KeyEvent;
|
||||
import javafx.scene.layout.*;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.BorderPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.scene.layout.StackPane;
|
||||
import javafx.scene.layout.VBox;
|
||||
import javafx.scene.paint.Color;
|
||||
import javafx.scene.text.TextAlignment;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Pos;
|
||||
|
||||
import javafx.beans.value.ChangeListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static javafx.scene.layout.AnchorPane.*;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import static javafx.scene.layout.AnchorPane.setBottomAnchor;
|
||||
import static javafx.scene.layout.AnchorPane.setLeftAnchor;
|
||||
import static javafx.scene.layout.AnchorPane.setRightAnchor;
|
||||
import static javafx.scene.layout.AnchorPane.setTopAnchor;
|
||||
|
||||
@FxmlView
|
||||
@Slf4j
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user