Merge pull request #2394 from ripcurlx/show-new-badge-on-dao-menu-item

Show DAO news badge

core/src/main/java/bisq/core/user/Preferences.java

@@ -52,6 +52,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import javafx.collections.ObservableMap;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -121,6 +122,7 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
     private final ObservableList<FiatCurrency> fiatCurrenciesAsObservable = FXCollections.observableArrayList();
     private final ObservableList<CryptoCurrency> cryptoCurrenciesAsObservable = FXCollections.observableArrayList();
     private final ObservableList<TradeCurrency> tradeCurrenciesAsObservable = FXCollections.observableArrayList();
+    private final ObservableMap<String, Boolean> dontShowAgainMapAsObservable = FXCollections.observableHashMap();
 
     private final Storage<PreferencesPayload> storage;
     private final BisqEnvironment bisqEnvironment;
@@ -251,6 +253,7 @@ public void readPersisted() {
 
         tradeCurrenciesAsObservable.addAll(prefPayload.getFiatCurrencies());
         tradeCurrenciesAsObservable.addAll(prefPayload.getCryptoCurrencies());
+        dontShowAgainMapAsObservable.putAll(getDontShowAgainMap());
 
         // Override settings with options if set
         if (useTorFlagFromOptions != null && !useTorFlagFromOptions.isEmpty()) {
@@ -300,11 +303,13 @@ else if (useTorFlagFromOptions.equals("true"))
     public void dontShowAgain(String key, boolean dontShowAgain) {
         prefPayload.getDontShowAgainMap().put(key, dontShowAgain);
         persist();
+        dontShowAgainMapAsObservable.put(key, dontShowAgain);
     }
 
     public void resetDontShowAgain() {
         prefPayload.getDontShowAgainMap().clear();
         persist();
+        dontShowAgainMapAsObservable.clear();
     }
 
 
@@ -629,6 +634,10 @@ public ObservableList<TradeCurrency> getTradeCurrenciesAsObservable() {
         return tradeCurrenciesAsObservable;
     }
 
+    public ObservableMap<String, Boolean> getDontShowAgainMapAsObservable() {
+        return dontShowAgainMapAsObservable;
+    }
+
     public BlockChainExplorer getBlockChainExplorer() {
         if (BisqEnvironment.getBaseCurrencyNetwork().isMainnet())
             return prefPayload.getBlockChainExplorerMainNet();

core/src/main/resources/i18n/displayStrings.properties

@@ -196,6 +196,7 @@ shared.interval=Interval
 shared.actions=Actions
 shared.buyerUpperCase=Buyer
 shared.sellerUpperCase=Seller
+shared.new=NEW
 
 ####################################################################
 # UI views

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

@@ -521,6 +521,10 @@ bg color of non edit textFields: fafafa
     -fx-pref-height: 15;
 }
 
+.jfx-badge.new .badge-pane {
+    -fx-pref-width: 30;
+}
+
 .jfx-badge .label {
     -fx-font-weight: bold;
     -fx-font-size: 0.692em;

desktop/src/main/java/bisq/desktop/main/MainView.java

@@ -81,6 +81,7 @@
 import javafx.geometry.Pos;
 
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ChangeListener;
 
@@ -182,6 +183,8 @@ protected void initialize() {
 
         JFXBadge portfolioButtonWithBadge = new JFXBadge(portfolioButton);
         JFXBadge disputesButtonWithBadge = new JFXBadge(disputesButton);
+        JFXBadge daoButtonWithBadge = new JFXBadge(daoButton);
+        daoButtonWithBadge.getStyleClass().add("new");
 
         root.sceneProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue != null) {
@@ -246,7 +249,7 @@ protected void initialize() {
         HBox.setHgrow(primaryNav, Priority.SOMETIMES);
 
         HBox secondaryNav = new HBox(disputesButtonWithBadge, getNavigationSpacer(), settingsButton,
-                getNavigationSpacer(), accountButton, getNavigationSpacer(), daoButton);
+                getNavigationSpacer(), accountButton, getNavigationSpacer(), daoButtonWithBadge);
         secondaryNav.getStyleClass().add("nav-secondary");
         HBox.setHgrow(secondaryNav, Priority.SOMETIMES);
 
@@ -289,6 +292,7 @@ protected void initialize() {
 
         setupBadge(portfolioButtonWithBadge, model.getNumPendingTrades(), model.getShowPendingTradesNotification());
         setupBadge(disputesButtonWithBadge, model.getNumOpenDisputes(), model.getShowOpenDisputesNotification());
+        setupBadge(daoButtonWithBadge, new SimpleStringProperty(Res.get("shared.new")), model.getShowDaoUpdatesNotification());
 
         navigation.addListener(viewPath -> {
             if (viewPath.size() != 2 || viewPath.indexOf(MainView.class) != 0)

desktop/src/main/java/bisq/desktop/main/MainViewModel.java

@@ -28,6 +28,7 @@
 import bisq.desktop.main.overlays.windows.TorNetworkSettingsWindow;
 import bisq.desktop.main.overlays.windows.WalletPasswordWindow;
 import bisq.desktop.main.overlays.windows.downloadupdate.DisplayUpdateDownloadWindow;
+import bisq.desktop.main.presentation.DaoPresentation;
 import bisq.desktop.util.GUIUtil;
 
 import bisq.core.alert.PrivateNotificationManager;
@@ -89,6 +90,7 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupCompleteList
     private final TradePresentation tradePresentation;
     private final DisputePresentation disputePresentation;
     private final MarketPricePresentation marketPricePresentation;
+    private final DaoPresentation daoPresentation;
     private final P2PService p2PService;
     private final TradeManager tradeManager;
     private final Preferences preferences;
@@ -128,6 +130,7 @@ public MainViewModel(BisqSetup bisqSetup,
                          TradePresentation tradePresentation,
                          DisputePresentation disputePresentation,
                          MarketPricePresentation marketPricePresentation,
+                         DaoPresentation daoPresentation,
                          P2PService p2PService,
                          TradeManager tradeManager,
                          Preferences preferences,
@@ -149,6 +152,7 @@ public MainViewModel(BisqSetup bisqSetup,
         this.tradePresentation = tradePresentation;
         this.disputePresentation = disputePresentation;
         this.marketPricePresentation = marketPricePresentation;
+        this.daoPresentation = daoPresentation;
         this.p2PService = p2PService;
         this.tradeManager = tradeManager;
         this.preferences = preferences;
@@ -222,6 +226,7 @@ public void onSetupComplete() {
         setupBtcNumPeersWatcher();
 
         marketPricePresentation.setup();
+        daoPresentation.setup();
 
         if (DevEnv.isDevMode()) {
             preferences.setShowOwnOffersInOfferBook(true);
@@ -563,4 +568,8 @@ IntegerProperty getMarketPriceUpdated() {
     public ObservableList<PriceFeedComboBoxItem> getPriceFeedComboBoxItems() {
         return marketPricePresentation.getPriceFeedComboBoxItems();
     }
+
+    public BooleanProperty getShowDaoUpdatesNotification() {
+        return daoPresentation.getShowDaoUpdatesNotification();
+    }
 }

desktop/src/main/java/bisq/desktop/main/dao/wallet/receive/BsqReceiveView.java

@@ -22,13 +22,15 @@
 import bisq.desktop.components.BsqAddressTextField;
 import bisq.desktop.components.TitledGroupBg;
 import bisq.desktop.main.dao.wallet.BsqBalanceUtil;
+import bisq.desktop.main.presentation.DaoPresentation;
 import bisq.desktop.util.FormBuilder;
 import bisq.desktop.util.GUIUtil;
 import bisq.desktop.util.Layout;
 
 import bisq.core.app.BisqEnvironment;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.locale.Res;
+import bisq.core.user.Preferences;
 import bisq.core.util.BsqFormatter;
 
 import bisq.common.util.Tuple3;
@@ -50,17 +52,20 @@ public class BsqReceiveView extends ActivatableView<GridPane, Void> {
     private final BsqWalletService bsqWalletService;
     private final BsqFormatter bsqFormatter;
     private final BsqBalanceUtil bsqBalanceUtil;
+    private final Preferences preferences;
     private int gridRow = 0;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private BsqReceiveView(BsqWalletService bsqWalletService, BsqFormatter bsqFormatter, BsqBalanceUtil bsqBalanceUtil) {
+    private BsqReceiveView(BsqWalletService bsqWalletService, BsqFormatter bsqFormatter, BsqBalanceUtil bsqBalanceUtil,
+                           Preferences preferences) {
         this.bsqWalletService = bsqWalletService;
         this.bsqFormatter = bsqFormatter;
         this.bsqBalanceUtil = bsqBalanceUtil;
+        this.preferences = preferences;
     }
 
     @Override
@@ -111,6 +116,10 @@ public void initialize() {
 
     @Override
     protected void activate() {
+        // Hide dao new badge if user saw this page
+        if (!BisqEnvironment.isDAOActivatedAndBaseCurrencySupportingBsq())
+            preferences.dontShowAgain(DaoPresentation.DAO_NEWS, true);
+
         if (BisqEnvironment.isDAOActivatedAndBaseCurrencySupportingBsq())
             bsqBalanceUtil.activate();
 

desktop/src/main/java/bisq/desktop/main/presentation/DaoPresentation.java

@@ -0,0 +1,38 @@
+package bisq.desktop.main.presentation;
+
+import bisq.core.app.BisqEnvironment;
+import bisq.core.user.Preferences;
+
+import javax.inject.Inject;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
+import javafx.collections.MapChangeListener;
+
+public class DaoPresentation {
+
+    private final Preferences preferences;
+    public static final String DAO_NEWS = "daoNewsVersion0.9.4";
+
+    private final SimpleBooleanProperty showNotification = new SimpleBooleanProperty(false);
+
+    @Inject
+    public DaoPresentation(Preferences preferences) {
+        this.preferences = preferences;
+        preferences.getDontShowAgainMapAsObservable().addListener((MapChangeListener<? super String, ? super Boolean>) change -> {
+            if (change.getKey().equals(DAO_NEWS) && !BisqEnvironment.isDAOActivatedAndBaseCurrencySupportingBsq()) {
+                showNotification.set(!change.wasAdded());
+            }
+        });
+    }
+
+    public BooleanProperty getShowDaoUpdatesNotification() {
+        return showNotification;
+    }
+
+    public void setup() {
+        if (!BisqEnvironment.isDAOActivatedAndBaseCurrencySupportingBsq())
+            showNotification.set(preferences.showAgain(DAO_NEWS));
+    }
+}