From f09f9a5c602fd25175c0fea3e1bf460af71c49d5 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 24 Jun 2019 15:50:43 +0200 Subject: [PATCH] Renaming of recyclerView id --- .../android/ui/fragment/FeedFragment.kt | 20 +++++++++---------- app/src/main/res/layout/fragment_feed.xml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt index d4a09661..0fd5b516 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt @@ -88,7 +88,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { override fun onCreateContextMenu(menu: ContextMenu?, v: View?, menuInfo: ContextMenu.ContextMenuInfo?) { super.onCreateContextMenu(menu, v, menuInfo) - if (v?.id == R.id.recyclerView) { + if (v?.id == R.id.menuRecyclerView) { activity?.menuInflater?.inflate(R.menu.menu_session, menu) } @@ -171,7 +171,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { this.feedSessionAdapter = FeedSessionRowRepresentableAdapter(getRealm(), this) - registerForContextMenu(this.recyclerView) + registerForContextMenu(this.menuRecyclerView) val messageToShow: Preferences.FeedMessage? = Preferences.feedMessageToShow(requireContext()) @@ -204,11 +204,11 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { when (tab.position) { 0 -> { currentFilterable = FilterableType.SESSION - recyclerView.adapter = feedSessionAdapter + menuRecyclerView.adapter = feedSessionAdapter } 1 -> { currentFilterable = FilterableType.TRANSACTION - recyclerView.adapter = feedTransactionAdapter + menuRecyclerView.adapter = feedTransactionAdapter } } } @@ -232,7 +232,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { this.currentFilterable = FilterableType.SESSION val viewManager = SmoothScrollLinearLayoutManager(requireContext()) - recyclerView.apply { + menuRecyclerView.apply { setHasFixedSize(true) layoutManager = viewManager } @@ -350,11 +350,11 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { filter?.let { when (it.filterableType) { FilterableType.SESSION -> { - recyclerView.adapter = feedSessionAdapter + menuRecyclerView.adapter = feedSessionAdapter this.selectTab(Tab.SESSIONS) } FilterableType.TRANSACTION -> { - recyclerView.adapter = feedTransactionAdapter + menuRecyclerView.adapter = feedTransactionAdapter this.selectTab(Tab.TRANSACTIONS) } else -> { @@ -365,7 +365,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { if (!adapterHasBeenSet) { adapterHasBeenSet = true - recyclerView.adapter = feedSessionAdapter + menuRecyclerView.adapter = feedSessionAdapter } } @@ -375,9 +375,9 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { this.loadSessions() this.loadTransactions() if (currentFilterable == FilterableType.SESSION) { - recyclerView.adapter = feedSessionAdapter + menuRecyclerView.adapter = feedSessionAdapter } else { - recyclerView.adapter = feedTransactionAdapter + menuRecyclerView.adapter = feedTransactionAdapter } } diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml index 37e78201..8fd01704 100644 --- a/app/src/main/res/layout/fragment_feed.xml +++ b/app/src/main/res/layout/fragment_feed.xml @@ -58,7 +58,7 @@ app:layout_constraintTop_toBottomOf="@+id/appBar" />