From 033c204fd02fe832f63efa14208c5c93f8588b89 Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 6 Jan 2021 15:34:35 +0100 Subject: [PATCH] Package name refactoring --- .../unitTests/filter/BlindFilterInstrumentedTest.kt | 2 +- .../filter/DateFilterInstrumentedUnitTest.kt | 2 +- .../filter/RealmFilterInstrumentedUnitTest.kt | 6 +++--- .../filter/SessionFilterInstrumentedUnitTest.kt | 2 +- .../pokeranalytics/android/model/realm/Bankroll.kt | 11 +++++++---- .../pokeranalytics/android/model/realm/CustomField.kt | 6 +++--- .../net/pokeranalytics/android/model/realm/Filter.kt | 4 ++-- .../android/model/realm/FilterCondition.kt | 2 +- .../net/pokeranalytics/android/model/realm/Game.kt | 4 ++-- .../pokeranalytics/android/model/realm/Location.kt | 2 +- .../net/pokeranalytics/android/model/realm/Player.kt | 6 +++--- .../net/pokeranalytics/android/model/realm/Session.kt | 2 +- .../android/model/realm/TournamentFeature.kt | 4 ++-- .../android/model/realm/TournamentName.kt | 4 ++-- .../pokeranalytics/android/model/realm/Transaction.kt | 2 +- .../android/model/realm/TransactionType.kt | 4 ++-- .../android/model/realm/rows/BankrollRow.kt | 3 --- .../android/model/utils/FavoriteSessionFinder.kt | 2 +- .../android/ui/fragment/ComparisonChartFragment.kt | 2 +- .../android/ui/fragment/CurrenciesFragment.kt | 2 +- .../android/ui/fragment/ReportCreationFragment.kt | 4 ++-- .../android/ui/fragment/ReportsFragment.kt | 4 ++-- .../android/ui/fragment/SettingsFragment.kt | 2 +- .../components/bottomsheet/BottomSheetFragment.kt | 4 ++-- .../fragment/report/ComposableTableReportFragment.kt | 4 ++-- .../ui/modules/bankroll/BankrollDetailsFragment.kt | 2 +- .../android/ui/modules/bankroll/BankrollFragment.kt | 8 ++++---- .../ui/modules/calendar/CalendarDetailsFragment.kt | 6 +++--- .../android/ui/modules/calendar/CalendarFragment.kt | 2 +- .../android/ui/modules/data/BankrollDataFragment.kt | 6 +++--- .../ui/modules/data/CustomFieldDataFragment.kt | 4 ++-- .../android/ui/modules/data/LocationDataFragment.kt | 6 +++--- .../android/ui/modules/data/PlayerDataFragment.kt | 2 +- .../ui/modules/data/TransactionDataFragment.kt | 2 +- .../ui/modules/data/TransactionTypeDataFragment.kt | 4 ++-- .../ui/modules/filter/FilterDetailsFragment.kt | 2 +- .../ui/modules/filter/FilterDetailsViewModel.kt | 4 ++-- .../android/ui/modules/filter/FilterViewModel.kt | 2 +- .../android/ui/modules/filter/FiltersActivity.kt | 2 +- .../android/ui/modules/filter/FiltersFragment.kt | 2 +- .../ui/modules/handhistory/editor/EditorAdapter.kt | 2 +- .../ui/modules/handhistory/model/EditorViewModel.kt | 2 +- .../android/ui/modules/session/SessionFragment.kt | 2 +- .../android/ui/modules/session/SessionViewModel.kt | 6 +++--- .../android/ui/view/HistorySessionDiffCallback.kt | 2 +- .../net/pokeranalytics/android/ui/view/RowViewType.kt | 2 +- .../android/ui/view/holder/RowViewHolder.kt | 2 +- .../{rowrepresentable => rows}/BankrollMainRow.kt | 2 +- .../BankrollPropertiesRow.kt | 2 +- .../CustomFieldPropertiesRow.kt | 2 +- .../CustomizableRowRepresentable.kt | 3 +-- .../ui/view/{rowrepresentable => rows}/DualStatRow.kt | 2 +- .../{rowrepresentable => rows}/FilterCategoryRow.kt | 4 ++-- .../view/{rowrepresentable => rows}/FilterItemRow.kt | 2 +- .../{rowrepresentable => rows}/FilterSectionRow.kt | 2 +- .../{rowrepresentable => rows}/GamePropertiesRow.kt | 2 +- .../ui/view/{rowrepresentable => rows}/GraphRow.kt | 2 +- .../LocationPropertiesRow.kt | 2 +- .../ui/view/{rowrepresentable => rows}/MoreTabRow.kt | 2 +- .../{rowrepresentable => rows}/PlayerPropertiesRow.kt | 2 +- .../ui/view/{rowrepresentable => rows}/ReportRow.kt | 2 +- .../view/{rowrepresentable => rows}/SeparatorRow.kt | 2 +- .../SessionPropertiesRow.kt | 2 +- .../ui/view/{rowrepresentable => rows}/SettingsRow.kt | 2 +- .../ui/view/{rowrepresentable => rows}/SimpleRow.kt | 2 +- .../ui/view/{rowrepresentable => rows}/StatRow.kt | 2 +- .../TournamentFeatureRow.kt | 2 +- .../{rowrepresentable => rows}/TournamentNameRow.kt | 2 +- .../TransactionPropertiesRow.kt | 2 +- .../TransactionTypePropertiesRow.kt | 2 +- .../android/ui/viewmodel/BottomSheetViewModel.kt | 2 +- 71 files changed, 106 insertions(+), 107 deletions(-) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/BankrollMainRow.kt (90%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/BankrollPropertiesRow.kt (97%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/CustomFieldPropertiesRow.kt (96%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/CustomizableRowRepresentable.kt (88%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/DualStatRow.kt (86%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/FilterCategoryRow.kt (96%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/FilterItemRow.kt (99%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/FilterSectionRow.kt (99%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/GamePropertiesRow.kt (93%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/GraphRow.kt (92%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/LocationPropertiesRow.kt (94%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/MoreTabRow.kt (92%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/PlayerPropertiesRow.kt (96%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/ReportRow.kt (96%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/SeparatorRow.kt (85%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/SessionPropertiesRow.kt (99%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/SettingsRow.kt (98%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/SimpleRow.kt (90%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/StatRow.kt (93%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/TournamentFeatureRow.kt (76%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/TournamentNameRow.kt (76%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/TransactionPropertiesRow.kt (97%) rename app/src/main/java/net/pokeranalytics/android/ui/view/{rowrepresentable => rows}/TransactionTypePropertiesRow.kt (93%) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt index 883816ce..66ac9ec0 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt @@ -7,7 +7,7 @@ import net.pokeranalytics.android.model.realm.Bankroll import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.model.realm.FilterCondition import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow +import net.pokeranalytics.android.ui.view.rows.FilterSectionRow import org.junit.Assert import org.junit.Test import java.util.* diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt index c5162051..ad8c8926 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt @@ -7,7 +7,7 @@ import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.model.realm.FilterCondition import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow +import net.pokeranalytics.android.ui.view.rows.FilterSectionRow import net.pokeranalytics.android.util.extensions.hourMinute import net.pokeranalytics.android.util.extensions.startOfDay import org.junit.Assert diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt index 14db5813..a594b836 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt @@ -5,9 +5,9 @@ import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.ui.view.rowrepresentable.FixedValueFilterItemRow -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow +import net.pokeranalytics.android.ui.view.rows.FixedValueFilterItemRow +import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow +import net.pokeranalytics.android.ui.view.rows.FilterSectionRow import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt index 45b9957b..1b56676b 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt @@ -6,7 +6,7 @@ import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest import net.pokeranalytics.android.model.filter.Query import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.realm.* -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow +import net.pokeranalytics.android.ui.view.rows.FilterSectionRow import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith 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 650c63ff..ec109c60 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 @@ -15,9 +15,9 @@ import net.pokeranalytics.android.model.interfaces.NameManageable import net.pokeranalytics.android.model.interfaces.SaveValidityStatus import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowUpdatable -import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.SessionPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.ui.view.rows.BankrollPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.UserDefaults import java.util.* @@ -28,7 +28,10 @@ enum class ResultCaptureType { NET_RESULT; companion object { - val buyinCashedOutFields = listOf(SessionPropertiesRow.CASHED_OUT, SessionPropertiesRow.BUY_IN, SessionPropertiesRow.TIPS) + val buyinCashedOutFields = listOf( + SessionPropertiesRow.CASHED_OUT, + SessionPropertiesRow.BUY_IN, + SessionPropertiesRow.TIPS) val netResultFields = listOf(SessionPropertiesRow.NET_RESULT) } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt index a0fabe59..15b55812 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt @@ -20,9 +20,9 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowUpdatable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomFieldPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.ui.view.rows.CustomFieldPropertiesRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.SimpleRow import net.pokeranalytics.android.util.enumerations.IntIdentifiable import timber.log.Timber import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt index 3d00c007..c258c30f 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt @@ -13,8 +13,8 @@ import net.pokeranalytics.android.model.interfaces.* import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType import net.pokeranalytics.android.ui.modules.filter.FilterableType import net.pokeranalytics.android.ui.view.* -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterItemRow +import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow +import net.pokeranalytics.android.ui.view.rows.FilterItemRow import timber.log.Timber import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt index e187aac7..a14eccda 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt @@ -4,7 +4,7 @@ import io.realm.RealmList import io.realm.RealmObject import net.pokeranalytics.android.exceptions.PokerAnalyticsException import net.pokeranalytics.android.model.filter.QueryCondition -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow +import net.pokeranalytics.android.ui.view.rows.FilterSectionRow import java.util.* import kotlin.collections.ArrayList 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 f4bb3a4c..98f7e861 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 @@ -16,8 +16,8 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowUpdatable -import net.pokeranalytics.android.ui.view.rowrepresentable.GamePropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.ui.view.rows.GamePropertiesRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow import net.pokeranalytics.android.util.NULL_TEXT import java.util.* import kotlin.collections.ArrayList 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 fdfa7739..3ba090e0 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 @@ -13,7 +13,7 @@ import net.pokeranalytics.android.model.interfaces.NameManageable import net.pokeranalytics.android.model.interfaces.SaveValidityStatus import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowUpdatable -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt index b6e7d07c..ce3f537f 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt @@ -14,9 +14,9 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowUpdatable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.PlayerPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.PlayerPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SeparatorRow import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.RANDOM_PLAYER import net.pokeranalytics.android.util.extensions.isSameDay 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 012ebb54..3a67adf6 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 @@ -31,7 +31,7 @@ import net.pokeranalytics.android.model.utils.SessionSetManager import net.pokeranalytics.android.ui.adapter.UnmanagedRowRepresentableException import net.pokeranalytics.android.ui.graph.Graph import net.pokeranalytics.android.ui.view.* -import net.pokeranalytics.android.ui.view.rowrepresentable.SessionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.util.UserDefaults 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 3d8e35bd..63563857 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 @@ -16,8 +16,8 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowUpdatable -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow -import net.pokeranalytics.android.ui.view.rowrepresentable.TournamentFeatureRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow +import net.pokeranalytics.android.ui.view.rows.TournamentFeatureRow import net.pokeranalytics.android.util.NULL_TEXT import java.util.* import kotlin.collections.ArrayList diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt index 6cb15af9..b3d5e3b6 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt @@ -14,8 +14,8 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowUpdatable -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow -import net.pokeranalytics.android.ui.view.rowrepresentable.TournamentNameRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow +import net.pokeranalytics.android.ui.view.rows.TournamentNameRow import net.pokeranalytics.android.util.NULL_TEXT import java.util.* import kotlin.collections.ArrayList diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt index 71b9c355..32b9a8fd 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt @@ -13,7 +13,7 @@ import net.pokeranalytics.android.model.interfaces.* import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.graph.Graph import net.pokeranalytics.android.ui.view.* -import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.TransactionPropertiesRow import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.util.extensions.findById import java.text.DateFormat 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 a2c335b1..e4d7ce63 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 @@ -14,8 +14,8 @@ import net.pokeranalytics.android.ui.view.Localizable import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowUpdatable -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow -import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionTypePropertiesRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow +import net.pokeranalytics.android.ui.view.rows.TransactionTypePropertiesRow import net.pokeranalytics.android.util.enumerations.IntIdentifiable import net.pokeranalytics.android.util.enumerations.IntSearchable import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/rows/BankrollRow.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/rows/BankrollRow.kt index dc5a570d..acb4e438 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/rows/BankrollRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/rows/BankrollRow.kt @@ -3,9 +3,6 @@ package net.pokeranalytics.android.model.realm.rows import android.content.Context import net.pokeranalytics.android.model.realm.Bankroll import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.RowUpdatable -import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow class BankrollRow(var bankroll: Bankroll) : RowRepresentable { diff --git a/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt b/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt index f6c8de6c..3d203e45 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt @@ -5,7 +5,7 @@ import io.realm.Realm import io.realm.Sort import net.pokeranalytics.android.model.realm.Location import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.ui.view.rowrepresentable.SessionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow /** * Returns all significant parameters concatenated in a String diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt index 3fc6c73f..db448067 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt @@ -12,7 +12,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.extensions.toast import net.pokeranalytics.android.ui.fragment.components.BaseFragment import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.MoreTabRow +import net.pokeranalytics.android.ui.view.rows.MoreTabRow class ComparisonChartFragment : BaseFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt index a6f2e5cf..4a9e5c5e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt @@ -16,7 +16,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.BaseFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow +import net.pokeranalytics.android.ui.view.rows.SeparatorRow import net.pokeranalytics.android.util.UserDefaults import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt index b20990a7..556edb90 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt @@ -25,8 +25,8 @@ import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode import net.pokeranalytics.android.ui.modules.filter.FilterableType import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.SeparatorRow import net.pokeranalytics.android.util.extensions.sorted import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt index 9ec25d9a..dc162ae6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt @@ -33,8 +33,8 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.DeletableItemFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.ReportRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.ReportRow import timber.log.Timber import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt index 34e21985..d0535dde 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt @@ -34,7 +34,7 @@ import net.pokeranalytics.android.ui.fragment.components.RealmFragment import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity import net.pokeranalytics.android.ui.modules.datalist.DataListActivity import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.SettingsRow +import net.pokeranalytics.android.ui.view.rows.SettingsRow import net.pokeranalytics.android.util.* import net.pokeranalytics.android.util.billing.AppGuard import net.pokeranalytics.android.util.billing.IAPProducts diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index a74f9344..5c3bac02 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt @@ -21,8 +21,8 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.modules.data.EditableDataActivity import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor -import net.pokeranalytics.android.ui.view.rowrepresentable.SessionPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.TransactionPropertiesRow import net.pokeranalytics.android.ui.viewmodel.BottomSheetViewModel import net.pokeranalytics.android.ui.viewmodel.BottomSheetViewModelFactory import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt index 0c465ddb..47341493 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt @@ -27,8 +27,8 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.RealmFragment import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.StatRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.StatRow import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.TextFormat import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt index b56e6334..0f7c9592 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt @@ -23,7 +23,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.RealmFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable import net.pokeranalytics.android.util.extensions.findById import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt index 63139c66..7ca3d0a7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt @@ -29,10 +29,10 @@ import net.pokeranalytics.android.ui.modules.data.EditableDataActivity import net.pokeranalytics.android.ui.modules.datalist.DataListActivity import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollGraphRow -import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollMainRow -import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollTotalRow -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.BankrollGraphRow +import net.pokeranalytics.android.ui.view.rows.BankrollMainRow +import net.pokeranalytics.android.ui.view.rows.BankrollTotalRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable import net.pokeranalytics.android.util.extensions.sorted import timber.log.Timber import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt index 15a99442..0206b538 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt @@ -30,9 +30,9 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.BaseFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.GraphRow -import net.pokeranalytics.android.ui.view.rowrepresentable.DualStatRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.GraphRow +import net.pokeranalytics.android.ui.view.rows.DualStatRow import timber.log.Timber import java.util.* import kotlin.collections.ArrayList diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt index d10a6439..83110ac3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt @@ -29,7 +29,7 @@ import net.pokeranalytics.android.ui.fragment.components.RealmFragment import net.pokeranalytics.android.ui.view.CalendarTabs import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable import net.pokeranalytics.android.util.extensions.* import timber.log.Timber import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt index 58113494..996eac62 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt @@ -19,9 +19,9 @@ import net.pokeranalytics.android.ui.fragment.CurrenciesFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.ui.view.rows.BankrollPropertiesRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.SimpleRow import net.pokeranalytics.android.ui.viewmodel.DataManagerViewModel import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.Preferences diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt index d749b99c..29920edc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt @@ -20,8 +20,8 @@ import net.pokeranalytics.android.ui.extensions.px import net.pokeranalytics.android.ui.extensions.showAlertDialog import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomFieldPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.ui.view.rows.CustomFieldPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow import net.pokeranalytics.android.util.NULL_TEXT import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt index 10ba489d..6fd81364 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt @@ -11,9 +11,9 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.LocationPropertiesRow -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.LocationPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow import net.pokeranalytics.android.util.LocationManager import net.pokeranalytics.android.util.NULL_TEXT import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt index 249d1896..4912b528 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt @@ -25,7 +25,7 @@ import net.pokeranalytics.android.ui.extensions.showAlertDialog import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.PlayerPropertiesRow +import net.pokeranalytics.android.ui.view.rows.PlayerPropertiesRow import net.pokeranalytics.android.util.NULL_TEXT import java.io.File diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt index 645f10ad..b6e23388 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt @@ -15,7 +15,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.helpers.DateTimePickerManager import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor -import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.TransactionPropertiesRow import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.extensions.round import net.pokeranalytics.android.util.extensions.shortDate diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt index 0617b4de..73b62242 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt @@ -6,8 +6,8 @@ import net.pokeranalytics.android.model.realm.TransactionType import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor -import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow -import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionTypePropertiesRow +import net.pokeranalytics.android.ui.view.rows.SimpleRow +import net.pokeranalytics.android.ui.view.rows.TransactionTypePropertiesRow class TransactionTypeDataFragment : EditableDataFragment(), RowRepresentableDataSource { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt index 0ace340c..74c684d6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt @@ -16,7 +16,7 @@ import net.pokeranalytics.android.ui.fragment.components.RealmFragment import net.pokeranalytics.android.ui.helpers.DateTimePickerManager import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.* +import net.pokeranalytics.android.ui.view.rows.* import timber.log.Timber import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt index 61c9daad..2c39c36c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt @@ -8,8 +8,8 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter 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.FilterCategoryRow -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterItemRow +import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow +import net.pokeranalytics.android.ui.view.rows.FilterItemRow import net.pokeranalytics.android.util.NULL_TEXT import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterViewModel.kt index ab42eaae..d3ce4e85 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterViewModel.kt @@ -7,7 +7,7 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow +import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow import net.pokeranalytics.android.util.extensions.findById class FilterViewModel : ViewModel(), StaticRowRepresentableDataSource { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt index 7c243331..0abf007f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModelProvider import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.activity.components.BaseActivity import net.pokeranalytics.android.ui.fragment.components.BaseFragment -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow +import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow class FiltersActivity : BaseActivity() { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt index eb1ca559..78bd10b1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt @@ -18,7 +18,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.extensions.px import net.pokeranalytics.android.ui.fragment.components.RealmFragment import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow +import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.extensions.sorted diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt index ea2e360d..b0f6ec9d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt @@ -26,7 +26,7 @@ import net.pokeranalytics.android.ui.modules.handhistory.views.PositionAdapter import net.pokeranalytics.android.ui.view.PlayerImageView import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.holder.RowViewHolder -import net.pokeranalytics.android.ui.view.rowrepresentable.ViewIdentifier +import net.pokeranalytics.android.ui.view.rows.ViewIdentifier import net.pokeranalytics.android.util.extensions.formatted diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt index f8978926..28c8c2b6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt @@ -25,7 +25,7 @@ import net.pokeranalytics.android.ui.modules.handhistory.editor.HandRowType import net.pokeranalytics.android.ui.modules.handhistory.views.CardCentralizer import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable import net.pokeranalytics.android.util.extensions.findById import net.pokeranalytics.android.util.extensions.formatted import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt index b9696ad6..4acbd89e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt @@ -37,7 +37,7 @@ import net.pokeranalytics.android.ui.modules.data.EditableDataActivity import net.pokeranalytics.android.ui.modules.datalist.DataListActivity import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity import net.pokeranalytics.android.ui.view.* -import net.pokeranalytics.android.ui.view.rowrepresentable.SessionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.extensions.* import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionViewModel.kt index 42cb18d1..bb05602f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionViewModel.kt @@ -13,9 +13,9 @@ import net.pokeranalytics.android.model.realm.ResultCaptureType import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow -import net.pokeranalytics.android.ui.view.rowrepresentable.SessionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.SeparatorRow +import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow import net.pokeranalytics.android.util.extensions.sorted import java.util.ArrayList diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/HistorySessionDiffCallback.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/HistorySessionDiffCallback.kt index df0ff0b3..19119d01 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/HistorySessionDiffCallback.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/HistorySessionDiffCallback.kt @@ -3,7 +3,7 @@ package net.pokeranalytics.android.ui.view import androidx.annotation.Nullable import androidx.recyclerview.widget.DiffUtil import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable class HistorySessionDiffCallback(var newRows: List, var oldRows: List) : DiffUtil.Callback() { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt index a75870ef..d357fcb1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt @@ -35,7 +35,7 @@ import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable import net.pokeranalytics.android.ui.graph.setStyle import net.pokeranalytics.android.ui.modules.handhistory.views.RowHandHistoryViewHolder import net.pokeranalytics.android.ui.view.holder.RowViewHolder -import net.pokeranalytics.android.ui.view.rowrepresentable.* +import net.pokeranalytics.android.ui.view.rows.* import net.pokeranalytics.android.util.extensions.longDate import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt index 549eb53e..f2d9b026 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt @@ -17,7 +17,7 @@ import net.pokeranalytics.android.ui.extensions.addCircleRipple import net.pokeranalytics.android.ui.extensions.setTextFormat import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable import timber.log.Timber diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollMainRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/BankrollMainRow.kt similarity index 90% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollMainRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/BankrollMainRow.kt index 6cec1e54..4b5a942e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollMainRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/BankrollMainRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.content.Context import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollPropertiesRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/BankrollPropertiesRow.kt similarity index 97% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollPropertiesRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/BankrollPropertiesRow.kt index c5befc84..53c1d64e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollPropertiesRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/BankrollPropertiesRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.text.InputType import net.pokeranalytics.android.R diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomFieldPropertiesRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/CustomFieldPropertiesRow.kt similarity index 96% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomFieldPropertiesRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/CustomFieldPropertiesRow.kt index 515aa3fa..321a5181 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomFieldPropertiesRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/CustomFieldPropertiesRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.CustomField diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomizableRowRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/CustomizableRowRepresentable.kt similarity index 88% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomizableRowRepresentable.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/CustomizableRowRepresentable.kt index f5d71d37..55a4e023 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomizableRowRepresentable.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/CustomizableRowRepresentable.kt @@ -1,7 +1,6 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.content.Context -import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.util.TextFormat diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/DualStatRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/DualStatRow.kt similarity index 86% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/DualStatRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/DualStatRow.kt index 95a16c87..cdd4a7fc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/DualStatRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/DualStatRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.calculus.ComputedStat import net.pokeranalytics.android.ui.view.RowRepresentable diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterCategoryRow.kt similarity index 96% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterCategoryRow.kt index 362c09a5..61084287 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterCategoryRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import io.realm.Realm import net.pokeranalytics.android.R @@ -6,7 +6,7 @@ import net.pokeranalytics.android.model.realm.CustomField import net.pokeranalytics.android.ui.modules.filter.FilterableType import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow.* +import net.pokeranalytics.android.ui.view.rows.FilterSectionRow.* import net.pokeranalytics.android.util.extensions.sorted enum class FilterCategoryRow(override val resId: Int?, override val viewType: Int = RowViewType.TITLE_VALUE_ARROW.ordinal) : RowRepresentable { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterItemRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterItemRow.kt similarity index 99% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterItemRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterItemRow.kt index 7a15ddc5..82d5317d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterItemRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterItemRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.content.Context import android.text.InputType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterSectionRow.kt similarity index 99% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterSectionRow.kt index 62c611b8..e967fe6a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterSectionRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.content.Context import net.pokeranalytics.android.R diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GamePropertiesRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/GamePropertiesRow.kt similarity index 93% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GamePropertiesRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/GamePropertiesRow.kt index 4da5ba47..5af362eb 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GamePropertiesRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/GamePropertiesRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GraphRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/GraphRow.kt similarity index 92% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GraphRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/GraphRow.kt index eb812a0b..48884d9e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GraphRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/GraphRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import com.github.mikephil.charting.data.DataSet import net.pokeranalytics.android.calculus.Report diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationPropertiesRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/LocationPropertiesRow.kt similarity index 94% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationPropertiesRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/LocationPropertiesRow.kt index d72625c7..36cef282 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationPropertiesRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/LocationPropertiesRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/MoreTabRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/MoreTabRow.kt similarity index 92% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/MoreTabRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/MoreTabRow.kt index 1f6982a9..16cf8370 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/MoreTabRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/MoreTabRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.view.RowRepresentable diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/PlayerPropertiesRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/PlayerPropertiesRow.kt similarity index 96% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/PlayerPropertiesRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/PlayerPropertiesRow.kt index cbfdbb84..fd9a0f85 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/PlayerPropertiesRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/PlayerPropertiesRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/ReportRow.kt similarity index 96% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/ReportRow.kt index d015c36d..51b94abc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/ReportRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.R import net.pokeranalytics.android.model.Criteria diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/SeparatorRow.kt similarity index 85% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/SeparatorRow.kt index a45bfb04..3f2f3c0f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/SeparatorRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionPropertiesRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/SessionPropertiesRow.kt similarity index 99% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionPropertiesRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/SessionPropertiesRow.kt index de3ef6cb..5eb0f9ff 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionPropertiesRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/SessionPropertiesRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.content.Context import android.text.InputType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingsRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/SettingsRow.kt similarity index 98% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingsRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/SettingsRow.kt index 4468ef6c..46e980f5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingsRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/SettingsRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.os.Build import net.pokeranalytics.android.R diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/SimpleRow.kt similarity index 90% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/SimpleRow.kt index 3142f7b1..0fc93eb1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/SimpleRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/StatRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/StatRow.kt similarity index 93% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/StatRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/StatRow.kt index 5cfc0bd4..e5c583c2 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/StatRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/StatRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.content.Context import net.pokeranalytics.android.calculus.ComputedStat diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/TournamentFeatureRow.kt similarity index 76% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/TournamentFeatureRow.kt index 0d15fc15..10239ade 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/TournamentFeatureRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.ui.view.DefaultEditDataSource import net.pokeranalytics.android.ui.view.RowRepresentable diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/TournamentNameRow.kt similarity index 76% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/TournamentNameRow.kt index d03a1d06..bbe4b39b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/TournamentNameRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.ui.view.DefaultEditDataSource import net.pokeranalytics.android.ui.view.RowRepresentable diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionPropertiesRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/TransactionPropertiesRow.kt similarity index 97% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionPropertiesRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/TransactionPropertiesRow.kt index fdf45771..83bd227f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionPropertiesRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/TransactionPropertiesRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import android.text.InputType import io.realm.RealmResults diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypePropertiesRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/TransactionTypePropertiesRow.kt similarity index 93% rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypePropertiesRow.kt rename to app/src/main/java/net/pokeranalytics/android/ui/view/rows/TransactionTypePropertiesRow.kt index 49d52bf6..e60eb5b4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypePropertiesRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/TransactionTypePropertiesRow.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui.view.rowrepresentable +package net.pokeranalytics.android.ui.view.rows import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt index 144fe35d..75b8d1e5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt @@ -10,7 +10,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor -import net.pokeranalytics.android.ui.view.rowrepresentable.SessionPropertiesRow +import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow import java.util.* class BottomSheetViewModelFactory(var row: RowRepresentable, var delegate: RowRepresentableDelegate): ViewModelProvider.Factory {