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

Rename enum gui.{Navigation#Item => FxmlView}

Browse source
This commit is contained in:
Chris Beams 2014-11-24 09:25:45 +01:00
parent 444948f3ca
commit 6de4e63973
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
19 changed files with 271 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/io/bitsquare/app/gui/BitsquareApp.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.app.gui;
import io.bitsquare.BitsquareException; import io.bitsquare.BitsquareException;
import io.bitsquare.account.AccountSettings; import io.bitsquare.account.AccountSettings;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.SystemTray; import io.bitsquare.gui.SystemTray;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.ImageUtil;
@ -97,7 +97,7 @@ public class BitsquareApp extends Application {
// load the main view and create the main scene // load the main view and create the main scene
ViewLoader viewLoader = injector.getInstance(CachingViewLoader.class); ViewLoader viewLoader = injector.getInstance(CachingViewLoader.class);
View view = viewLoader.load(Navigation.Item.MAIN.getFxmlUrl()); View view = viewLoader.load(FxmlView.MAIN.getLocation());
Scene scene = new Scene((Parent) view.getRoot(), 1000, 600); Scene scene = new Scene((Parent) view.getRoot(), 1000, 600);
scene.getStylesheets().setAll( scene.getStylesheets().setAll(

120
src/main/java/io/bitsquare/gui/FxmlView.java Normal file
View file

@ -0,0 +1,120 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui;
import io.bitsquare.BitsquareException;
import java.net.URL;
public enum FxmlView {
// ~ Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
MAIN("/io/bitsquare/gui/main/MainView.fxml"),
// ~ Main menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
HOME("/io/bitsquare/gui/main/home/HomeView.fxml", "Overview"),
BUY("/io/bitsquare/gui/main/trade/BuyView.fxml", "Buy BTC"),
SELL("/io/bitsquare/gui/main/trade/SellView.fxml", "Sell BTC"),
PORTFOLIO("/io/bitsquare/gui/main/portfolio/PortfolioView.fxml", "Portfolio"),
FUNDS("/io/bitsquare/gui/main/funds/FundsView.fxml", "Funds"),
MSG("/io/bitsquare/gui/main/msg/MsgView.fxml", "Messages"),
SETTINGS("/io/bitsquare/gui/main/settings/SettingsView.fxml", "Settings"),
ACCOUNT("/io/bitsquare/gui/main/account/AccountView.fxml", "Account"),
// ~ Sub menus ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// buy/sell (trade)
OFFER_BOOK("/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml"),
CREATE_OFFER("/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml"),
TAKE_OFFER("/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml"),
// portfolio
OFFERS("/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml"),
PENDING_TRADES("/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml"),
CLOSED_TRADES("/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml"),
// funds
WITHDRAWAL("/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml"),
TRANSACTIONS("/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml"),
// settings
PREFERENCES("/io/bitsquare/gui/main/settings/application/PreferencesView.fxml"),
NETWORK_SETTINGS("/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml"),
// account
ACCOUNT_SETUP("/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml"),
ACCOUNT_SETTINGS("/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml"),
ARBITRATOR_SETTINGS("/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml"),
// ~ Content in sub menus ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// account content
SEED_WORDS("/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml"),
ADD_PASSWORD("/io/bitsquare/gui/main/account/content/password/PasswordView.fxml"),
CHANGE_PASSWORD("/io/bitsquare/gui/main/account/content/password/PasswordView.fxml"),
RESTRICTIONS("/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml"),
REGISTRATION("/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml"),
FIAT_ACCOUNT("/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml"),
// ~ Popups ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// arbitration
ARBITRATOR_PROFILE("/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml"),
ARBITRATOR_BROWSER("/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml"),
ARBITRATOR_REGISTRATION(
"/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml"),
// ~ Testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
BOGUS("/io/bitsquare/BogusView.fxml");
private final String location;
private final String displayName;
FxmlView(String location) {
this(location, "NONE");
}
FxmlView(String location, String displayName) {
this.location = location;
this.displayName = displayName;
}
public URL getLocation() {
URL url = Navigation.class.getResource(location);
if (url == null)
throw new BitsquareException("'%s' could not be loaded as a resource", location);
return url;
}
public String getDisplayName() {
return displayName;
}
public String getId() {
return location.substring(location.lastIndexOf("/") + 1, location.lastIndexOf("View.fxml")).toLowerCase();
}
}

135
src/main/java/io/bitsquare/gui/Navigation.java
View file

@ -17,13 +17,10 @@
package io.bitsquare.gui; package io.bitsquare.gui;
import io.bitsquare.BitsquareException;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
@ -33,11 +30,11 @@ public class Navigation {
// modification // modification
private final List<Listener> listeners = new CopyOnWriteArrayList<>(); private final List<Listener> listeners = new CopyOnWriteArrayList<>();
private final Persistence persistence; private final Persistence persistence;
private Item[] currentItems; private FxmlView[] currentItems;
// Used for returning to the last important view // Used for returning to the last important view
// After setup is done we want to return to the last opened view (e.g. sell/buy) // After setup is done we want to return to the last opened view (e.g. sell/buy)
private Item[] itemsForReturning; private FxmlView[] itemsForReturning;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -53,20 +50,20 @@ public class Navigation {
// Public methods // Public methods
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void navigationTo(Item... items) { public void navigationTo(FxmlView... items) {
List<Item> temp = new ArrayList<>(); List<FxmlView> temp = new ArrayList<>();
if (items != null) { if (items != null) {
for (int i = 0; i < items.length; i++) { for (int i = 0; i < items.length; i++) {
Item item = items[i]; FxmlView item = items[i];
temp.add(item); temp.add(item);
if (currentItems == null || if (currentItems == null ||
(currentItems != null && (currentItems != null &&
currentItems.length > i && currentItems.length > i &&
item != currentItems[i] && item != currentItems[i] &&
i != items.length - 1)) { i != items.length - 1)) {
List<Item> temp2 = new ArrayList<>(temp); List<FxmlView> temp2 = new ArrayList<>(temp);
for (int n = i + 1; n < items.length; n++) { for (int n = i + 1; n < items.length; n++) {
Item[] newTemp = new Item[i + 1]; FxmlView[] newTemp = new FxmlView[i + 1];
currentItems = temp2.toArray(newTemp); currentItems = temp2.toArray(newTemp);
navigationTo(currentItems); navigationTo(currentItems);
item = items[n]; item = items[n];
@ -83,10 +80,10 @@ public class Navigation {
} }
public void navigateToLastStoredItem() { public void navigateToLastStoredItem() {
Item[] items = (Item[]) persistence.read(this, "navigationItems"); FxmlView[] items = (FxmlView[]) persistence.read(this, "navigationItems");
// TODO we set BUY as default yet, should be HOME later // TODO we set BUY as default yet, should be HOME later
if (items == null || items.length == 0) if (items == null || items.length == 0)
items = new Item[]{Item.MAIN, Item.BUY}; items = new FxmlView[]{FxmlView.MAIN, FxmlView.BUY};
navigationTo(items); navigationTo(items);
} }
@ -109,11 +106,11 @@ public class Navigation {
// Getters // Getters
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public Item[] getItemsForReturning() { public FxmlView[] getItemsForReturning() {
return itemsForReturning; return itemsForReturning;
} }
public Item[] getCurrentItems() { public FxmlView[] getCurrentItems() {
return currentItems; return currentItems;
} }
@ -122,7 +119,7 @@ public class Navigation {
// Setters // Setters
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void setItemsForReturning(Item[] itemsForReturning) { public void setItemsForReturning(FxmlView[] itemsForReturning) {
this.itemsForReturning = itemsForReturning; this.itemsForReturning = itemsForReturning;
} }
@ -132,7 +129,7 @@ public class Navigation {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public static interface Listener { public static interface Listener {
void onNavigationRequested(Item... items); void onNavigationRequested(FxmlView... items);
} }
@ -140,110 +137,4 @@ public class Navigation {
// Enum // Enum
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public static enum Item {
///////////////////////////////////////////////////////////////////////////////////////////
// Application
///////////////////////////////////////////////////////////////////////////////////////////
MAIN("/io/bitsquare/gui/main/MainView.fxml"),
///////////////////////////////////////////////////////////////////////////////////////////
// Main menu screens
///////////////////////////////////////////////////////////////////////////////////////////
HOME("/io/bitsquare/gui/main/home/HomeView.fxml", "Overview"),
BUY("/io/bitsquare/gui/main/trade/BuyView.fxml", "Buy BTC"),
SELL("/io/bitsquare/gui/main/trade/SellView.fxml", "Sell BTC"),
PORTFOLIO("/io/bitsquare/gui/main/portfolio/PortfolioView.fxml", "Portfolio"),
FUNDS("/io/bitsquare/gui/main/funds/FundsView.fxml", "Funds"),
MSG("/io/bitsquare/gui/main/msg/MsgView.fxml", "Messages"),
SETTINGS("/io/bitsquare/gui/main/settings/SettingsView.fxml", "Settings"),
ACCOUNT("/io/bitsquare/gui/main/account/AccountView.fxml", "Account"),
///////////////////////////////////////////////////////////////////////////////////////////
// Sub menus
///////////////////////////////////////////////////////////////////////////////////////////
// buy/sell (trade)
OFFER_BOOK("/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml"),
CREATE_OFFER("/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml"),
TAKE_OFFER("/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml"),
// portfolio
OFFERS("/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml"),
PENDING_TRADES("/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml"),
CLOSED_TRADES("/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml"),
// funds
WITHDRAWAL("/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml"),
TRANSACTIONS("/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml"),
// settings
PREFERENCES("/io/bitsquare/gui/main/settings/application/PreferencesView.fxml"),
NETWORK_SETTINGS("/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml"),
// account
ACCOUNT_SETUP("/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml"),
ACCOUNT_SETTINGS("/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml"),
ARBITRATOR_SETTINGS("/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml"),
///////////////////////////////////////////////////////////////////////////////////////////
// Content in sub menus
///////////////////////////////////////////////////////////////////////////////////////////
// account content
SEED_WORDS("/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml"),
ADD_PASSWORD("/io/bitsquare/gui/main/account/content/password/PasswordView.fxml"),
CHANGE_PASSWORD("/io/bitsquare/gui/main/account/content/password/PasswordView.fxml"),
RESTRICTIONS("/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml"),
REGISTRATION("/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml"),
FIAT_ACCOUNT("/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml"),
///////////////////////////////////////////////////////////////////////////////////////////
// Popups
///////////////////////////////////////////////////////////////////////////////////////////
// arbitrator
ARBITRATOR_PROFILE("/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml"),
ARBITRATOR_BROWSER("/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml"),
ARBITRATOR_REGISTRATION(
"/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml"),
// for testing, does not actually exist
BOGUS("/io/bitsquare/BogusView.fxml");
private final String displayName;
private final String fxmlUrl;
Item(String fxmlUrl) {
this(fxmlUrl, "NONE");
}
Item(String fxmlUrl, String displayName) {
this.displayName = displayName;
this.fxmlUrl = fxmlUrl;
}
public URL getFxmlUrl() {
URL url = Navigation.class.getResource(fxmlUrl);
if (url == null)
throw new BitsquareException("'%s' could not be loaded as a resource", fxmlUrl);
return url;
}
public String getDisplayName() {
return displayName;
}
public String getId() {
return fxmlUrl.substring(fxmlUrl.lastIndexOf("/") + 1, fxmlUrl.lastIndexOf("View.fxml")).toLowerCase();
}
}
} }

11
src/main/java/io/bitsquare/gui/main/MainView.java
View file

@ -19,6 +19,7 @@ package io.bitsquare.gui.main;
import io.bitsquare.BitsquareException; import io.bitsquare.BitsquareException;
import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccount;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
@ -43,7 +44,7 @@ import javafx.scene.layout.*;
import javafx.scene.paint.*; import javafx.scene.paint.*;
import javafx.scene.text.*; import javafx.scene.text.*;
import static io.bitsquare.gui.Navigation.Item.*; import static io.bitsquare.gui.FxmlView.*;
import static javafx.scene.layout.AnchorPane.*; import static javafx.scene.layout.AnchorPane.*;
public class MainView extends ActivatableView<StackPane, MainViewModel> { public class MainView extends ActivatableView<StackPane, MainViewModel> {
@ -123,10 +124,10 @@ public class MainView extends ActivatableView<StackPane, MainViewModel> {
}}; }};
navigation.addListener(navItems -> { navigation.addListener(navItems -> {
if (navItems == null || navItems.length != 2 || navItems[0] != Navigation.Item.MAIN) if (navItems == null || navItems.length != 2 || navItems[0] != FxmlView.MAIN)
return; return;
View view = viewLoader.load(navItems[1].getFxmlUrl()); View view = viewLoader.load(navItems[1].getLocation());
contentContainer.getChildren().setAll(view.getRoot()); contentContainer.getChildren().setAll(view.getRoot());
navButtons.getToggles().stream() navButtons.getToggles().stream()
@ -333,7 +334,7 @@ public class MainView extends ActivatableView<StackPane, MainViewModel> {
private class NavButton extends ToggleButton { private class NavButton extends ToggleButton {
public NavButton(Navigation.Item item) { public NavButton(FxmlView item) {
super(item.getDisplayName(), new ImageView() {{ super(item.getDisplayName(), new ImageView() {{
setId("image-nav-" + item.getId()); setId("image-nav-" + item.getId());
}}); }});
@ -359,7 +360,7 @@ public class MainView extends ActivatableView<StackPane, MainViewModel> {
} }
}); });
this.setOnAction(e -> navigation.navigationTo(Navigation.Item.MAIN, item)); this.setOnAction(e -> navigation.navigationTo(FxmlView.MAIN, item));
} }
} }
} }

29
src/main/java/io/bitsquare/gui/main/account/AccountView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.account; package io.bitsquare.gui.main.account;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import javax.inject.Inject; import javax.inject.Inject;
@ -51,17 +52,17 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
navigationListener = navigationItems -> { navigationListener = navigationItems -> {
if (navigationItems != null && if (navigationItems != null &&
navigationItems.length == 3 && navigationItems.length == 3 &&
navigationItems[1] == Navigation.Item.ACCOUNT) navigationItems[1] == FxmlView.ACCOUNT)
loadView(navigationItems[2]); loadView(navigationItems[2]);
}; };
tabChangeListener = (ov, oldValue, newValue) -> { tabChangeListener = (ov, oldValue, newValue) -> {
if (newValue == accountSettingsTab) if (newValue == accountSettingsTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ACCOUNT_SETTINGS); FxmlView.ACCOUNT_SETTINGS);
else else
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ARBITRATOR_SETTINGS); FxmlView.ARBITRATOR_SETTINGS);
}; };
} }
@ -72,18 +73,18 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener); root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
if (navigation.getCurrentItems().length == 2 && if (navigation.getCurrentItems().length == 2 &&
navigation.getCurrentItems()[1] == Navigation.Item.ACCOUNT) { navigation.getCurrentItems()[1] == FxmlView.ACCOUNT) {
if (model.getNeedRegistration()) { if (model.getNeedRegistration()) {
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ACCOUNT_SETUP); FxmlView.ACCOUNT_SETUP);
} }
else { else {
if (root.getSelectionModel().getSelectedItem() == accountSettingsTab) if (root.getSelectionModel().getSelectedItem() == accountSettingsTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ACCOUNT_SETTINGS); FxmlView.ACCOUNT_SETTINGS);
else else
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ARBITRATOR_SETTINGS); FxmlView.ARBITRATOR_SETTINGS);
} }
} }
} }
@ -95,8 +96,8 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
} }
private void loadView(Navigation.Item navigationItem) { private void loadView(FxmlView navigationItem) {
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
final Tab tab; final Tab tab;
switch (navigationItem) { switch (navigationItem) {
case ACCOUNT_SETTINGS: case ACCOUNT_SETTINGS:

9
src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.account.arbitrator; package io.bitsquare.gui.main.account.arbitrator;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView; import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
@ -48,8 +49,8 @@ class ArbitratorSettingsView extends AbstractView {
this.primaryStage = primaryStage; this.primaryStage = primaryStage;
} }
private void loadView(Navigation.Item navigationItem) { private void loadView(FxmlView navigationItem) {
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
arbitratorRegistrationView = (ArbitratorRegistrationView) view; arbitratorRegistrationView = (ArbitratorRegistrationView) view;
final Stage stage = new Stage(); final Stage stage = new Stage();
@ -69,12 +70,12 @@ class ArbitratorSettingsView extends AbstractView {
@FXML @FXML
public void onArbitratorRegistration() { public void onArbitratorRegistration() {
loadView(Navigation.Item.ARBITRATOR_REGISTRATION); loadView(FxmlView.ARBITRATOR_REGISTRATION);
} }
@FXML @FXML
public void onArbitratorEdit() { public void onArbitratorEdit() {
loadView(Navigation.Item.ARBITRATOR_REGISTRATION); loadView(FxmlView.ARBITRATOR_REGISTRATION);
arbitratorRegistrationView.setEditMode(true); arbitratorRegistrationView.setEditMode(true);
} }
} }

8
src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.arbitrator.browser;
import io.bitsquare.account.AccountSettings; import io.bitsquare.account.AccountSettings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView; import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
import io.bitsquare.locale.LanguageUtil; import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.msg.MessageService; import io.bitsquare.msg.MessageService;
@ -71,7 +71,7 @@ class ArbitratorBrowserView extends ActivatableView<Pane, Void> implements Arbit
messageService.addArbitratorListener(this); messageService.addArbitratorListener(this);
messageService.getArbitrators(LanguageUtil.getDefaultLanguageLocale()); messageService.getArbitrators(LanguageUtil.getDefaultLanguageLocale());
loadView(Navigation.Item.ARBITRATOR_PROFILE); loadView(FxmlView.ARBITRATOR_PROFILE);
checkButtonState(); checkButtonState();
} }
@ -91,8 +91,8 @@ class ArbitratorBrowserView extends ActivatableView<Pane, Void> implements Arbit
}*/ }*/
private void loadView(Navigation.Item navigationItem) { private void loadView(FxmlView navigationItem) {
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
root.getChildren().set(0, view.getRoot()); root.getChildren().set(0, view.getRoot());
arbitratorProfileView = (ArbitratorProfileView) view; arbitratorProfileView = (ArbitratorProfileView) view;
} }

10
src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.account.content.restrictions; package io.bitsquare.gui.main.account.content.restrictions;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.help.HelpId;
import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.ImageUtil;
@ -121,7 +121,7 @@ public class RestrictionsView extends ActivatableViewAndModel<GridPane, Restrict
@FXML @FXML
private void onOpenArbitratorScreen() { private void onOpenArbitratorScreen() {
loadView(Navigation.Item.ARBITRATOR_BROWSER); loadView(FxmlView.ARBITRATOR_BROWSER);
} }
@ -146,8 +146,8 @@ public class RestrictionsView extends ActivatableViewAndModel<GridPane, Restrict
Help.openWindow(HelpId.SETUP_RESTRICTION_ARBITRATORS); Help.openWindow(HelpId.SETUP_RESTRICTION_ARBITRATORS);
} }
private void loadView(Navigation.Item navigationItem) { private void loadView(FxmlView navigationItem) {
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
final Stage stage = new Stage(); final Stage stage = new Stage();
stage.setTitle("Arbitrator selection"); stage.setTitle("Arbitrator selection");
@ -162,7 +162,7 @@ public class RestrictionsView extends ActivatableViewAndModel<GridPane, Restrict
Scene scene = new Scene((Parent) view.getRoot(), 800, 600); Scene scene = new Scene((Parent) view.getRoot(), 800, 600);
stage.setScene(scene); stage.setScene(scene);
stage.setOnHidden(windowEvent -> { stage.setOnHidden(windowEvent -> {
if (navigationItem == Navigation.Item.ARBITRATOR_BROWSER) if (navigationItem == FxmlView.ARBITRATOR_BROWSER)
updateArbitratorList(); updateArbitratorList();
}); });
stage.show(); stage.show();

41
src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.account.settings; package io.bitsquare.gui.main.account.settings;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.util.Colors; import io.bitsquare.gui.util.Colors;
@ -58,7 +59,7 @@ class AccountSettingsView extends ActivatableViewAndModel {
listener = navigationItems -> { listener = navigationItems -> {
if (navigationItems != null && if (navigationItems != null &&
navigationItems.length == 4 && navigationItems.length == 4 &&
navigationItems[2] == Navigation.Item.ACCOUNT_SETTINGS) { navigationItems[2] == FxmlView.ACCOUNT_SETTINGS) {
loadView(navigationItems[3]); loadView(navigationItems[3]);
selectMainMenuButton(navigationItems[3]); selectMainMenuButton(navigationItems[3]);
} }
@ -66,15 +67,15 @@ class AccountSettingsView extends ActivatableViewAndModel {
ToggleGroup toggleGroup = new ToggleGroup(); ToggleGroup toggleGroup = new ToggleGroup();
seedWords = new MenuItem(navigation, "Wallet seed", seedWords = new MenuItem(navigation, "Wallet seed",
Navigation.Item.SEED_WORDS, toggleGroup); FxmlView.SEED_WORDS, toggleGroup);
password = new MenuItem(navigation, "Wallet password", password = new MenuItem(navigation, "Wallet password",
Navigation.Item.CHANGE_PASSWORD, toggleGroup); FxmlView.CHANGE_PASSWORD, toggleGroup);
restrictions = new MenuItem(navigation, "Arbitrator selection", restrictions = new MenuItem(navigation, "Arbitrator selection",
Navigation.Item.RESTRICTIONS, toggleGroup); FxmlView.RESTRICTIONS, toggleGroup);
fiatAccount = new MenuItem(navigation, "Payments account(s)", fiatAccount = new MenuItem(navigation, "Payments account(s)",
Navigation.Item.FIAT_ACCOUNT, toggleGroup); FxmlView.FIAT_ACCOUNT, toggleGroup);
registration = new MenuItem(navigation, "Renew your account", registration = new MenuItem(navigation, "Renew your account",
Navigation.Item.REGISTRATION, toggleGroup); FxmlView.REGISTRATION, toggleGroup);
seedWords.setDisable(true); seedWords.setDisable(true);
password.setDisable(true); password.setDisable(true);
@ -88,15 +89,15 @@ class AccountSettingsView extends ActivatableViewAndModel {
@Override @Override
public void doActivate() { public void doActivate() {
navigation.addListener(listener); navigation.addListener(listener);
Navigation.Item[] items = navigation.getCurrentItems(); FxmlView[] items = navigation.getCurrentItems();
if (items.length == 3 && if (items.length == 3 &&
items[2] == Navigation.Item.ACCOUNT_SETTINGS) { items[2] == FxmlView.ACCOUNT_SETTINGS) {
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ACCOUNT_SETTINGS, Navigation.Item.FIAT_ACCOUNT); FxmlView.ACCOUNT_SETTINGS, FxmlView.FIAT_ACCOUNT);
} }
else { else {
if (items.length == 4 && if (items.length == 4 &&
items[2] == Navigation.Item.ACCOUNT_SETTINGS) { items[2] == FxmlView.ACCOUNT_SETTINGS) {
loadView(items[3]); loadView(items[3]);
selectMainMenuButton(items[3]); selectMainMenuButton(items[3]);
} }
@ -108,14 +109,14 @@ class AccountSettingsView extends ActivatableViewAndModel {
navigation.removeListener(listener); navigation.removeListener(listener);
} }
private void loadView(Navigation.Item navigationItem) { private void loadView(FxmlView navigationItem) {
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
content.getChildren().setAll(view.getRoot()); content.getChildren().setAll(view.getRoot());
if (view instanceof Wizard.Step) if (view instanceof Wizard.Step)
((Wizard.Step) view).hideWizardNavigation(); ((Wizard.Step) view).hideWizardNavigation();
} }
private void selectMainMenuButton(Navigation.Item item) { private void selectMainMenuButton(FxmlView item) {
switch (item) { switch (item) {
case SEED_WORDS: case SEED_WORDS:
seedWords.setSelected(true); seedWords.setSelected(true);
@ -133,7 +134,7 @@ class AccountSettingsView extends ActivatableViewAndModel {
registration.setSelected(true); registration.setSelected(true);
break; break;
default: default:
log.error(item.getFxmlUrl() + " is invalid"); log.error(item.getLocation() + " is invalid");
break; break;
} }
} }
@ -142,7 +143,7 @@ class AccountSettingsView extends ActivatableViewAndModel {
class MenuItem extends ToggleButton { class MenuItem extends ToggleButton {
MenuItem(Navigation navigation, String title, Navigation.Item navigationItem, MenuItem(Navigation navigation, String title, FxmlView navigationItem,
ToggleGroup toggleGroup) { ToggleGroup toggleGroup) {
setToggleGroup(toggleGroup); setToggleGroup(toggleGroup);
@ -154,17 +155,17 @@ class MenuItem extends ToggleButton {
Label icon = new Label(); Label icon = new Label();
icon.setTextFill(Paint.valueOf("#999")); icon.setTextFill(Paint.valueOf("#999"));
if (navigationItem.equals(Navigation.Item.SEED_WORDS)) if (navigationItem.equals(FxmlView.SEED_WORDS))
AwesomeDude.setIcon(icon, AwesomeIcon.INFO_SIGN); AwesomeDude.setIcon(icon, AwesomeIcon.INFO_SIGN);
else if (navigationItem.equals(Navigation.Item.REGISTRATION)) else if (navigationItem.equals(FxmlView.REGISTRATION))
AwesomeDude.setIcon(icon, AwesomeIcon.BRIEFCASE); AwesomeDude.setIcon(icon, AwesomeIcon.BRIEFCASE);
else else
AwesomeDude.setIcon(icon, AwesomeIcon.EDIT_SIGN); AwesomeDude.setIcon(icon, AwesomeIcon.EDIT_SIGN);
setGraphic(icon); setGraphic(icon);
setOnAction((event) -> navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, setOnAction((event) -> navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ACCOUNT_SETTINGS, navigationItem)); FxmlView.ACCOUNT_SETTINGS, navigationItem));
selectedProperty().addListener((ov, oldValue, newValue) -> { selectedProperty().addListener((ov, oldValue, newValue) -> {
if (newValue) { if (newValue) {

23
src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.account.setup; package io.bitsquare.gui.main.account.setup;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.main.account.content.irc.IrcAccountView; import io.bitsquare.gui.main.account.content.irc.IrcAccountView;
import io.bitsquare.gui.main.account.content.password.PasswordView; import io.bitsquare.gui.main.account.content.password.PasswordView;
@ -59,7 +60,7 @@ class AccountSetupWizard extends ActivatableView implements Wizard {
listener = navigationItems -> { listener = navigationItems -> {
if (navigationItems != null && if (navigationItems != null &&
navigationItems.length == 4 && navigationItems.length == 4 &&
navigationItems[2] == Navigation.Item.ACCOUNT_SETUP) { navigationItems[2] == FxmlView.ACCOUNT_SETUP) {
switch (navigationItems[3]) { switch (navigationItems[3]) {
case SEED_WORDS: case SEED_WORDS:
@ -92,18 +93,18 @@ class AccountSetupWizard extends ActivatableView implements Wizard {
}; };
seedWords = new WizardItem(this, "Backup wallet seed", "Write down the seed word for your wallet", seedWords = new WizardItem(this, "Backup wallet seed", "Write down the seed word for your wallet",
Navigation.Item.SEED_WORDS); FxmlView.SEED_WORDS);
password = new WizardItem(this, "Setup password", "Protect your wallet with a password", password = new WizardItem(this, "Setup password", "Protect your wallet with a password",
Navigation.Item.ADD_PASSWORD); FxmlView.ADD_PASSWORD);
restrictions = new WizardItem(this, "Select arbitrators", restrictions = new WizardItem(this, "Select arbitrators",
"Select which arbitrators you want to use for trading", "Select which arbitrators you want to use for trading",
Navigation.Item.RESTRICTIONS); FxmlView.RESTRICTIONS);
fiatAccount = new WizardItem(this, " Setup Payments account(s)", fiatAccount = new WizardItem(this, " Setup Payments account(s)",
"You need to setup at least one payment account", "You need to setup at least one payment account",
Navigation.Item.FIAT_ACCOUNT); FxmlView.FIAT_ACCOUNT);
registration = new WizardItem(this, "Register your account", registration = new WizardItem(this, "Register your account",
"The registration in the Blockchain requires a payment of 0.0002 BTC", "The registration in the Blockchain requires a payment of 0.0002 BTC",
Navigation.Item.REGISTRATION); FxmlView.REGISTRATION);
leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount, registration); leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount, registration);
@ -148,12 +149,12 @@ class AccountSetupWizard extends ActivatableView implements Wizard {
if (navigation.getItemsForReturning() != null) if (navigation.getItemsForReturning() != null)
navigation.navigationTo(navigation.getItemsForReturning()); navigation.navigationTo(navigation.getItemsForReturning());
else else
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.BUY); navigation.navigationTo(FxmlView.MAIN, FxmlView.BUY);
} }
} }
protected void loadView(Navigation.Item navigationItem) { protected void loadView(FxmlView navigationItem) {
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
content.getChildren().setAll(view.getRoot()); content.getChildren().setAll(view.getRoot());
if (view instanceof Wizard.Step) if (view instanceof Wizard.Step)
((Step) view).setParent(this); ((Step) view).setParent(this);
@ -167,10 +168,10 @@ class WizardItem extends HBox {
private final Label titleLabel; private final Label titleLabel;
private final Label subTitleLabel; private final Label subTitleLabel;
private final AccountSetupWizard parent; private final AccountSetupWizard parent;
private final Navigation.Item navigationItem; private final FxmlView navigationItem;
WizardItem(AccountSetupWizard parent, String title, String subTitle, WizardItem(AccountSetupWizard parent, String title, String subTitle,
Navigation.Item navigationItem) { FxmlView navigationItem) {
this.parent = parent; this.parent = parent;
this.navigationItem = navigationItem; this.navigationItem = navigationItem;

15
src/main/java/io/bitsquare/gui/main/funds/FundsView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.funds; package io.bitsquare.gui.main.funds;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import javax.inject.Inject; import javax.inject.Inject;
@ -51,15 +52,15 @@ class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
public void initialize() { public void initialize() {
navigationListener = navigationItems -> { navigationListener = navigationItems -> {
if (navigationItems != null && navigationItems.length == 3 if (navigationItems != null && navigationItems.length == 3
&& navigationItems[1] == Navigation.Item.FUNDS) && navigationItems[1] == FxmlView.FUNDS)
loadView(navigationItems[2]); loadView(navigationItems[2]);
}; };
tabChangeListener = (ov, oldValue, newValue) -> { tabChangeListener = (ov, oldValue, newValue) -> {
if (newValue == withdrawalTab) if (newValue == withdrawalTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.FUNDS, Navigation.Item.WITHDRAWAL); navigation.navigationTo(FxmlView.MAIN, FxmlView.FUNDS, FxmlView.WITHDRAWAL);
else if (newValue == transactionsTab) else if (newValue == transactionsTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.FUNDS, Navigation.Item.TRANSACTIONS); navigation.navigationTo(FxmlView.MAIN, FxmlView.FUNDS, FxmlView.TRANSACTIONS);
}; };
} }
@ -69,9 +70,9 @@ class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
navigation.addListener(navigationListener); navigation.addListener(navigationListener);
if (root.getSelectionModel().getSelectedItem() == transactionsTab) if (root.getSelectionModel().getSelectedItem() == transactionsTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.FUNDS, Navigation.Item.TRANSACTIONS); navigation.navigationTo(FxmlView.MAIN, FxmlView.FUNDS, FxmlView.TRANSACTIONS);
else else
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.FUNDS, Navigation.Item.WITHDRAWAL); navigation.navigationTo(FxmlView.MAIN, FxmlView.FUNDS, FxmlView.WITHDRAWAL);
} }
@Override @Override
@ -80,12 +81,12 @@ class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
navigation.removeListener(navigationListener); navigation.removeListener(navigationListener);
} }
private void loadView(Navigation.Item navigationItem) { private void loadView(FxmlView navigationItem) {
// we want to get activate/deactivate called, so we remove the old view on tab change // we want to get activate/deactivate called, so we remove the old view on tab change
if (currentTab != null) if (currentTab != null)
currentTab.setContent(null); currentTab.setContent(null);
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
switch (navigationItem) { switch (navigationItem) {
case WITHDRAWAL: case WITHDRAWAL:
currentTab = withdrawalTab; currentTab = withdrawalTab;

19
src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.portfolio; package io.bitsquare.gui.main.portfolio;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
@ -54,18 +55,18 @@ class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable> {
public void initialize() { public void initialize() {
navigationListener = navigationItems -> { navigationListener = navigationItems -> {
if (navigationItems != null && navigationItems.length == 3 if (navigationItems != null && navigationItems.length == 3
&& navigationItems[1] == Navigation.Item.PORTFOLIO) && navigationItems[1] == FxmlView.PORTFOLIO)
loadView(navigationItems[2]); loadView(navigationItems[2]);
}; };
tabChangeListener = (ov, oldValue, newValue) -> { tabChangeListener = (ov, oldValue, newValue) -> {
if (newValue == offersTab) if (newValue == offersTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.OFFERS); navigation.navigationTo(FxmlView.MAIN, FxmlView.PORTFOLIO, FxmlView.OFFERS);
else if (newValue == openTradesTab) else if (newValue == openTradesTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, navigation.navigationTo(FxmlView.MAIN, FxmlView.PORTFOLIO,
Navigation.Item.PENDING_TRADES); FxmlView.PENDING_TRADES);
else if (newValue == closedTradesTab) else if (newValue == closedTradesTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.CLOSED_TRADES); navigation.navigationTo(FxmlView.MAIN, FxmlView.PORTFOLIO, FxmlView.CLOSED_TRADES);
}; };
} }
@ -75,9 +76,9 @@ class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable> {
navigation.addListener(navigationListener); navigation.addListener(navigationListener);
if (tradeManager.getPendingTrades().size() == 0) if (tradeManager.getPendingTrades().size() == 0)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.OFFERS); navigation.navigationTo(FxmlView.MAIN, FxmlView.PORTFOLIO, FxmlView.OFFERS);
else else
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.PENDING_TRADES); navigation.navigationTo(FxmlView.MAIN, FxmlView.PORTFOLIO, FxmlView.PENDING_TRADES);
} }
@Override @Override
@ -87,13 +88,13 @@ class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable> {
currentTab = null; currentTab = null;
} }
private void loadView(Navigation.Item navigationItem) { private void loadView(FxmlView navigationItem) {
// we want to get activate/deactivate called, so we remove the old view on tab change // we want to get activate/deactivate called, so we remove the old view on tab change
if (currentTab != null) if (currentTab != null)
currentTab.setContent(null); currentTab.setContent(null);
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
switch (navigationItem) { switch (navigationItem) {
case OFFERS: case OFFERS:
currentTab = offersTab; currentTab = offersTab;

5
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.portfolio.pending; package io.bitsquare.gui.main.portfolio.pending;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.InfoDisplay;
import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.InputTextField;
@ -180,8 +181,8 @@ class PendingTradesView extends ActivatableViewAndModel<AnchorPane, PendingTrade
setSummaryControlsVisible(false); setSummaryControlsVisible(false);
model.withdraw(withdrawAddressTextField.getText()); model.withdraw(withdrawAddressTextField.getText());
Platform.runLater(() -> Platform.runLater(() ->
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, navigation.navigationTo(FxmlView.MAIN, FxmlView.PORTFOLIO,
Navigation.Item.CLOSED_TRADES)); FxmlView.CLOSED_TRADES));
} }
@FXML @FXML

27
src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.settings; package io.bitsquare.gui.main.settings;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.settings.Preferences; import io.bitsquare.settings.Preferences;
@ -53,17 +54,17 @@ class SettingsView extends ActivatableViewAndModel<TabPane, Activatable> {
public void initialize() { public void initialize() {
navigationListener = navigationItems -> { navigationListener = navigationItems -> {
if (navigationItems != null && navigationItems.length == 3 if (navigationItems != null && navigationItems.length == 3
&& navigationItems[1] == Navigation.Item.SETTINGS) && navigationItems[1] == FxmlView.SETTINGS)
loadView(navigationItems[2]); loadView(navigationItems[2]);
}; };
tabChangeListener = (ov, oldValue, newValue) -> { tabChangeListener = (ov, oldValue, newValue) -> {
if (newValue == preferencesTab) if (newValue == preferencesTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.SETTINGS, navigation.navigationTo(FxmlView.MAIN, FxmlView.SETTINGS,
Navigation.Item.PREFERENCES); FxmlView.PREFERENCES);
else if (newValue == networkSettingsTab) else if (newValue == networkSettingsTab)
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.SETTINGS, navigation.navigationTo(FxmlView.MAIN, FxmlView.SETTINGS,
Navigation.Item.NETWORK_SETTINGS); FxmlView.NETWORK_SETTINGS);
}; };
} }
@ -73,13 +74,13 @@ class SettingsView extends ActivatableViewAndModel<TabPane, Activatable> {
navigation.addListener(navigationListener); navigation.addListener(navigationListener);
if (root.getSelectionModel().getSelectedItem() == preferencesTab) if (root.getSelectionModel().getSelectedItem() == preferencesTab)
navigation.navigationTo(Navigation.Item.MAIN, navigation.navigationTo(FxmlView.MAIN,
Navigation.Item.SETTINGS, FxmlView.SETTINGS,
Navigation.Item.PREFERENCES); FxmlView.PREFERENCES);
else else
navigation.navigationTo(Navigation.Item.MAIN, navigation.navigationTo(FxmlView.MAIN,
Navigation.Item.SETTINGS, FxmlView.SETTINGS,
Navigation.Item.NETWORK_SETTINGS); FxmlView.NETWORK_SETTINGS);
} }
@Override @Override
@ -88,8 +89,8 @@ class SettingsView extends ActivatableViewAndModel<TabPane, Activatable> {
navigation.removeListener(navigationListener); navigation.removeListener(navigationListener);
} }
private void loadView(Navigation.Item navigationItem) { private void loadView(FxmlView navigationItem) {
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
final Tab tab; final Tab tab;
switch (navigationItem) { switch (navigationItem) {
case PREFERENCES: case PREFERENCES:

29
src/main/java/io/bitsquare/gui/main/trade/TradeView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.trade; package io.bitsquare.gui.main.trade;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.main.trade.createoffer.CreateOfferView; import io.bitsquare.gui.main.trade.createoffer.CreateOfferView;
@ -48,7 +49,7 @@ public class TradeView extends ActivatableView<TabPane, Void> {
private Node createOfferRoot; private Node createOfferRoot;
private Node takeOfferRoot; private Node takeOfferRoot;
private Navigation.Listener listener; private Navigation.Listener listener;
private Navigation.Item navigationItem; private FxmlView navigationItem;
private Direction direction; private Direction direction;
private Coin amount; private Coin amount;
private Fiat price; private Fiat price;
@ -65,7 +66,7 @@ public class TradeView extends ActivatableView<TabPane, Void> {
@Override @Override
protected void initialize() { protected void initialize() {
direction = (this instanceof BuyView) ? Direction.BUY : Direction.SELL; direction = (this instanceof BuyView) ? Direction.BUY : Direction.SELL;
navigationItem = (direction == Direction.BUY) ? Navigation.Item.BUY : Navigation.Item.SELL; navigationItem = (direction == Direction.BUY) ? FxmlView.BUY : FxmlView.SELL;
listener = navigationItems -> { listener = navigationItems -> {
if (navigationItems != null && navigationItems.length == 3 && navigationItems[1] == navigationItem) { if (navigationItems != null && navigationItems.length == 3 && navigationItems[1] == navigationItem) {
@ -97,7 +98,7 @@ public class TradeView extends ActivatableView<TabPane, Void> {
}); });
navigation.addListener(listener); navigation.addListener(listener);
navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); navigation.navigationTo(FxmlView.MAIN, navigationItem, FxmlView.OFFER_BOOK);
} }
@Override @Override
@ -109,21 +110,21 @@ public class TradeView extends ActivatableView<TabPane, Void> {
public void createOffer(Coin amount, Fiat price) { public void createOffer(Coin amount, Fiat price) {
this.amount = amount; this.amount = amount;
this.price = price; this.price = price;
navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.CREATE_OFFER); navigation.navigationTo(FxmlView.MAIN, navigationItem, FxmlView.CREATE_OFFER);
} }
public void takeOffer(Coin amount, Fiat price, Offer offer) { public void takeOffer(Coin amount, Fiat price, Offer offer) {
this.amount = amount; this.amount = amount;
this.price = price; this.price = price;
this.offer = offer; this.offer = offer;
navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.TAKE_OFFER); navigation.navigationTo(FxmlView.MAIN, navigationItem, FxmlView.TAKE_OFFER);
} }
private View loadView(Navigation.Item navigationItem) { private View loadView(FxmlView navigationItem) {
TabPane tabPane = root; TabPane tabPane = root;
if (navigationItem == Navigation.Item.OFFER_BOOK && offerBookView == null) { if (navigationItem == FxmlView.OFFER_BOOK && offerBookView == null) {
// Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens. // Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens.
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
final Tab tab = new Tab(direction == Direction.BUY ? "Buy Bitcoin" : "Sell Bitcoin"); final Tab tab = new Tab(direction == Direction.BUY ? "Buy Bitcoin" : "Sell Bitcoin");
tab.setClosable(false); tab.setClosable(false);
tab.setContent(view.getRoot()); tab.setContent(view.getRoot());
@ -135,10 +136,10 @@ public class TradeView extends ActivatableView<TabPane, Void> {
return offerBookView; return offerBookView;
} }
else if (navigationItem == Navigation.Item.CREATE_OFFER && createOfferView == null) { else if (navigationItem == FxmlView.CREATE_OFFER && createOfferView == null) {
// CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times // CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times
// in different graphs // in different graphs
View view = viewLoader.load(navigationItem.getFxmlUrl()); View view = viewLoader.load(navigationItem.getLocation());
createOfferView = (CreateOfferView) view; createOfferView = (CreateOfferView) view;
createOfferView.initWithData(direction, amount, price); createOfferView.initWithData(direction, amount, price);
createOfferRoot = view.getRoot(); createOfferRoot = view.getRoot();
@ -149,11 +150,11 @@ public class TradeView extends ActivatableView<TabPane, Void> {
tabPane.getSelectionModel().select(tab); tabPane.getSelectionModel().select(tab);
return createOfferView; return createOfferView;
} }
else if (navigationItem == Navigation.Item.TAKE_OFFER && takeOfferView == null && else if (navigationItem == FxmlView.TAKE_OFFER && takeOfferView == null &&
offer != null) { offer != null) {
// CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times // CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times
// in different graphs // in different graphs
View view = viewLoader.load(Navigation.Item.TAKE_OFFER.getFxmlUrl()); View view = viewLoader.load(FxmlView.TAKE_OFFER.getLocation());
takeOfferView = (TakeOfferView) view; takeOfferView = (TakeOfferView) view;
takeOfferView.initWithData(direction, amount, offer); takeOfferView.initWithData(direction, amount, offer);
takeOfferRoot = view.getRoot(); takeOfferRoot = view.getRoot();
@ -172,14 +173,14 @@ public class TradeView extends ActivatableView<TabPane, Void> {
offerBookView.enableCreateOfferButton(); offerBookView.enableCreateOfferButton();
// update the navigation state // update the navigation state
navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); navigation.navigationTo(FxmlView.MAIN, navigationItem, FxmlView.OFFER_BOOK);
} }
private void onTakeOfferViewRemoved() { private void onTakeOfferViewRemoved() {
takeOfferView = null; takeOfferView = null;
// update the navigation state // update the navigation state
navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.OFFER_BOOK); navigation.navigationTo(FxmlView.MAIN, navigationItem, FxmlView.OFFER_BOOK);
} }
} }

11
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.trade.createoffer; package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.AddressTextField; import io.bitsquare.gui.components.AddressTextField;
@ -221,17 +222,17 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
} }
private void openAccountSettings() { private void openAccountSettings() {
navigation.navigationTo(Navigation.Item.MAIN, navigation.navigationTo(FxmlView.MAIN,
Navigation.Item.ACCOUNT, FxmlView.ACCOUNT,
Navigation.Item.ACCOUNT_SETTINGS, FxmlView.ACCOUNT_SETTINGS,
Navigation.Item.RESTRICTIONS); FxmlView.RESTRICTIONS);
} }
private void close() { private void close() {
TabPane tabPane = ((TabPane) (root.getParent().getParent())); TabPane tabPane = ((TabPane) (root.getParent().getParent()));
tabPane.getTabs().remove(tabPane.getSelectionModel().getSelectedItem()); tabPane.getTabs().remove(tabPane.getSelectionModel().getSelectedItem());
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.OFFERS); navigation.navigationTo(FxmlView.MAIN, FxmlView.PORTFOLIO, FxmlView.OFFERS);
} }
private void setupListeners() { private void setupListeners() {

11
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.trade.offerbook; package io.bitsquare.gui.main.trade.offerbook;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.InputTextField;
@ -203,8 +204,8 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
Dialog.Actions.OK.handle(actionEvent); Dialog.Actions.OK.handle(actionEvent);
overlayManager.removeBlurContent(); overlayManager.removeBlurContent();
navigation.setItemsForReturning(navigation.getCurrentItems()); navigation.setItemsForReturning(navigation.getCurrentItems());
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ACCOUNT_SETUP); FxmlView.ACCOUNT_SETUP);
} }
}); });
Popups.openInfoPopup("You don't have setup a trading account.", Popups.openInfoPopup("You don't have setup a trading account.",
@ -254,9 +255,9 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
actions); actions);
if (Popups.isYes(response)) if (Popups.isYes(response))
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, navigation.navigationTo(FxmlView.MAIN, FxmlView.ACCOUNT,
Navigation.Item.ACCOUNT_SETTINGS, FxmlView.ACCOUNT_SETTINGS,
Navigation.Item.RESTRICTIONS); FxmlView.RESTRICTIONS);
else else
table.getSelectionModel().clearSelection(); table.getSelectionModel().clearSelection();
} }

5
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
View file

@ -18,6 +18,7 @@
package io.bitsquare.gui.main.trade.takeoffer; package io.bitsquare.gui.main.trade.takeoffer;
import io.bitsquare.gui.FxmlView;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.AddressTextField; import io.bitsquare.gui.components.AddressTextField;
@ -280,8 +281,8 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
getProperties().put("type", "CLOSE"); getProperties().put("type", "CLOSE");
try { try {
close(); close();
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, navigation.navigationTo(FxmlView.MAIN, FxmlView.PORTFOLIO,
Navigation.Item.PENDING_TRADES); FxmlView.PENDING_TRADES);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

6
src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.app.gui;
import io.bitsquare.BitsquareException; import io.bitsquare.BitsquareException;
import io.bitsquare.app.BitsquareEnvironment; import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.FxmlView;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import com.google.inject.Guice; import com.google.inject.Guice;
@ -81,11 +81,11 @@ public class ViewLoaderTests {
@Test(expected = BitsquareException.class) @Test(expected = BitsquareException.class)
public void loadingBogusFxmlResourceShouldThrow() throws MalformedURLException { public void loadingBogusFxmlResourceShouldThrow() throws MalformedURLException {
new FxmlViewLoader(viewFactory, resourceBundle).load(Navigation.Item.BOGUS.getFxmlUrl()); new FxmlViewLoader(viewFactory, resourceBundle).load(FxmlView.BOGUS.getLocation());
} }
@Test @Test
public void loadingValidFxmlResourceShouldNotThrow() { public void loadingValidFxmlResourceShouldNotThrow() {
new FxmlViewLoader(viewFactory, resourceBundle).load(Navigation.Item.ACCOUNT.getFxmlUrl()); new FxmlViewLoader(viewFactory, resourceBundle).load(FxmlView.ACCOUNT.getLocation());
} }
} }