modfiy address option view
MODIFY
bither-android/res/layout/dialog_address_watch_only_option.xml
bither-android/res/layout/dialog_address_watch_only_option.xml
android:layout_height="match_parent"
android:orientation="vertical">
- <TextView
- android:id="@+id/tv_view_on_blockchaininfo"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ui_touchable_foreground"
- android:padding="10dp"
- android:text="@string/address_option_view_on_blockchain_info"
- android:textColor="@color/dialog_text_color_selector"
- android:textSize="18sp"/>
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="#22ffffff"/>
-
- <TextView
- android:id="@+id/tv_view_on_blockmeta"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ui_touchable_foreground"
- android:padding="10dp"
- android:text="@string/address_option_view_on_btc"
- android:textColor="@color/dialog_text_color_selector"
- android:textSize="18sp"/>
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:id="@+id/iv_blockmeta"
- android:background="#22ffffff"/>
-
<TextView
android:id="@+id/tv_view_on_blockchair"
android:layout_width="wrap_content"

MODIFY
bither-android/res/layout/dialog_address_with_private_key_option.xml
bither-android/res/layout/dialog_address_with_private_key_option.xml
android:layout_height="match_parent"
android:orientation="vertical">
- <TextView
- android:id="@+id/tv_view_on_blockchaininfo"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ui_touchable_foreground"
- android:padding="10dp"
- android:text="@string/address_option_view_on_blockchain_info"
- android:textColor="@color/dialog_text_color_selector"
- android:textSize="18sp" />
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="#22ffffff" />
-
- <TextView
- android:id="@+id/tv_view_on_blockmeta"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ui_touchable_foreground"
- android:padding="10dp"
- android:text="@string/address_option_view_on_btc"
- android:textColor="@color/dialog_text_color_selector"
- android:textSize="18sp" />
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:id="@+id/iv_blockmeta"
- android:background="#22ffffff" />
-
<TextView
android:id="@+id/tv_view_on_blockchair"
android:layout_width="wrap_content"

MODIFY
bither-android/src/net/bither/TrashCanActivity.java
bither-android/src/net/bither/TrashCanActivity.java
@@ -213,36 +213,15 @@ public class TrashCanActivity extends SwipeRightFragmentActivity {
@Override
protected List<Action> getActions() {
ArrayList<Action> actions = new ArrayList<Action>();
- actions.add(new Action(R.string.address_option_view_on_blockchain_info,
- new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(TrashCanActivity.this,
- BitherUrl.BLOCKCHAIN_INFO_ADDRESS_URL + address
- .getAddress());
- }
- }));
-
- String defaultCountry = Locale.getDefault().getCountry();
- if (Utils.compareString(defaultCountry, "CN") || Utils.compareString
- (defaultCountry, "cn")) {
- actions.add(new Action(R.string.address_option_view_on_btc,
- new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(TrashCanActivity.this,
- BitherUrl.BTC_COM_ADDRESS_URL + address.getAddress());
- }
- }));
- }
actions.add(new Action(R.string.address_option_view_on_blockchair,
new Runnable() {
@Override
public void run() {
UIUtil.gotoBrower(TrashCanActivity.this,
- BitherUrl.BLOCKCHAIR_ADDRESS_URL + address
- .getAddress());
+ String.format(BitherUrl.BLOCKCHAIR_ADDRESS_URL, address
+ .getAddress()));
+
}
}));

MODIFY
bither-android/src/net/bither/activity/hot/EnterpriseHDMAddressDetailActivity.java
bither-android/src/net/bither/activity/hot/EnterpriseHDMAddressDetailActivity.java
@@ -62,33 +62,13 @@ public class EnterpriseHDMAddressDetailActivity extends AddressDetailActivity {
@Override
protected List<Action> getActions() {
ArrayList<Action> actions = new ArrayList<Action>();
- actions.add(new Action(R.string.address_option_view_on_blockchain_info, new
- Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(EnterpriseHDMAddressDetailActivity.this, BitherUrl
- .BLOCKCHAIN_INFO_ADDRESS_URL + address.getAddress());
- }
- }));
- String defaultCountry = Locale.getDefault().getCountry();
- if (Utils.compareString(defaultCountry, "CN") || Utils.compareString
- (defaultCountry, "cn")) {
- actions.add(new Action(R.string.address_option_view_on_btc, new
- Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(EnterpriseHDMAddressDetailActivity.this, BitherUrl
- .BTC_COM_ADDRESS_URL + address.getAddress());
- }
- }));
- }
actions.add(new Action(R.string.address_option_view_on_blockchair,
new Runnable() {
@Override
public void run() {
UIUtil.gotoBrower(EnterpriseHDMAddressDetailActivity.this,
- BitherUrl.BLOCKCHAIR_ADDRESS_URL + address
- .getAddress());
+ String.format(BitherUrl.BLOCKCHAIR_ADDRESS_URL, address
+ .getAddress()));
}
}));
return actions;

MODIFY
bither-android/src/net/bither/ui/base/dialog/DialogAddressWatchOnlyOption.java
bither-android/src/net/bither/ui/base/dialog/DialogAddressWatchOnlyOption.java
@@ -52,31 +52,13 @@ public class DialogAddressWatchOnlyOption extends DialogWithActions {
@Override
protected List<Action> getActions() {
ArrayList<Action> actions = new ArrayList<Action>();
- actions.add(new Action(R.string.address_option_view_on_blockchain_info, new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(activity, BitherUrl.BLOCKCHAIN_INFO_ADDRESS_URL + address
- .getAddress());
- }
- }));
- String defaultCountry = Locale.getDefault().getCountry();
- if (Utils.compareString(defaultCountry, "CN") || Utils.compareString(defaultCountry,
- "cn")) {
- actions.add(new Action(R.string.address_option_view_on_btc, new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(activity, BitherUrl.BTC_COM_ADDRESS_URL + address
- .getAddress());
- }
- }));
- }
actions.add(new Action(R.string.address_option_view_on_blockchair,
new Runnable() {
@Override
public void run() {
UIUtil.gotoBrower(activity,
- BitherUrl.BLOCKCHAIR_ADDRESS_URL + address
- .getAddress());
+ String.format(BitherUrl.BLOCKCHAIR_ADDRESS_URL, address
+ .getAddress()));
}
}));
actions.add(new Action(R.string.address_alias_manage, new Runnable() {

MODIFY
bither-android/src/net/bither/ui/base/dialog/DialogAddressWithPrivateKeyOption.java
bither-android/src/net/bither/ui/base/dialog/DialogAddressWithPrivateKeyOption.java
@@ -44,31 +44,13 @@ public class DialogAddressWithPrivateKeyOption extends DialogWithActions {
@Override
protected List<Action> getActions() {
ArrayList<Action> actions = new ArrayList<Action>();
- actions.add(new Action(R.string.address_option_view_on_blockchain_info, new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(activity, BitherUrl.BLOCKCHAIN_INFO_ADDRESS_URL + address
- .getAddress());
- }
- }));
- String defaultCountry = Locale.getDefault().getCountry();
- if (Utils.compareString(defaultCountry, "CN") || Utils.compareString(defaultCountry,
- "cn")) {
- actions.add(new Action(R.string.address_option_view_on_btc, new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(activity, BitherUrl.BTC_COM_ADDRESS_URL + address
- .getAddress());
- }
- }));
- }
actions.add(new Action(R.string.address_option_view_on_blockchair,
new Runnable() {
@Override
public void run() {
UIUtil.gotoBrower(activity,
- BitherUrl.BLOCKCHAIR_ADDRESS_URL + address
- .getAddress());
+ String.format(BitherUrl.BLOCKCHAIR_ADDRESS_URL, address
+ .getAddress()));
}
}));
actions.add(new Action(R.string.private_key_management, new Runnable() {

MODIFY
bither-android/src/net/bither/ui/base/dialog/DialogHDMAddressOptions.java
bither-android/src/net/bither/ui/base/dialog/DialogHDMAddressOptions.java
@@ -63,31 +63,13 @@ public class DialogHDMAddressOptions extends DialogWithActions {
@Override
protected List<Action> getActions() {
ArrayList<Action> actions = new ArrayList<Action>();
- actions.add(new Action(R.string.address_option_view_on_blockchain_info, new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(activity, BitherUrl.BLOCKCHAIN_INFO_ADDRESS_URL + address
- .getAddress());
- }
- }));
- String defaultCountry = Locale.getDefault().getCountry();
- if (Utils.compareString(defaultCountry, "CN") || Utils.compareString(defaultCountry,
- "cn")) {
- actions.add(new Action(R.string.address_option_view_on_btc, new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(activity, BitherUrl.BTC_COM_ADDRESS_URL + address
- .getAddress());
- }
- }));
- }
actions.add(new Action(R.string.address_option_view_on_blockchair,
new Runnable() {
@Override
public void run() {
UIUtil.gotoBrower(activity,
- BitherUrl.BLOCKCHAIR_ADDRESS_URL + address
- .getAddress());
+ String.format(BitherUrl.BLOCKCHAIR_ADDRESS_URL, address.getAddress()));
+
}
}));
Action moveToTrashAction = new Action(R.string.trash_private_key, new Runnable() {

MODIFY
bither-android/src/net/bither/ui/base/dialog/DialogHdAccountOldAddresses.java
bither-android/src/net/bither/ui/base/dialog/DialogHdAccountOldAddresses.java
@@ -175,33 +175,13 @@ public class DialogHdAccountOldAddresses extends CenterDialog {
@Override
protected List<Action> getActions() {
ArrayList<Action> actions = new ArrayList<Action>();
- actions.add(new Action(R.string
- .address_option_view_on_blockchain_info, new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(activity, BitherUrl
- .BLOCKCHAIN_INFO_ADDRESS_URL + address);
- }
- }));
-
- String defaultCountry = Locale.getDefault().getCountry();
- if (Utils.compareString(defaultCountry, "CN") || Utils.compareString
- (defaultCountry, "cn")) {
- actions.add(new Action(R.string.address_option_view_on_btc,
- new Runnable() {
- @Override
- public void run() {
- UIUtil.gotoBrower(activity, BitherUrl
- .BTC_COM_ADDRESS_URL + address);
- }
- }));
- }
actions.add(new Action(R.string.address_option_view_on_blockchair,
new Runnable() {
@Override
public void run() {
UIUtil.gotoBrower(activity,
- BitherUrl.BLOCKCHAIR_ADDRESS_URL + address);
+ String.format(BitherUrl.BLOCKCHAIR_ADDRESS_URL, address));
+
}
}));
return actions;

MODIFY
bitherj
bitherj
-Subproject commit 05d3aa09bca3d926f48b6b8b3892cdb88d3cec52
+Subproject commit 44e10ccd2f866edb1749622faa703c8c95ac43a7

modfiy address option view