fix ui issues (#41)

app/src/main/java/com/cobo/cold/ui/fragment/SyncFragment.java

@@ -85,7 +85,7 @@ public class SyncFragment extends BaseFragment<SyncFragmentBinding> {
                 LayoutInflater.from(mActivity), R.layout.common_modal,
                 null, false);
         binding.title.setText(R.string.export_xpub_guide_text1_cobo);
-        binding.subTitle.setText(R.string.export_xpub_guide_text2_cobo);
+        binding.subTitle.setText(R.string.export_xpub_guide_text2_cobo_info);
         binding.subTitle.setGravity(Gravity.START);
         binding.close.setVisibility(View.GONE);
         binding.confirm.setText(R.string.know);

app/src/main/java/com/cobo/cold/ui/fragment/main/BlueWalletExportFragment.java

@@ -67,7 +67,7 @@ public class BlueWalletExportFragment extends BaseFragment<BlueExportBinding> {
                 LayoutInflater.from(mActivity), R.layout.common_modal,
                 null, false);
         binding.title.setText(R.string.export_xpub_guide_text1_blue);
-        binding.subTitle.setText(R.string.export_xpub_guide_text2_blue);
+        binding.subTitle.setText(R.string.export_xpub_guide_text2_blue_info);
         binding.subTitle.setGravity(Gravity.START);
         binding.close.setVisibility(View.GONE);
         binding.confirm.setText(R.string.know);

app/src/main/java/com/cobo/cold/ui/fragment/main/WalletInfoFragment.java

@@ -33,6 +33,7 @@ import com.cobo.cold.viewmodel.WatchWallet;
 import com.cobo.cold.viewmodel.WalletInfoViewModel;
 
 import static com.cobo.cold.ui.fragment.Constants.KEY_TITLE;
+import static com.cobo.cold.ui.fragment.setup.SelectAddressFormatFragment.KEY_NEED_CONFIRM;
 
 public class WalletInfoFragment extends BaseFragment<WalletInfoBinding> {
     private Coins.Account account;
@@ -48,8 +49,7 @@ public class WalletInfoFragment extends BaseFragment<WalletInfoBinding> {
         mBinding.switchAddress.setOnClickListener(v -> switchAddressFormat());
         account = GlobalViewModel.getAccount(mActivity);
         WatchWallet watchOnly = WatchWallet.getWatchWallet(mActivity);
-        if (watchOnly != WatchWallet.ELECTRUM
-                && watchOnly != WatchWallet.GENERIC) {
+        if (watchOnly != WatchWallet.GENERIC) {
             mBinding.switchAddress.setVisibility(View.GONE);
         }
         mBinding.addressFormat.setText(getAddressFormat());
@@ -69,6 +69,8 @@ public class WalletInfoFragment extends BaseFragment<WalletInfoBinding> {
             if (!TextUtils.isEmpty(xpub)) {
                 if (watchOnly == WatchWallet.BLUE) {
                     xpub = Util.convertXpubToZpub(xpub);
+                } else if(watchOnly == WatchWallet.ELECTRUM) {
+                    xpub = Util.convertXpubToYpub(xpub);
                 }
                 mBinding.xpub.setText(xpub);
             }
@@ -91,6 +93,7 @@ public class WalletInfoFragment extends BaseFragment<WalletInfoBinding> {
     private void switchAddressFormat() {
         Bundle data = new Bundle();
         data.putInt(KEY_TITLE, R.string.toggle_address_format);
+        data.putBoolean(KEY_NEED_CONFIRM,true);
         navigate(R.id.action_to_selectAddressFormatFragment, data);
     }
 

app/src/main/java/com/cobo/cold/ui/fragment/main/electrum/ElectrumExportFragment.java

@@ -109,7 +109,7 @@ public class ElectrumExportFragment extends BaseFragment<ElectrumExportBinding>
                 LayoutInflater.from(mActivity), R.layout.common_modal,
                 null, false);
         binding.title.setText(R.string.electrum_import_xpub_guide_title);
-        binding.subTitle.setText(R.string.electrum_import_xpub_action_guide);
+        binding.subTitle.setText(R.string.export_xpub_guide_text2_electrum_info);
         binding.subTitle.setGravity(Gravity.START);
         binding.close.setVisibility(View.GONE);
         binding.confirm.setText(R.string.know);

app/src/main/java/com/cobo/cold/ui/fragment/setting/ChooseWatchWalletFragment.java

@@ -68,13 +68,13 @@ public class ChooseWatchWalletFragment extends ListPreferenceFragment {
         Bundle data = new Bundle();
         WatchWallet selectWatchOnlyWallet = getWatchWallet(mActivity);
         switch (selectWatchOnlyWallet) {
-            case ELECTRUM:
             case GENERIC:
                 data.putInt(KEY_TITLE, R.string.select_address_format);
                 navId = R.id.action_to_selectAddressFormatFragment;
                 break;
             case COBO:
             case WASABI:
+            case ELECTRUM:
             case BLUE:
                 navId = R.id.action_to_export_xpub_guide;
                 break;
@@ -115,7 +115,8 @@ public class ChooseWatchWalletFragment extends ListPreferenceFragment {
 
     private void setWatchWallet() {
         prefs.edit().putString(SETTING_CHOOSE_WATCH_WALLET, value).apply();
-        if (value.equals(WatchWallet.COBO.getWalletId())) {
+        if (value.equals(WatchWallet.COBO.getWalletId())
+                || value.equals(WatchWallet.ELECTRUM.getWalletId())) {
             prefs.edit().putString(SETTING_ADDRESS_FORMAT, Coins.Account.P2SH.getType()).apply();
         } else if (value.equals(WatchWallet.WASABI.getWalletId())
                 || value.equals(WatchWallet.BLUE.getWalletId())) {

app/src/main/java/com/cobo/cold/ui/fragment/setup/SelectAddressFormatFragment.java

@@ -17,6 +17,7 @@
 
 package com.cobo.cold.ui.fragment.setup;
 
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -33,9 +34,16 @@ import static com.cobo.cold.ui.fragment.setting.MainPreferenceFragment.SETTING_A
 
 public class SelectAddressFormatFragment extends ListPreferenceFragment {
 
+    public static final String KEY_NEED_CONFIRM = "need_confirm";
+    private boolean needConfirm;
+
     @Override
     protected void init(View view) {
         super.init(view);
+        Bundle data = getArguments();
+        if (data != null) {
+            needConfirm = data.getBoolean(KEY_NEED_CONFIRM);
+        }
         subTitles = getResources().getStringArray(R.array.address_format_subtitle);
         mBinding.confirm.setVisibility(View.VISIBLE);
         mBinding.confirm.setText(R.string.next);
@@ -76,6 +84,10 @@ public class SelectAddressFormatFragment extends ListPreferenceFragment {
         String old = value;
         value = values[position].toString();
         if (!old.equals(value)) {
+            if (!needConfirm) {
+                onSwitchAddressFormat();
+                return;
+            }
             ModalDialog dialog = new ModalDialog();
             ModalWithTwoButtonBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mActivity),
                     R.layout.modal_with_two_button,
@@ -90,11 +102,15 @@ public class SelectAddressFormatFragment extends ListPreferenceFragment {
             binding.right.setText(R.string.toggle_confirm);
             binding.right.setOnClickListener(v -> {
                 dialog.dismiss();
-                prefs.edit().putString(getKey(), value).apply();
-                adapter.notifyDataSetChanged();
+                onSwitchAddressFormat();
             });
             dialog.setBinding(binding);
             dialog.show(mActivity.getSupportFragmentManager(), "");
         }
     }
+
+    private void onSwitchAddressFormat() {
+        prefs.edit().putString(getKey(), value).apply();
+        adapter.notifyDataSetChanged();
+    }
 }

app/src/main/res/layout/set_pattern_unlock.xml

@@ -70,6 +70,8 @@
         <TextView
             android:id="@+id/hint"
             android:layout_marginTop="30dp"
+            android:layout_marginHorizontal="16dp"
+            android:gravity="center"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/pattern_unlock_hint"
@@ -79,6 +81,8 @@
             android:layout_marginTop="10dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:gravity="center"
             android:text="@string/pattern_lock_hide_track"
             android:textColor="@color/white40"
             android:textSize="12sp" />

app/src/main/res/values-zh-rCN/strings.xml

@@ -376,6 +376,30 @@
         2. 选择“导入钱包”<br>
         3. 扫描 Cobo 金库二维码（点击下方按钮查看）<br>
     ]]></string>
+
+    <string name="export_xpub_guide_text2_cobo_info"><![CDATA[
+        1. 打开 Cobo 金库移动端，添加新钱包 <br>
+        2. 选择<font color="#00cdc3">“硬件钱包”<font/>，点击绑定按钮<font/> <br>
+        3. 勾选隐私协议和服务条款后，点击确定按钮，扫描钱包二维码 <br><br>
+        Cobo 金库移动端可在 Cobo 官网下载：<br>
+        <font color="#00cdc3">https://cobo.com/hardware-wallet/downloads<font/>
+    ]]></string>
+
+    <string name="export_xpub_guide_text2_electrum_info"><![CDATA[
+        1. 打开 Electrum，新建钱包 <br>
+        2. 选择<font color="#00cdc3">“标准钱包”<font/> <br>
+        3. 选择<font color="#00cdc3">“使用主公钥”<font/> <br>
+        4. 在输入主公钥页面点击照相机按钮，扫描主公钥二维码<br>
+        5. 设置钱包密码 <br>
+        6. 进入观察钱包
+    ]]></string>
+
+    <string name="export_xpub_guide_text2_blue_info"><![CDATA[
+        1. 打开 BlueWallet，添加新钱包<br>
+        2. 选择<font color="#00cdc3">“导入钱包”<font/><br>
+        3. 扫描 Cobo 金库二维码<br>
+    ]]></string>
+
     <string name="show_master_public_key_qrcode">查看主公钥二维码</string>
     <string name="show_qrcode">查看二维码</string>
     <string name="export_wallet">导出钱包</string>

app/src/main/res/values/strings.xml

@@ -363,7 +363,7 @@
     <string name="master_xpub">Master Public Key (%s)</string>
     <string name="electrum_qrcode_hint"><![CDATA[Difficulty scanning? Tap the QR code to enlarge<br>or <u>touch here to export the file with microSD</u>.]]></string>
     <string name="generic_qrcode_hint"><![CDATA[Difficulty scanning?Tap the QR code to enlarge<br>No scanning?  <u>Touch here to export the file with microSD</u>.]]></string>
-    <string name="scan_electrum_hint">Difficulty scanning? You can import pending transactions from Electrum using a microSD card (Menu > MicroSD Card).</string>
+    <string name="scan_electrum_hint">Difficulty scanning? You can import pending transactions from Electrum using a microSD card.</string>
     <string name="sign_txn_in_sdcard">Unsigned Transaction Files</string>
     <string name="master_pubkey_not_match">Transaction not recognized. Your Cobo Vault has not been successfully paired with the watch-only wallet.</string>
     <string name="change">Change</string>
@@ -431,6 +431,30 @@
         3. Touch <font color="#00cdc3">“Display QR Code”<font/> below, then touch "Scan or import file" in BlueWallet to scan the QR code that displays on Cobo Vault.<br><br>
         <font color="#808080">BlueWallet requires the zPub, wallet type, hardware wallet fingerprint, and firmware version to be used as a watch-only wallet. This information will be exported if you touch “Display QR Code” below.<font/>
     ]]></string>
+
+    <string name="export_xpub_guide_text2_blue_info"><![CDATA[
+     1. Open BlueWallet and add a new wallet.<br>
+     2. Choose <font color="#00cdc3">“Import Wallet”<font/>.<br>
+     3. Touch <font color="#00cdc3">“Scan or import file”<font/> in BlueWallet to scan the QR code that displays on Cobo Vault.
+    ]]></string>
+
+
+    <string name="export_xpub_guide_text2_cobo_info"><![CDATA[
+        1. Open the Cobo Vault mobile app and add a new wallet.<br>
+        2. Choose <font color="#00cdc3">“Hardware Wallet”<font/>, then touch <font color="#00cdc3">“Bind”<font/>.<br>
+        3. Scan the QR code that displays on Cobo Vault with the Cobo Vault mobile app.
+
+    ]]></string>
+
+    <string name="export_xpub_guide_text2_electrum_info"><![CDATA[
+        1. Open Electrum and create a new wallet.<br>
+        2. Choose <font color="#00cdc3">“Standard wallet”<font/>.<br>
+        3. Choose <font color="#00cdc3">“Use a master key”<font/>.<br>
+        4. Click the camera icon in Electrum to scan the QR code that displays on Cobo Vault.<br>
+        5. Set a password.<br>
+        6. Enter the watch-only wallet.
+    ]]></string>
+
     <string name="show_master_public_key_qrcode">Display Master Public Key QR Code</string>
     <string name="show_qrcode">Display QR Code</string>
     <string name="export_wallet">Export Wallet</string>