Refactor classes

dev_raz_wip
Aurelien Hubert 7 years ago
parent 7e451e9688
commit 7f0c188fde
  1. 7
      app/src/main/java/net/pokeranalytics/android/ui/activity/DataListActivity.kt
  2. 9
      app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt
  5. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
  6. 6
      app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
  7. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
  8. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
  9. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
  10. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
  11. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
  12. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDateFragment.kt
  13. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DatePickerFragment.kt
  14. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DynamicListFragment.kt
  15. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
  16. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/TimePickerFragment.kt

@ -3,15 +3,10 @@ package net.pokeranalytics.android.ui.activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import io.realm.Realm
import io.realm.kotlin.where
import kotlinx.android.synthetic.main.activity_data_list.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.fragment.DataListFragment
import net.pokeranalytics.android.util.PokerAnalyticsActivity
import net.pokeranalytics.android.util.data.sessionDao
import java.util.*
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
class DataListActivity : PokerAnalyticsActivity() {

@ -3,17 +3,10 @@ package net.pokeranalytics.android.ui.activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import io.realm.Realm
import io.realm.kotlin.where
import kotlinx.android.synthetic.main.activity_data_list.*
import kotlinx.android.synthetic.main.activity_editable_data.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.fragment.DataListFragment
import net.pokeranalytics.android.ui.fragment.EditableDataFragment
import net.pokeranalytics.android.util.PokerAnalyticsActivity
import net.pokeranalytics.android.util.data.sessionDao
import java.util.*
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
class EditableDataActivity : PokerAnalyticsActivity() {

@ -11,7 +11,7 @@ import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.fragment.HistoryFragment
import net.pokeranalytics.android.ui.fragment.SettingsFragment
import net.pokeranalytics.android.ui.fragment.StatsFragment
import net.pokeranalytics.android.util.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.util.data.sessionDao
import java.util.*

@ -6,7 +6,7 @@ import android.os.Bundle
import kotlinx.android.synthetic.main.activity_new_session.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.fragment.NewSessionFragment
import net.pokeranalytics.android.util.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
class NewSessionActivity: PokerAnalyticsActivity() {

@ -1,4 +1,4 @@
package net.pokeranalytics.android.util
package net.pokeranalytics.android.ui.activity.components
import android.os.Bundle
import android.os.PersistableBundle

@ -6,16 +6,12 @@ import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.LinearLayoutManager
import io.realm.Realm
import io.realm.RealmObject
import io.realm.RealmResults
import io.realm.Sort
import kotlinx.android.synthetic.main.fragment_new_session.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.*
import net.pokeranalytics.android.ui.activity.DataListActivity
import net.pokeranalytics.android.ui.activity.EditableDataActivity
import net.pokeranalytics.android.ui.adapter.components.*
import net.pokeranalytics.android.util.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class DataListFragment : PokerAnalyticsFragment(), DisplayableDelegate {

@ -7,12 +7,10 @@ import android.view.ViewGroup
import androidx.recyclerview.widget.LinearLayoutManager
import io.realm.Realm
import io.realm.RealmObject
import io.realm.kotlin.createObject
import kotlinx.android.synthetic.main.fragment_new_session.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.*
import net.pokeranalytics.android.ui.adapter.components.*
import net.pokeranalytics.android.util.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback {

@ -17,9 +17,8 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.activity.NewSessionActivity
import net.pokeranalytics.android.ui.adapter.HistoryAdapter
import net.pokeranalytics.android.util.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.util.data.sessionDao
import timber.log.Timber
import java.util.*
class HistoryFragment : PokerAnalyticsFragment() {

@ -9,14 +9,14 @@ import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.fragment_new_session.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.adapter.components.DynamicListAdapter
import net.pokeranalytics.android.ui.adapter.components.DynamicRowCallback
import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
import net.pokeranalytics.android.ui.adapter.components.EditableDataDelegate
import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
import net.pokeranalytics.android.util.PokerAnalyticsActivity
import net.pokeranalytics.android.util.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate {

@ -9,7 +9,7 @@ import kotlinx.android.synthetic.main.fragment_settings.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.DataListActivity
import net.pokeranalytics.android.ui.adapter.components.*
import net.pokeranalytics.android.util.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class SettingsFragment : PokerAnalyticsFragment(), DynamicRowDelegate, DynamicRowCallback {

@ -4,9 +4,8 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import net.pokeranalytics.android.R
import net.pokeranalytics.android.util.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class StatsFragment : PokerAnalyticsFragment() {

@ -7,9 +7,6 @@ import kotlinx.android.synthetic.main.bottom_sheet_date.*
import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.TimeFrame
import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
import net.pokeranalytics.android.util.DatePickerFragment
import net.pokeranalytics.android.util.TimePickerFragment
class BottomSheetDateFragment : BottomSheetFragment() {

@ -1,4 +1,4 @@
package net.pokeranalytics.android.util
package net.pokeranalytics.android.ui.fragment.components
import android.app.DatePickerDialog
import android.app.Dialog

@ -1,8 +1,5 @@
package net.pokeranalytics.android.ui.fragment.components
import androidx.recyclerview.widget.RecyclerView
import net.pokeranalytics.android.util.PokerAnalyticsFragment
open class DynamicListFragment : PokerAnalyticsFragment() {

@ -1,8 +1,9 @@
package net.pokeranalytics.android.util
package net.pokeranalytics.android.ui.fragment.components
import android.os.Bundle
import androidx.fragment.app.Fragment
import io.realm.Realm
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
open class PokerAnalyticsFragment: Fragment() {

@ -1,4 +1,4 @@
package net.pokeranalytics.android.util
package net.pokeranalytics.android.ui.fragment.components
import android.app.Dialog
import android.app.TimePickerDialog
Loading…
Cancel
Save