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

Update models, migrations and UI

Browse Source
dev
Aurelien Hubert 7 years ago
parent eaa947a661
commit d3178e656b
7 changed files with 234 additions and 62 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/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
  2. 67
      app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
  3. 42
      app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
  4. 15
      app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
  5. 79
      app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
  6. 4
      app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
  7. 87
      app/src/main/res/layout/fragment_custom_view.xml

2
app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
Unescape View File

@ -34,7 +34,7 @@ class PokerAnalyticsApplication : Application() {
Realm.init(this)
val realmConfiguration = RealmConfiguration.Builder()
.name(Realm.DEFAULT_REALM_NAME)
.schemaVersion(7)
.schemaVersion(6)
.migration(PokerAnalyticsMigration())
.initialData(Seed(this))
.build()

67
app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
Unescape View File

@ -2,11 +2,10 @@ package net.pokeranalytics.android.model.migrations
import io.realm.DynamicRealm
import io.realm.RealmMigration
import net.pokeranalytics.android.model.realm.CustomFieldEntry
import timber.log.Timber
class PokerAnalyticsMigration : RealmMigration {
override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@ -51,41 +50,41 @@ class PokerAnalyticsMigration : RealmMigration {
schema.get("Filter")?.removeField("entityType")
schema.get("Session")?.let {
it.addField("blinds", String::class.java).transform {
schema.get("Session")?.let {
it.addField("blinds", String::class.java).transform {
}
}
schema.get("FilterCondition")?.let {
it.removeField("blindValues")
it.removeField("numericValues")
}
}
it.addField("operator", Integer::class.java)
it.addField("intValue", Integer::class.java)
it.addRealmListField("intValues", Integer::class.java)
it.addField("doubleValue", Double::class.java).setNullable("doubleValue", true)
it.addRealmListField("doubleValues", Double::class.java)
if(it.isRequired("doubleValues")) {
it.setRequired("doubleValues", false)
}
it.addField("stringValue", String::class.java)
}
schema.get("FilterCondition")?.let {
it.removeField("blindValues")
it.removeField("numericValues")
it.addField("operator", Integer::class.java)
it.addField("intValue", Integer::class.java)
it.addRealmListField("intValues", Integer::class.java)
it.addField("doubleValue", Double::class.java).setNullable("doubleValue", true)
it.addRealmListField("doubleValues", Double::class.java)
if (it.isRequired("doubleValues")) {
it.setRequired("doubleValues", false)
}
it.addField("stringValue", String::class.java)
}
schema.get("ComputableResult")?.removeField("sessionSet")
schema.get("Bankroll")?.addField("initialValue", Double::class.java)
currentVersion++
currentVersion++
}
// Migrate to version 4
if (currentVersion == 3) {
Timber.d("*** Running migration ${currentVersion + 1}")
// Migrate to version 4
if (currentVersion == 3) {
Timber.d("*** Running migration ${currentVersion + 1}")
schema.get("Result")?.addField("numberOfRebuy", Double::class.java)?.setNullable("numberOfRebuy", true)
currentVersion++
}
schema.get("Result")?.addField("numberOfRebuy", Double::class.java)?.setNullable("numberOfRebuy", true)
currentVersion++
}
// Migrate to version 5
if (currentVersion == 4) {
@ -103,20 +102,18 @@ class PokerAnalyticsMigration : RealmMigration {
it.addField("year", Integer::class.java)
it.addField("dayOfMonth", Integer::class.java)
}
currentVersion++
}
// Migrate to version 7
if (currentVersion == 6) {
Timber.d("*** Running migration ${currentVersion + 1}")
schema.create("CustomFieldEntry")?.let {
it.addField("id", String::class.java).setRequired("id", true)
it.addField("value", String::class.java).setNullable("type", false)
it.addField("order", Integer::class.java).setNullable("type", false)
}
schema.get("CustomField")?.let {
it.addField("type", Integer::class.java).setNullable("type", false)
it.addField("duplicateValue", Boolean::class.java)
it.addRealmListField("entries", String::class.java)
it.addRealmListField("entries", CustomFieldEntry::class.java)
}
currentVersion++
}
}
override fun equals(other: Any?): Boolean {

42
app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
Unescape View File

@ -13,7 +13,9 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowViewType
import net.pokeranalytics.android.ui.view.rowrepresentable.CustomFieldRow
import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
import timber.log.Timber
import java.util.*
@ -25,16 +27,6 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
AMOUNT(R.string.amount)
}
companion object {
val rowRepresentation: List<RowRepresentable> by lazy {
val rows = ArrayList<RowRepresentable>()
rows.add(SimpleRow.NAME)
rows.addAll(CustomFieldRow.values())
rows
}
}
@PrimaryKey
override var id = UUID.randomUUID().toString()
@ -43,8 +35,13 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
// Migration
var type: Int = Type.LIST.ordinal
set(value) {
field = value
this.updateRowRepresentation()
}
var duplicateValue: Boolean = false
var entries: RealmList<String> = RealmList()
var entries: RealmList<CustomFieldEntry> = RealmList()
// @todo
@ -56,8 +53,11 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
@Ignore
override val viewType: Int = RowViewType.TITLE_VALUE_ARROW.ordinal
@Ignore
private var rowRepresentation: List<RowRepresentable> = mutableListOf()
override fun adapterRows(): List<RowRepresentable>? {
Timber.d("adapterRows: ${rowRepresentation.size}")
return rowRepresentation
}
@ -93,4 +93,24 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
return R.string.relationship_error
}
private fun updatedRowRepresentationForCurrentState(): List<RowRepresentable> {
val rows = ArrayList<RowRepresentable>()
rows.add(SimpleRow.NAME)
rows.add(CustomFieldRow.TYPE)
if (type == Type.LIST.ordinal && entries.size >= 0) {
rows.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, R.string.items_list))
entries.forEach {entry ->
rows.add(CustomizableRowRepresentable(RowViewType.TITLE, title = entry.value))
}
}
return rows
}
fun updateRowRepresentation() {
this.rowRepresentation = this.updatedRowRepresentationForCurrentState()
}
}

15
app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
Unescape View File

@ -0,0 +1,15 @@
package net.pokeranalytics.android.model.realm
import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
import java.util.*
open class CustomFieldEntry : RealmObject() {
@PrimaryKey
var id = UUID.randomUUID().toString()
var value: String = ""
var order: Int = 0
}

79
app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
Unescape View File

@ -1,11 +1,19 @@
package net.pokeranalytics.android.ui.fragment.data
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import androidx.recyclerview.widget.DiffUtil
import kotlinx.android.synthetic.main.fragment_custom_view.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.CustomField
import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
import net.pokeranalytics.android.ui.extensions.px
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowRepresentableDiffCallback
import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
import net.pokeranalytics.android.ui.view.rowrepresentable.CustomFieldRow
import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
@ -24,9 +32,18 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
return this.item as CustomField
}
private val oldRows: ArrayList<RowRepresentable> = ArrayList()
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
super.onCreateView(inflater, container, savedInstanceState)
return inflater.inflate(R.layout.fragment_custom_view, container, false)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
shouldOpenKeyboard = false
//shouldOpenKeyboard = false
initUI()
}
override fun getDataSource(): RowRepresentableDataSource {
@ -72,22 +89,56 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
}
override fun onRowValueChanged(value: Any?, row: RowRepresentable) {
super.onRowValueChanged(value, row)
//super.onRowValueChanged(value, row)
Timber.d("onRowValueChanged: $row => $value")
customField.updateValue(value, row)
updateUI()
updateAdapterUI()
}
/**
* Init UI
*/
private fun initUI() {
customField.updateRowRepresentation()
bottomBar.translationY = 72f.px
bottomBar.visibility = View.VISIBLE
addItem.setOnClickListener {
Timber.d("Click on add item")
}
updateUI()
updateAdapterUI()
}
/**
* Update UI
*/
private fun updateUI() {
if (customField.type == CustomField.Type.LIST.ordinal) {
bottomBar.animate().translationY(0f.px)
.setInterpolator(FastOutSlowInInterpolator())
.start()
} else {
bottomBar.animate().translationY(72f.px)
.setInterpolator(FastOutSlowInInterpolator())
.withEndAction { }
.start()
}
}
/**
* Update adapter UI
*/
private fun updateAdapterUI() {
customField.adapterRows()?.let {
val diffResult = DiffUtil.calculateDiff(RowRepresentableDiffCallback(it, oldRows))
rowRepresentableAdapter.updateRows(diffResult)
//rowRepresentableAdapter.refreshRow(row)
/*
GlobalScope.launch(Dispatchers.Main) {
delay(200)
when(row) {
TransactionRow.BANKROLL -> onRowSelected(0, TransactionRow.TYPE)
TransactionRow.TYPE -> onRowSelected(0, TransactionRow.AMOUNT)
TransactionRow.AMOUNT -> onRowSelected(0, TransactionRow.DATE)
TransactionRow.DATE -> onRowSelected(0, TransactionRow.COMMENT)
}
oldRows.clear()
oldRows.addAll(it)
}
*/
}
}

4
app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
Unescape View File

@ -410,6 +410,9 @@ enum class RowViewType(private var layoutRes: Int) {
itemView.findViewById<ChipGroup>(R.id.chipGroup)?.let { chipGroup ->
chipGroup.removeAllViews()
chipGroup.setOnCheckedChangeListener(null)
CustomField.Type.values().forEach { type ->
val chip = Chip(itemView.context)
chip.id = type.ordinal
@ -432,7 +435,6 @@ enum class RowViewType(private var layoutRes: Int) {
adapter.delegate?.onRowValueChanged(CustomField.Type.values()[checkedId], row)
}
})
}
}
}

87
app/src/main/res/layout/fragment_custom_view.xml
Unescape View File

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.core.widget.NestedScrollView
android:id="@+id/nestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:layout_width="match_parent"
android:layout_height="128dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsingToolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
app:contentScrim="?attr/colorPrimary"
app:expandedTitleGravity="bottom"
app:expandedTitleMarginStart="72dp"
app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="Poker Analytics"
app:titleTextColor="@color/white" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/bottomBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:visibility="gone"
app:contentInsetStart="8dp"
tools:visibility="visible">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/addItem"
android:layout_width="32dp"
android:layout_height="32dp"
android:padding="4dp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_add"
android:tint="@color/green" />
</FrameLayout>
</com.google.android.material.bottomappbar.BottomAppBar>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
Write Preview
Loading…
Cancel
Save