Skip to content

Commit 58588fc

Browse files
simoarpesimoarpe
committed
Rename onboarding fragments
1 parent 67b35e3 commit 58588fc

15 files changed

+145
-123
lines changed

‎android/brave_java_sources.gni

+10-10
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ brave_java_sources = [
134134
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/AccountsFragment.java",
135135
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/ApproveTxBottomSheetDialogFragment.java",
136136
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/AssetsFragment.java",
137+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/BaseWalletNextPageFragment.java",
137138
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/CreateAccountBottomSheetFragment.java",
138139
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/EditVisibleAssetsBottomSheetDialogFragment.java",
139140
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/MarketFragment.java",
@@ -147,6 +148,7 @@ brave_java_sources = [
147148
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemFragment.java",
148149
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TxDetailsFragment.java",
149150
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TxFragment.java",
151+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/UnlockWalletFragment.java",
150152
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java",
151153
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/AddSwitchChainNetworkFragment.java",
152154
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/AddTokenFragment.java",
@@ -159,16 +161,14 @@ brave_java_sources = [
159161
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignMessageFragment.java",
160162
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignTransactionFragment.java",
161163
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SiweMessageFragment.java",
162-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/BackupWalletFragment.java",
163-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/CreatingWalletFragment.java",
164-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/CryptoOnboardingFragment.java",
165-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/RecoveryPhraseFragment.java",
166-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/RestoreWalletFragment.java",
167-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/SecurePasswordFragment.java",
168-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/SetupWalletFragment.java",
169-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/UnlockWalletFragment.java",
170-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/BaseWalletNextPageFragment.java",
171-
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/VerifyRecoveryPhraseFragment.java",
164+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/BaseOnboardingWalletFragment.java",
165+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/OnboardingBackupWalletFragment.java",
166+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/OnboardingCreatingWalletFragment.java",
167+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/OnboardingInitWalletFragment.java",
168+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/OnboardingRecoveryPhraseFragment.java",
169+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/OnboardingRestoreWalletFragment.java",
170+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/OnboardingSecurePasswordFragment.java",
171+
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding/OnboardingVerifyRecoveryPhraseFragment.java",
172172
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/listeners/OnNextPage.java",
173173
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/listeners/OnWalletListItemClick.java",
174174
"../../brave/android/java/org/chromium/chrome/browser/crypto_wallet/listeners/TransactionConfirmationListener.java",

‎android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java

+71-54
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
import org.chromium.chrome.browser.crypto_wallet.adapters.CryptoWalletOnboardingPagerAdapter;
3636
import org.chromium.chrome.browser.crypto_wallet.fragments.PortfolioFragment;
3737
import org.chromium.chrome.browser.crypto_wallet.fragments.SwapBottomSheetDialogFragment;
38-
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.BackupWalletFragment;
39-
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.CreatingWalletFragment;
40-
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.RecoveryPhraseFragment;
41-
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.RestoreWalletFragment;
42-
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.SecurePasswordFragment;
43-
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.SetupWalletFragment;
4438
import org.chromium.chrome.browser.crypto_wallet.fragments.UnlockWalletFragment;
45-
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.VerifyRecoveryPhraseFragment;
39+
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.OnboardingBackupWalletFragment;
40+
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.OnboardingCreatingWalletFragment;
41+
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.OnboardingInitWalletFragment;
42+
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.OnboardingRecoveryPhraseFragment;
43+
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.OnboardingRestoreWalletFragment;
44+
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.OnboardingSecurePasswordFragment;
45+
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.OnboardingVerifyRecoveryPhraseFragment;
4646
import org.chromium.chrome.browser.crypto_wallet.listeners.OnNextPage;
4747
import org.chromium.chrome.browser.crypto_wallet.util.NavigationItem;
4848
import org.chromium.chrome.browser.crypto_wallet.util.Utils;
@@ -178,12 +178,14 @@ protected void triggerLayoutInflation() {
178178
mOnboardingCloseButton.setOnClickListener(v -> finish());
179179

180180
mOnboardingBackButton = findViewById(R.id.onboarding_back_button);
181-
mOnboardingBackButton.setOnClickListener(v -> {
182-
if (mCryptoWalletOnboardingViewPager != null && mCryptoWalletOnboardingViewPager.getCurrentItem() > 0) {
183-
mCryptoWalletOnboardingViewPager.setCurrentItem(
184-
mCryptoWalletOnboardingViewPager.getCurrentItem() - 1);
185-
}
186-
});
181+
mOnboardingBackButton.setOnClickListener(
182+
v -> {
183+
if (mCryptoWalletOnboardingViewPager != null
184+
&& mCryptoWalletOnboardingViewPager.getCurrentItem() > 0) {
185+
mCryptoWalletOnboardingViewPager.setCurrentItem(
186+
mCryptoWalletOnboardingViewPager.getCurrentItem() - 1);
187+
}
188+
});
187189

188190
mModalDialogManager = new ModalDialogManager(
189191
new AppModalPresenter(this), ModalDialogManager.ModalDialogType.APP);
@@ -200,13 +202,14 @@ public void finishNativeInitialization() {
200202
if (Utils.shouldShowCryptoOnboarding()) {
201203
setNavigationFragments(WalletAction.ONBOARDING);
202204
} else if (mKeyringService != null) {
203-
mKeyringService.isLocked(isLocked -> {
204-
if (isLocked) {
205-
setNavigationFragments(WalletAction.UNLOCK);
206-
} else {
207-
showMainLayout();
208-
}
209-
});
205+
mKeyringService.isLocked(
206+
isLocked -> {
207+
if (isLocked) {
208+
setNavigationFragments(WalletAction.UNLOCK);
209+
} else {
210+
showMainLayout();
211+
}
212+
});
210213
}
211214
}
212215

@@ -242,21 +245,25 @@ private void setNavigationFragments(@NonNull final WalletAction walletAction) {
242245
mCryptoLayout.setVisibility(View.GONE);
243246
mCryptoOnboardingLayout.setVisibility(View.VISIBLE);
244247
if (walletAction == WalletAction.ONBOARDING) {
245-
SetupWalletFragment setupWalletFragment =
246-
new SetupWalletFragment(mRestartSetupAction, mRestartRestoreAction);
247-
navigationItems.add(new NavigationItem(
248-
getResources().getString(R.string.setup_crypto), setupWalletFragment));
248+
OnboardingInitWalletFragment onboardingInitWalletFragment =
249+
new OnboardingInitWalletFragment(mRestartSetupAction, mRestartRestoreAction);
250+
navigationItems.add(
251+
new NavigationItem(
252+
getResources().getString(R.string.setup_crypto),
253+
onboardingInitWalletFragment));
249254
mBraveWalletP3A.reportOnboardingAction(OnboardingAction.SHOWN);
250255
} else if (walletAction == WalletAction.UNLOCK) {
251256
UnlockWalletFragment unlockWalletFragment = new UnlockWalletFragment();
252257
navigationItems.add(new NavigationItem(
253258
getResources().getString(R.string.unlock_wallet_title), unlockWalletFragment));
254259
} else if (walletAction == WalletAction.RESTORE) {
255260
mShowBiometricPrompt = false;
256-
RestoreWalletFragment restoreWalletFragment = RestoreWalletFragment.newInstance(false);
261+
OnboardingRestoreWalletFragment onboardingRestoreWalletFragment =
262+
OnboardingRestoreWalletFragment.newInstance(false);
257263
navigationItems.add(
258-
new NavigationItem(getResources().getString(R.string.restore_crypto_account),
259-
restoreWalletFragment));
264+
new NavigationItem(
265+
getResources().getString(R.string.restore_crypto_account),
266+
onboardingRestoreWalletFragment));
260267
}
261268

262269
if (mCryptoWalletOnboardingPagerAdapter != null) {
@@ -281,33 +288,37 @@ private void addRemoveSecureFlag(boolean add) {
281288
}
282289
}
283290

284-
private void replaceNavigationFragments(@NonNull final WalletAction walletAction, boolean isOnboarding) {
291+
private void replaceNavigationFragments(
292+
@NonNull final WalletAction walletAction, boolean isOnboarding) {
285293
mShowBiometricPrompt = true;
286294
if (mCryptoWalletOnboardingViewPager != null
287295
&& mCryptoWalletOnboardingPagerAdapter != null) {
288296
if (walletAction == WalletAction.RESTORE) {
289297
mShowBiometricPrompt = false;
290-
RestoreWalletFragment restoreWalletFragment =
291-
RestoreWalletFragment.newInstance(isOnboarding);
298+
OnboardingRestoreWalletFragment onboardingRestoreWalletFragment =
299+
OnboardingRestoreWalletFragment.newInstance(isOnboarding);
292300
mCryptoWalletOnboardingPagerAdapter.replaceWithNavigationItem(
293301
new NavigationItem(
294302
getResources().getString(R.string.restore_crypto_account),
295-
restoreWalletFragment),
303+
onboardingRestoreWalletFragment),
296304
mCryptoWalletOnboardingViewPager.getCurrentItem() + 1);
297305

298-
CreatingWalletFragment creatingWalletFragment = new CreatingWalletFragment();
306+
OnboardingCreatingWalletFragment onboardingCreatingWalletFragment =
307+
new OnboardingCreatingWalletFragment();
299308
mCryptoWalletOnboardingPagerAdapter.replaceWithNavigationItem(
300309
new NavigationItem(
301310
getResources()
302311
.getString(R.string.your_wallet_is_restoring_page_title),
303-
creatingWalletFragment),
312+
onboardingCreatingWalletFragment),
304313
mCryptoWalletOnboardingPagerAdapter.getCount());
305314
} else if (walletAction == WalletAction.PASSWORD_CREATION) {
306315
List<NavigationItem> navigationItems = new ArrayList<>();
307-
SecurePasswordFragment securePasswordFragment = new SecurePasswordFragment();
316+
OnboardingSecurePasswordFragment onboardingSecurePasswordFragment =
317+
new OnboardingSecurePasswordFragment();
308318
navigationItems.add(
309-
new NavigationItem(getResources().getString(R.string.secure_your_crypto),
310-
securePasswordFragment));
319+
new NavigationItem(
320+
getResources().getString(R.string.secure_your_crypto),
321+
onboardingSecurePasswordFragment));
311322
addWalletCreatingPage(navigationItems);
312323
addBackupWalletSequence(navigationItems, true);
313324
mCryptoWalletOnboardingPagerAdapter.replaceWithNavigationItems(
@@ -330,26 +341,33 @@ private void showMainLayout() {
330341

331342
private void addBackupWalletSequence(
332343
List<NavigationItem> navigationItems, boolean isOnboarding) {
333-
BackupWalletFragment backupWalletFragment = BackupWalletFragment.newInstance(isOnboarding);
334-
navigationItems.add(new NavigationItem(
335-
getResources().getString(R.string.backup_your_wallet), backupWalletFragment));
336-
RecoveryPhraseFragment recoveryPhraseFragment =
337-
RecoveryPhraseFragment.newInstance(isOnboarding);
338-
navigationItems.add(new NavigationItem(
339-
getResources().getString(R.string.your_recovery_phrase), recoveryPhraseFragment));
340-
VerifyRecoveryPhraseFragment verifyRecoveryPhraseFragment =
341-
VerifyRecoveryPhraseFragment.newInstance(isOnboarding);
344+
OnboardingBackupWalletFragment onboardingBackupWalletFragment =
345+
OnboardingBackupWalletFragment.newInstance(isOnboarding);
346+
navigationItems.add(
347+
new NavigationItem(
348+
getResources().getString(R.string.backup_your_wallet),
349+
onboardingBackupWalletFragment));
350+
OnboardingRecoveryPhraseFragment onboardingRecoveryPhraseFragment =
351+
OnboardingRecoveryPhraseFragment.newInstance(isOnboarding);
342352
navigationItems.add(
343-
new NavigationItem(getResources().getString(R.string.verify_recovery_phrase),
344-
verifyRecoveryPhraseFragment));
353+
new NavigationItem(
354+
getResources().getString(R.string.your_recovery_phrase),
355+
onboardingRecoveryPhraseFragment));
356+
OnboardingVerifyRecoveryPhraseFragment onboardingVerifyRecoveryPhraseFragment =
357+
OnboardingVerifyRecoveryPhraseFragment.newInstance(isOnboarding);
358+
navigationItems.add(
359+
new NavigationItem(
360+
getResources().getString(R.string.verify_recovery_phrase),
361+
onboardingVerifyRecoveryPhraseFragment));
345362
}
346363

347364
private void addWalletCreatingPage(List<NavigationItem> navigationItems) {
348-
CreatingWalletFragment creatingWalletFragment = new CreatingWalletFragment();
365+
OnboardingCreatingWalletFragment onboardingCreatingWalletFragment =
366+
new OnboardingCreatingWalletFragment();
349367
navigationItems.add(
350368
new NavigationItem(
351369
getResources().getString(R.string.your_wallet_is_creating_page_title),
352-
creatingWalletFragment));
370+
onboardingCreatingWalletFragment));
353371
}
354372

355373
public void showOnboardingLayout() {
@@ -399,9 +417,10 @@ public void enableBiometricPrompt() {
399417

400418
@Override
401419
public void gotoNextPage() {
402-
if (mCryptoWalletOnboardingViewPager != null &&
403-
mCryptoWalletOnboardingViewPager.getAdapter() != null &&
404-
mCryptoWalletOnboardingViewPager.getCurrentItem() < mCryptoWalletOnboardingViewPager.getAdapter().getCount() - 1) {
420+
if (mCryptoWalletOnboardingViewPager != null
421+
&& mCryptoWalletOnboardingViewPager.getAdapter() != null
422+
&& mCryptoWalletOnboardingViewPager.getCurrentItem()
423+
< mCryptoWalletOnboardingViewPager.getAdapter().getCount() - 1) {
405424
mCryptoWalletOnboardingViewPager.setCurrentItem(
406425
mCryptoWalletOnboardingViewPager.getCurrentItem() + 1);
407426
}
@@ -442,7 +461,6 @@ public void showCloseButton(boolean show) {
442461
mOnboardingCloseButton.setVisibility(View.VISIBLE);
443462
} else {
444463
mOnboardingCloseButton.setVisibility(View.GONE);
445-
446464
}
447465
}
448466

@@ -452,7 +470,6 @@ public void showBackButton(boolean show) {
452470
mOnboardingBackButton.setVisibility(View.VISIBLE);
453471
} else {
454472
mOnboardingBackButton.setVisibility(View.GONE);
455-
456473
}
457474
}
458475

‎android/java/org/chromium/chrome/browser/crypto_wallet/adapters/CryptoWalletOnboardingPagerAdapter.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@ public void setNavigationItems(List<NavigationItem> navigationItems) {
2424
}
2525

2626
public void replaceWithNavigationItem(NavigationItem navigationItem, int index) {
27-
this.navigationItems =
28-
new ArrayList<>(this.navigationItems.subList(0, index));
27+
this.navigationItems = new ArrayList<>(this.navigationItems.subList(0, index));
2928
this.navigationItems.add(navigationItem);
3029
}
3130

3231
public void replaceWithNavigationItems(List<NavigationItem> navigationItems, int index) {
33-
this.navigationItems =
34-
new ArrayList<>(this.navigationItems.subList(0, index));
32+
this.navigationItems = new ArrayList<>(this.navigationItems.subList(0, index));
3533
this.navigationItems.addAll(navigationItems);
3634
}
3735

‎android/java/org/chromium/chrome/browser/crypto_wallet/adapters/RecoveryPhraseAdapter.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import androidx.recyclerview.widget.RecyclerView;
1515

1616
import org.chromium.chrome.R;
17-
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.VerifyRecoveryPhraseFragment;
17+
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding.OnboardingVerifyRecoveryPhraseFragment;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -23,7 +23,8 @@ public class RecoveryPhraseAdapter extends RecyclerView.Adapter<RecoveryPhraseAd
2323
List<String> recoveryPhraseList = new ArrayList<>();
2424
List<String> selectedRecoveryPhraseList = new ArrayList<>();
2525
List<Integer> selectedPositions = new ArrayList<>();
26-
private VerifyRecoveryPhraseFragment.OnRecoveryPhraseSelected onRecoveryPhraseSelected;
26+
private OnboardingVerifyRecoveryPhraseFragment.OnRecoveryPhraseSelected
27+
onRecoveryPhraseSelected;
2728
private boolean isSelectedRecoveryPhrase;
2829

2930
@NonNull
@@ -93,7 +94,8 @@ public void setRecoveryPhraseList(List<String> recoveryPhraseList) {
9394
}
9495

9596
public void setOnRecoveryPhraseSelectedListener(
96-
VerifyRecoveryPhraseFragment.OnRecoveryPhraseSelected onRecoveryPhraseSelected) {
97+
OnboardingVerifyRecoveryPhraseFragment.OnRecoveryPhraseSelected
98+
onRecoveryPhraseSelected) {
9799
this.onRecoveryPhraseSelected = onRecoveryPhraseSelected;
98100
}
99101

0 commit comments

Comments
 (0)