Merge pull request #5231 from BtcContributor/bankidcopy

Fix copy of BankName value + BranchId/BankId
bisq-network · Mar 12, 2021 · 6148b61 · 6148b61
2 parents edbac95 + fbf7af8
commit 6148b61
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java b/desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java
@@ -39,7 +39,7 @@ public class TextFieldWithCopyIcon extends AnchorPane {
     private final StringProperty text = new SimpleStringProperty();
     private final TextField textField;
     private boolean copyWithoutCurrencyPostFix;
-
+    private boolean copyTextAfterDelimiter;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
@@ -65,6 +65,12 @@ public TextFieldWithCopyIcon(String customStyleClass) {
                         copyText = strings[0]; // exclude the BTC postfix
                     else
                         copyText = text;
+                } else if (copyTextAfterDelimiter) {
+                    String[] strings = text.split(" ");
+                    if (strings.length > 1)
+                        copyText = strings[2]; // exclude the part before / (slash included)
+                    else
+                        copyText = text;
                 } else {
                     copyText = text;
                 }
@@ -110,4 +116,8 @@ public void setCopyWithoutCurrencyPostFix(boolean copyWithoutCurrencyPostFix) {
         this.copyWithoutCurrencyPostFix = copyWithoutCurrencyPostFix;
     }
 
+    public void setCopyTextAfterDelimiter(boolean copyTextAfterDelimiter) {
+        this.copyTextAfterDelimiter = copyTextAfterDelimiter;
+    }
+
 }
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
@@ -105,13 +105,13 @@ static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload
             addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++),
                     bankNameLabel + " / " +
                             bankIdLabel + ":",
-                    data.getBankName() + " / " + data.getBankId());
+                    data.getBankName() + " / " + data.getBankId(), true);
         }
         if (bankNameBranchIdCombined) {
             addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++),
                     bankNameLabel + " / " +
                             branchIdLabel + ":",
-                    data.getBankName() + " / " + data.getBranchId());
+                    data.getBankName() + " / " + data.getBranchId(), true);
         }
 
         if (!bankNameBankIdCombined && !bankNameBranchIdCombined && BankUtil.isBankNameRequired(countryCode))

diff --git a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
@@ -1519,6 +1519,15 @@ public static Tuple2<Label, TextFieldWithCopyIcon> addCompactTopLabelTextFieldWi
         return addTopLabelTextFieldWithCopyIcon(gridPane, rowIndex, colIndex, title, value, -Layout.FLOATING_LABEL_DISTANCE);
     }
 
+    public static Tuple2<Label, TextFieldWithCopyIcon> addCompactTopLabelTextFieldWithCopyIcon(GridPane gridPane,
+                                                                                               int rowIndex,
+                                                                                               int colIndex,
+                                                                                               String title,
+                                                                                               String value,
+                                                                                               boolean onlyCopyTextAfterDelimiter) {
+        return addTopLabelTextFieldWithCopyIcon(gridPane, rowIndex, colIndex, title, value, -Layout.FLOATING_LABEL_DISTANCE, onlyCopyTextAfterDelimiter);
+    }
+
     public static Tuple2<Label, TextFieldWithCopyIcon> addTopLabelTextFieldWithCopyIcon(GridPane gridPane,
                                                                                         int rowIndex,
                                                                                         String title,
@@ -1548,6 +1557,25 @@ public static Tuple2<Label, TextFieldWithCopyIcon> addTopLabelTextFieldWithCopyI
         return new Tuple2<>(topLabelWithVBox.first, textFieldWithCopyIcon);
     }
 
+    public static Tuple2<Label, TextFieldWithCopyIcon> addTopLabelTextFieldWithCopyIcon(GridPane gridPane,
+                                                                                        int rowIndex,
+                                                                                        int colIndex,
+                                                                                        String title,
+                                                                                        String value,
+                                                                                        double top,
+                                                                                        boolean onlyCopyTextAfterDelimiter) {
+
+        TextFieldWithCopyIcon textFieldWithCopyIcon = new TextFieldWithCopyIcon();
+        textFieldWithCopyIcon.setText(value);
+        textFieldWithCopyIcon.setCopyTextAfterDelimiter(true);
+
+        final Tuple2<Label, VBox> topLabelWithVBox = addTopLabelWithVBox(gridPane, rowIndex, title, textFieldWithCopyIcon, top);
+        topLabelWithVBox.second.setAlignment(Pos.TOP_LEFT);
+        GridPane.setColumnIndex(topLabelWithVBox.second, colIndex);
+
+        return new Tuple2<>(topLabelWithVBox.first, textFieldWithCopyIcon);
+    }
+
     public static Tuple2<Label, TextFieldWithCopyIcon> addTopLabelTextFieldWithCopyIcon(GridPane gridPane,
                                                                                         int rowIndex,
                                                                                         int colIndex,