Show full address

AlphaWallet · Aug 8, 2023 · 5e4c235 · 5e4c235
1 parent 7a57f67
commit 5e4c235
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/app/src/main/java/com/alphawallet/app/ui/MyAddressActivity.java b/app/src/main/java/com/alphawallet/app/ui/MyAddressActivity.java
@@ -235,7 +235,7 @@ private void showAddress()
 
         displayAddress = Keys.toChecksumAddress(wallet.address);
         setTitle(getString(R.string.my_wallet_address));
-        copyAddress.setText(displayAddress);
+        copyAddress.setFixedText(displayAddress);
         currentMode = AddressMode.MODE_ADDRESS;
         if (getCurrentFocus() != null) {
             KeyboardUtils.hideKeyboard(getCurrentFocus());

diff --git a/app/src/main/java/com/alphawallet/app/util/Utils.java b/app/src/main/java/com/alphawallet/app/util/Utils.java
@@ -1,6 +1,5 @@
 package com.alphawallet.app.util;
 
-import static com.alphawallet.app.service.AssetDefinitionService.getEASContract;
 import static com.alphawallet.ethereum.EthereumNetworkBase.AVALANCHE_ID;
 import static com.alphawallet.ethereum.EthereumNetworkBase.BINANCE_MAIN_ID;
 import static com.alphawallet.ethereum.EthereumNetworkBase.CLASSIC_ID;
@@ -37,9 +36,9 @@
 import com.alphawallet.app.web3j.StructuredDataEncoder;
 import com.alphawallet.token.entity.ProviderTypedData;
 import com.alphawallet.token.entity.Signable;
+import com.google.gson.Gson;
 import com.google.zxing.client.android.Intents;
 import com.journeyapps.barcodescanner.ScanOptions;
-import com.google.gson.Gson;
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
@@ -56,7 +55,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
@@ -583,6 +581,15 @@ public static String formatAddress(String address, int frontCharCount)
         }
     }
 
+    public static String splitAddress(String address)
+    {
+        address = Keys.toChecksumAddress(address);
+        int split = address.length()/2;
+        String front = address.substring(0, split);
+        String back = address.substring(split);
+        return front + " " + back;
+    }
+
     public static String formatTxHash(String txHash)
     {
         if (isTxHashValid(txHash))

diff --git a/app/src/main/java/com/alphawallet/app/widget/CopyTextView.java b/app/src/main/java/com/alphawallet/app/widget/CopyTextView.java
@@ -87,6 +87,26 @@ public String getText()
         return originalText;
     }
 
+    public void setFixedText(CharSequence text)
+    {
+        originalText = text.toString();
+
+        setVisibility(TextUtils.isEmpty(originalText) ? View.GONE : View.VISIBLE);
+
+        if (Utils.isAddressValid(originalText))
+        {
+            button.setText(Utils.splitAddress(originalText));
+        }
+        else if (Utils.isTxHashValid(originalText))
+        {
+            button.setText(Utils.formatTxHash(originalText, 10));
+        }
+        else
+        {
+            button.setText(originalText);
+        }
+    }
+
     public void setText(CharSequence text)
     {
         originalText = text.toString();