diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt index 46b1285e..4bd8134e 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt @@ -2,9 +2,10 @@ package net.pokeranalytics.android.model.realm import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import net.pokeranalytics.android.ui.adapter.components.DisplayableDataSource import java.util.* -open class Game : RealmObject() { +open class Game : RealmObject(), DisplayableDataSource { @PrimaryKey var id = UUID.randomUUID().toString() @@ -15,4 +16,8 @@ open class Game : RealmObject() { // A shorter name for the game var shortName: String? = null + override var title: String = "" + get() { + return name + } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DataListAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DataListAdapter.kt index 7ab9e23b..d5fb592e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DataListAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DataListAdapter.kt @@ -3,8 +3,8 @@ package net.pokeranalytics.android.ui.adapter.components import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.RecyclerView -import kotlinx.android.synthetic.main.row_session.view.* import net.pokeranalytics.android.R interface DisplayableDelegate { @@ -17,12 +17,17 @@ interface DisplayableDataSource { var title: String } -class DataListAdapter(var delegate: DisplayableDelegate) : RecyclerView.Adapter() { +class DataListAdapter(var delegate: DisplayableDelegate, layout: Int? = null) : RecyclerView.Adapter() { inner class DataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { fun bind(row: DisplayableDataSource, listener: View.OnClickListener) { - itemView.title.text = row.title - itemView.container.setOnClickListener(listener) + //itemView.title.text = row.title + //itemView.container.setOnClickListener(listener) + + itemView.findViewById(R.id.title).text = row.title + itemView.findViewById(R.id.title).text = row.title + + } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetGameFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetGameFragment.kt index f6cdec3c..bad25aef 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetGameFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetGameFragment.kt @@ -9,13 +9,13 @@ import kotlinx.android.synthetic.main.bottom_sheet_game.* import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.* import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.Game -import net.pokeranalytics.android.ui.adapter.components.DynamicListAdapter -import net.pokeranalytics.android.ui.adapter.components.DynamicRowDelegate +import net.pokeranalytics.android.ui.adapter.components.DataListAdapter +import net.pokeranalytics.android.ui.adapter.components.DisplayableDataSource +import net.pokeranalytics.android.ui.adapter.components.DisplayableDelegate import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface - -class BottomSheetGameFragment : BottomSheetFragment(), DynamicRowDelegate { +class BottomSheetGameFragment : BottomSheetFragment(), DisplayableDelegate { private var game: Game = Game() @@ -31,14 +31,18 @@ class BottomSheetGameFragment : BottomSheetFragment(), DynamicRowDelegate { dismiss() } - override fun adapterRows(): ArrayList { - val array = ArrayList() - array.add(TitleObject("Game 1")) - array.add(TitleObject("Game 2")) - array.add(TitleObject("Game 3")) - return array + override fun data(position: Int): DisplayableDataSource { + return game + } + + override fun onRowSelected(position: Int) { } + override fun size(): Int { + return 1 + } + + /** * Init data */ @@ -54,12 +58,12 @@ class BottomSheetGameFragment : BottomSheetFragment(), DynamicRowDelegate { LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_game, view?.bottomSheetContainer, true) val viewManager = LinearLayoutManager(requireContext()) - val dataAdapter = DynamicListAdapter(this) + val dataAdapter = DataListAdapter(this) gameNameRecyclerView.apply { setHasFixedSize(true) layoutManager = viewManager - //adapter = dataAdapter + adapter = dataAdapter } }