Refactor bottom sheets

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

@@ -1,19 +1,11 @@
 package net.pokeranalytics.android.model
 
-import android.text.InputType
 import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.RealmResults
 import io.realm.Sort
 import net.pokeranalytics.android.model.realm.*
-import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
-import net.pokeranalytics.android.ui.adapter.components.EditableDataSource
-import net.pokeranalytics.android.ui.adapter.components.SimpleRow
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetDelegate
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
 import java.util.*
-import kotlin.collections.ArrayList
 
 enum class DataList {
     BANKROLL,

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

@@ -5,7 +5,7 @@ import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -64,7 +64,13 @@ open class Bankroll(name: String = "") : RealmObject(), DynamicRowDelegate, Disp
     override fun getBottomSheetData(row: DynamicRowInterface): ArrayList<BottomSheetData> {
         val data = java.util.ArrayList<BottomSheetData>()
         when (row) {
-            SimpleRow.NAME -> data.add(BottomSheetData(this.name, SimpleRow.NAME.resId, InputType.TYPE_CLASS_TEXT))
+            SimpleRow.NAME -> data.add(
+	            BottomSheetData(
+		            this.name,
+		            SimpleRow.NAME.resId,
+		            InputType.TYPE_CLASS_TEXT
+	            )
+            )
         }
         return data
     }

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

@@ -4,7 +4,7 @@ import android.text.InputType
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData
 import java.util.*
 
 open class Game : RealmObject(), DynamicRowDelegate, DisplayableDataSource, EditableDataSource {
@@ -38,7 +38,13 @@ open class Game : RealmObject(), DynamicRowDelegate, DisplayableDataSource, Edit
     override fun getBottomSheetData(row: DynamicRowInterface): ArrayList<BottomSheetData> {
         val data = java.util.ArrayList<BottomSheetData>()
         when (row) {
-            SimpleRow.NAME -> data.add(BottomSheetData(this.name, SimpleRow.NAME.resId, InputType.TYPE_CLASS_TEXT))
+            SimpleRow.NAME -> data.add(
+	            BottomSheetData(
+		            this.name,
+		            SimpleRow.NAME.resId,
+		            InputType.TYPE_CLASS_TEXT
+	            )
+            )
         }
         return data
     }

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

@@ -4,7 +4,7 @@ import android.text.InputType
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData
 import java.util.*
 
 
@@ -42,7 +42,13 @@ open class Location : RealmObject(), DynamicRowDelegate, DisplayableDataSource,
     override fun getBottomSheetData(row: DynamicRowInterface): ArrayList<BottomSheetData> {
         val data = java.util.ArrayList<BottomSheetData>()
         when (row) {
-            SimpleRow.NAME -> data.add(BottomSheetData(this.name, SimpleRow.NAME.resId, InputType.TYPE_CLASS_TEXT))
+            SimpleRow.NAME -> data.add(
+	            BottomSheetData(
+		            this.name,
+		            SimpleRow.NAME.resId,
+		            InputType.TYPE_CLASS_TEXT
+	            )
+            )
         }
         return data
     }

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

@@ -8,7 +8,7 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.SessionInterface
 import net.pokeranalytics.android.model.DataList
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData
 import net.pokeranalytics.android.util.data.sessionDao
 import net.pokeranalytics.android.util.short
 import java.util.*
@@ -170,20 +170,56 @@ open class Session : RealmObject(), SessionInterface, DynamicRowDelegate, Displa
 
 		when (row) {
 			SessionRow.GAME -> {
-				data.add(BottomSheetData(game, inputType = InputType.TYPE_NULL, data = DataList.GAME.items(realm)))
+				data.add(
+					BottomSheetData(
+						game,
+						inputType = InputType.TYPE_NULL,
+						data = DataList.GAME.items(realm)
+					)
+				)
 			}
 			SessionRow.LOCATION -> {
-				data.add(BottomSheetData(location, inputType = InputType.TYPE_NULL, data = DataList.LOCATION.items(realm)))
+				data.add(
+					BottomSheetData(
+						location,
+						inputType = InputType.TYPE_NULL,
+						data = DataList.LOCATION.items(realm)
+					)
+				)
 			}
 			SessionRow.BANKROLL -> {
-				data.add(BottomSheetData(bankroll, inputType = InputType.TYPE_NULL, data = DataList.BANKROLL.items(realm)))
+				data.add(
+					BottomSheetData(
+						bankroll,
+						inputType = InputType.TYPE_NULL,
+						data = DataList.BANKROLL.items(realm)
+					)
+				)
 			}
 			SessionRow.BLINDS -> {
-				data.add(BottomSheetData(cgSmallBlind, R.string.small_blind, InputType.TYPE_CLASS_NUMBER))
+				data.add(
-				data.add(BottomSheetData(cgBigBlind, R.string.big_blind, InputType.TYPE_CLASS_NUMBER))
+					BottomSheetData(
+						cgSmallBlind,
+						R.string.small_blind,
+						InputType.TYPE_CLASS_NUMBER
+					)
+				)
+				data.add(
+					BottomSheetData(
+						cgBigBlind,
+						R.string.big_blind,
+						InputType.TYPE_CLASS_NUMBER
+					)
+				)
 			}
 			SessionRow.COMMENT -> {
-				data.add(BottomSheetData(comment, R.string.comment, InputType.TYPE_CLASS_TEXT))
+				data.add(
+					BottomSheetData(
+						comment,
+						R.string.comment,
+						InputType.TYPE_CLASS_TEXT
+					)
+				)
 			}
 		}
 

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

@@ -4,7 +4,7 @@ import android.text.InputType
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData
 import java.util.*
 
 open class TournamentFeature : RealmObject(), DynamicRowDelegate, DisplayableDataSource, EditableDataSource {
@@ -36,7 +36,13 @@ open class TournamentFeature : RealmObject(), DynamicRowDelegate, DisplayableDat
     override fun getBottomSheetData(row: DynamicRowInterface): ArrayList<BottomSheetData> {
         val data = java.util.ArrayList<BottomSheetData>()
         when (row) {
-            SimpleRow.NAME -> data.add(BottomSheetData(this.name, SimpleRow.NAME.resId, InputType.TYPE_CLASS_TEXT))
+            SimpleRow.NAME -> data.add(
+                BottomSheetData(
+                    this.name,
+                    SimpleRow.NAME.resId,
+                    InputType.TYPE_CLASS_TEXT
+                )
+            )
         }
         return data
     }

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

@@ -4,7 +4,7 @@ import android.text.InputType
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData
 import java.util.*
 
 
@@ -45,7 +45,13 @@ open class TransactionType : RealmObject(), DynamicRowDelegate, DisplayableDataS
     override fun getBottomSheetData(row: DynamicRowInterface): ArrayList<BottomSheetData> {
         val data = java.util.ArrayList<BottomSheetData>()
         when (row) {
-            SimpleRow.NAME -> data.add(BottomSheetData(this.name, SimpleRow.NAME.resId, InputType.TYPE_CLASS_TEXT))
+            SimpleRow.NAME -> data.add(
+	            BottomSheetData(
+		            this.name,
+		            SimpleRow.NAME.resId,
+		            InputType.TYPE_CLASS_TEXT
+	            )
+            )
         }
         return data
     }

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

@@ -7,7 +7,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData
 
 interface DisplayableDelegate {
     fun data(position: Int) : DisplayableDataSource

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

@@ -3,7 +3,7 @@ package net.pokeranalytics.android.ui.adapter.components
 import android.content.Context
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.DataList
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
 
 
 interface DynamicRowInterface {

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

@@ -14,11 +14,12 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.DataList
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetDelegate
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 
-class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback, BottomSheetDelegate {
+class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback,
+	BottomSheetDelegate {
 
     private lateinit var item: RealmObject
 	private lateinit var dataType: DataList

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

@@ -17,13 +17,14 @@ import net.pokeranalytics.android.ui.adapter.components.DynamicListAdapter
 import net.pokeranalytics.android.ui.adapter.components.DynamicRowCallback
 import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
 import net.pokeranalytics.android.ui.adapter.components.SessionRow
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetDelegate
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
 import net.pokeranalytics.android.ui.fragment.components.DateTimePickerManager
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import java.util.*
 
-class SessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, BottomSheetDelegate {
+class SessionFragment : PokerAnalyticsFragment(), DynamicRowCallback,
+	BottomSheetDelegate {
 
 	private lateinit var currentSession: Session
 	private lateinit var sessionAdapter: DynamicListAdapter

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

@@ -9,6 +9,7 @@ import android.widget.DatePicker
 import android.widget.TimePicker
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
+import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate
 import java.util.*
 
 class DateTimePickerManager : DatePickerDialog.OnDateSetListener,

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetData.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components
+package net.pokeranalytics.android.ui.fragment.components.bottomsheet
 
 import android.text.InputType
 import io.realm.RealmResults

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components
+package net.pokeranalytics.android.ui.fragment.components.bottomsheet
 
 import android.os.Bundle
 import android.text.InputType

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleListFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components
+package net.pokeranalytics.android.ui.fragment.components.bottomsheet
 
 import android.os.Bundle
 import android.view.LayoutInflater

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components
+package net.pokeranalytics.android.ui.fragment.components.bottomsheet
 
 import android.os.Bundle
 import android.text.InputType

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components
+package net.pokeranalytics.android.ui.fragment.components.bottomsheet
 
 import android.os.Bundle
 import android.view.LayoutInflater

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components
+package net.pokeranalytics.android.ui.fragment.components.bottomsheet
 
 import android.os.Bundle
 import android.view.LayoutInflater