diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 56a36a3b..648a853a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,7 +55,7 @@
@@ -108,7 +108,7 @@
android:screenOrientation="portrait" />
@@ -123,7 +123,7 @@
android:screenOrientation="portrait" />
@@ -138,12 +138,12 @@
android:screenOrientation="portrait" />
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 f3d9fe71..53c553e3 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
@@ -11,7 +11,7 @@ import net.pokeranalytics.android.model.filter.Query
import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.model.interfaces.*
import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
-import net.pokeranalytics.android.ui.interfaces.FilterableType
+import net.pokeranalytics.android.ui.modules.filter.FilterableType
import net.pokeranalytics.android.ui.view.ImageDecorator
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt
index 6e46c561..e5794fa4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt
@@ -6,7 +6,7 @@ import android.view.ViewGroup
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentStatePagerAdapter
import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.fragment.CalendarFragment
+import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment
import net.pokeranalytics.android.ui.modules.feed.FeedFragment
import net.pokeranalytics.android.ui.fragment.GraphFragment
import net.pokeranalytics.android.ui.fragment.components.BaseFragment
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt
index 41bb5b7a..b759478e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt
@@ -4,7 +4,7 @@ import android.util.SparseArray
import android.view.ViewGroup
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentStatePagerAdapter
-import net.pokeranalytics.android.ui.fragment.CalendarFragment
+import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment
import net.pokeranalytics.android.ui.fragment.ReportsFragment
import net.pokeranalytics.android.ui.fragment.SettingsFragment
import net.pokeranalytics.android.ui.fragment.StatisticsFragment
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 4a9d24f7..7bc5c016 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
@@ -14,14 +14,14 @@ import net.pokeranalytics.android.model.Criteria
import net.pokeranalytics.android.model.CustomFieldCriteria
import net.pokeranalytics.android.model.realm.CustomField
import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.activity.FiltersActivity
+import net.pokeranalytics.android.ui.modules.filter.FiltersActivity
import net.pokeranalytics.android.ui.activity.ReportCreationActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.fragment.components.RealmFragment
-import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
-import net.pokeranalytics.android.ui.interfaces.FilterableType
+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
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt
index 5f5c3b69..e9682c7e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt
@@ -22,11 +22,11 @@ import net.pokeranalytics.android.model.filter.Query
import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.model.realm.ComputableResult
import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.activity.FiltersActivity
+import net.pokeranalytics.android.ui.modules.filter.FiltersActivity
import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
import net.pokeranalytics.android.ui.fragment.report.ComposableTableReportFragment
-import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
-import net.pokeranalytics.android.ui.interfaces.FilterableType
+import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode
+import net.pokeranalytics.android.ui.modules.filter.FilterableType
import timber.log.Timber
import java.util.*
import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
index 44d5a320..fad2f7b5 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
@@ -14,9 +14,9 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.interfaces.FilterHandler
-import net.pokeranalytics.android.ui.interfaces.FilterHandler.Companion.INTENT_FILTER_UPDATE_FILTER_UI
-import net.pokeranalytics.android.ui.interfaces.FilterableType
+import net.pokeranalytics.android.ui.modules.filter.FilterHandler
+import net.pokeranalytics.android.ui.modules.filter.FilterHandler.Companion.INTENT_FILTER_UPDATE_FILTER_UI
+import net.pokeranalytics.android.ui.modules.filter.FilterableType
import net.pokeranalytics.android.util.Preferences
@@ -26,7 +26,8 @@ import net.pokeranalytics.android.util.Preferences
* - Listen for INTENT_FILTER_UPDATE_FILTER_UI
* -
*/
-open class FilterableFragment : RealmFragment(), FilterHandler {
+open class FilterableFragment : RealmFragment(),
+ FilterHandler {
override var currentFilterable: FilterableType = FilterableType.ALL
set(value) {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/CalendarDetailsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsActivity.kt
similarity index 74%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/CalendarDetailsActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsActivity.kt
index 96022765..029b493d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/CalendarDetailsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.calendar
import android.content.Context
import android.content.Intent
@@ -8,7 +8,6 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.calculus.ComputedResults
import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.viewmodel.CalendarDetailsViewModel
class CalendarDetailsActivity : BaseActivity() {
@@ -27,9 +26,9 @@ class CalendarDetailsActivity : BaseActivity() {
* Default constructor
*/
fun newInstance(context: Context, computedResults: ComputedResults, sessionTypeCondition: QueryCondition?, title: String?) {
- this.computedResults = computedResults
- this.sessionTypeCondition = sessionTypeCondition
- this.detailsTitle = title
+ Companion.computedResults = computedResults
+ Companion.sessionTypeCondition = sessionTypeCondition
+ detailsTitle = title
val intent = Intent(context, CalendarDetailsActivity::class.java)
context.startActivity(intent)
}
@@ -47,9 +46,12 @@ class CalendarDetailsActivity : BaseActivity() {
*/
private fun initData() {
- this.viewModel.computedResults = computedResults
- this.viewModel.sessionTypeCondition = sessionTypeCondition
- this.viewModel.detailsTitle = detailsTitle
+ this.viewModel.computedResults =
+ computedResults
+ this.viewModel.sessionTypeCondition =
+ sessionTypeCondition
+ this.viewModel.detailsTitle =
+ detailsTitle
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt
similarity index 97%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt
index 6ee22d7e..769d3db3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.calendar
import android.content.Context
import android.content.Intent
@@ -26,13 +26,13 @@ import net.pokeranalytics.android.ui.activity.GraphActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
+import net.pokeranalytics.android.ui.fragment.GraphFragment
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.StatDoubleRow
-import net.pokeranalytics.android.ui.viewmodel.CalendarDetailsViewModel
import timber.log.Timber
import java.util.*
import kotlin.collections.ArrayList
@@ -146,10 +146,12 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource
val dataSet = row.dataSet
when (dataSet) {
is LineDataSet-> {
- GraphActivity.newInstance(requireContext(), listOf(dataSet), null, GraphFragment.Style.LINE, title)
+ GraphActivity.newInstance(requireContext(), listOf(dataSet), null,
+ GraphFragment.Style.LINE, title)
}
is BarDataSet -> {
- GraphActivity.newInstance(requireContext(), null, listOf(dataSet), GraphFragment.Style.BAR, title)
+ GraphActivity.newInstance(requireContext(), null, listOf(dataSet),
+ GraphFragment.Style.BAR, title)
}
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/CalendarDetailsViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsViewModel.kt
similarity index 89%
rename from app/src/main/java/net/pokeranalytics/android/ui/viewmodel/CalendarDetailsViewModel.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsViewModel.kt
index 4f449b01..d34b78a2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/CalendarDetailsViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsViewModel.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.viewmodel
+package net.pokeranalytics.android.ui.modules.calendar
import androidx.lifecycle.ViewModel
import net.pokeranalytics.android.calculus.ComputedResults
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt
similarity index 97%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt
index 0acf9f26..ce8d968c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.calendar
import android.os.Bundle
import android.view.LayoutInflater
@@ -22,7 +22,6 @@ import net.pokeranalytics.android.model.Criteria
import net.pokeranalytics.android.model.combined
import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.model.realm.ComputableResult
-import net.pokeranalytics.android.ui.activity.CalendarDetailsActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
@@ -52,7 +51,8 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
* Create new instance
*/
fun newInstance(): CalendarFragment {
- val fragment = CalendarFragment()
+ val fragment =
+ CalendarFragment()
val bundle = Bundle()
fragment.arguments = bundle
return fragment
@@ -71,7 +71,8 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
private var datesForRows: HashMap = HashMap()
private var sessionTypeCondition: QueryCondition? = null
- private var currentTimeFilter: TimeFilter = TimeFilter.MONTH
+ private var currentTimeFilter: TimeFilter =
+ TimeFilter.MONTH
private var currentStat = Stat.NET_RESULT
// Life Cycle
@@ -201,7 +202,8 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
// Manage time queryWith
filterTimeMonth.setOnCheckedChangeListener { _, isChecked ->
if (isChecked) {
- currentTimeFilter = TimeFilter.MONTH
+ currentTimeFilter =
+ TimeFilter.MONTH
filterTimeYear.isChecked = false
displayData()
} else if (currentTimeFilter == TimeFilter.MONTH) {
@@ -211,7 +213,8 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
}
filterTimeYear.setOnCheckedChangeListener { _, isChecked ->
if (isChecked) {
- currentTimeFilter = TimeFilter.YEAR
+ currentTimeFilter =
+ TimeFilter.YEAR
filterTimeMonth.isChecked = false
displayData()
} else if (currentTimeFilter == TimeFilter.YEAR) {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListActivity.kt
index e02c17fe..11b947f4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListActivity.kt
@@ -9,7 +9,7 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.LiveData
import net.pokeranalytics.android.ui.activity.components.BaseActivity
import net.pokeranalytics.android.ui.activity.components.RequestCode
-import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
+import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode
class DataListActivity : BaseActivity() {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
index 99dc0cd2..e7294fef 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
@@ -19,7 +19,7 @@ import net.pokeranalytics.android.model.interfaces.Deletable
import net.pokeranalytics.android.model.interfaces.Identifiable
import net.pokeranalytics.android.model.realm.Filter
import net.pokeranalytics.android.ui.activity.EditableDataActivity
-import net.pokeranalytics.android.ui.activity.FiltersActivity
+import net.pokeranalytics.android.ui.modules.filter.FiltersActivity
import net.pokeranalytics.android.ui.activity.components.RequestCode
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
index 50b21a5e..f9497fe2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
@@ -26,10 +26,12 @@ import net.pokeranalytics.android.ui.activity.*
import net.pokeranalytics.android.ui.activity.components.RequestCode
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
-import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
-import net.pokeranalytics.android.ui.interfaces.FilterableType
+import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode
+import net.pokeranalytics.android.ui.modules.filter.FilterableType
import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
+import net.pokeranalytics.android.ui.modules.filter.FiltersActivity
import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity
+import net.pokeranalytics.android.ui.modules.session.SessionActivity
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
import net.pokeranalytics.android.util.Preferences
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/FilterDetailsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsActivity.kt
similarity index 90%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/FilterDetailsActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsActivity.kt
index 8e5f4185..52e8d002 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/FilterDetailsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsActivity.kt
@@ -1,13 +1,11 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.filter
import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.fragment.app.Fragment
import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.realm.Filter
import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.fragment.FilterDetailsFragment
class FilterDetailsActivity : BaseActivity() {
@@ -62,7 +60,8 @@ class FilterDetailsActivity : BaseActivity() {
val filterId = intent.getStringExtra(IntentKey.FILTER_ID.keyName)
val filterCategoryOrdinal = intent.getIntExtra(IntentKey.FILTER_CATEGORY_ORDINAL.keyName, 0)
- fragment = FilterDetailsFragment()
+ fragment =
+ FilterDetailsFragment()
fragmentTransaction.add(R.id.container, fragment)
fragmentTransaction.commit()
fragment.setData(filterId, filterCategoryOrdinal)
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt
similarity index 98%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt
index 3a207b86..a3eb2b18 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.filter
import android.app.Activity.RESULT_OK
import android.content.Context
@@ -13,7 +13,6 @@ import kotlinx.android.synthetic.main.fragment_filter_details.view.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.activity.FilterDetailsActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterHandler.kt
similarity index 91%
rename from app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterHandler.kt
index 8e8c1167..e7d73757 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterHandler.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.interfaces
+package net.pokeranalytics.android.ui.modules.filter
import android.content.Context
import android.content.Intent
@@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment
import io.realm.Realm
import io.realm.kotlin.where
import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.activity.FiltersActivity
import net.pokeranalytics.android.util.Preferences
import net.pokeranalytics.android.util.enumerations.IntIdentifiable
import net.pokeranalytics.android.util.enumerations.IntSearchable
@@ -56,7 +55,8 @@ interface FilterHandler {
// Send broadcast
val intent = Intent()
- intent.action = INTENT_FILTER_UPDATE_FILTER_UI
+ intent.action =
+ INTENT_FILTER_UPDATE_FILTER_UI
context.sendBroadcast(intent)
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt
similarity index 86%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt
index 23e9cbd0..fbe0a135 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.filter
import android.content.Context
import android.content.Intent
@@ -6,9 +6,6 @@ import android.os.Bundle
import androidx.fragment.app.Fragment
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.fragment.FiltersFragment
-import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
-import net.pokeranalytics.android.ui.interfaces.FilterableType
class FiltersActivity : BaseActivity() {
@@ -26,7 +23,13 @@ class FiltersActivity : BaseActivity() {
* Create a new instance for result
*/
fun newInstanceForResult(fragment: Fragment, filterId: String? = null, currentFilterable: FilterableType, hideMostUsedFilters: Boolean = false) {
- val intent = getIntent(fragment.requireContext(), filterId, currentFilterable, hideMostUsedFilters)
+ val intent =
+ getIntent(
+ fragment.requireContext(),
+ filterId,
+ currentFilterable,
+ hideMostUsedFilters
+ )
fragment.startActivityForResult(intent, FilterActivityRequestCode.CREATE_FILTER.ordinal)
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt
similarity index 95%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt
index 9b6f51c6..108ff1ca 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.filter
import android.app.Activity.RESULT_OK
import android.content.Context
@@ -16,16 +16,11 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.LiveData
import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.activity.FilterDetailsActivity
-import net.pokeranalytics.android.ui.activity.FiltersActivity
-import net.pokeranalytics.android.ui.activity.FiltersListActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
import net.pokeranalytics.android.ui.extensions.px
import net.pokeranalytics.android.ui.fragment.components.RealmFragment
-import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
-import net.pokeranalytics.android.ui.interfaces.FilterableType
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
import net.pokeranalytics.android.util.Preferences
@@ -153,7 +148,9 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
super.onRowSelected(position, row, tag)
selectedRow = row
currentFilter?.id?.let { filterId ->
- FilterDetailsActivity.newInstanceForResult(this, filterId, (row as FilterCategoryRow).ordinal, REQUEST_CODE_FILTER_DETAILS)
+ FilterDetailsActivity.newInstanceForResult(this, filterId, (row as FilterCategoryRow).ordinal,
+ REQUEST_CODE_FILTER_DETAILS
+ )
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersListActivity.kt
similarity index 85%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersListActivity.kt
index 7003d2e1..98b47a66 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersListActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.filter
import android.content.Context
import android.content.Intent
@@ -8,7 +8,6 @@ import androidx.lifecycle.ViewModelProviders
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.LiveData
import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
import net.pokeranalytics.android.ui.modules.datalist.DataListViewModel
class FiltersListActivity : BaseActivity() {
@@ -26,12 +25,22 @@ class FiltersListActivity : BaseActivity() {
companion object {
fun newInstance(context: Context, dataType: Int) {
- context.startActivity(getIntent(context, dataType))
+ context.startActivity(
+ getIntent(
+ context,
+ dataType
+ )
+ )
}
fun newSelectInstance(fragment: Fragment, dataType: Int, showAddButton: Boolean = true) {
val context = fragment.requireContext()
- fragment.startActivityForResult(getIntent(context, dataType, showAddButton), FilterActivityRequestCode.SELECT_FILTER.ordinal)
+ fragment.startActivityForResult(
+ getIntent(
+ context,
+ dataType,
+ showAddButton
+ ), FilterActivityRequestCode.SELECT_FILTER.ordinal)
}
private fun getIntent(context: Context, dataType: Int, showAddButton: Boolean = true): Intent {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersListFragment.kt
similarity index 94%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersListFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersListFragment.kt
index dcd497d0..45b9aaac 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersListFragment.kt
@@ -1,12 +1,11 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.filter
import android.app.Activity
import android.content.Context
import android.content.Intent
import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.activity.FiltersActivity
import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.interfaces.FilterHandler.Companion.INTENT_FILTER_UPDATE_FILTER_UI
+import net.pokeranalytics.android.ui.modules.filter.FilterHandler.Companion.INTENT_FILTER_UPDATE_FILTER_UI
import net.pokeranalytics.android.ui.modules.datalist.DataListFragment
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.util.Preferences
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionActivity.kt
similarity index 86%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionActivity.kt
index f37c3e37..c552f7b2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.session
import android.app.Activity
import android.content.Context
@@ -8,8 +8,6 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProviders
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.fragment.SessionFragment
-import net.pokeranalytics.android.ui.viewmodel.SessionViewModel
class SessionActivity: BaseActivity() {
@@ -28,12 +26,24 @@ class SessionActivity: BaseActivity() {
companion object {
fun newInstance(context: Context, isTournament: Boolean? = false, sessionId: String? = "", duplicate: Boolean = false) {
- val intent = this.intent(context, isTournament, sessionId, duplicate)
+ val intent =
+ intent(
+ context,
+ isTournament,
+ sessionId,
+ duplicate
+ )
context.startActivity(intent)
}
fun newInstanceForResult(fragment: Fragment, isTournament: Boolean? = false, sessionId: String? = "", duplicate: Boolean = false, requestCode: Int) {
- val intent = this.intent(fragment.requireContext(), isTournament, sessionId, duplicate)
+ val intent =
+ intent(
+ fragment.requireContext(),
+ isTournament,
+ sessionId,
+ duplicate
+ )
fragment.startActivityForResult(intent, requestCode)
}
@@ -76,7 +86,8 @@ class SessionActivity: BaseActivity() {
private fun initUI() {
val fragmentTransaction = supportFragmentManager.beginTransaction()
- val fragment = SessionFragment()
+ val fragment =
+ SessionFragment()
fragmentTransaction.add(R.id.container, fragment)
fragmentTransaction.commit()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
similarity index 98%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
index 3bff8352..3b2c3dff 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.session
import android.os.Bundle
import android.os.Handler
@@ -33,7 +33,6 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowRepresentableDiffCallback
import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
-import net.pokeranalytics.android.ui.viewmodel.SessionViewModel
import net.pokeranalytics.android.util.extensions.findById
import net.pokeranalytics.android.util.extensions.getNextMinuteInMilliseconds
import java.util.*
@@ -59,7 +58,9 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
private val refreshTimer: Runnable = object : Runnable {
override fun run() {
refreshTimer()
- handler.postDelayed(this, TIMER_DELAY)
+ handler.postDelayed(this,
+ TIMER_DELAY
+ )
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/SessionViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionViewModel.kt
similarity index 86%
rename from app/src/main/java/net/pokeranalytics/android/ui/viewmodel/SessionViewModel.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionViewModel.kt
index 3261ab26..ce772d3e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/SessionViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionViewModel.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.viewmodel
+package net.pokeranalytics.android.ui.modules.session
import androidx.lifecycle.ViewModel
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/rowrepresentable/FilterCategoryRow.kt
index a0d7cd41..362001bc 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt
@@ -3,7 +3,7 @@ package net.pokeranalytics.android.ui.view.rowrepresentable
import io.realm.Realm
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.CustomField
-import net.pokeranalytics.android.ui.interfaces.FilterableType
+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.*
@@ -26,7 +26,7 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In
;
companion object {
- fun values(filterableType:FilterableType): ArrayList {
+ fun values(filterableType: FilterableType): ArrayList {
val list = arrayListOf()
for (category in values()) {
if (category.isAllowed(filterableType)) {
@@ -37,7 +37,7 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In
}
}
- fun isAllowed(filterableType:FilterableType): Boolean {
+ fun isAllowed(filterableType: FilterableType): Boolean {
return when (filterableType) {
FilterableType.SESSION -> {
when (this) {
diff --git a/app/src/main/res/layout/activity_calendar_details.xml b/app/src/main/res/layout/activity_calendar_details.xml
index 90873fe0..0370c3ce 100644
--- a/app/src/main/res/layout/activity_calendar_details.xml
+++ b/app/src/main/res/layout/activity_calendar_details.xml
@@ -7,7 +7,7 @@
diff --git a/app/src/main/res/layout/activity_filters_list.xml b/app/src/main/res/layout/activity_filters_list.xml
index 8560f7e1..e5653e1e 100644
--- a/app/src/main/res/layout/activity_filters_list.xml
+++ b/app/src/main/res/layout/activity_filters_list.xml
@@ -7,7 +7,7 @@
diff --git a/app/src/main/res/layout/activity_session.xml b/app/src/main/res/layout/activity_session.xml
index 7d440aec..30e484f3 100644
--- a/app/src/main/res/layout/activity_session.xml
+++ b/app/src/main/res/layout/activity_session.xml
@@ -14,7 +14,7 @@
-
+