update settings adapter

dev_raz_wip
Razmig Sarkissian 7 years ago
parent cb436c74c6
commit e03089ab2a
  1. 46
      app/src/main/java/net/pokeranalytics/android/ui/activity/DataManagementActivity.kt
  2. 66
      app/src/main/java/net/pokeranalytics/android/ui/adapter/SettingsAdapter.kt
  3. 22
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
  4. 17
      app/src/main/java/net/pokeranalytics/android/ui/view/DataRowView.kt
  5. 20
      app/src/main/res/layout/fragment_settings.xml
  6. 4
      app/src/main/res/layout/row_data_cell.xml
  7. 2
      app/src/main/res/layout/row_data_content_view.xml

@ -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() {
}
}

@ -4,57 +4,75 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView 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 kotlinx.android.synthetic.main.row_history_session.view.*
import net.pokeranalytics.android.R 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<Session>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() { class SettingsAdapter() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
companion object { companion object {
const val ROW_SESSION: Int = 100 const val ROW_DATA: Int = 100
const val ROW_TOURNAMENT: Int = 101 enum class DataType {
const val ROW_HAND: Int = 102 BANKROLL {
const val ROW_TRANSACTION: Int = 103 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"
}
};
var onClickOnSession: ((position: Int, session: Session) -> Unit)? = null abstract fun localizedName(): String
}
inner class RowSessionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { }
fun bind(session: Session?) { var onClickOnData: ((position: Int, dataType: DataType) -> Unit)? = null
Timber.d("Bind session")
session?.let { inner class RowDataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
itemView.sessionRow.setData(session) fun bind(dataType: DataType) {
itemView.sessionRow.setOnClickListener { itemView.dataRow.setData(dataType.localizedName())
onClickOnSession?.invoke(adapterPosition, session) itemView.dataRow.setOnClickListener {
} onClickOnData?.invoke(adapterPosition, dataType)
} }
} }
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
when (viewType) { when (viewType) {
ROW_SESSION -> return RowSessionViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_history_session, parent, false)) 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 HistoryAdapter") else -> throw IllegalStateException("Need to implement type $viewType in Settings Adapter")
} }
} }
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
when (getItemViewType(position)) { when (getItemViewType(position)) {
ROW_SESSION -> (holder as SettingsAdapter.RowSessionViewHolder).bind(sessions.get(position)) ROW_DATA -> (holder as SettingsAdapter.RowDataViewHolder).bind(enumValues<DataType>()[position])
} }
} }
override fun getItemCount(): Int { override fun getItemCount(): Int {
return sessions.size return enumValues<DataType>().count()
} }
override fun getItemViewType(position: Int): Int { override fun getItemViewType(position: Int): Int {
return ROW_SESSION return ROW_DATA
} }

@ -4,8 +4,10 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup 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.R
import net.pokeranalytics.android.ui.adapter.SettingsAdapter
import net.pokeranalytics.android.util.PokerAnalyticsFragment import net.pokeranalytics.android.util.PokerAnalyticsFragment
class SettingsFragment : 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? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_settings, container, false) return inflater.inflate(R.layout.fragment_settings, container, false)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
initData()
} }
/**
* Init data
*/
private fun initData() {
val viewManager = LinearLayoutManager(requireContext())
settingsAdapter = SettingsAdapter()
recyclerView.apply {
setHasFixedSize(true)
layoutManager = viewManager
adapter = settingsAdapter
}
}
} }

@ -2,19 +2,17 @@ package net.pokeranalytics.android.ui.view
import android.widget.FrameLayout import android.widget.FrameLayout
import android.content.Context import android.content.Context
import android.graphics.Color
import android.util.AttributeSet import android.util.AttributeSet
import android.view.LayoutInflater import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout 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.R
import net.pokeranalytics.android.model.realm.Session
import timber.log.Timber
class DataRowView : FrameLayout { class DataRowView : FrameLayout {
private lateinit var rowHistorySession: ConstraintLayout private lateinit var rowDataCell: ConstraintLayout
/** /**
* Constructors * Constructors
@ -38,21 +36,20 @@ class DataRowView : FrameLayout {
*/ */
private fun init() { private fun init() {
val layoutInflater = LayoutInflater.from(context) 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( val layoutParams = FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT,
FrameLayout.LayoutParams.WRAP_CONTENT FrameLayout.LayoutParams.WRAP_CONTENT
) )
addView(rowHistorySession, layoutParams) addView(rowDataCell, layoutParams)
} }
/** /**
* Set the session data to the view * Set the session data to the view
*/ */
fun setData(session: Session) { fun setData(title: String) {
Timber.d("Set data: ${session.creationDate}") rowDataCell.rowTitle.text = title
rowHistorySession.date.text = session.creationDate.toString()
} }
} }

@ -5,19 +5,17 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="#999999"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.activity.HomeActivity"> tools:context=".ui.activity.HomeActivity">
<TextView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/title" android:id="@+id/recyclerView"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginStart="@dimen/activity_horizontal_margin" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginLeft="@dimen/activity_horizontal_margin" app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="@dimen/activity_vertical_margin" app:layout_constraintBottom_toBottomOf="parent"
android:text="fragment" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent" tools:listitem="@layout/row_data_cell"/>
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

@ -4,8 +4,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<net.pokeranalytics.android.ui.view.SessionRowView <net.pokeranalytics.android.ui.view.DataRowView
android:id="@+id/sessionRow" android:id="@+id/dataRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />

@ -8,7 +8,7 @@
android:padding="16dp"> android:padding="16dp">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title" android:id="@+id/rowTitle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

Loading…
Cancel
Save