staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put hand history related classes in a handhistory package

Browse Source
hh
Laurent 6 years ago
parent 4c91718967
commit d8a6de3e94
19 changed files with 42 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/AndroidManifest.xml
  2. 2
      app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt
  3. 4
      app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
  4. 1
      app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
  5. 3
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
  6. 15
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
  7. 19
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
  8. 4
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryViewModel.kt
  9. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/AbstractKeyboardView.kt
  10. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/Circle.kt
  11. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
  12. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt
  13. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
  14. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt
  15. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/RowHandHistoryViewHolder.kt
  16. 4
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/StreetCardHeader.kt
  17. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt
  18. 2
      app/src/main/res/layout/fragment_hand_history.xml
  19. 2
      app/src/main/res/layout/view_video.xml

2
app/src/main/AndroidManifest.xml
Unescape View File

@ -72,7 +72,7 @@
android:screenOrientation="portrait" />
<activity
android:name="net.pokeranalytics.android.ui.activity.HandHistoryActivity"
android:name="net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateAlwaysHidden"/>

2
app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt
Unescape View File

@ -1,7 +1,7 @@
package net.pokeranalytics.android.model.handhistory
import net.pokeranalytics.android.model.realm.handhistory.Action
import net.pokeranalytics.android.ui.adapter.HandRowType
import net.pokeranalytics.android.ui.modules.handhistory.HandRowType
import net.pokeranalytics.android.ui.view.RowRepresentable
import timber.log.Timber
import kotlin.math.min

4
app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
Unescape View File

@ -4,9 +4,9 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.realm.handhistory.Action
import net.pokeranalytics.android.model.realm.handhistory.HandHistory
import net.pokeranalytics.android.ui.adapter.HandRowType
import net.pokeranalytics.android.ui.modules.handhistory.HandRowType
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.handhistory.StreetCardHeader
import net.pokeranalytics.android.ui.modules.handhistory.views.StreetCardHeader
import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
import timber.log.Timber
import java.util.*

1
app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
Unescape View File

@ -31,6 +31,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
import net.pokeranalytics.android.ui.interfaces.FilterableType
import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
import net.pokeranalytics.android.util.Preferences

3
app/src/main/java/net/pokeranalytics/android/ui/activity/HandHistoryActivity.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.activity
package net.pokeranalytics.android.ui.modules.handhistory
import android.content.Intent
import android.os.Bundle
@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.components.BaseActivity
import net.pokeranalytics.android.ui.activity.components.RequestCode
import net.pokeranalytics.android.ui.fragment.HandHistoryFragment
class HandHistoryActivity : BaseActivity() {

15
app/src/main/java/net/pokeranalytics/android/ui/adapter/HandHistoryAdapter.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.adapter
package net.pokeranalytics.android.ui.modules.handhistory
import android.app.Activity
import android.content.res.ColorStateList
@ -14,6 +14,10 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.handhistory.ComputedAction
import net.pokeranalytics.android.model.handhistory.HHKeyboard
import net.pokeranalytics.android.ui.adapter.BindableHolder
import net.pokeranalytics.android.ui.adapter.RecyclerAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.extensions.hideKeyboard
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.holder.RowViewHolder
@ -32,7 +36,8 @@ enum class HandRowType(var layoutRes: Int) : ViewIdentifier {
class HandHistoryAdapter(
override var dataSource: RowRepresentableDataSource,
override var delegate: RowRepresentableDelegate? = null) :
RecyclerView.Adapter<RecyclerView.ViewHolder>(), RecyclerAdapter {
RecyclerView.Adapter<RecyclerView.ViewHolder>(),
RecyclerAdapter {
override fun getItemViewType(position: Int): Int {
return this.dataSource.viewTypeForPosition(position)
@ -88,7 +93,8 @@ class HandHistoryAdapter(
/**
* Display a hand action
*/
inner class RowHandAction(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
inner class RowHandAction(itemView: View) : RecyclerView.ViewHolder(itemView),
BindableHolder {
// private var listener = TextListener()
private var currentPosition = 0
@ -239,7 +245,8 @@ class HandHistoryAdapter(
/**
* Display a hand street
*/
inner class RowHandStreet(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
inner class RowHandStreet(itemView: View) : RecyclerView.ViewHolder(itemView),
BindableHolder {
override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) {
}

19
app/src/main/java/net/pokeranalytics/android/ui/fragment/HandHistoryFragment.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.fragment
package net.pokeranalytics.android.ui.modules.handhistory
import android.os.Bundle
import android.view.LayoutInflater
@ -16,16 +16,14 @@ import net.pokeranalytics.android.model.handhistory.*
import net.pokeranalytics.android.model.realm.handhistory.Action
import net.pokeranalytics.android.model.realm.handhistory.Card
import net.pokeranalytics.android.model.realm.handhistory.HandHistory
import net.pokeranalytics.android.ui.adapter.HandHistoryAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.fragment.components.RealmFragment
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
import net.pokeranalytics.android.ui.view.handhistory.KeyboardListener
import net.pokeranalytics.android.ui.view.handhistory.NumericKey
import net.pokeranalytics.android.ui.view.handhistory.StreetCardHeader
import net.pokeranalytics.android.ui.viewmodel.HandHistoryViewModel
import net.pokeranalytics.android.ui.modules.handhistory.views.KeyboardListener
import net.pokeranalytics.android.ui.modules.handhistory.views.NumericKey
import net.pokeranalytics.android.ui.modules.handhistory.views.StreetCardHeader
import net.pokeranalytics.android.util.extensions.findById
import timber.log.Timber
@ -42,7 +40,8 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDataSource, RowRepr
companion object {
fun newInstance(id: String? = null): HandHistoryFragment {
val fragment = HandHistoryFragment()
val fragment =
HandHistoryFragment()
val bundle = Bundle()
bundle.putSerializable(BundleKey.PRIMARY_KEY.value, id)
fragment.arguments = bundle
@ -101,7 +100,11 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDataSource, RowRepr
// SmoothScrollLinearLayoutManager(requireContext())
// val viewManager = LinearLayoutManager(requireContext())
this.handHistoryAdapter = HandHistoryAdapter(this, this)
this.handHistoryAdapter =
HandHistoryAdapter(
this,
this
)
recyclerView.apply {
setHasFixedSize(true)

4
app/src/main/java/net/pokeranalytics/android/ui/viewmodel/HandHistoryViewModel.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryViewModel.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.viewmodel
package net.pokeranalytics.android.ui.modules.handhistory
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
@ -9,7 +9,7 @@ import net.pokeranalytics.android.model.handhistory.HHSelection
import net.pokeranalytics.android.model.realm.handhistory.Action
import net.pokeranalytics.android.model.realm.handhistory.Card
import net.pokeranalytics.android.model.realm.handhistory.CardProperty
import net.pokeranalytics.android.ui.view.handhistory.NumericKey
import net.pokeranalytics.android.ui.modules.handhistory.views.NumericKey
import timber.log.Timber
class HandHistoryViewModel : ViewModel() {

2
app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/AbstractKeyboardView.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/AbstractKeyboardView.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.view.handhistory
package net.pokeranalytics.android.ui.modules.handhistory.views
import android.content.Context
import android.widget.FrameLayout

2
app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/Circle.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/Circle.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.view.handhistory
package net.pokeranalytics.android.ui.modules.handhistory.views
import android.content.Context
import android.graphics.Canvas

2
app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardActionView.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.view.handhistory
package net.pokeranalytics.android.ui.modules.handhistory.views
import android.content.Context
import android.view.LayoutInflater

2
app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardAmountView.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.view.handhistory
package net.pokeranalytics.android.ui.modules.handhistory.views
import android.content.Context
import android.view.LayoutInflater

2
app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardCardView.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.view.handhistory
package net.pokeranalytics.android.ui.modules.handhistory.views
import android.content.Context

2
app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardContainer.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.view.handhistory
package net.pokeranalytics.android.ui.modules.handhistory.views
import android.app.Activity
import android.content.Context

2
app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowHandHistoryViewHolder.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/RowHandHistoryViewHolder.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.view.holder
package net.pokeranalytics.android.ui.modules.handhistory.views
import android.view.View
import androidx.recyclerview.widget.RecyclerView

4
app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/StreetCardHeader.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/StreetCardHeader.kt
Unescape View File

@ -1,10 +1,10 @@
package net.pokeranalytics.android.ui.view.handhistory
package net.pokeranalytics.android.ui.modules.handhistory.views
import net.pokeranalytics.android.model.handhistory.HHKeyboard
import net.pokeranalytics.android.model.handhistory.HandHistoryRow
import net.pokeranalytics.android.model.handhistory.Street
import net.pokeranalytics.android.model.realm.handhistory.Card
import net.pokeranalytics.android.ui.adapter.HandRowType
import net.pokeranalytics.android.ui.modules.handhistory.HandRowType
class StreetCardHeader(var street: Street, var cards: List<Card>, var potSize: Double) : HandHistoryRow {

2
app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/VideoView.kt → app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.ui.view.handhistory
package net.pokeranalytics.android.ui.modules.handhistory.views
import android.content.Context
import android.util.AttributeSet

2
app/src/main/res/layout/fragment_hand_history.xml
Unescape View File

@ -34,7 +34,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBar" />
<net.pokeranalytics.android.ui.view.handhistory.KeyboardContainer
<net.pokeranalytics.android.ui.modules.handhistory.views.KeyboardContainer
android:id="@+id/keyboard"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/view_video.xml
Unescape View File

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<net.pokeranalytics.android.ui.view.handhistory.Circle
<net.pokeranalytics.android.ui.modules.handhistory.views.Circle
android:id="@+id/circle"
android:layout_width="match_parent"
android:layout_height="match_parent" />

Write Preview
Loading…
Cancel
Save