Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-09 07:02:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename all packages and other names from bisq to haveno

Browse source
This commit is contained in:
woodser 2023-03-06 19:14:00 -05:00
parent ab0b9e3b77
commit 1a1fb130c0
1775 changed files with 14575 additions and 16767 deletions
Download patch file Download diff file Expand all files Collapse all files

0
desktop/src/main/java/bisq/desktop/CandleStickChart.css → desktop/src/main/java/haveno/desktop/CandleStickChart.css
View file

22
desktop/src/main/java/bisq/desktop/DesktopModule.java → desktop/src/main/java/haveno/desktop/DesktopModule.java
View file

@ -15,25 +15,21 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop;
package haveno.desktop;
import bisq.desktop.common.fxml.FxmlViewLoader;
import bisq.desktop.common.view.ViewFactory;
import bisq.desktop.common.view.ViewLoader;
import bisq.desktop.common.view.guice.InjectorViewFactory;
import bisq.core.locale.Res;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
import static haveno.common.config.Config.APP_NAME;
import com.google.inject.Singleton;
import com.google.inject.name.Names;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.core.locale.Res;
import haveno.desktop.common.fxml.FxmlViewLoader;
import haveno.desktop.common.view.ViewFactory;
import haveno.desktop.common.view.ViewLoader;
import haveno.desktop.common.view.guice.InjectorViewFactory;
import java.util.ResourceBundle;
import static bisq.common.config.Config.APP_NAME;
public class DesktopModule extends AppModule {
public DesktopModule(Config config) {

19
desktop/src/main/java/bisq/desktop/Navigation.java → desktop/src/main/java/haveno/desktop/Navigation.java
View file

@ -15,19 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
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.persistence.PersistenceManager;
import bisq.common.proto.persistable.NavigationPath;
import bisq.common.proto.persistable.PersistedDataHost;
package haveno.desktop;
import com.google.inject.Inject;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.NavigationPath;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.desktop.common.view.View;
import haveno.desktop.common.view.ViewPath;
import haveno.desktop.main.MainView;
import haveno.desktop.main.market.MarketView;
import javax.inject.Singleton;
import java.util.ArrayList;

74
desktop/src/main/java/bisq/desktop/app/HavenoApp.java → desktop/src/main/java/haveno/desktop/app/HavenoApp.java
View file

@ -15,43 +15,39 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.app;
import bisq.desktop.common.view.CachingViewLoader;
import bisq.desktop.common.view.View;
import bisq.desktop.common.view.ViewLoader;
import bisq.desktop.main.MainView;
import bisq.desktop.main.debug.DebugView;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.overlays.windows.BtcEmptyWalletWindow;
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.CssTheme;
import bisq.desktop.util.ImageUtil;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.OpenOfferManager;
import bisq.core.user.Cookie;
import bisq.core.user.CookieKey;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import bisq.common.app.DevEnv;
import bisq.common.app.Log;
import bisq.common.config.Config;
import bisq.common.setup.GracefulShutDownHandler;
import bisq.common.setup.UncaughtExceptionHandler;
import bisq.common.util.Utilities;
package haveno.desktop.app;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.name.Names;
import haveno.common.app.DevEnv;
import haveno.common.app.Log;
import haveno.common.config.Config;
import haveno.common.setup.GracefulShutDownHandler;
import haveno.common.setup.UncaughtExceptionHandler;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
import haveno.core.user.Cookie;
import haveno.core.user.CookieKey;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.desktop.common.view.CachingViewLoader;
import haveno.desktop.common.view.View;
import haveno.desktop.common.view.ViewLoader;
import haveno.desktop.main.MainView;
import haveno.desktop.main.debug.DebugView;
import haveno.desktop.main.overlays.popups.Popup;
import haveno.desktop.main.overlays.windows.BtcEmptyWalletWindow;
import haveno.desktop.main.overlays.windows.FilterWindow;
import haveno.desktop.main.overlays.windows.ManualPayoutTxWindow;
import haveno.desktop.main.overlays.windows.SendAlertMessageWindow;
import haveno.desktop.main.overlays.windows.ShowWalletDataWindow;
import haveno.desktop.util.CssTheme;
import haveno.desktop.util.ImageUtil;
import com.google.common.base.Joiner;
import javafx.application.Application;
@ -77,6 +73,11 @@ import java.util.function.Consumer;
import org.slf4j.LoggerFactory;
import static haveno.desktop.util.Layout.INITIAL_WINDOW_HEIGHT;
import static haveno.desktop.util.Layout.INITIAL_WINDOW_WIDTH;
import static haveno.desktop.util.Layout.MIN_WINDOW_HEIGHT;
import static haveno.desktop.util.Layout.MIN_WINDOW_WIDTH;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
@ -84,11 +85,6 @@ import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import static bisq.desktop.util.Layout.INITIAL_WINDOW_HEIGHT;
import static bisq.desktop.util.Layout.INITIAL_WINDOW_WIDTH;
import static bisq.desktop.util.Layout.MIN_WINDOW_HEIGHT;
import static bisq.desktop.util.Layout.MIN_WINDOW_WIDTH;
@Slf4j
public class HavenoApp extends Application implements UncaughtExceptionHandler {
@Setter
@ -361,7 +357,7 @@ public class HavenoApp extends Application implements UncaughtExceptionHandler {
return;
}
// We show a popup to inform user that open offers will be removed if Bisq is not running.
// We show a popup to inform user that open offers will be removed if Haveno is not running.
String key = "showOpenOfferWarnPopupAtShutDown";
if (injector.getInstance(Preferences.class).showAgain(key) && !DevEnv.isDevMode()) {
new Popup().information(Res.get("popup.info.shutDownWithOpenOffers"))

26
desktop/src/main/java/bisq/desktop/app/HavenoAppMain.java → desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java
View file

@ -15,20 +15,18 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.app;
package haveno.desktop.app;
import bisq.desktop.common.UITimer;
import bisq.desktop.common.view.guice.InjectorViewFactory;
import bisq.desktop.setup.DesktopPersistedDataHost;
import bisq.desktop.util.ImageUtil;
import bisq.core.app.AvoidStandbyModeService;
import bisq.core.app.HavenoExecutable;
import bisq.common.UserThread;
import bisq.common.app.AppModule;
import bisq.common.app.Version;
import bisq.common.crypto.IncorrectPasswordException;
import haveno.common.UserThread;
import haveno.common.app.AppModule;
import haveno.common.app.Version;
import haveno.common.crypto.IncorrectPasswordException;
import haveno.core.app.AvoidStandbyModeService;
import haveno.core.app.HavenoExecutable;
import haveno.desktop.common.UITimer;
import haveno.desktop.common.view.guice.InjectorViewFactory;
import haveno.desktop.setup.DesktopPersistedDataHost;
import haveno.desktop.util.ImageUtil;
import javafx.application.Application;
import javafx.application.Platform;
@ -57,7 +55,7 @@ public class HavenoAppMain extends HavenoExecutable {
private HavenoApp application;
public HavenoAppMain() {
super("Bisq Desktop", "bisq-desktop", DEFAULT_APP_NAME, Version.VERSION);
super("Haveno Desktop", "haveno-desktop", DEFAULT_APP_NAME, Version.VERSION);
}
public static void main(String[] args) {

12
desktop/src/main/java/bisq/desktop/app/HavenoAppModule.java → desktop/src/main/java/haveno/desktop/app/HavenoAppModule.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.app;
package haveno.desktop.app;
import bisq.desktop.DesktopModule;
import bisq.core.app.CoreModule;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.core.app.CoreModule;
import haveno.desktop.DesktopModule;
public class HavenoAppModule extends AppModule {

12
desktop/src/main/java/bisq/desktop/common/UITimer.java → desktop/src/main/java/haveno/desktop/common/UITimer.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.reactfx.FxTimer;
package haveno.desktop.common;
import javafx.application.Platform;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.reactfx.FxTimer;
import java.time.Duration;
import org.slf4j.Logger;
@ -30,7 +28,7 @@ import org.slf4j.LoggerFactory;
public class UITimer implements Timer {
private final Logger log = LoggerFactory.getLogger(UITimer.class);
private bisq.common.reactfx.Timer timer;
private haveno.common.reactfx.Timer timer;
public UITimer() {
}

2
desktop/src/main/java/bisq/desktop/common/ViewfxException.java → desktop/src/main/java/haveno/desktop/common/ViewfxException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common;
package haveno.desktop.common;
import static java.lang.String.format;

19
desktop/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java → desktop/src/main/java/haveno/desktop/common/fxml/FxmlViewLoader.java
View file

@ -15,21 +15,18 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
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 bisq.common.util.Utilities;
package haveno.desktop.common.fxml;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.base.Joiner;
import haveno.common.util.Utilities;
import haveno.desktop.common.ViewfxException;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.common.view.View;
import haveno.desktop.common.view.ViewFactory;
import haveno.desktop.common.view.ViewLoader;
import javafx.fxml.FXMLLoader;
import java.net.URL;
@ -130,7 +127,7 @@ public class FxmlViewLoader implements ViewLoader {
/**
* Copied and adapted from Spring Framework v4.3.6's AnnotationUtils#defaultValue
* method in order to make it possible to drop Bisq's dependency on Spring altogether.
* method in order to make it possible to drop Haveno's dependency on Spring altogether.
*/
@SuppressWarnings("SameParameterValue")
private static Object getDefaultValue(Class<? extends Annotation> annotationType, String attributeName) {

2
desktop/src/main/java/bisq/desktop/common/model/Activatable.java → desktop/src/main/java/haveno/desktop/common/model/Activatable.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.model;
package haveno.desktop.common.model;
public interface Activatable {

2
desktop/src/main/java/bisq/desktop/common/model/ActivatableDataModel.java → desktop/src/main/java/haveno/desktop/common/model/ActivatableDataModel.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.model;
package haveno.desktop.common.model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
desktop/src/main/java/bisq/desktop/common/model/ActivatableViewModel.java → desktop/src/main/java/haveno/desktop/common/model/ActivatableViewModel.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.model;
package haveno.desktop.common.model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
desktop/src/main/java/bisq/desktop/common/model/ActivatableWithDataModel.java → desktop/src/main/java/haveno/desktop/common/model/ActivatableWithDataModel.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.model;
package haveno.desktop.common.model;
public class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable {

2
desktop/src/main/java/bisq/desktop/common/model/DataModel.java → desktop/src/main/java/haveno/desktop/common/model/DataModel.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.model;
package haveno.desktop.common.model;
public interface DataModel extends Model {
}

2
desktop/src/main/java/bisq/desktop/common/model/Model.java → desktop/src/main/java/haveno/desktop/common/model/Model.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.model;
package haveno.desktop.common.model;
public interface Model {
}

2
desktop/src/main/java/bisq/desktop/common/model/ViewModel.java → desktop/src/main/java/haveno/desktop/common/model/ViewModel.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.model;
package haveno.desktop.common.model;
public interface ViewModel extends Model {
}

2
desktop/src/main/java/bisq/desktop/common/model/WithDataModel.java → desktop/src/main/java/haveno/desktop/common/model/WithDataModel.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.model;
package haveno.desktop.common.model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
desktop/src/main/java/bisq/desktop/common/view/AbstractView.java → desktop/src/main/java/haveno/desktop/common/view/AbstractView.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
import javafx.fxml.FXML;

2
desktop/src/main/java/bisq/desktop/common/view/ActivatableView.java → desktop/src/main/java/haveno/desktop/common/view/ActivatableView.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
import javafx.scene.Node;

6
desktop/src/main/java/bisq/desktop/common/view/ActivatableViewAndModel.java → desktop/src/main/java/haveno/desktop/common/view/ActivatableViewAndModel.java
View file

@ -15,14 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
import bisq.desktop.common.model.Activatable;
package haveno.desktop.common.view;
import javafx.scene.Node;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.desktop.common.model.Activatable;
public abstract class ActivatableViewAndModel<R extends Node, M extends Activatable> extends ActivatableView<R, M> {
public ActivatableViewAndModel(M model) {

2
desktop/src/main/java/bisq/desktop/common/view/CachingViewLoader.java → desktop/src/main/java/haveno/desktop/common/view/CachingViewLoader.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
import javax.inject.Inject;
import javax.inject.Singleton;

2
desktop/src/main/java/bisq/desktop/common/view/DefaultPathConvention.java → desktop/src/main/java/haveno/desktop/common/view/DefaultPathConvention.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
public class DefaultPathConvention implements FxmlView.PathConvention {

2
desktop/src/main/java/bisq/desktop/common/view/FxmlView.java → desktop/src/main/java/haveno/desktop/common/view/FxmlView.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
import java.util.function.Function;

2
desktop/src/main/java/bisq/desktop/common/view/InitializableView.java → desktop/src/main/java/haveno/desktop/common/view/InitializableView.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
import javafx.fxml.Initializable;

2
desktop/src/main/java/bisq/desktop/common/view/View.java → desktop/src/main/java/haveno/desktop/common/view/View.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
import javafx.scene.Node;

2
desktop/src/main/java/bisq/desktop/common/view/ViewFactory.java → desktop/src/main/java/haveno/desktop/common/view/ViewFactory.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
import javafx.util.Callback;

2
desktop/src/main/java/bisq/desktop/common/view/ViewLoader.java → desktop/src/main/java/haveno/desktop/common/view/ViewLoader.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
public interface ViewLoader {
View load(Class<? extends View> viewClass);

2
desktop/src/main/java/bisq/desktop/common/view/ViewPath.java → desktop/src/main/java/haveno/desktop/common/view/ViewPath.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view;
package haveno.desktop.common.view;
import java.util.ArrayList;
import java.util.Arrays;

6
desktop/src/main/java/bisq/desktop/common/view/guice/InjectorViewFactory.java → desktop/src/main/java/haveno/desktop/common/view/guice/InjectorViewFactory.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.common.view.guice;
import bisq.desktop.common.view.ViewFactory;
package haveno.desktop.common.view.guice;
import com.google.inject.Injector;
import haveno.desktop.common.view.ViewFactory;
import javax.inject.Singleton;
import com.google.common.base.Preconditions;

24
desktop/src/main/java/bisq/desktop/components/AccountStatusTooltipLabel.java → desktop/src/main/java/haveno/desktop/components/AccountStatusTooltipLabel.java
View file

@ -15,22 +15,18 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.components.controlsfx.control.PopOver;
import bisq.desktop.main.offer.offerbook.OfferBookListItem;
import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.GUIUtil;
import bisq.core.account.sign.SignedWitnessService;
import bisq.core.locale.Res;
import bisq.core.offer.OfferRestrictions;
import bisq.core.trade.HavenoUtils;
import bisq.common.UserThread;
package haveno.desktop.components;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import haveno.common.UserThread;
import haveno.core.account.sign.SignedWitnessService;
import haveno.core.locale.Res;
import haveno.core.offer.OfferRestrictions;
import haveno.core.trade.HavenoUtils;
import haveno.desktop.components.controlsfx.control.PopOver;
import haveno.desktop.main.offer.offerbook.OfferBookListItem;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.GUIUtil;
import javafx.scene.Node;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Hyperlink;

15
desktop/src/main/java/bisq/desktop/components/AddressTextField.java → desktop/src/main/java/haveno/desktop/components/AddressTextField.java
View file

@ -15,18 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.util.GUIUtil;
import bisq.core.locale.Res;
import bisq.core.trade.HavenoUtils;
import bisq.common.util.Utilities;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.locale.Res;
import haveno.core.trade.HavenoUtils;
import haveno.desktop.main.overlays.popups.Popup;
import haveno.desktop.util.GUIUtil;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Label;

2
desktop/src/main/java/bisq/desktop/components/AddressWithIconAndDirection.java → desktop/src/main/java/haveno/desktop/components/AddressWithIconAndDirection.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;

6
desktop/src/main/java/bisq/desktop/components/AutoTooltipButton.java → desktop/src/main/java/haveno/desktop/components/AutoTooltipButton.java
View file

@ -15,7 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.skins.JFXButtonSkin;
@ -23,8 +25,6 @@ import com.jfoenix.skins.JFXButtonSkin;
import javafx.scene.Node;
import javafx.scene.control.Skin;
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipButton extends JFXButton {
public AutoTooltipButton() {

6
desktop/src/main/java/bisq/desktop/components/AutoTooltipCheckBox.java → desktop/src/main/java/haveno/desktop/components/AutoTooltipCheckBox.java
View file

@ -15,15 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import com.jfoenix.controls.JFXCheckBox;
import com.jfoenix.skins.JFXCheckBoxSkin;
import javafx.scene.control.Skin;
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipCheckBox extends JFXCheckBox {
public AutoTooltipCheckBox() {

6
desktop/src/main/java/bisq/desktop/components/AutoTooltipLabel.java → desktop/src/main/java/haveno/desktop/components/AutoTooltipLabel.java
View file

@ -15,14 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import javafx.scene.control.Label;
import javafx.scene.control.Skin;
import javafx.scene.control.skin.LabelSkin;
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipLabel extends Label {
public AutoTooltipLabel() {

8
desktop/src/main/java/bisq/desktop/components/AutoTooltipRadioButton.java → desktop/src/main/java/haveno/desktop/components/AutoTooltipRadioButton.java
View file

@ -15,14 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import com.jfoenix.controls.JFXRadioButton;
import javafx.scene.control.Skin;
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipRadioButton extends JFXRadioButton {
public AutoTooltipRadioButton() {
@ -38,7 +38,7 @@ public class AutoTooltipRadioButton extends JFXRadioButton {
return new AutoTooltipRadioButtonSkin(this);
}
private class AutoTooltipRadioButtonSkin extends JFXRadioButtonSkinBisqStyle {
private class AutoTooltipRadioButtonSkin extends JFXRadioButtonSkinHavenoStyle {
public AutoTooltipRadioButtonSkin(JFXRadioButton radioButton) {
super(radioButton);
}

6
desktop/src/main/java/bisq/desktop/components/AutoTooltipSlideToggleButton.java → desktop/src/main/java/haveno/desktop/components/AutoTooltipSlideToggleButton.java
View file

@ -1,12 +1,12 @@
package bisq.desktop.components;
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import com.jfoenix.controls.JFXToggleButton;
import com.jfoenix.skins.JFXToggleButtonSkin;
import javafx.scene.control.Skin;
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipSlideToggleButton extends JFXToggleButton {
public AutoTooltipSlideToggleButton() {
super();

8
desktop/src/main/java/bisq/desktop/components/AutoTooltipTableColumn.java → desktop/src/main/java/haveno/desktop/components/AutoTooltipTableColumn.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.components.controlsfx.control.PopOver;
import bisq.desktop.util.FormBuilder;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.desktop.components.controlsfx.control.PopOver;
import haveno.desktop.util.FormBuilder;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.TableColumn;

6
desktop/src/main/java/bisq/desktop/components/AutoTooltipToggleButton.java → desktop/src/main/java/haveno/desktop/components/AutoTooltipToggleButton.java
View file

@ -15,15 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import javafx.scene.Node;
import javafx.scene.control.Skin;
import javafx.scene.control.ToggleButton;
import javafx.scene.control.skin.ToggleButtonSkin;
import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipToggleButton extends ToggleButton {
public AutoTooltipToggleButton() {

6
desktop/src/main/java/bisq/desktop/components/AutocompleteComboBox.java → desktop/src/main/java/haveno/desktop/components/AutocompleteComboBox.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.common.UserThread;
package haveno.desktop.components;
import org.apache.commons.lang3.StringUtils;
import com.jfoenix.controls.JFXComboBox;
import com.jfoenix.skins.JFXComboBoxListViewSkin;
import haveno.common.UserThread;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;

8
desktop/src/main/java/bisq/desktop/components/BalanceTextField.java → desktop/src/main/java/haveno/desktop/components/BalanceTextField.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.core.trade.HavenoUtils;
import bisq.core.util.coin.CoinFormatter;
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import haveno.core.trade.HavenoUtils;
import haveno.core.util.coin.CoinFormatter;
import javafx.scene.effect.BlurType;
import javafx.scene.effect.DropShadow;
import javafx.scene.effect.Effect;

2
desktop/src/main/java/bisq/desktop/components/BusyAnimation.java → desktop/src/main/java/haveno/desktop/components/BusyAnimation.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import com.jfoenix.controls.JFXSpinner;

8
desktop/src/main/java/bisq/desktop/components/ColoredDecimalPlacesWithZerosText.java → desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.core.util.FormattingUtils;
import bisq.common.util.Tuple2;
package haveno.desktop.components;
import haveno.common.util.Tuple2;
import haveno.core.util.FormattingUtils;
import javafx.scene.control.Label;
import javafx.scene.layout.HBox;

16
desktop/src/main/java/bisq/desktop/components/ExplorerAddressTextField.java → desktop/src/main/java/haveno/desktop/components/ExplorerAddressTextField.java
View file

@ -15,19 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.util.GUIUtil;
import bisq.core.locale.Res;
import bisq.core.user.BlockChainExplorer;
import bisq.core.user.Preferences;
import bisq.common.util.Utilities;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.locale.Res;
import haveno.core.user.BlockChainExplorer;
import haveno.core.user.Preferences;
import haveno.desktop.util.GUIUtil;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Label;

2
desktop/src/main/java/bisq/desktop/components/ExternalHyperlink.java → desktop/src/main/java/haveno/desktop/components/ExternalHyperlink.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;

11
desktop/src/main/java/bisq/desktop/components/FundsTextField.java → desktop/src/main/java/haveno/desktop/components/FundsTextField.java
View file

@ -15,14 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import bisq.core.locale.Res;
import bisq.common.util.Utilities;
import static haveno.desktop.util.FormBuilder.getIcon;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.locale.Res;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
@ -34,8 +33,6 @@ import javafx.beans.property.StringProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static bisq.desktop.util.FormBuilder.getIcon;
public class FundsTextField extends InfoTextField {
public static final Logger log = LoggerFactory.getLogger(FundsTextField.class);

4
desktop/src/main/java/bisq/desktop/components/HavenoTextArea.java → desktop/src/main/java/haveno/desktop/components/HavenoTextArea.java
View file

@ -1,4 +1,4 @@
package bisq.desktop.components;
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextArea;
@ -7,6 +7,6 @@ import javafx.scene.control.Skin;
public class HavenoTextArea extends JFXTextArea {
@Override
protected Skin<?> createDefaultSkin() {
return new JFXTextAreaSkinBisqStyle(this);
return new JFXTextAreaSkinHavenoStyle(this);
}
}

4
desktop/src/main/java/bisq/desktop/components/HavenoTextField.java → desktop/src/main/java/haveno/desktop/components/HavenoTextField.java
View file

@ -1,4 +1,4 @@
package bisq.desktop.components;
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
@ -16,6 +16,6 @@ public class HavenoTextField extends JFXTextField {
@Override
protected Skin<?> createDefaultSkin() {
return new JFXTextFieldSkinBisqStyle<>(this, 0);
return new JFXTextFieldSkinHavenoStyle<>(this, 0);
}
}

6
desktop/src/main/java/bisq/desktop/components/HyperlinkWithIcon.java → desktop/src/main/java/haveno/desktop/components/HyperlinkWithIcon.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.util.FormBuilder;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import de.jensd.fx.glyphs.GlyphIcons;
import haveno.desktop.util.FormBuilder;
import javafx.scene.Node;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Hyperlink;

8
desktop/src/main/java/bisq/desktop/components/InfoAutoTooltipLabel.java → desktop/src/main/java/haveno/desktop/components/InfoAutoTooltipLabel.java
View file

@ -15,21 +15,19 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import bisq.desktop.components.controlsfx.control.PopOver;
import static haveno.desktop.util.FormBuilder.getIcon;
import de.jensd.fx.fontawesome.AwesomeIcon;
import de.jensd.fx.glyphs.GlyphIcons;
import haveno.desktop.components.controlsfx.control.PopOver;
import javafx.scene.Node;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Label;
import javafx.geometry.Insets;
import static bisq.desktop.util.FormBuilder.getIcon;
public class InfoAutoTooltipLabel extends AutoTooltipLabel {
public static final int DEFAULT_WIDTH = 300;

12
desktop/src/main/java/bisq/desktop/components/InfoDisplay.java → desktop/src/main/java/haveno/desktop/components/InfoDisplay.java
View file

@ -15,16 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.util.FormBuilder;
import bisq.core.locale.Res;
import bisq.common.UserThread;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.UserThread;
import haveno.core.locale.Res;
import haveno.desktop.util.FormBuilder;
import javafx.scene.Parent;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;

6
desktop/src/main/java/bisq/desktop/components/InfoInputTextField.java → desktop/src/main/java/haveno/desktop/components/InfoInputTextField.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.components.controlsfx.control.PopOver;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.desktop.components.controlsfx.control.PopOver;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.AnchorPane;

11
desktop/src/main/java/bisq/desktop/components/InfoTextField.java → desktop/src/main/java/haveno/desktop/components/InfoTextField.java
View file

@ -15,12 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.components.controlsfx.control.PopOver;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeIcon;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import haveno.desktop.components.controlsfx.control.PopOver;
import static haveno.desktop.util.FormBuilder.getIcon;
import static haveno.desktop.util.FormBuilder.getRegularIconForLabel;
import com.jfoenix.controls.JFXTextField;
@ -37,9 +39,6 @@ import org.slf4j.LoggerFactory;
import lombok.Getter;
import static bisq.desktop.util.FormBuilder.getIcon;
import static bisq.desktop.util.FormBuilder.getRegularIconForLabel;
public class InfoTextField extends AnchorPane {
public static final Logger log = LoggerFactory.getLogger(InfoTextField.class);

11
desktop/src/main/java/bisq/desktop/components/InputTextField.java → desktop/src/main/java/haveno/desktop/components/InputTextField.java
View file

@ -15,14 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import bisq.core.locale.Res;
import bisq.core.util.validation.InputValidator;
import bisq.desktop.util.validation.JFXInputValidator;
import com.jfoenix.controls.JFXTextField;
import haveno.core.locale.Res;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.util.validation.JFXInputValidator;
import javafx.scene.control.Skin;
import javafx.beans.property.ObjectProperty;
@ -145,6 +144,6 @@ public class InputTextField extends JFXTextField {
}
protected Skin<?> createDefaultSkin() {
return new JFXTextFieldSkinBisqStyle<>(this, inputLineExtension);
return new JFXTextFieldSkinHavenoStyle<>(this, inputLineExtension);
}
}

6
desktop/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java → desktop/src/main/java/haveno/desktop/components/JFXRadioButtonSkinHavenoStyle.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import com.jfoenix.controls.JFXRadioButton;
import com.jfoenix.controls.JFXRippler;
@ -45,7 +45,7 @@ import javafx.util.Duration;
* Code copied and adapted from com.jfoenix.skins.JFXRadioButtonSkin
*/
public class JFXRadioButtonSkinBisqStyle extends RadioButtonSkin {
public class JFXRadioButtonSkinHavenoStyle extends RadioButtonSkin {
private final JFXRippler rippler;
private double padding = 12;
@ -54,7 +54,7 @@ public class JFXRadioButtonSkinBisqStyle extends RadioButtonSkin {
private JFXAnimationTimer timer;
public JFXRadioButtonSkinBisqStyle(JFXRadioButton control) {
public JFXRadioButtonSkinHavenoStyle(JFXRadioButton control) {
super(control);
final double radioRadius = 7;

6
desktop/src/main/java/bisq/desktop/components/JFXTextAreaSkinBisqStyle.java → desktop/src/main/java/haveno/desktop/components/JFXTextAreaSkinHavenoStyle.java
View file

@ -1,4 +1,4 @@
package bisq.desktop.components;
package haveno.desktop.components;
import com.jfoenix.adapters.ReflectionHelper;
import com.jfoenix.controls.JFXTextArea;
@ -25,7 +25,7 @@ import java.lang.reflect.Field;
* Code copied and adapted from com.jfoenix.skins.JFXTextAreaSkin
*/
public class JFXTextAreaSkinBisqStyle extends TextAreaSkin {
public class JFXTextAreaSkinHavenoStyle extends TextAreaSkin {
private boolean invalid = true;
@ -35,7 +35,7 @@ public class JFXTextAreaSkinBisqStyle extends TextAreaSkin {
private ValidationPane<JFXTextArea> errorContainer;
private PromptLinesWrapper<JFXTextArea> linesWrapper;
public JFXTextAreaSkinBisqStyle(JFXTextArea textArea) {
public JFXTextAreaSkinHavenoStyle(JFXTextArea textArea) {
super(textArea);
// init text area properties
scrollPane = (ScrollPane) getChildren().get(0);

6
desktop/src/main/java/bisq/desktop/components/JFXTextFieldSkinBisqStyle.java → desktop/src/main/java/haveno/desktop/components/JFXTextFieldSkinHavenoStyle.java
View file

@ -1,4 +1,4 @@
package bisq.desktop.components;
package haveno.desktop.components;
import com.jfoenix.adapters.ReflectionHelper;
import com.jfoenix.controls.base.IFXLabelFloatControl;
@ -20,7 +20,7 @@ import java.lang.reflect.Field;
* Code copied and adapted from com.jfoenix.skins.JFXTextFieldSkin
*/
public class JFXTextFieldSkinBisqStyle<T extends TextField & IFXLabelFloatControl> extends TextFieldSkin {
public class JFXTextFieldSkinHavenoStyle<T extends TextField & IFXLabelFloatControl> extends TextFieldSkin {
private double inputLineExtension;
private boolean invalid = true;
@ -34,7 +34,7 @@ public class JFXTextFieldSkinBisqStyle<T extends TextField & IFXLabelFloatContro
private ValidationPane<T> errorContainer;
private PromptLinesWrapper<T> linesWrapper;
public JFXTextFieldSkinBisqStyle(T textField, double inputLineExtension) {
public JFXTextFieldSkinHavenoStyle(T textField, double inputLineExtension) {
super(textField);
textPane = (Pane) this.getChildren().get(0);
this.inputLineExtension = inputLineExtension;

8
desktop/src/main/java/bisq/desktop/components/MenuItem.java → desktop/src/main/java/haveno/desktop/components/MenuItem.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.Navigation;
import bisq.desktop.common.view.View;
package haveno.desktop.components;
import com.jfoenix.controls.JFXButton;
import haveno.desktop.Navigation;
import haveno.desktop.common.view.View;
import javafx.scene.control.Toggle;
import javafx.scene.control.ToggleGroup;

8
desktop/src/main/java/bisq/desktop/components/NewBadge.java → desktop/src/main/java/haveno/desktop/components/NewBadge.java
View file

@ -1,10 +1,8 @@
package bisq.desktop.components;
import bisq.core.locale.Res;
import bisq.core.user.Preferences;
package haveno.desktop.components;
import com.jfoenix.controls.JFXBadge;
import haveno.core.locale.Res;
import haveno.core.user.Preferences;
import javafx.scene.Node;
import javafx.collections.MapChangeListener;

4
desktop/src/main/java/bisq/desktop/components/PasswordTextField.java → desktop/src/main/java/haveno/desktop/components/PasswordTextField.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import com.jfoenix.controls.JFXPasswordField;
@ -30,6 +30,6 @@ public class PasswordTextField extends JFXPasswordField {
@Override
protected Skin<?> createDefaultSkin() {
return new JFXTextFieldSkinBisqStyle<>(this, 0);
return new JFXTextFieldSkinHavenoStyle<>(this, 0);
}
}

22
desktop/src/main/java/bisq/desktop/components/PeerInfoIcon.java → desktop/src/main/java/haveno/desktop/components/PeerInfoIcon.java
View file

@ -15,21 +15,17 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.main.overlays.editor.PeerInfoWithTagEditor;
import bisq.desktop.util.DisplayUtils;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.trade.Trade;
import bisq.core.user.Preferences;
import bisq.network.p2p.NodeAddress;
package haveno.desktop.components;
import com.google.common.base.Charsets;
import haveno.core.alert.PrivateNotificationManager;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.trade.Trade;
import haveno.core.user.Preferences;
import haveno.desktop.main.overlays.editor.PeerInfoWithTagEditor;
import haveno.desktop.util.DisplayUtils;
import haveno.network.p2p.NodeAddress;
import javafx.scene.Group;
import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext;

12
desktop/src/main/java/bisq/desktop/components/PeerInfoIconDispute.java → desktop/src/main/java/haveno/desktop/components/PeerInfoIconDispute.java
View file

@ -15,17 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import bisq.core.locale.Res;
import bisq.core.user.Preferences;
import bisq.network.p2p.NodeAddress;
import static haveno.desktop.util.Colors.AVATAR_GREY;
import haveno.core.locale.Res;
import haveno.core.user.Preferences;
import haveno.network.p2p.NodeAddress;
import lombok.extern.slf4j.Slf4j;
import static bisq.desktop.util.Colors.AVATAR_GREY;
@Slf4j
public class PeerInfoIconDispute extends PeerInfoIcon {

16
desktop/src/main/java/bisq/desktop/components/PeerInfoIconSmall.java → desktop/src/main/java/haveno/desktop/components/PeerInfoIconSmall.java
View file

@ -1,13 +1,11 @@
package bisq.desktop.components;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.offer.Offer;
import bisq.core.trade.Trade;
import bisq.core.user.Preferences;
import bisq.network.p2p.NodeAddress;
package haveno.desktop.components;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.alert.PrivateNotificationManager;
import haveno.core.offer.Offer;
import haveno.core.trade.Trade;
import haveno.core.user.Preferences;
import haveno.network.p2p.NodeAddress;
import javax.annotation.Nullable;
public class PeerInfoIconSmall extends PeerInfoIconTrading {

31
desktop/src/main/java/bisq/desktop/components/PeerInfoIconTrading.java → desktop/src/main/java/haveno/desktop/components/PeerInfoIconTrading.java
View file

@ -15,20 +15,17 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.trade.Trade;
import bisq.core.user.Preferences;
import bisq.network.p2p.NodeAddress;
import bisq.common.util.Tuple5;
package haveno.desktop.components;
import haveno.common.util.Tuple5;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.alert.PrivateNotificationManager;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.trade.Trade;
import haveno.core.user.Preferences;
import haveno.network.p2p.NodeAddress;
import org.apache.commons.lang3.StringUtils;
import javafx.scene.paint.Color;
@ -39,11 +36,11 @@ import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import static bisq.desktop.util.Colors.AVATAR_BLUE;
import static bisq.desktop.util.Colors.AVATAR_GREEN;
import static bisq.desktop.util.Colors.AVATAR_ORANGE;
import static bisq.desktop.util.Colors.AVATAR_RED;
import static com.google.common.base.Preconditions.checkNotNull;
import static haveno.desktop.util.Colors.AVATAR_BLUE;
import static haveno.desktop.util.Colors.AVATAR_GREEN;
import static haveno.desktop.util.Colors.AVATAR_ORANGE;
import static haveno.desktop.util.Colors.AVATAR_RED;
@Slf4j
public class PeerInfoIconTrading extends PeerInfoIcon {

8
desktop/src/main/java/bisq/desktop/components/PopOverWrapper.java → desktop/src/main/java/haveno/desktop/components/PopOverWrapper.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.components.controlsfx.control.PopOver;
import bisq.common.UserThread;
package haveno.desktop.components;
import haveno.common.UserThread;
import haveno.desktop.components.controlsfx.control.PopOver;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;

8
desktop/src/main/java/bisq/desktop/components/SimpleMarkdownLabel.java → desktop/src/main/java/haveno/desktop/components/SimpleMarkdownLabel.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.util.GUIUtil;
import bisq.core.util.SimpleMarkdownParser;
package haveno.desktop.components;
import haveno.core.util.SimpleMarkdownParser;
import haveno.desktop.util.GUIUtil;
import javafx.scene.Node;
import javafx.scene.control.Hyperlink;
import javafx.scene.text.Text;

2
desktop/src/main/java/bisq/desktop/components/TableGroupHeadline.java → desktop/src/main/java/haveno/desktop/components/TableGroupHeadline.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;

9
desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java → desktop/src/main/java/haveno/desktop/components/TextFieldWithCopyIcon.java
View file

@ -15,15 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.core.locale.Res;
import bisq.common.util.Utilities;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.locale.Res;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Label;

4
desktop/src/main/java/bisq/desktop/components/TextFieldWithIcon.java → desktop/src/main/java/haveno/desktop/components/TextFieldWithIcon.java
View file

@ -15,11 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import bisq.common.UserThread;
import haveno.common.UserThread;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Label;

8
desktop/src/main/java/bisq/desktop/components/TitledGroupBg.java → desktop/src/main/java/haveno/desktop/components/TitledGroupBg.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.GUIUtil;
package haveno.desktop.components;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.GUIUtil;
import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;

2
desktop/src/main/java/bisq/desktop/components/TooltipUtil.java → desktop/src/main/java/haveno/desktop/components/TooltipUtil.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
package haveno.desktop.components;
import javafx.scene.control.Labeled;
import javafx.scene.control.SkinBase;

20
desktop/src/main/java/bisq/desktop/components/TxIdTextField.java → desktop/src/main/java/haveno/desktop/components/TxIdTextField.java
View file

@ -15,21 +15,17 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components;
import bisq.desktop.components.indicator.TxConfidenceIndicator;
import bisq.desktop.util.GUIUtil;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.locale.Res;
import bisq.core.user.BlockChainExplorer;
import bisq.core.user.Preferences;
import bisq.common.util.Utilities;
package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.user.BlockChainExplorer;
import haveno.core.user.Preferences;
import haveno.desktop.components.indicator.TxConfidenceIndicator;
import haveno.desktop.util.GUIUtil;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Label;

5
desktop/src/main/java/bisq/desktop/components/chart/ChartDataModel.java → desktop/src/main/java/haveno/desktop/components/chart/ChartDataModel.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.chart;
import bisq.desktop.common.model.ActivatableDataModel;
package haveno.desktop.components.chart;
import haveno.desktop.common.model.ActivatableDataModel;
import java.time.Instant;
import java.time.temporal.TemporalAdjuster;

15
desktop/src/main/java/bisq/desktop/components/chart/ChartView.java → desktop/src/main/java/haveno/desktop/components/chart/ChartView.java
View file

@ -15,16 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.chart;
import bisq.desktop.common.view.ActivatableViewAndModel;
import bisq.desktop.components.AutoTooltipSlideToggleButton;
import bisq.desktop.components.AutoTooltipToggleButton;
import bisq.core.locale.Res;
import bisq.common.UserThread;
package haveno.desktop.components.chart;
import haveno.common.UserThread;
import haveno.core.locale.Res;
import haveno.desktop.common.view.ActivatableViewAndModel;
import haveno.desktop.components.AutoTooltipSlideToggleButton;
import haveno.desktop.components.AutoTooltipToggleButton;
import javafx.stage.PopupWindow;
import javafx.stage.Stage;

10
desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java → desktop/src/main/java/haveno/desktop/components/chart/ChartViewModel.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.chart;
import bisq.desktop.common.model.ActivatableWithDataModel;
import bisq.desktop.util.DisplayUtils;
import bisq.common.util.Tuple2;
package haveno.desktop.components.chart;
import haveno.common.util.Tuple2;
import haveno.desktop.common.model.ActivatableWithDataModel;
import haveno.desktop.util.DisplayUtils;
import javafx.scene.chart.XYChart;
import javafx.util.StringConverter;

6
desktop/src/main/java/bisq/desktop/components/chart/TemporalAdjusterModel.java → desktop/src/main/java/haveno/desktop/components/chart/TemporalAdjusterModel.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.chart;
import bisq.common.util.MathUtils;
package haveno.desktop.components.chart;
import java.time.DayOfWeek;
import java.time.Instant;
@ -33,6 +31,8 @@ import lombok.extern.slf4j.Slf4j;
import static java.time.temporal.ChronoField.DAY_OF_YEAR;
import haveno.common.util.MathUtils;
@Slf4j
public class TemporalAdjusterModel {
private static final ZoneId ZONE_ID = ZoneId.systemDefault();

0
desktop/src/main/java/bisq/desktop/components/controlsfx/README.md → desktop/src/main/java/haveno/desktop/components/controlsfx/README.md
View file

6
desktop/src/main/java/bisq/desktop/components/controlsfx/control/PopOver.java → desktop/src/main/java/haveno/desktop/components/controlsfx/control/PopOver.java
View file

@ -25,9 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package bisq.desktop.components.controlsfx.control;
import bisq.desktop.components.controlsfx.skin.PopOverSkin;
package haveno.desktop.components.controlsfx.control;
import javafx.animation.FadeTransition;
@ -67,6 +65,8 @@ import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
import static javafx.scene.input.MouseEvent.MOUSE_CLICKED;
import haveno.desktop.components.controlsfx.skin.PopOverSkin;
/**
* The PopOver control provides detailed information about an owning node in a
* popup window. The popup window has a very lightweight appearance (no default

0
desktop/src/main/java/bisq/desktop/components/controlsfx/control/popover.css → desktop/src/main/java/haveno/desktop/components/controlsfx/control/popover.css
View file

10
desktop/src/main/java/bisq/desktop/components/controlsfx/skin/PopOverSkin.java → desktop/src/main/java/haveno/desktop/components/controlsfx/skin/PopOverSkin.java
View file

@ -24,10 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package bisq.desktop.components.controlsfx.skin;
import bisq.desktop.components.controlsfx.control.PopOver;
import bisq.desktop.components.controlsfx.control.PopOver.ArrowLocation;
package haveno.desktop.components.controlsfx.skin;
import javafx.stage.Window;
@ -64,12 +61,15 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static bisq.desktop.components.controlsfx.control.PopOver.ArrowLocation.*;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.*;
import static java.lang.Double.MAX_VALUE;
import static javafx.geometry.Pos.CENTER_LEFT;
import static javafx.scene.control.ContentDisplay.GRAPHIC_ONLY;
import static javafx.scene.paint.Color.YELLOW;
import haveno.desktop.components.controlsfx.control.PopOver;
import haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation;
public class PopOverSkin implements Skin<PopOver> {
private static final String DETACHED_STYLE_CLASS = "detached"; //$NON-NLS-1$

6
desktop/src/main/java/bisq/desktop/components/indicator/TxConfidenceIndicator.java → desktop/src/main/java/haveno/desktop/components/indicator/TxConfidenceIndicator.java
View file

@ -40,16 +40,14 @@
* questions.
*/
package bisq.desktop.components.indicator;
import bisq.desktop.components.indicator.skin.StaticProgressIndicatorSkin;
package haveno.desktop.components.indicator;
import javafx.scene.control.Control;
import javafx.scene.control.Skin;
import javafx.css.PseudoClass;
import javafx.css.StyleableProperty;
import haveno.desktop.components.indicator.skin.StaticProgressIndicatorSkin;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.DoublePropertyBase;
import javafx.beans.property.ReadOnlyBooleanProperty;

6
desktop/src/main/java/bisq/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java → desktop/src/main/java/haveno/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java
View file

@ -40,9 +40,7 @@
* questions.
*/
package bisq.desktop.components.indicator.skin;
import bisq.desktop.components.indicator.TxConfidenceIndicator;
package haveno.desktop.components.indicator.skin;
import javafx.scene.Node;
import javafx.scene.control.SkinBase;
@ -77,7 +75,7 @@ import javafx.beans.property.ObjectProperty;
import javafx.collections.ObservableList;
import javafx.collections.FXCollections;
import haveno.desktop.components.indicator.TxConfidenceIndicator;
import java.util.ArrayList;
import java.util.List;

12
desktop/src/main/java/bisq/desktop/components/list/FilterBox.java → desktop/src/main/java/haveno/desktop/components/list/FilterBox.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.list;
import bisq.desktop.components.AutoTooltipLabel;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.filtering.FilterableListItem;
import bisq.core.locale.Res;
package haveno.desktop.components.list;
import haveno.core.locale.Res;
import haveno.desktop.components.AutoTooltipLabel;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.filtering.FilterableListItem;
import javafx.scene.control.TableView;
import javafx.scene.layout.HBox;

30
desktop/src/main/java/bisq/desktop/components/paymentmethods/AchTransferForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/AchTransferForm.java
View file

@ -15,27 +15,27 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.BankUtil;
import bisq.core.locale.Country;
import bisq.core.locale.Res;
import bisq.core.payment.AchTransferAccount;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AchTransferAccountPayload;
import bisq.core.payment.payload.BankAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
package haveno.desktop.components.paymentmethods;
import javafx.scene.control.ComboBox;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static bisq.desktop.util.FormBuilder.*;
import static haveno.desktop.util.FormBuilder.*;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.BankUtil;
import haveno.core.locale.Country;
import haveno.core.locale.Res;
import haveno.core.payment.AchTransferAccount;
import haveno.core.payment.CountryBasedPaymentAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.AchTransferAccountPayload;
import haveno.core.payment.payload.BankAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
public class AchTransferForm extends GeneralUsBankForm {

34
desktop/src/main/java/bisq/desktop/components/paymentmethods/AdvancedCashForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/AdvancedCashForm.java
View file

@ -15,30 +15,28 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.payment.AdvancedCashAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AdvancedCashAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.AdvancedCashValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import bisq.common.util.Tuple2;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.AdvancedCashAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.AdvancedCashAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.AdvancedCashValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane;
@Deprecated
public class AdvancedCashForm extends PaymentMethodForm {
private final AdvancedCashAccount advancedCashAccount;

24
desktop/src/main/java/bisq/desktop/components/paymentmethods/AliPayForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java
View file

@ -15,21 +15,21 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.payment.AliPayAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AliPayAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.AliPayValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
package haveno.desktop.components.paymentmethods;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.AliPayAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.AliPayAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.AliPayValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
public class AliPayForm extends GeneralAccountNumberForm {

34
desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java
View file

@ -15,24 +15,24 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.Layout;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Country;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.AmazonGiftCardAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AmazonGiftCardAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import static haveno.desktop.util.FormBuilder.*;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.AmazonGiftCardAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.AmazonGiftCardAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.Layout;
import javafx.scene.control.ComboBox;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
@ -45,8 +45,6 @@ import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import static bisq.desktop.util.FormBuilder.*;
@Slf4j
public class AmazonGiftCardForm extends PaymentMethodForm {
ComboBox<Country> countryCombo;

55
desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/AssetsForm.java
View file

@ -15,31 +15,34 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.AutocompleteComboBox;
import bisq.desktop.components.InputTextField;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.Layout;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.filter.FilterManager;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.AssetAccount;
import bisq.core.payment.InstantCryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AssetAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.AltCoinAddressValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import bisq.common.UserThread;
import bisq.common.util.Tuple3;
import static haveno.desktop.util.DisplayUtils.createAssetsAccountName;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addLabelCheckBox;
import static haveno.desktop.util.GUIUtil.getComboBoxButtonCell;
import haveno.common.UserThread;
import haveno.common.util.Tuple3;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.filter.FilterManager;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.AssetAccount;
import haveno.core.payment.InstantCryptoCurrencyAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.AssetAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.AltCoinAddressValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.AutocompleteComboBox;
import haveno.desktop.components.InputTextField;
import haveno.desktop.main.overlays.popups.Popup;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.Layout;
import javafx.scene.control.CheckBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
@ -50,12 +53,6 @@ import javafx.geometry.Insets;
import javafx.util.StringConverter;
import static bisq.desktop.util.DisplayUtils.createAssetsAccountName;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static bisq.desktop.util.FormBuilder.addLabelCheckBox;
import static bisq.desktop.util.GUIUtil.getComboBoxButtonCell;
public class AssetsForm extends PaymentMethodForm {
public static final String INSTANT_TRADE_NEWS = "instantTradeNews0.9.5";
private final AssetAccount assetAccount;

31
desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/AustraliaPayidForm.java
View file

@ -15,27 +15,26 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.AustraliaPayidAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AustraliaPayidAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.AustraliaPayidValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.AustraliaPayidAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.AustraliaPayidAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.AustraliaPayidValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
public class AustraliaPayidForm extends PaymentMethodForm {
private final AustraliaPayidAccount australiaPayidAccount;
private final AustraliaPayidValidator australiaPayidValidator;

43
desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/BankForm.java
View file

@ -15,29 +15,28 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.GUIUtil;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.BankUtil;
import bisq.core.locale.Country;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.FiatCurrency;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.BankAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple4;
import static haveno.desktop.util.FormBuilder.*;
import haveno.common.util.Tuple2;
import haveno.common.util.Tuple4;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.BankUtil;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.FiatCurrency;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.CountryBasedPaymentAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.BankAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.GUIUtil;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
@ -45,8 +44,6 @@ import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static bisq.desktop.util.FormBuilder.*;
abstract class BankForm extends GeneralBankForm {
static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {

34
desktop/src/main/java/bisq/desktop/components/paymentmethods/BizumForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/BizumForm.java
View file

@ -15,29 +15,27 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.Layout;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.Res;
import bisq.core.payment.BizumAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.BizumAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.Res;
import haveno.core.payment.BizumAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.BizumAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.Layout;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public class BizumForm extends PaymentMethodForm {
private final BizumAccount account;

34
desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/CapitualForm.java
View file

@ -15,30 +15,28 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.payment.CapitualAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.CapitualAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.CapitualValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import bisq.common.util.Tuple2;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.CapitualAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.CapitualAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.CapitualValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane;
public class CapitualForm extends PaymentMethodForm {
private final CapitualAccount capitualAccount;
private final CapitualValidator capitualValidator;

31
desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/CashByMailForm.java
View file

@ -15,31 +15,28 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.Layout;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.CashByMailAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.CashByMailAccountPayload;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import static haveno.desktop.util.FormBuilder.*;
import com.jfoenix.controls.JFXTextArea;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.CashByMailAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.CashByMailAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.Layout;
import javafx.scene.control.TextArea;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static bisq.desktop.util.FormBuilder.*;
public class CashByMailForm extends PaymentMethodForm {
private final CashByMailAccount cashByMailAccount;
private TextArea postalAddressTextArea;

44
desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/CashDepositForm.java
View file

@ -15,29 +15,29 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.GUIUtil;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.BankUtil;
import bisq.core.locale.Country;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.FiatCurrency;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.CashDepositAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.EmailValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple4;
import static haveno.desktop.util.FormBuilder.*;
import haveno.common.util.Tuple2;
import haveno.common.util.Tuple4;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.BankUtil;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.FiatCurrency;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.CountryBasedPaymentAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.CashDepositAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.EmailValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.GUIUtil;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
@ -46,8 +46,6 @@ import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static bisq.desktop.util.FormBuilder.*;
public class CashDepositForm extends GeneralBankForm {
public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {

29
desktop/src/main/java/bisq/desktop/components/paymentmethods/CelPayForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/CelPayForm.java
View file

@ -15,27 +15,26 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.payment.CelPayAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.CelPayAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.EmailValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.CelPayAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.CelPayAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.EmailValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class CelPayForm extends PaymentMethodForm {
private final CelPayAccount account;
private final EmailValidator validator = new EmailValidator();

31
desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/ChaseQuickPayForm.java
View file

@ -15,27 +15,26 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.ChaseQuickPayAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.ChaseQuickPayAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.ChaseQuickPayValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.ChaseQuickPayAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.ChaseQuickPayAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.ChaseQuickPayValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
public class ChaseQuickPayForm extends PaymentMethodForm {
private final ChaseQuickPayAccount chaseQuickPayAccount;

33
desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/ClearXchangeForm.java
View file

@ -15,28 +15,27 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.ClearXchangeAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.ClearXchangeAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.EmailOrMobileNrValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.ClearXchangeAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.ClearXchangeAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.EmailOrMobileNrValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
public class ClearXchangeForm extends PaymentMethodForm {
private final ClearXchangeAccount clearXchangeAccount;
private final EmailOrMobileNrValidator clearXchangeValidator;

23
desktop/src/main/java/bisq/desktop/components/paymentmethods/DomesticWireTransferForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/DomesticWireTransferForm.java
View file

@ -15,19 +15,18 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Country;
import bisq.core.payment.DomesticWireTransferAccount;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.BankAccountPayload;
import bisq.core.payment.payload.DomesticWireTransferAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
package haveno.desktop.components.paymentmethods;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Country;
import haveno.core.payment.CountryBasedPaymentAccount;
import haveno.core.payment.DomesticWireTransferAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.BankAccountPayload;
import haveno.core.payment.payload.DomesticWireTransferAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import javafx.scene.layout.GridPane;
public class DomesticWireTransferForm extends GeneralUsBankForm {

45
desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/F2FForm.java
View file

@ -15,37 +15,34 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.GUIUtil;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Country;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.FiatCurrency;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.offer.Offer;
import bisq.core.payment.CountryBasedPaymentAccount;
import bisq.core.payment.F2FAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.F2FAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.F2FValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import bisq.common.util.Tuple2;
import static haveno.desktop.util.FormBuilder.*;
import com.jfoenix.controls.JFXTextArea;
import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.FiatCurrency;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.offer.Offer;
import haveno.core.payment.CountryBasedPaymentAccount;
import haveno.core.payment.F2FAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.F2FAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.F2FValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.GUIUtil;
import javafx.scene.control.ComboBox;
import javafx.scene.control.TextArea;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.*;
public class F2FForm extends PaymentMethodForm {
private final F2FAccount f2fAccount;
private final F2FValidator f2fValidator;

33
desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java → desktop/src/main/java/haveno/desktop/components/paymentmethods/FasterPaymentsForm.java
View file

@ -15,28 +15,27 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.components.paymentmethods;
package haveno.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.FasterPaymentsAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.FasterPaymentsAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.AccountNrValidator;
import bisq.core.payment.validation.BranchIdValidator;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.FasterPaymentsAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.FasterPaymentsAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.AccountNrValidator;
import haveno.core.payment.validation.BranchIdValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
public class FasterPaymentsForm extends PaymentMethodForm {
private static final String UK_SORT_CODE = "UK sort code";

Some files were not shown because too many files have changed in this diff Show more