From 2c6c81f4d62c2477285126805ff694f15fe99e10 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Tue, 12 Feb 2019 16:17:45 +0100 Subject: [PATCH] Add new session screens --- app/src/main/AndroidManifest.xml | 36 ++++++------ .../android/ui/activity/NewSessionActivity.kt | 48 ++++++++++++++++ .../android/ui/adapter/NewSessionAdapter.kt | 53 ++++++++++++++++++ .../android/ui/fragment/HistoryFragment.kt | 24 ++++++++ .../android/ui/fragment/NewSessionFragment.kt | 56 +++++++++++++++++++ .../main/res/layout/activity_new_session.xml | 13 +++++ app/src/main/res/layout/fragment_history.xml | 56 ++++++++++++++++++- .../main/res/layout/fragment_new_session.xml | 31 ++++++++++ 8 files changed, 298 insertions(+), 19 deletions(-) create mode 100644 app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt create mode 100644 app/src/main/java/net/pokeranalytics/android/ui/adapter/NewSessionAdapter.kt create mode 100644 app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt create mode 100644 app/src/main/res/layout/activity_new_session.xml create mode 100644 app/src/main/res/layout/fragment_new_session.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a0d144ab..2fc1179a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,25 +2,27 @@ - + - - - + + + - - - + + + - + + + \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt new file mode 100644 index 00000000..1cb81bc4 --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt @@ -0,0 +1,48 @@ +package net.pokeranalytics.android.ui.activity + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import kotlinx.android.synthetic.main.activity_new_session.* +import net.pokeranalytics.android.R +import net.pokeranalytics.android.ui.fragment.NewSessionFragment +import net.pokeranalytics.android.util.PokerAnalyticsActivity + +class NewSessionActivity: PokerAnalyticsActivity() { + + companion object { + fun newInstance(context: Context, isTournament: Boolean) { + val intent = Intent(context, NewSessionActivity::class.java) + intent.putExtra("is_tournament", isTournament) + context.startActivity(intent) + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_new_session) + + initUI() + } + + /** + * Init UI + */ + private fun initUI() { + + val isTournament = intent.getBooleanExtra("is_tournament", false) + 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/NewSessionAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/NewSessionAdapter.kt new file mode 100644 index 00000000..3feee255 --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/NewSessionAdapter.kt @@ -0,0 +1,53 @@ +package net.pokeranalytics.android.ui.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import net.pokeranalytics.android.R +import net.pokeranalytics.android.model.realm.Session +import timber.log.Timber + +class NewSessionAdapter(private var session: Session) : RecyclerView.Adapter() { + + companion object { + const val ROW_SESSION: Int = 100 + } + + //var onClickOnSession: ((position: Int) -> Unit)? = null + + inner class RowSessionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + fun bind() { + Timber.d("Bind session") + } + } + + 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 NewSessionAdapter") + } + } + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (getItemViewType(position)) { + ROW_SESSION -> (holder as NewSessionAdapter.RowSessionViewHolder).bind() + } + } + + override fun getItemCount(): Int { + return 2 + } + + override fun getItemViewType(position: Int): Int { + return ROW_SESSION + } + + +} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt index 7998f20f..93dcf34c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt @@ -15,6 +15,7 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.Session +import net.pokeranalytics.android.ui.activity.NewSessionActivity import net.pokeranalytics.android.ui.adapter.HistoryAdapter import net.pokeranalytics.android.util.PokerAnalyticsFragment import net.pokeranalytics.android.util.data.sessionDao @@ -41,6 +42,7 @@ class HistoryFragment : PokerAnalyticsFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + initUI() initData() } @@ -49,6 +51,28 @@ class HistoryFragment : PokerAnalyticsFragment() { realmSessions?.removeAllChangeListeners() } + /** + * Init UI + */ + private fun initUI() { + + newSession.setOnClickListener { + NewSessionActivity.newInstance(requireContext(), false) + } + + newTournament.setOnClickListener { + NewSessionActivity.newInstance(requireContext(), true) + } + + newHand.setOnClickListener { + Toast.makeText(requireContext(), "Open new hand", Toast.LENGTH_SHORT).show() + } + newTransaction.setOnClickListener { + Toast.makeText(requireContext(), "Open new transaction", Toast.LENGTH_SHORT).show() + } + + } + /** * Init data */ diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt new file mode 100644 index 00000000..8b9f0f15 --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt @@ -0,0 +1,56 @@ +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_new_session.* +import net.pokeranalytics.android.R +import net.pokeranalytics.android.model.realm.Session +import net.pokeranalytics.android.ui.adapter.NewSessionAdapter +import net.pokeranalytics.android.util.PokerAnalyticsFragment + +class NewSessionFragment: PokerAnalyticsFragment() { + + private lateinit var newSession: Session + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + return inflater.inflate(R.layout.fragment_new_session, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + initData() + initUI() + } + + private fun initData() { + newSession = Session() + } + + /** + * Init UI + */ + private fun initUI() { + + val viewManager = LinearLayoutManager(requireContext()) + val newSessionAdapter = NewSessionAdapter(newSession) + + recyclerView.apply { + setHasFixedSize(true) + layoutManager = viewManager + adapter = newSessionAdapter + } + + } + + /** + * Set fragment data + */ + fun setData(isTournament: Boolean) { + title.text = if (isTournament) "New tournament" else "New cash game" + } + +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_new_session.xml b/app/src/main/res/layout/activity_new_session.xml new file mode 100644 index 00000000..0ffe46ae --- /dev/null +++ b/app/src/main/res/layout/activity_new_session.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index 5b771f93..e7d86807 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -8,6 +8,57 @@ android:layout_height="match_parent" tools:context=".ui.activity.HomeActivity"> + + + + + + + + + + + tools:listitem="@layout/row_history_session" + android:layout_marginTop="8dp" + app:layout_constraintTop_toBottomOf="@+id/newHand"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_new_session.xml b/app/src/main/res/layout/fragment_new_session.xml new file mode 100644 index 00000000..99f85212 --- /dev/null +++ b/app/src/main/res/layout/fragment_new_session.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file