Update banner for the warning
This commit is contained in:
+1
@@ -62,6 +62,7 @@ public class AccountDetailActivity
|
||||
new Intent(AccountDetailActivity.this, AccountDetailsWithQrActivity.class);
|
||||
accountDetailsWithQrActivityIntent.putExtra(Utils.ADDRESS, mAddress);
|
||||
accountDetailsWithQrActivityIntent.putExtra(Utils.NAME, mName);
|
||||
accountDetailsWithQrActivityIntent.putExtra(Utils.ISIMPORTED, mIsImported);
|
||||
startActivity(accountDetailsWithQrActivityIntent);
|
||||
}
|
||||
});
|
||||
|
||||
+5
@@ -37,6 +37,7 @@ public class AccountDetailsWithQrActivity extends AsyncInitializationActivity {
|
||||
|
||||
private String mAddress;
|
||||
private String mName;
|
||||
private boolean mIsImported;
|
||||
|
||||
@Override
|
||||
protected void triggerLayoutInflation() {
|
||||
@@ -45,6 +46,7 @@ public class AccountDetailsWithQrActivity extends AsyncInitializationActivity {
|
||||
if (getIntent() != null) {
|
||||
mAddress = getIntent().getStringExtra(Utils.ADDRESS);
|
||||
mName = getIntent().getStringExtra(Utils.NAME);
|
||||
mIsImported = getIntent().getBooleanExtra(Utils.ISIMPORTED, false);
|
||||
}
|
||||
|
||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||
@@ -67,6 +69,9 @@ public class AccountDetailsWithQrActivity extends AsyncInitializationActivity {
|
||||
accountNameText.setEnabled(false);
|
||||
|
||||
TextView privateKeyText = findViewById(R.id.account_private_key_text);
|
||||
if (mIsImported) {
|
||||
privateKeyText.setVisibility(View.GONE);
|
||||
}
|
||||
privateKeyText.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
||||
+37
-5
@@ -6,9 +6,13 @@
|
||||
package org.chromium.chrome.browser.crypto_wallet.activities;
|
||||
|
||||
import android.text.method.HideReturnsTransformationMethod;
|
||||
import android.text.method.PasswordTransformationMethod;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
@@ -28,6 +32,7 @@ public class AccountPrivateKeyActivity
|
||||
extends AsyncInitializationActivity implements ConnectionErrorHandler {
|
||||
private KeyringController mKeyringController;
|
||||
private String mAddress;
|
||||
private boolean mIsPrivateKeyShown;
|
||||
@Override
|
||||
protected void triggerLayoutInflation() {
|
||||
setContentView(R.layout.activity_account_private_key);
|
||||
@@ -47,6 +52,38 @@ public class AccountPrivateKeyActivity
|
||||
-> Utils.saveTextToClipboard(
|
||||
AccountPrivateKeyActivity.this, privateKeyText.getText().toString()));
|
||||
|
||||
LinearLayout bannerLayout = findViewById(R.id.wallet_backup_banner);
|
||||
bannerLayout.setVisibility(View.VISIBLE);
|
||||
|
||||
TextView warningText = findViewById(R.id.warning_text);
|
||||
warningText.setText(getResources().getString(R.string.private_key_warning_text));
|
||||
|
||||
ImageView bannerBtn = findViewById(R.id.backup_banner_close);
|
||||
bannerBtn.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
bannerLayout.setVisibility(View.GONE);
|
||||
}
|
||||
});
|
||||
|
||||
Button showPrivateKeyBtn = findViewById(R.id.btn_show_private_key);
|
||||
showPrivateKeyBtn.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (!mIsPrivateKeyShown) {
|
||||
privateKeyText.setTransformationMethod(
|
||||
HideReturnsTransformationMethod.getInstance());
|
||||
showPrivateKeyBtn.setText(getResources().getString(R.string.hide_private_key));
|
||||
} else {
|
||||
privateKeyText.setTransformationMethod(
|
||||
PasswordTransformationMethod.getInstance());
|
||||
showPrivateKeyBtn.setText(getResources().getString(R.string.show_private_key));
|
||||
}
|
||||
mIsPrivateKeyShown = !mIsPrivateKeyShown;
|
||||
}
|
||||
});
|
||||
|
||||
InitKeyringController();
|
||||
if (mKeyringController != null)
|
||||
mKeyringController.getPrivateKeyForDefaultKeyringAccount(
|
||||
mAddress, (result, privateKey) -> {
|
||||
@@ -55,11 +92,6 @@ public class AccountPrivateKeyActivity
|
||||
}
|
||||
});
|
||||
|
||||
Button showPrivateKeyBtn = findViewById(R.id.btn_show_private_key);
|
||||
showPrivateKeyBtn.setOnClickListener(v
|
||||
-> privateKeyText.setTransformationMethod(
|
||||
HideReturnsTransformationMethod.getInstance()));
|
||||
|
||||
onInitialLayoutInflationComplete();
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
android:layout_marginBottom="24dp"
|
||||
android:gravity="center_vertical" />
|
||||
|
||||
<include layout="@layout/wallet_backup_banner"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
android:paddingBottom="10dp"
|
||||
android:textCursorDrawable="@null"
|
||||
android:textSize="14sp"
|
||||
android:inputType="text"
|
||||
android:inputType="textPassword"
|
||||
android:textColor="@color/wallet_text_color"
|
||||
android:textColorHint="@color/wallet_edittext_outline_color" />
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
tools:ignore="UseCompoundDrawables">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/warning_text"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
Reference in New Issue
Block a user