Merge branch 'master' of gitlab.com:stax-river/poker-analytics

app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt

@@ -1,8 +1,6 @@
 package net.pokeranalytics.android.model.realm
 
-import android.content.Context
+import io.realm.*
-import io.realm.RealmList
-import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.ui.adapter.components.BankrollRow
 import net.pokeranalytics.android.ui.adapter.components.DisplayableDataSource
@@ -11,7 +9,6 @@ import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
 import java.util.*
 import kotlin.collections.ArrayList
 
-
 open class Bankroll(name: String = "") : RealmObject(), DynamicRowDelegate, DisplayableDataSource {
 
     companion object {

app/src/main/java/net/pokeranalytics/android/model/realm/DataList.kt

@@ -0,0 +1,69 @@
+package net.pokeranalytics.android.model.realm
+
+import io.realm.Realm
+import io.realm.RealmObject
+import io.realm.RealmResults
+import io.realm.Sort
+import java.util.*
+
+enum class DataList {
+    NONE,
+    BANKROLL,
+    GAME,
+    LOCATION,
+    TOURNAMENT_TYPE,
+    TRANSACTION_TYPE;
+
+    fun items(realm: Realm, fieldName: String? = null, sortOrder: Sort? = null): RealmResults<*> {
+        return realm.where(this.relatedEntity).findAll().sort(fieldName?:this.sortingFieldName, sortOrder?:this.sorting)
+    }
+
+    private var sortingFieldName: String = "name"
+    private var sorting: Sort = Sort.DESCENDING
+
+
+    private val relatedEntity: Class < out RealmObject >
+        get() {
+            return when (this) {
+                NONE -> RealmObject::class.java
+                BANKROLL -> Bankroll::class.java
+                GAME -> Game::class.java
+                LOCATION -> Location::class.java
+                TOURNAMENT_TYPE -> TournamentFeature::class.java
+                TRANSACTION_TYPE -> TransactionType::class.java
+            }
+        }
+
+    fun getData(realm:Realm, primaryKey:String?): RealmObject? {
+        var proxyItem: RealmObject? = null
+        primaryKey?.let {
+            val t = realm.where(this.relatedEntity).equalTo("id", it).findFirst()
+            t?.let {
+                proxyItem = t
+            }
+        }
+        return proxyItem
+    }
+
+    fun updateOrCreate(realm:Realm, primaryKey:String?): RealmObject {
+        val proxyItem: RealmObject? = this.getData(realm, primaryKey)
+        proxyItem?.let {
+            return realm.copyFromRealm(it)
+        } ?: run {
+            realm.beginTransaction()
+            val t = realm.createObject(this.relatedEntity, UUID.randomUUID().toString())
+            realm.commitTransaction()
+            return realm.copyFromRealm(t)
+        }
+    }
+
+}
+
+/*
+interface ListableDataSource {
+    fun items(realm: Realm, fieldName: String? = null, sortOrder: Sort? = null): RealmResults<*>
+    var sortingFieldName: String
+    var sorting: Sort
+    var relatedEntity: Class < out RealmObject >
+}
+*/

app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@@ -156,13 +156,13 @@ open class Session : RealmObject(), SessionInterface, DynamicRowDelegate, Displa
 		// Todo: Localize & set real data
 		when (row) {
 			SessionRow.GAME -> {
-				data.add(BottomSheetData(game, "", 0, SettingRow.GAME.items(realm)))
+				data.add(BottomSheetData(game, "", 0, DataList.GAME.items(realm)))
 			}
 			SessionRow.LOCATION -> {
-				data.add(BottomSheetData(location, "", 0, SettingRow.LOCATION.items(realm)))
+				data.add(BottomSheetData(location, "", 0, DataList.LOCATION.items(realm)))
 			}
 			SessionRow.BANKROLL -> {
-				data.add(BottomSheetData(bankroll, "", 0, SettingRow.BANKROLL.items(realm)))
+				data.add(BottomSheetData(bankroll, "", 0, DataList.BANKROLL.items(realm)))
 			}
 			SessionRow.DATE -> {
 				data.add(BottomSheetData(timeFrame?.startDate, "Start date"))

app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt

@@ -12,15 +12,20 @@ import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
 
 interface DynamicRowInterface {
 	fun localizedTitle(context: Context): String
-	var viewType: Int
+	val viewType: Int
-	var bottomSheetType: BottomSheetType
+		get() {
+			return 0
+		}
+
+	val bottomSheetType: BottomSheetType
+		get() {
+			return BottomSheetType.NONE
 		}
 
-interface DynamicValues {
+	val relatedDataList: DataList
-	fun items(realm: Realm): RealmResults<*>
+		get() {
-	var sortingFieldName: String
+			return DataList.NONE
-	var sorting: Sort
+		}
-	fun clazz(): Class<out RealmObject>
 }
 
 class SectionRow(stringRes: Int) : DynamicRowInterface {
@@ -30,9 +35,6 @@ class SectionRow(stringRes: Int) : DynamicRowInterface {
 	override fun localizedTitle(context: Context): String {
 		return context.getString(this.stringRes)
 	}
-
-	override var viewType: Int = 0
-	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
 }
 
 enum class SessionRow(val resId: Int) : DynamicRowInterface {
@@ -46,14 +48,14 @@ enum class SessionRow(val resId: Int) : DynamicRowInterface {
 		return context.getString(this.resId)
 	}
 
-	override var viewType: Int = RowViewType.HEADER.ordinal
+	override val viewType: Int
 		get() {
 			return when (this) {
 				BLINDS, GAME, DATE, BANKROLL, LOCATION -> RowViewType.TITLE_VALUE.ordinal
 			}
 		}
 
-	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
+	override val bottomSheetType: BottomSheetType
 		get() {
 			return when (this) {
 				BLINDS -> BottomSheetType.DOUBLE_EDIT_TEXT
@@ -75,14 +77,14 @@ enum class BankrollRow(val resId: Int) : DynamicRowInterface {
 		return context.getString(this.resId)
 	}
 
-	override var viewType: Int = RowViewType.HEADER.ordinal
+	override val viewType: Int
 		get() {
 			return when (this) {
 				NAME, LIVE, CURRENCY -> RowViewType.TITLE_VALUE.ordinal
 			}
 		}
 
-	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
+	override val bottomSheetType: BottomSheetType
 		get() {
 			return when (this) {
 				NAME -> BottomSheetType.EDIT_TEXT
@@ -99,14 +101,14 @@ enum class GameRow(val resId: Int) : DynamicRowInterface {
 		return context.getString(this.resId)
 	}
 
-	override var viewType: Int = RowViewType.HEADER.ordinal
+	override val viewType: Int
 		get() {
 			return when (this) {
 				NAME -> RowViewType.TITLE_VALUE.ordinal
 			}
 		}
 
-	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
+	override val bottomSheetType: BottomSheetType
 		get() {
 			return when (this) {
 				NAME -> BottomSheetType.EDIT_TEXT
@@ -121,14 +123,14 @@ enum class LocationRow(val resId: Int) : DynamicRowInterface {
 		return context.getString(this.resId)
 	}
 
-	override var viewType: Int = RowViewType.HEADER.ordinal
+	override val viewType: Int
 		get() {
 			return when (this) {
 				NAME -> RowViewType.TITLE_VALUE.ordinal
 			}
 		}
 
-	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
+	override val bottomSheetType: BottomSheetType
 		get() {
 			return when (this) {
 				NAME -> BottomSheetType.EDIT_TEXT
@@ -143,14 +145,14 @@ enum class TransactionTypeRow(val resId: Int) : DynamicRowInterface {
 		return context.getString(this.resId)
 	}
 
-	override var viewType: Int = RowViewType.HEADER.ordinal
+	override val viewType: Int
 		get() {
 			return when (this) {
 				NAME -> RowViewType.TITLE_VALUE.ordinal
 			}
 		}
 
-	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
+	override val bottomSheetType: BottomSheetType
 		get() {
 			return when (this) {
 				NAME -> BottomSheetType.EDIT_TEXT
@@ -165,14 +167,14 @@ enum class TournamentFeatureRow(val resId: Int) : DynamicRowInterface {
 		return context.getString(this.resId)
 	}
 
-	override var viewType: Int = RowViewType.HEADER.ordinal
+	override val viewType: Int
 		get() {
 			return when (this) {
 				NAME -> RowViewType.TITLE_VALUE.ordinal
 			}
 		}
 
-	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
+	override val bottomSheetType: BottomSheetType
 		get() {
 			return when (this) {
 				NAME -> BottomSheetType.EDIT_TEXT
@@ -180,7 +182,7 @@ enum class TournamentFeatureRow(val resId: Int) : DynamicRowInterface {
 		}
 }
 
-enum class SettingRow(val resId: Int) : DynamicRowInterface, DynamicValues {
+enum class SettingRow(val resId: Int) : DynamicRowInterface {
 	BANKROLL(R.string.bankroll),
 	GAME(R.string.game),
 	LOCATION(R.string.location),
@@ -191,23 +193,17 @@ enum class SettingRow(val resId: Int) : DynamicRowInterface, DynamicValues {
 		return context.getString(this.resId)
 	}
 
-	override var viewType: Int = RowViewType.TITLE.ordinal
+	override val viewType: Int = RowViewType.TITLE.ordinal
-	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
-
-	override fun items(realm: Realm): RealmResults<*> {
-		return realm.where(this.clazz()).findAll().sort(this.sortingFieldName, this.sorting)
-	}
-
-	override var sortingFieldName: String = "name"
-	override var sorting: Sort = Sort.DESCENDING
 
-	override fun clazz(): Class<out RealmObject> {
+	override val relatedDataList : DataList
+		get() {
 			return when (this) {
-			BANKROLL -> Bankroll::class.java
+				BANKROLL -> DataList.BANKROLL
-			GAME -> Game::class.java
+				GAME -> DataList.GAME
-			LOCATION -> Location::class.java
+				LOCATION -> DataList.LOCATION
-			TOURNAMENT_TYPE -> TournamentFeature::class.java
+				TOURNAMENT_TYPE -> DataList.TOURNAMENT_TYPE
-			TRANSACTION_TYPE -> TransactionType::class.java
+				TRANSACTION_TYPE-> DataList.TRANSACTION_TYPE
 			}
 		}
+
 }

app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt

@@ -36,7 +36,7 @@ class DataListFragment : PokerAnalyticsFragment(), DisplayableDelegate {
 	}
 
 	override fun onRowSelected(position: Int) {
-		EditableDataActivity.newInstance(requireContext(), this.dataType.ordinal, this.data(position).primaryKey)
+		EditableDataActivity.newInstance(requireContext(), this.dataType.relatedDataList.ordinal, this.data(position).primaryKey)
 	}
 
     override fun size(): Int {
@@ -61,7 +61,7 @@ class DataListFragment : PokerAnalyticsFragment(), DisplayableDelegate {
 		}
 
 		this.addButton.setOnClickListener {
-			EditableDataActivity.newInstance(requireContext(), dataType = this.dataType.ordinal, primaryKey = null)
+			EditableDataActivity.newInstance(requireContext(), dataType = this.dataType.relatedDataList.ordinal, primaryKey = null)
 		}
 
 	}
@@ -74,7 +74,7 @@ class DataListFragment : PokerAnalyticsFragment(), DisplayableDelegate {
 		this.dataType = SettingRow.values()[dataType]
 		this.title.text = this.dataType.name.toLowerCase().capitalize()
 		val realm = Realm.getDefaultInstance()
-		this.items = this.dataType.items(realm)
+		this.items = this.dataType.relatedDataList.items(realm)
 		this.items.addChangeListener { newItems ->
 			Timber.d("newItems: ${newItems.size}")
 			this.recyclerView.adapter?.notifyDataSetChanged()

app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt

@@ -11,6 +11,8 @@ import io.realm.RealmObject
 import kotlinx.android.synthetic.main.fragment_editable_data.*
 import kotlinx.android.synthetic.main.fragment_editable_data.view.*
 import net.pokeranalytics.android.R
+import net.pokeranalytics.android.model.realm.Bankroll
+import net.pokeranalytics.android.model.realm.DataList
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.components.*
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetDelegate
@@ -21,7 +23,7 @@ import java.util.*
 class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback, BottomSheetDelegate {
 
     private lateinit var item: RealmObject
-	private var dataType: SettingRow = SettingRow.BANKROLL
+	private var dataType: DataList = DataList.NONE
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		return inflater.inflate(R.layout.fragment_editable_data, container, false)
@@ -74,27 +76,17 @@ class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback, Botto
 	 */
 	fun setData(dataType: Int, primaryKey: String?) {
 
-		this.dataType = SettingRow.values()[dataType]
+		this.dataType = DataList.values()[dataType]
 		val realm = Realm.getDefaultInstance()
-		var proxyItem : RealmObject? = null
+		var proxyItem : RealmObject? = this.dataType.getData(realm, primaryKey)
-		primaryKey?.let {
-			val t = realm.where(this.dataType.clazz()).equalTo("id", it).findFirst()
-			t?.let {
-                proxyItem = t
-			}
-		}
-
         proxyItem?.let {
-			this.item = realm.copyFromRealm(it)
 			this.appBar.toolbar.title = "Update ${this.dataType.name.toLowerCase().capitalize()}"
 		} ?: run {
-			realm.beginTransaction()
-			val t = realm.createObject(this.dataType.clazz(), UUID.randomUUID().toString())
-			realm.commitTransaction()
-			this.item = realm.copyFromRealm(t)
 			this.appBar.toolbar.title = "New ${this.dataType.name.toLowerCase().capitalize()}"
 		}
 
+		this.item = this.dataType.updateOrCreate(realm, primaryKey)
+
 		val dynamicListAdapter = DynamicListAdapter((this.item as DynamicRowDelegate), this)
 		this.recyclerView.adapter = dynamicListAdapter