From 5c683eb369434e0ac4c2ec8e7306fb51f420a9ac Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 5 Oct 2020 17:10:36 +0200 Subject: [PATCH] Fixes #37 : Reports header issue + cleanup --- .../android/ui/fragment/MoreFragment.kt | 95 ------------------- .../android/ui/fragment/ReportsFragment.kt | 4 + .../android/ui/fragment/SettingsFragment.kt | 8 +- app/src/main/res/layout/fragment_calendar.xml | 8 +- app/src/main/res/layout/fragment_more.xml | 37 -------- 5 files changed, 11 insertions(+), 141 deletions(-) delete mode 100644 app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt delete mode 100644 app/src/main/res/layout/fragment_more.xml diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt deleted file mode 100644 index 868de79f..00000000 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt +++ /dev/null @@ -1,95 +0,0 @@ -package net.pokeranalytics.android.ui.fragment - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.fragment_more.* -import net.pokeranalytics.android.R -import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity -import net.pokeranalytics.android.ui.activity.SettingsActivity -import net.pokeranalytics.android.ui.activity.Top10Activity -import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter -import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate -import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource -import net.pokeranalytics.android.ui.fragment.components.BaseFragment -import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.MoreTabRow - -class MoreFragment : BaseFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate { - - companion object { - - /** - * Create new instance - */ - fun newInstance(): MoreFragment { - val fragment = MoreFragment() - val bundle = Bundle() - fragment.arguments = bundle - return fragment - } - - val rowRepresentation: List by lazy { - val rows = ArrayList() - rows.addAll(MoreTabRow.values()) - rows - } - - } - - private lateinit var moreAdapter: RowRepresentableAdapter - - - // Life Cycle - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_more, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - initData() - initUI() - } - - // Rows - override fun adapterRows(): List? { - return rowRepresentation - } - - override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) { - super.onRowSelected(position, row, tag) - when(row) { - MoreTabRow.BANKROLL -> BankrollActivity.newInstance(requireContext()) - MoreTabRow.TOP_10 -> Top10Activity.newInstance(requireContext()) - MoreTabRow.SETTINGS -> SettingsActivity.newInstance(requireContext()) - } - } - - // Business - - /** - * Init data - */ - private fun initData() { - } - - /** - * Init UI - */ - private fun initUI() { - - moreAdapter = RowRepresentableAdapter(this, this) - - val viewManager = LinearLayoutManager(requireContext()) - - recyclerView.apply { - setHasFixedSize(true) - layoutManager = viewManager - adapter = moreAdapter - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt index 822566de..c1aefee7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt @@ -111,6 +111,10 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc */ private fun initUI() { + setToolbarTitle(getString(R.string.reports)) + + setDisplayHomeAsUpEnabled(false) + dataListAdapter = RowRepresentableAdapter(this, this) val viewManager = LinearLayoutManager(requireContext()) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt index 4e55ea8d..a2b30120 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt @@ -220,14 +220,12 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep */ private fun initUI() { - setToolbarTitle(getString(R.string.more)) +// setToolbarTitle(getString(R.string.more)) - setDisplayHomeAsUpEnabled(true) +// setDisplayHomeAsUpEnabled(true) val viewManager = LinearLayoutManager(requireContext()) - settingsAdapterRow = RowRepresentableAdapter( - this, this - ) + settingsAdapterRow = RowRepresentableAdapter(this, this) recyclerView.apply { setHasFixedSize(true) diff --git a/app/src/main/res/layout/fragment_calendar.xml b/app/src/main/res/layout/fragment_calendar.xml index 8675f607..69d5a476 100644 --- a/app/src/main/res/layout/fragment_calendar.xml +++ b/app/src/main/res/layout/fragment_calendar.xml @@ -52,10 +52,10 @@ - + + + + - - - - - - - - - - - \ No newline at end of file