From e03089ab2afe606aa193d9dea4ee3b5df4d8b15e Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Tue, 12 Feb 2019 16:39:02 +0100 Subject: [PATCH] update settings adapter --- .../android/model/realm/Player.kt | 2 +- .../ui/activity/DataManagementActivity.kt | 46 ++++++++++++ .../android/ui/adapter/SettingsAdapter.kt | 74 ++++++++++++------- .../android/ui/fragment/SettingsFragment.kt | 22 +++++- .../android/ui/view/DataRowView.kt | 17 ++--- app/src/main/res/layout/fragment_settings.xml | 20 +++-- app/src/main/res/layout/row_data_cell.xml | 4 +- .../main/res/layout/row_data_content_view.xml | 2 +- 8 files changed, 133 insertions(+), 54 deletions(-) create mode 100644 app/src/main/java/net/pokeranalytics/android/ui/activity/DataManagementActivity.kt diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt index f5b37535..0f8d019d 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt @@ -5,4 +5,4 @@ import io.realm.RealmObject open class Player : RealmObject() { var name: String = "" -} \ No newline at end of file + } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/DataManagementActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/DataManagementActivity.kt new file mode 100644 index 00000000..ce23a658 --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/DataManagementActivity.kt @@ -0,0 +1,46 @@ +package net.pokeranalytics.android.ui.activity + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import net.pokeranalytics.android.R +import net.pokeranalytics.android.util.PokerAnalyticsActivity + +class DataManagementActivity: PokerAnalyticsActivity() { + + companion object { + fun newInstance(context: Context, dataType: Int) { + val intent = Intent(context, DataManagementActivity::class.java) + intent.putExtra("dataType", dataType) + context.startActivity(intent) + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) +// setContentView(R.layout.activity_data_management) + + initUI() + } + + /** + * Init UI + */ + private fun initUI() { + + val isTournament = intent.getIntExtra("dataType", 0) +// val fragment = newSessionFragment as NewSessionFragment +// fragment.setData(isTournament) + + } + + /** + * Init data + */ + private fun initData() { + + + + } + +} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/SettingsAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/SettingsAdapter.kt index d9b2fa5b..ff7d8e5f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/SettingsAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/SettingsAdapter.kt @@ -4,58 +4,76 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import io.realm.RealmResults +import kotlinx.android.synthetic.main.row_data_cell.view.* import kotlinx.android.synthetic.main.row_history_session.view.* import net.pokeranalytics.android.R -import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.ui.view.SessionRowView -import timber.log.Timber -class SettingsAdapter(private var sessions: RealmResults) : RecyclerView.Adapter() { +class SettingsAdapter() : RecyclerView.Adapter() { companion object { - const val ROW_SESSION: Int = 100 - const val ROW_TOURNAMENT: Int = 101 - const val ROW_HAND: Int = 102 - const val ROW_TRANSACTION: Int = 103 - } - - var onClickOnSession: ((position: Int, session: Session) -> Unit)? = null + const val ROW_DATA: Int = 100 + enum class DataType { + BANKROLL { + override fun localizedName(): String { + return "Bankroll" + } + }, + GAME { + override fun localizedName(): String { + return "Game" + } + }, + LOCATION { + override fun localizedName(): String { + return "Location" + } + }, + TOURNAMENT_TYPE { + override fun localizedName(): String { + return "Tournament Type" + } + }, + TRANSACTION_TYPE { + override fun localizedName(): String { + return "Transaction" + } + }; - inner class RowSessionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + abstract fun localizedName(): String + } + } - fun bind(session: Session?) { - Timber.d("Bind session") + var onClickOnData: ((position: Int, dataType: DataType) -> Unit)? = null - session?.let { - itemView.sessionRow.setData(session) - itemView.sessionRow.setOnClickListener { - onClickOnSession?.invoke(adapterPosition, session) - } - } - } + inner class RowDataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + fun bind(dataType: DataType) { + itemView.dataRow.setData(dataType.localizedName()) + itemView.dataRow.setOnClickListener { + onClickOnData?.invoke(adapterPosition, dataType) + } + } } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { when (viewType) { - ROW_SESSION -> return RowSessionViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_history_session, parent, false)) - else -> throw IllegalStateException("Need to implement type $viewType in HistoryAdapter") + ROW_DATA -> return RowDataViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_data_cell, parent, false)) + else -> throw IllegalStateException("Need to implement type $viewType in Settings Adapter") } } override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { when (getItemViewType(position)) { - ROW_SESSION -> (holder as SettingsAdapter.RowSessionViewHolder).bind(sessions.get(position)) + ROW_DATA -> (holder as SettingsAdapter.RowDataViewHolder).bind(enumValues()[position]) } } override fun getItemCount(): Int { - return sessions.size + return enumValues().count() } override fun getItemViewType(position: Int): Int { - return ROW_SESSION - } + return ROW_DATA + } } \ No newline at end of file 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 ac4db256..4923fbdf 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 @@ -4,8 +4,10 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager +import kotlinx.android.synthetic.main.fragment_settings.* import net.pokeranalytics.android.R +import net.pokeranalytics.android.ui.adapter.SettingsAdapter import net.pokeranalytics.android.util.PokerAnalyticsFragment class SettingsFragment : PokerAnalyticsFragment() { @@ -23,12 +25,30 @@ class SettingsFragment : PokerAnalyticsFragment() { } } + private lateinit var settingsAdapter: SettingsAdapter + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { return inflater.inflate(R.layout.fragment_settings, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + initData() } + /** + * Init data + */ + private fun initData() { + + val viewManager = LinearLayoutManager(requireContext()) + settingsAdapter = SettingsAdapter() + + recyclerView.apply { + setHasFixedSize(true) + layoutManager = viewManager + adapter = settingsAdapter + } + } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/DataRowView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/DataRowView.kt index 39094a1c..def52bde 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/DataRowView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/DataRowView.kt @@ -2,19 +2,17 @@ package net.pokeranalytics.android.ui.view import android.widget.FrameLayout import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import kotlinx.android.synthetic.main.row_session.view.* +import kotlinx.android.synthetic.main.row_data_cell.view.* +import kotlinx.android.synthetic.main.row_data_content_view.view.* import net.pokeranalytics.android.R -import net.pokeranalytics.android.model.realm.Session -import timber.log.Timber class DataRowView : FrameLayout { - private lateinit var rowHistorySession: ConstraintLayout + private lateinit var rowDataCell: ConstraintLayout /** * Constructors @@ -38,21 +36,20 @@ class DataRowView : FrameLayout { */ private fun init() { val layoutInflater = LayoutInflater.from(context) - rowHistorySession = layoutInflater.inflate(R.layout.row_session, this, false) as ConstraintLayout + rowDataCell = layoutInflater.inflate(R.layout.row_data_content_view, this, false) as ConstraintLayout val layoutParams = FrameLayout.LayoutParams( FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT ) - addView(rowHistorySession, layoutParams) + addView(rowDataCell, layoutParams) } /** * Set the session data to the view */ - fun setData(session: Session) { - Timber.d("Set data: ${session.creationDate}") - rowHistorySession.date.text = session.creationDate.toString() + fun setData(title: String) { + rowDataCell.rowTitle.text = title } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 05c56d34..ecd6264b 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -5,19 +5,17 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/container" android:layout_width="match_parent" - android:background="#999999" android:layout_height="match_parent" tools:context=".ui.activity.HomeActivity"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/row_data_cell.xml b/app/src/main/res/layout/row_data_cell.xml index c4c27304..bfe6f84a 100644 --- a/app/src/main/res/layout/row_data_cell.xml +++ b/app/src/main/res/layout/row_data_cell.xml @@ -4,8 +4,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - diff --git a/app/src/main/res/layout/row_data_content_view.xml b/app/src/main/res/layout/row_data_content_view.xml index 857f9989..6cc65075 100644 --- a/app/src/main/res/layout/row_data_content_view.xml +++ b/app/src/main/res/layout/row_data_content_view.xml @@ -8,7 +8,7 @@ android:padding="16dp">