Package refactoring, modules creation

app/src/main/AndroidManifest.xml

@@ -62,12 +62,12 @@
 
         <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.NewDataMenuActivity"
+            android:name="net.pokeranalytics.android.ui.modules.feed.NewDataMenuActivity"
             android:launchMode="singleTop"
             android:theme="@style/PokerAnalyticsTheme.MenuDialog" />
 
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.BankrollActivity"
+            android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
@@ -78,7 +78,7 @@
             android:windowSoftInputMode="stateAlwaysHidden"/>
 
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.BankrollDetailsActivity"
+            android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollDetailsActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
@@ -128,7 +128,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.EditableDataActivity"
+            android:name="net.pokeranalytics.android.ui.modules.data.EditableDataActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 

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

@@ -8,7 +8,7 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity
 import net.pokeranalytics.android.ui.view.Localizable
 import net.pokeranalytics.android.util.extensions.findById

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

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.*
 import kotlinx.android.synthetic.main.fragment_comparison_chart.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.activity.BankrollActivity
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity
 import net.pokeranalytics.android.ui.activity.SettingsActivity
 import net.pokeranalytics.android.ui.adapter.ComparisonChartPagerAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate

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

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_more.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.activity.BankrollActivity
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity
 import net.pokeranalytics.android.ui.activity.SettingsActivity
 import net.pokeranalytics.android.ui.activity.Top10Activity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter

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

@@ -29,6 +29,7 @@ import net.pokeranalytics.android.ui.extensions.openContactMail
 import net.pokeranalytics.android.ui.extensions.openPlayStorePage
 import net.pokeranalytics.android.ui.extensions.openUrl
 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.SettingRow

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

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.fragment_bottom_sheet.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate

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

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import io.realm.RealmModel
 import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType

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

@@ -13,7 +13,7 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.CustomFieldCriteria
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.realm.ReportSetup
-import net.pokeranalytics.android.ui.fragment.data.DataManagerFragment
+import net.pokeranalytics.android.ui.modules.data.DataManagerFragment
 import net.pokeranalytics.android.ui.viewmodel.ReportViewModel
 import net.pokeranalytics.android.ui.viewmodel.ViewModelHolder
 import net.pokeranalytics.android.util.extensions.findById

app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollActivity.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.bankroll
 
 import android.content.Context
 import android.content.Intent

app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsActivity.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.bankroll
 
 import android.content.Intent
 import android.os.Bundle
@@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.bankroll.BankrollReport
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.fragment.BankrollDetailsFragment
 
 class BankrollDetailsActivity : BaseActivity() {
 
@@ -18,7 +17,7 @@ class BankrollDetailsActivity : BaseActivity() {
 		 * Default constructor
 		 */
 		fun newInstanceForResult(fragment: Fragment, bankrollReport: BankrollReport, requestCode: Int) {
-			this.bankrollReport = bankrollReport
+			Companion.bankrollReport = bankrollReport
 			val intent = Intent(fragment.requireContext(), BankrollDetailsActivity::class.java)
 			fragment.startActivityForResult(intent, requestCode)
 		}

app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.bankroll
 
 import android.app.Activity.RESULT_OK
 import android.content.Intent
@@ -15,7 +15,7 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.realm.Bankroll
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
@@ -32,7 +32,8 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc
 	companion object {
 
 		fun newInstance(bankrollReport: BankrollReport): BankrollDetailsFragment {
-			val fragment = BankrollDetailsFragment()
+			val fragment =
+				BankrollDetailsFragment()
 			fragment.bankrollId = bankrollReport.setup.bankrollId
 			return fragment
 		}

app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.bankroll
 
 import android.app.Activity
 import android.content.Intent
@@ -19,9 +19,8 @@ import net.pokeranalytics.android.calculus.bankroll.BankrollReportManager
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.realm.Bankroll
-import net.pokeranalytics.android.ui.activity.BankrollDetailsActivity
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.GraphActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@@ -51,7 +50,8 @@ class BankrollFragment : DeletableItemFragment(), StaticRowRepresentableDataSour
 		 * Create new instance
 		 */
 		fun newInstance(): BankrollFragment {
-			val fragment = BankrollFragment()
+			val fragment =
+				BankrollFragment()
 			val bundle = Bundle()
 			fragment.arguments = bundle
 			return fragment

app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.app.Activity.RESULT_OK
 import android.content.Context

app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import android.os.Bundle

app/src/main/java/net/pokeranalytics/android/ui/modules/data/DataManagerFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.app.Activity
 import android.content.Intent
@@ -13,7 +13,6 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.ConfigurationException
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
 import net.pokeranalytics.android.ui.viewmodel.DataManagerViewModel

app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataActivity.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import android.content.Intent
@@ -7,7 +7,6 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.ui.activity.components.MediaActivity
-import net.pokeranalytics.android.ui.fragment.data.*
 import java.io.File
 import java.util.*
 

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

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

app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import android.os.Bundle

app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.app.Activity.RESULT_OK
 import android.content.Context

app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import io.realm.kotlin.where

app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import net.pokeranalytics.android.model.realm.Transaction

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

@@ -18,7 +18,7 @@ import net.pokeranalytics.android.model.LiveData
 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.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.modules.filter.FiltersActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter

app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt

@@ -26,6 +26,7 @@ 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.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode
 import net.pokeranalytics.android.ui.modules.filter.FilterableType
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity

app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.feed
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter

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

@@ -9,9 +9,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.DiffUtil
-import androidx.work.Data
-import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.WorkManager
 import com.crashlytics.android.Crashlytics
 import kotlinx.android.synthetic.main.fragment_session.*
 import kotlinx.coroutines.Dispatchers
@@ -31,7 +28,7 @@ import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.model.realm.Location
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.model.utils.FavoriteSessionFinder
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
@@ -43,14 +40,12 @@ 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.util.NotificationSchedule
 import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.extensions.findById
 import net.pokeranalytics.android.util.extensions.formattedHourlyDuration
 import net.pokeranalytics.android.util.extensions.getNextMinuteInMilliseconds
 import timber.log.Timber
 import java.util.*
-import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 
 

app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt

@@ -32,7 +32,7 @@ import net.pokeranalytics.android.ui.adapter.RecyclerAdapter
 import net.pokeranalytics.android.ui.extensions.ChipGroupExtension
 import net.pokeranalytics.android.ui.extensions.px
 import net.pokeranalytics.android.ui.extensions.setTextFormat
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.graph.AxisFormatting
 import net.pokeranalytics.android.ui.graph.setStyle
 import net.pokeranalytics.android.ui.modules.handhistory.views.RowHandHistoryViewHolder

app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt

@@ -15,7 +15,7 @@ import net.pokeranalytics.android.ui.adapter.BindableHolder
 import net.pokeranalytics.android.ui.adapter.RecyclerAdapter
 import net.pokeranalytics.android.ui.extensions.addCircleRipple
 import net.pokeranalytics.android.ui.extensions.setTextFormat
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
 import timber.log.Timber

app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollMainRow.kt

@@ -1,9 +1,10 @@
 package net.pokeranalytics.android.ui.view.rowrepresentable
 
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
-class BankrollMainRow : BankrollRowRepresentable {
+class BankrollMainRow :
+	BankrollRowRepresentable {
 
 	override var bankrollId: String? = null
 

app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomizableRowRepresentable.kt

@@ -1,12 +1,13 @@
 package net.pokeranalytics.android.ui.view.rowrepresentable
 
 import android.content.Context
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+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
 
-class BankrollTotalRow(override var bankrollId: String?, var name: String) : BankrollRowRepresentable {
+class BankrollTotalRow(override var bankrollId: String?, var name: String) :
+	BankrollRowRepresentable {
 
 	override val viewType: Int = RowViewType.TITLE_VALUE_ARROW.ordinal
 

app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GraphRow.kt

@@ -3,12 +3,13 @@ package net.pokeranalytics.android.ui.view.rowrepresentable
 import com.github.mikephil.charting.data.DataSet
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
 
-class BankrollGraphRow : GraphRow(null, null, null, null), BankrollRowRepresentable {
+class BankrollGraphRow : GraphRow(null, null, null, null),
+	BankrollRowRepresentable {
 
     override var bankrollId: String? = null
 

app/src/main/res/layout/activity_bankroll.xml

@@ -7,7 +7,7 @@
 
 	<fragment
 		android:id="@+id/bankrollFragment"
-		android:name="net.pokeranalytics.android.ui.fragment.BankrollFragment"
+		android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollFragment"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		tools:layout="@layout/fragment_bankroll"  />