Fixes crash when tapping on the ALL button in Filter

hh
Laurent 6 years ago
parent ab4181c633
commit 9b2c5f6ee6
  1. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt
  2. 34
      app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersListActivity.kt

@ -122,7 +122,7 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate {
moreFilters.setOnClickListener { moreFilters.setOnClickListener {
LiveData.FILTER.subType = this.model.filterableType?.uniqueIdentifier LiveData.FILTER.subType = this.model.filterableType?.uniqueIdentifier
FiltersListActivity.newSelectInstance(this, LiveData.FILTER.ordinal, false) FiltersListActivity.newSelectInstance(this, false)
} }
mostUsedFiltersLayout.isVisible = showMostUsedFiltersLayout mostUsedFiltersLayout.isVisible = showMostUsedFiltersLayout

@ -18,34 +18,32 @@ class FiltersListActivity : BaseActivity() {
enum class IntentKey(val keyName: String) { enum class IntentKey(val keyName: String) {
DATA_TYPE("DATA_TYPE"), DATA_TYPE("DATA_TYPE"),
LIVE_DATA_TYPE("LIVE_DATA_TYPE"),
ITEM_DELETED("ITEM_DELETED"), ITEM_DELETED("ITEM_DELETED"),
SHOW_ADD_BUTTON("SHOW_ADD_BUTTON"), SHOW_ADD_BUTTON("SHOW_ADD_BUTTON"),
} }
companion object { companion object {
fun newInstance(context: Context, dataType: Int) {
context.startActivity(
getIntent(
context,
dataType
)
)
}
fun newSelectInstance(fragment: Fragment, dataType: Int, showAddButton: Boolean = true) { // fun newInstance(context: Context, dataType: Int) {
// context.startActivity(
// getIntent(
// context,
// dataType
// )
// )
// }
fun newSelectInstance(fragment: Fragment, showAddButton: Boolean = true) {
val context = fragment.requireContext() val context = fragment.requireContext()
fragment.startActivityForResult( fragment.startActivityForResult(
getIntent( getIntent(
context, context,
dataType,
showAddButton showAddButton
), FilterActivityRequestCode.SELECT_FILTER.ordinal) ), FilterActivityRequestCode.SELECT_FILTER.ordinal)
} }
private fun getIntent(context: Context, dataType: Int, showAddButton: Boolean = true): Intent { private fun getIntent(context: Context, showAddButton: Boolean = true): Intent {
val intent = Intent(context, FiltersListActivity::class.java) val intent = Intent(context, FiltersListActivity::class.java)
intent.putExtra(IntentKey.DATA_TYPE.keyName, dataType)
intent.putExtra(IntentKey.SHOW_ADD_BUTTON.keyName, showAddButton) intent.putExtra(IntentKey.SHOW_ADD_BUTTON.keyName, showAddButton)
return intent return intent
} }
@ -53,21 +51,27 @@ class FiltersListActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
initData()
setContentView(R.layout.activity_filters_list) setContentView(R.layout.activity_filters_list)
initUI() initUI()
} }
private fun initData() {
this.model.dataType = LiveData.FILTER
}
/** /**
* Init UI * Init UI
*/ */
private fun initUI() { private fun initUI() {
val dataType = intent.getIntExtra(IntentKey.DATA_TYPE.keyName, 0)
val showAddButton = intent.getBooleanExtra(IntentKey.SHOW_ADD_BUTTON.keyName, true) val showAddButton = intent.getBooleanExtra(IntentKey.SHOW_ADD_BUTTON.keyName, true)
// val fragment = filtersListFragment as FiltersListFragment // val fragment = filtersListFragment as FiltersListFragment
this.model.dataType = LiveData.values()[dataType]
this.model.showAddButton = showAddButton this.model.showAddButton = showAddButton
// fragment.setData(dataType) // fragment.setData(dataType)

Loading…
Cancel
Save