From 55caec1119e1a135efe4437e47ddbf697f524cd6 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Tue, 19 Feb 2019 17:56:21 +0100 Subject: [PATCH] Refactor bottom sheets --- .../pokeranalytics/android/model/DataList.kt | 8 --- .../android/model/realm/Bankroll.kt | 10 +++- .../android/model/realm/Game.kt | 10 +++- .../android/model/realm/Location.kt | 10 +++- .../android/model/realm/Session.kt | 50 ++++++++++++++++--- .../android/model/realm/TournamentFeature.kt | 10 +++- .../android/model/realm/TransactionType.kt | 10 +++- .../ui/adapter/components/DataListAdapter.kt | 2 +- .../adapter/components/DynamicRowInterface.kt | 2 +- .../ui/fragment/EditableDataFragment.kt | 7 +-- .../android/ui/fragment/SessionFragment.kt | 7 +-- .../components/DateTimePickerManager.kt | 1 + .../{ => bottomsheet}/BottomSheetData.kt | 2 +- .../BottomSheetDoubleEditTextFragment.kt | 2 +- .../BottomSheetDoubleListFragment.kt | 2 +- .../BottomSheetEditTextFragment.kt | 2 +- .../{ => bottomsheet}/BottomSheetFragment.kt | 2 +- .../BottomSheetListFragment.kt | 2 +- 18 files changed, 100 insertions(+), 39 deletions(-) rename app/src/main/java/net/pokeranalytics/android/ui/fragment/components/{ => bottomsheet}/BottomSheetData.kt (76%) rename app/src/main/java/net/pokeranalytics/android/ui/fragment/components/{ => bottomsheet}/BottomSheetDoubleEditTextFragment.kt (96%) rename app/src/main/java/net/pokeranalytics/android/ui/fragment/components/{ => bottomsheet}/BottomSheetDoubleListFragment.kt (95%) rename app/src/main/java/net/pokeranalytics/android/ui/fragment/components/{ => bottomsheet}/BottomSheetEditTextFragment.kt (95%) rename app/src/main/java/net/pokeranalytics/android/ui/fragment/components/{ => bottomsheet}/BottomSheetFragment.kt (98%) rename app/src/main/java/net/pokeranalytics/android/ui/fragment/components/{ => bottomsheet}/BottomSheetListFragment.kt (96%) diff --git a/app/src/main/java/net/pokeranalytics/android/model/DataList.kt b/app/src/main/java/net/pokeranalytics/android/model/DataList.kt index 8e6eba29..01b76756 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/DataList.kt +++ b/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, diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt index c75f1772..83bd60c2 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt +++ b/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 { val data = java.util.ArrayList() 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 } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt index c4dbf4ef..4c8359c7 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt +++ b/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 { val data = java.util.ArrayList() 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 } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt index 6869c726..3ca5795c 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt +++ b/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 { val data = java.util.ArrayList() 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 } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 50fefa73..5ae204ef 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/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(BottomSheetData(cgBigBlind, R.string.big_blind, InputType.TYPE_CLASS_NUMBER)) + data.add( + 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 + ) + ) } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt index d42ae3e1..287b50a0 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt +++ b/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 { val data = java.util.ArrayList() 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 } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt index 53753df1..bc12bd44 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt +++ b/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 { val data = java.util.ArrayList() 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 } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DataListAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DataListAdapter.kt index 21e6ad4d..7495f0bd 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DataListAdapter.kt +++ b/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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt index e058dc3d..21955eb9 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt +++ b/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 { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt index 23fe7493..ac036329 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt +++ b/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.BottomSheetFragment +import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate +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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index 99222a26..cba01f53 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/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.BottomSheetFragment +import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate +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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt index 2f6e9a91..3446a015 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt +++ b/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, diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetData.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetData.kt similarity index 76% rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetData.kt rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetData.kt index 5c0f2184..de66d062 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetData.kt +++ b/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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt similarity index 96% rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt index c72c3cd3..13f12ff3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt +++ b/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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleListFragment.kt similarity index 95% rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleListFragment.kt rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleListFragment.kt index 7615da1f..f447fa1b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleListFragment.kt +++ b/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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt similarity index 95% rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetEditTextFragment.kt rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt index 2fe5454c..0420957c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetEditTextFragment.kt +++ b/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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt similarity index 98% rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetFragment.kt rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index 869e689f..d0d6fa5c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetFragment.kt +++ b/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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt similarity index 96% rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetListFragment.kt rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt index 6b83b8ff..bf50672b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetListFragment.kt +++ b/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