From 765fbf8d538dd96c87db3dc6c039dd2e171bf174 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 11 Dec 2020 09:19:48 +0100 Subject: [PATCH] Fix crashes due to binding introduction --- .../BottomSheetDoubleEditTextFragment.kt | 2 +- .../BottomSheetEditTextFragment.kt | 2 +- .../BottomSheetEditTextMultiLinesFragment.kt | 2 +- .../bottomsheet/BottomSheetFragment.kt | 4 +-- .../bottomsheet/BottomSheetListFragment.kt | 2 +- .../BottomSheetListGameFragment.kt | 2 +- .../BottomSheetMultiSelectionFragment.kt | 2 +- .../BottomSheetNumericTextFragment.kt | 2 +- .../BottomSheetStaticListFragment.kt | 2 +- .../bottomsheet/BottomSheetSumFragment.kt | 2 +- .../BottomSheetTableSizeGridFragment.kt | 2 +- .../FeedSessionRowRepresentableAdapter.kt | 4 +-- .../ui/modules/filter/FiltersActivity.kt | 4 +-- .../ui/modules/filter/FiltersFragment.kt | 25 +++++++++---------- .../android/ui/view/SessionRowView.kt | 2 +- 15 files changed, 28 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt index 5283fbe9..41523072 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt @@ -17,7 +17,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { private var _binding: BottomSheetDoubleEditTextBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetDoubleEditTextBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt index 9ca5d970..66ca9689 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt @@ -16,7 +16,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() { private var _binding: BottomSheetEditTextBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetEditTextBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt index fd1f5f29..953811a5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt @@ -15,7 +15,7 @@ class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() { private var _binding: BottomSheetEditTextMultiLinesBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetEditTextMultiLinesBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index b206aaa8..6c1b474e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt @@ -95,11 +95,11 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { //TODO: When dependency 'com.google.android.material:material:1.1.0' will be available in stable version, upgrade and remove that activity?.setTheme(R.style.PokerAnalyticsTheme) _binding = FragmentBottomSheetBinding.inflate(inflater, container, false) - binding.bottomSheetContainer.addView(getChildView(inflater, binding.root)) + addChildView(inflater, binding.root) return binding.root } - open fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + open fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { return null } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt index 3a529e3c..dce48e4b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt @@ -18,7 +18,7 @@ open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentable private var _binding: BottomSheetListBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetListBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt index a504c182..b4731b05 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt @@ -22,7 +22,7 @@ class BottomSheetListGameFragment : BottomSheetListFragment() { private var _binding: BottomSheetGameListBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetGameListBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt index e471782d..e6a13522 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt @@ -21,7 +21,7 @@ open class BottomSheetMultiSelectionFragment : BottomSheetListFragment() { private var _binding: BottomSheetDoubleEditTextBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetDoubleEditTextBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt index fff1a184..13d8c39a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt @@ -17,7 +17,7 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() { private var _binding: BottomSheetEditTextBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetEditTextBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt index 50044cdb..e57c3042 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt @@ -17,7 +17,7 @@ class BottomSheetStaticListFragment : BottomSheetFragment(), StaticRowRepresenta private var _binding: BottomSheetListBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetListBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt index 6dfb301a..1b4f0df5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt @@ -19,7 +19,7 @@ class BottomSheetSumFragment : BottomSheetFragment() { private var _binding: BottomSheetSumBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetSumBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt index a38bb4c6..05a2af26 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt @@ -19,7 +19,7 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowReprese private var _binding: BottomSheetGridBinding? = null private val binding get() = _binding!! - override fun getChildView(inflater: LayoutInflater, container: ViewGroup): View? { + override fun addChildView(inflater: LayoutInflater, container: ViewGroup): View? { _binding = BottomSheetGridBinding.inflate(inflater, container, true) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedSessionRowRepresentableAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedSessionRowRepresentableAdapter.kt index d5449c22..c5239c89 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedSessionRowRepresentableAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedSessionRowRepresentableAdapter.kt @@ -108,10 +108,10 @@ class FeedSessionRowRepresentableAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return if (viewType == RowViewType.ROW_SESSION.ordinal) { - val layout = LayoutInflater.from(parent.context).inflate(net.pokeranalytics.android.R.layout.row_feed_session, parent, false) + val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_feed_session, parent, false) RowSessionViewHolder(layout) } else { - val layout = LayoutInflater.from(parent.context).inflate(net.pokeranalytics.android.R.layout.row_header_title, parent, false) + val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_header_title, parent, false) HeaderTitleViewHolder(layout) } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt index 650998b6..7c243331 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt @@ -6,7 +6,6 @@ import android.os.Bundle import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import net.pokeranalytics.android.R -import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.ui.activity.components.BaseActivity import net.pokeranalytics.android.ui.fragment.components.BaseFragment import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow @@ -89,12 +88,11 @@ class FiltersActivity : BaseActivity() { this.model.primaryKey = filterId this.model.filterableType = FilterableType.valueByIdentifier(uniqueIdentifier) - val filtersFragment = FiltersFragment() + val filtersFragment = FiltersFragment.newInstance(!hideMostUsedFilters) val fragmentTransaction = this.supportFragmentManager.beginTransaction() fragmentTransaction.add(R.id.container, filtersFragment, Tag.CATEGORIES.identifier) fragmentTransaction.commit() - filtersFragment.updateMostUsedFiltersVisibility(!hideMostUsedFilters) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt index 05c18a99..eb1ca559 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt @@ -21,8 +21,6 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.extensions.sorted -import timber.log.Timber - open class FiltersFragment : RealmFragment(), RowRepresentableDelegate { @@ -33,14 +31,23 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate { companion object { const val REQUEST_CODE_FILTER_DETAILS = 100 const val MOST_USED_FILTERS_DISPLAYED = 6 + + private const val MOST_USED_FILTERS_DISPLAYED_KEY = "most_used_filters_displayed" + + fun newInstance(showMostUsedFiltersLayout: Boolean): FiltersFragment { + val fragment = FiltersFragment() + val bundle = Bundle() + bundle.putBoolean(MOST_USED_FILTERS_DISPLAYED_KEY, showMostUsedFiltersLayout) + fragment.arguments = bundle + return fragment + } + } private lateinit var rowRepresentableAdapter: RowRepresentableAdapter private var filterMenu: Menu? = null - private var showMostUsedFiltersLayout = true - private var _binding: FragmentFiltersBinding? = null private val binding get() = _binding!! @@ -128,6 +135,7 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate { FiltersListActivity.newSelectInstance(this, false) } + val showMostUsedFiltersLayout = this.arguments?.getBoolean(MOST_USED_FILTERS_DISPLAYED_KEY, true) ?: true this.binding.mostUsedFiltersLayout.isVisible = showMostUsedFiltersLayout } @@ -249,13 +257,4 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate { activity?.finish() } - /** - * Update the most used filters visibility - */ - fun updateMostUsedFiltersVisibility(visible: Boolean) { - Timber.d("updateMostUsedFiltersVisibility: $visible") - showMostUsedFiltersLayout = visible - this.binding.mostUsedFiltersLayout.isVisible = visible - } - } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt index fd9f8a14..d3a0bcc8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt @@ -73,7 +73,7 @@ class SessionRowView : FrameLayout { this.sessionInfoLocationIcon = rowSession.findViewById(R.id.sessionInfoLocationIcon) this.sessionInfoLocationValue = rowSession.findViewById(R.id.sessionInfoLocationValue) this.sessionInfoTableIcon = rowSession.findViewById(R.id.sessionInfoTableIcon) - this.sessionInfoTableValue = sessionInfoTableValue.findViewById(R.id.dateDay) + this.sessionInfoTableValue = rowSession.findViewById(R.id.sessionInfoTableValue) this.gameResult = rowSession.findViewById(R.id.gameResult) this.infoIcon = rowSession.findViewById(R.id.infoIcon) this.infoTitle = rowSession.findViewById(R.id.infoTitle)