Move zero balances filter

app/src/main/java/io/novafoundation/nova/app/root/navigation/Navigator.kt

@@ -323,10 +323,6 @@ class Navigator(
  navController?.navigate(R.id.action_open_receive, ReceiveFragment.getBundle(assetPayload))
  }
 
- override fun openAssetFilters() {
- navController?.navigate(R.id.action_mainFragment_to_assetFiltersFragment)
- }
-
  override fun openAssetSearch() {
  navController?.navigate(R.id.action_mainFragment_to_assetSearchFragment)
  }

app/src/main/res/navigation/main_nav_graph.xml

@@ -365,14 +365,6 @@
  app:popEnterAnim="@anim/fragment_close_enter"
  app:popExitAnim="@anim/fragment_close_exit" />
 
- <action
- android:id="@+id/action_mainFragment_to_assetFiltersFragment"
- app:destination="@id/assetFiltersFragment"
- app:enterAnim="@anim/fragment_open_enter"
- app:exitAnim="@anim/fragment_open_exit"
- app:popEnterAnim="@anim/fragment_close_enter"
- app:popExitAnim="@anim/fragment_close_exit" />
-
  <action
  android:id="@+id/action_mainFragment_to_nfts_nav_graph"
  app:destination="@id/nfts_nav_graph"
@@ -847,11 +839,6 @@
 
  <include app:graph="@navigation/nfts_nav_graph" />
 
- <dialog
- android:id="@+id/assetFiltersFragment"
- android:name="io.novafoundation.nova.feature_assets.presentation.balance.filters.AssetFiltersBottomSheetFragment"
- android:label="AssetFiltersFragment" />
-
  <fragment
  android:id="@+id/authorizedDAppsFragment"
  android:name="io.novafoundation.nova.feature_dapp_impl.presentation.authorizedDApps.AuthorizedDAppsFragment"

feature-assets/src/main/java/io/novafoundation/nova/feature_assets/di/AssetsFeatureComponent.kt

@@ -9,7 +9,6 @@ import io.novafoundation.nova.feature_account_api.di.AccountFeatureApi
 import io.novafoundation.nova.feature_account_api.presenatation.mixin.selectAddress.SelectAddressCommunicator
 import io.novafoundation.nova.feature_assets.presentation.AssetsRouter
 import io.novafoundation.nova.feature_assets.presentation.balance.detail.di.BalanceDetailComponent
-import io.novafoundation.nova.feature_assets.presentation.balance.filters.di.AssetFiltersComponent
 import io.novafoundation.nova.feature_assets.presentation.balance.list.di.BalanceListComponent
 import io.novafoundation.nova.feature_assets.presentation.balance.list.view.GoToNftsView
 import io.novafoundation.nova.feature_assets.presentation.balance.search.di.AssetSearchComponent
@@ -74,8 +73,6 @@ interface AssetsFeatureComponent : AssetsFeatureApi {
 
  fun receiveComponentFactory(): ReceiveComponent.Factory
 
- fun assetFiltersComponentFactory(): AssetFiltersComponent.Factory
-
  fun assetSearchComponentFactory(): AssetSearchComponent.Factory
 
  fun manageTokensComponentFactory(): ManageTokensComponent.Factory

feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/AssetsRouter.kt

@@ -40,8 +40,6 @@ interface AssetsRouter {
 
  fun openReceive(assetPayload: AssetPayload)
 
- fun openAssetFilters()
-
  fun openAssetSearch()
 
  fun openManageTokens()

feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/balance/list/BalanceListFragment.kt

@@ -154,10 +154,6 @@ class BalanceListFragment :
  viewModel.searchClicked()
  }
 
- override fun filtersClicked() {
- viewModel.filtersClicked()
- }
-
  override fun avatarClicked() {
  viewModel.avatarClicked()
  }

feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/balance/list/BalanceListViewModel.kt

@@ -216,10 +216,6 @@ class BalanceListViewModel(
  router.openSwitchWallet()
  }
 
- fun filtersClicked() {
- router.openAssetFilters()
- }
-
  fun manageClicked() {
  router.openManageTokens()
  }

feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/balance/list/view/AssetsHeaderAdapter.kt

@@ -15,7 +15,6 @@ import kotlinx.android.synthetic.main.item_asset_header.view.balanceListAssetPla
 import kotlinx.android.synthetic.main.item_asset_header.view.balanceListAssetTitle
 import kotlinx.android.synthetic.main.item_asset_header.view.balanceListAvatar
 import kotlinx.android.synthetic.main.item_asset_header.view.balanceListCrowdloansPromoBanner
-import kotlinx.android.synthetic.main.item_asset_header.view.balanceListFilters
 import kotlinx.android.synthetic.main.item_asset_header.view.balanceListManage
 import kotlinx.android.synthetic.main.item_asset_header.view.balanceListNfts
 import kotlinx.android.synthetic.main.item_asset_header.view.balanceListSearch
@@ -29,7 +28,7 @@ class AssetsHeaderAdapter(private val handler: Handler) : RecyclerView.Adapter<H
  fun totalBalanceClicked()
 
  fun searchClicked()
- fun filtersClicked()
+
  fun manageClicked()
 
  fun avatarClicked()
@@ -65,8 +64,6 @@ class AssetsHeaderAdapter(private val handler: Handler) : RecyclerView.Adapter<H
 
  fun setFilterIconRes(filterIconRes: Int) {
  this.filterIconRes = filterIconRes
-
- notifyItemChanged(0, Payload.FILTER_ICON)
  }
 
  fun setCrowdloanBannerVisible(crowdloanBannerVisible: Boolean) {
@@ -133,7 +130,6 @@ class AssetsHeaderAdapter(private val handler: Handler) : RecyclerView.Adapter<H
  Payload.NFT_PREVIEWS -> holder.bindNftPreviews(nftPreviews)
  Payload.PLACEHOLDER -> holder.bindPlaceholder(shouldShowPlaceholder)
  Payload.WALLET_CONNECT -> holder.bindWalletConnect(walletConnectModel)
- Payload.FILTER_ICON -> holder.bindFilterIcon(filterIconRes)
  Payload.CROWDLOAN_BANNER_VISIBLE -> holder.bindCrowdloanBanner(crowdloanBannerVisible)
  Payload.ASSET_VIEW_MODE -> holder.bindAssetViewMode(assetViewModeModel)
  }
@@ -161,7 +157,7 @@ class AssetsHeaderAdapter(private val handler: Handler) : RecyclerView.Adapter<H
 }
 
 private enum class Payload {
- TOTAL_BALANCE, ADDRESS, NFT_COUNT, NFT_PREVIEWS, PLACEHOLDER, WALLET_CONNECT, FILTER_ICON,
+ TOTAL_BALANCE, ADDRESS, NFT_COUNT, NFT_PREVIEWS, PLACEHOLDER, WALLET_CONNECT,
  CROWDLOAN_BANNER_VISIBLE, ASSET_VIEW_MODE
 }
 
@@ -178,7 +174,6 @@ class HeaderHolder(
  balanceListAvatar.setOnClickListener { handler.avatarClicked() }
  balanceListNfts.setOnClickListener { handler.goToNftsClicked() }
  balanceListSearch.setOnClickListener { handler.searchClicked() }
- balanceListFilters.setOnClickListener { handler.filtersClicked() }
  balanceListTotalBalance.onSendClick { handler.sendClicked() }
  balanceListTotalBalance.onReceiveClick { handler.receiveClicked() }
  balanceListTotalBalance.onBuyClick { handler.buyClicked() }
@@ -209,7 +204,6 @@ class HeaderHolder(
  bindNftCount(nftCount)
  bindPlaceholder(shouldShowPlaceholder)
  bindWalletConnect(walletConnect)
- bindFilterIcon(filterIconRes)
  bindCrowdloanBanner(bannerVisible)
  bindAssetViewMode(assetViewModeModel)
  }
@@ -242,10 +236,6 @@ class HeaderHolder(
  containerView.balanceListWalletConnect.setConnectionCount(it.connections)
  }
 
- fun bindFilterIcon(filterIconRes: Int?) {
- filterIconRes?.let { containerView.balanceListFilters.setImageResource(it) }
- }
-
  fun bindCrowdloanBanner(bannerVisible: Boolean) = with(containerView) {
  balanceListCrowdloansPromoBanner.setVisible(bannerVisible)
  }

feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/tokens/manage/ManageTokensFragment.kt

@@ -15,15 +15,18 @@ import io.novafoundation.nova.common.utils.keyboard.hideSoftKeyboard
 import io.novafoundation.nova.common.utils.setVisible
 import io.novafoundation.nova.common.utils.keyboard.showSoftKeyboard
 import io.novafoundation.nova.common.utils.submitListPreservingViewPoint
+import io.novafoundation.nova.common.view.bindFromMap
 import io.novafoundation.nova.feature_assets.R
 import io.novafoundation.nova.feature_assets.di.AssetsFeatureApi
 import io.novafoundation.nova.feature_assets.di.AssetsFeatureComponent
+import io.novafoundation.nova.feature_assets.domain.assets.filters.NonZeroBalanceFilter
 import kotlinx.android.synthetic.main.fragment_manage_tokens.manageTokensContainer
 import kotlinx.android.synthetic.main.fragment_manage_tokens.manageTokensList
 import kotlinx.android.synthetic.main.fragment_manage_tokens.manageTokensPlaceholder
 import kotlinx.android.synthetic.main.fragment_manage_tokens.manageTokensSearch
 import kotlinx.android.synthetic.main.fragment_manage_tokens.manageTokensToolbar
 import javax.inject.Inject
+import kotlinx.android.synthetic.main.fragment_manage_tokens.manageTokensSwitchZeroBalances
 
 class ManageTokensFragment :
  BaseFragment<ManageTokensViewModel>(),
@@ -62,6 +65,8 @@ class ManageTokensFragment :
 
  manageTokensSearch.requestFocus()
  manageTokensSearch.content.showSoftKeyboard()
+
+ manageTokensSwitchZeroBalances.bindFromMap(NonZeroBalanceFilter, viewModel.filtersEnabledMap, viewLifecycleOwner.lifecycleScope)
  }
 
  override fun inject() {