diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 17564fcdbc9..9deecc09014 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -569,7 +569,6 @@ brave_java_resources = [ "java/res/drawable/default_indicator.xml", "java/res/drawable/ic_accessibility.xml", "java/res/drawable/ic_add.xml", - "java/res/drawable/ic_add_account_onboarding.xml", "java/res/drawable/ic_addresses.xml", "java/res/drawable/ic_appearance.xml", "java/res/drawable/ic_arrow_downward.xml", @@ -794,7 +793,6 @@ brave_java_resources = [ "java/res/layout/crypto_widget_layout.xml", "java/res/layout/edit_visible_assets_bottom_sheet.xml", "java/res/layout/fragment_accounts.xml", - "java/res/layout/fragment_add_account_onboarding_dialog.xml", "java/res/layout/fragment_backup_wallet.xml", "java/res/layout/fragment_binance_buy.xml", "java/res/layout/fragment_binance_convert.xml", diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index db7a05e1cde..50f10583adb 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -283,7 +283,6 @@ if (brave_wallet_enabled) { "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/RecoveryPhraseAdapter.java", "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/WalletCoinAdapter.java", "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/AccountsFragment.java", - "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/AddAccountOnboardingDialogFragment.java", "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/ApproveTxBottomSheetDialogFragment.java", "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/EditVisibleAssetsBottomSheetDialogFragment.java", "../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/PortfolioFragment.java", diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AccountDetailActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AccountDetailActivity.java index d49b1e69dfc..27fe88e9a4e 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AccountDetailActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AccountDetailActivity.java @@ -60,8 +60,8 @@ public class AccountDetailActivity startActivity(accountDetailsWithQrActivityIntent); } }); - TextView btnEdit = findViewById(R.id.edit_btn); - btnEdit.setOnClickListener(new View.OnClickListener() { + TextView btnRename = findViewById(R.id.rename_btn); + btnRename.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { // TODO add action for edit diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/AddAccountOnboardingDialogFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/AddAccountOnboardingDialogFragment.java deleted file mode 100644 index fcf37731778..00000000000 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/AddAccountOnboardingDialogFragment.java +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.crypto_wallet.fragments; - -import android.content.res.Configuration; -import android.os.Bundle; -import android.util.DisplayMetrics; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.WindowManager; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.fragment.app.DialogFragment; - -import org.chromium.chrome.R; - -public class AddAccountOnboardingDialogFragment - extends DialogFragment implements View.OnClickListener { - @Override - public void onConfigurationChanged(@NonNull Configuration newConfig) { - super.onConfigurationChanged(newConfig); - setDialogParams(); - } - - @Override - public void onResume() { - super.onResume(); - assert getDialog() != null; - getDialog().setOnKeyListener((dialog, keyCode, event) -> { - if ((keyCode == android.view.KeyEvent.KEYCODE_BACK)) { - dismiss(); - return true; - } else - return false; - }); - setDialogParams(); - } - - @Override - public View onCreateView( - LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_add_account_onboarding_dialog, container, false); - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - Button mDoneButton = view.findViewById(R.id.btn_enable); - mDoneButton.setOnClickListener(this); - - ImageView btnClose = view.findViewById(R.id.btn_close); - btnClose.setOnClickListener(this); - } - - @Override - public void onClick(View view) { - dismiss(); - } - - private void setDialogParams() { - DisplayMetrics displayMetrics = new DisplayMetrics(); - assert getActivity() != null; - getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); - int mDeviceWidth = displayMetrics.widthPixels; - - assert getDialog() != null; - WindowManager.LayoutParams params = getDialog().getWindow().getAttributes(); - boolean isTablet = false; - boolean isLandscape = false; - if (isTablet) { - params.width = (int) (0.5 * mDeviceWidth); - } else { - if (isLandscape) { - params.width = (int) (0.5 * mDeviceWidth); - } else { - params.width = (int) (0.9 * mDeviceWidth); - } - } - params.height = LinearLayout.LayoutParams.WRAP_CONTENT; - getDialog().getWindow().setAttributes(params); - } -} diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/VerifyRecoveryPhraseFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/VerifyRecoveryPhraseFragment.java index 4fd49a2359a..23dd4996c11 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/VerifyRecoveryPhraseFragment.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/VerifyRecoveryPhraseFragment.java @@ -24,7 +24,6 @@ import org.chromium.brave_wallet.mojom.KeyringController; import org.chromium.chrome.R; import org.chromium.chrome.browser.crypto_wallet.activities.BraveWalletActivity; import org.chromium.chrome.browser.crypto_wallet.adapters.RecoveryPhraseAdapter; -import org.chromium.chrome.browser.crypto_wallet.fragments.AddAccountOnboardingDialogFragment; import org.chromium.chrome.browser.crypto_wallet.util.ItemOffsetDecoration; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.ui.widget.Toast; @@ -77,7 +76,6 @@ public class VerifyRecoveryPhraseFragment extends CryptoOnboardingFragment { recoveryPhrasesToVerifyAdapter.getRecoveryPhraseList()); if (result.equals(recoveryPhraseToVerify)) { onNextPage.gotoNextPage(true); - showAddAccountDialog(); } else { phraseNotMatch(); } @@ -153,16 +151,6 @@ public class VerifyRecoveryPhraseFragment extends CryptoOnboardingFragment { selectedPhraseRecyclerView.setAdapter(recoveryPhrasesToVerifyAdapter); } - private void showAddAccountDialog() { - AddAccountOnboardingDialogFragment addAccountOnboardingDialogFragment = - new AddAccountOnboardingDialogFragment(); - addAccountOnboardingDialogFragment.setCancelable(false); - assert getActivity() != null; - addAccountOnboardingDialogFragment.show( - ((FragmentActivity) getActivity()).getSupportFragmentManager(), - "AddAccountOnboardingDialog"); - } - OnRecoveryPhraseSelected onRecoveryPhraseSelected = new OnRecoveryPhraseSelected() { @Override public void onSelectedRecoveryPhrase(String phrase) { diff --git a/android/java/res/drawable/ic_add_account_onboarding.xml b/android/java/res/drawable/ic_add_account_onboarding.xml deleted file mode 100644 index d0177d20e2b..00000000000 --- a/android/java/res/drawable/ic_add_account_onboarding.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/java/res/layout/activity_account_detail.xml b/android/java/res/layout/activity_account_detail.xml index 19777df4b81..51dcdf19d2b 100644 --- a/android/java/res/layout/activity_account_detail.xml +++ b/android/java/res/layout/activity_account_detail.xml @@ -64,10 +64,10 @@ android:paddingEnd="16dp"/> - - - - - - - - - - - - -