-
Notifications
You must be signed in to change notification settings - Fork 926
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(wallet): Refactor network selector for multi chain (#16355)
* feat(wallet): Refactor network selector for multi chain - Add support for "All networks" option - Add support for independent network selection - Fix selection animation lag * test-pr: remove extra docs
- Loading branch information
Pavneet Singh
authored
Dec 14, 2022
1 parent
13d663c
commit 26c1fc0
Showing
13 changed files
with
776 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
android/java/org/chromium/chrome/browser/app/domain/NetworkSelectorModel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* Copyright (c) 2022 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 https://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| package org.chromium.chrome.browser.app.domain; | ||
|
|
||
| import android.content.Context; | ||
|
|
||
| import androidx.lifecycle.LiveData; | ||
| import androidx.lifecycle.MutableLiveData; | ||
| import androidx.lifecycle.Transformations; | ||
|
|
||
| import org.chromium.brave_wallet.mojom.NetworkInfo; | ||
| import org.chromium.chrome.browser.crypto_wallet.presenters.NetworkInfoPresenter; | ||
| import org.chromium.chrome.browser.crypto_wallet.util.NetworkUtils; | ||
| import org.chromium.mojo.bindings.Callbacks; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * NetworkSelectorModel handles the selector of network for either global or local network | ||
| * selection. | ||
| * {@link NetworkSelectorModel#mMode} acts as a switch between global or local network selection | ||
| * live data events. Local selection can be observed via {@link | ||
| * NetworkSelectorModel#mSelectedNetwork} and global via {@link NetworkModel#mDefaultNetwork} | ||
| */ | ||
| public class NetworkSelectorModel { | ||
| private final Context mContext; | ||
| private final NetworkModel mNetworkModel; | ||
| private final MutableLiveData<NetworkInfo> _mLocalSelectedNetwork; | ||
| private Mode mMode; | ||
| public LiveData<List<NetworkInfoPresenter>> mPrimaryNetworks; | ||
| public LiveData<List<NetworkInfoPresenter>> mSecondaryNetworks; | ||
| public final LiveData<NetworkInfo> mSelectedNetwork; | ||
|
|
||
| public NetworkSelectorModel(Mode mode, NetworkModel networkModel, Context context) { | ||
| mMode = mode; | ||
| if (mMode == null) { | ||
| mMode = Mode.LOCAL_NETWORK_FILTER; | ||
| } | ||
| mNetworkModel = networkModel; | ||
| mContext = context; | ||
| _mLocalSelectedNetwork = new MutableLiveData<>(); | ||
| mSelectedNetwork = _mLocalSelectedNetwork; | ||
| init(); | ||
| } | ||
|
|
||
| public NetworkSelectorModel(NetworkModel networkModel, Context context) { | ||
| this(Mode.DEFAULT_WALLET_NETWORK, networkModel, context); | ||
| } | ||
|
|
||
| public void init() { | ||
| if (mMode == Mode.DEFAULT_WALLET_NETWORK) { | ||
| _mLocalSelectedNetwork.postValue(mNetworkModel.mDefaultNetwork.getValue()); | ||
| } else if (mMode == Mode.LOCAL_NETWORK_FILTER) { | ||
| _mLocalSelectedNetwork.postValue(NetworkUtils.getAllNetworkOption(mContext)); | ||
| } | ||
| mPrimaryNetworks = Transformations.map(mNetworkModel.mPrimaryNetworks, networkInfos -> { | ||
| List<NetworkInfoPresenter> list = new ArrayList<>(); | ||
| if (mMode == Mode.LOCAL_NETWORK_FILTER) { | ||
| list.add(0, | ||
| new NetworkInfoPresenter(NetworkUtils.getAllNetworkOption(mContext), true, | ||
| Collections.emptyList())); | ||
| } | ||
| for (NetworkInfo networkInfo : networkInfos) { | ||
| list.add(new NetworkInfoPresenter( | ||
| networkInfo, true, mNetworkModel.getSubTestNetworks(networkInfo))); | ||
| } | ||
| return list; | ||
| }); | ||
| mSecondaryNetworks = Transformations.map(mNetworkModel.mSecondaryNetworks, networkInfos -> { | ||
| List<NetworkInfoPresenter> list = new ArrayList<>(); | ||
| for (NetworkInfo networkInfo : networkInfos) { | ||
| list.add(new NetworkInfoPresenter(networkInfo, false, Collections.emptyList())); | ||
| } | ||
| return list; | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Reset the mode | ||
| * DEFAULT_WALLET_NETWORK for global wallet network | ||
| * LOCAL_NETWORK_FILTER for only onscreen network selection via "mSelectedNetwork" | ||
| * @param mode to set selected network | ||
| */ | ||
| public void updateSelectorMode(Mode mode) { | ||
| this.mMode = mode; | ||
| init(); | ||
| } | ||
|
|
||
| public void setNetworkWithAccountCheck( | ||
| NetworkInfo networkToBeSetAsSelected, Callbacks.Callback1<Boolean> callback) { | ||
| boolean hasAccountOfNetworkType = | ||
| mNetworkModel.hasAccountOfNetworkType(networkToBeSetAsSelected); | ||
| if (!hasAccountOfNetworkType && mMode == Mode.DEFAULT_WALLET_NETWORK) { | ||
| // Delegate to network model to handle account creation flow | ||
| mNetworkModel.setNetworkWithAccountCheck(networkToBeSetAsSelected, isSet -> { | ||
| callback.call(isSet); | ||
| if (isSet) { | ||
| _mLocalSelectedNetwork.postValue(networkToBeSetAsSelected); | ||
| } | ||
| }); | ||
| return; | ||
| } | ||
| if (mMode == Mode.LOCAL_NETWORK_FILTER) { | ||
| _mLocalSelectedNetwork.postValue(networkToBeSetAsSelected); | ||
| callback.call(true); | ||
| } | ||
| } | ||
|
|
||
| public enum Mode { DEFAULT_WALLET_NETWORK, LOCAL_NETWORK_FILTER } | ||
| } |
Oops, something went wrong.