|
|
|
|
@ -18,34 +18,32 @@ class FiltersListActivity : BaseActivity() { |
|
|
|
|
|
|
|
|
|
enum class IntentKey(val keyName: String) { |
|
|
|
|
DATA_TYPE("DATA_TYPE"), |
|
|
|
|
LIVE_DATA_TYPE("LIVE_DATA_TYPE"), |
|
|
|
|
ITEM_DELETED("ITEM_DELETED"), |
|
|
|
|
SHOW_ADD_BUTTON("SHOW_ADD_BUTTON"), |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
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() |
|
|
|
|
fragment.startActivityForResult( |
|
|
|
|
getIntent( |
|
|
|
|
context, |
|
|
|
|
dataType, |
|
|
|
|
showAddButton |
|
|
|
|
), 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) |
|
|
|
|
intent.putExtra(IntentKey.DATA_TYPE.keyName, dataType) |
|
|
|
|
intent.putExtra(IntentKey.SHOW_ADD_BUTTON.keyName, showAddButton) |
|
|
|
|
return intent |
|
|
|
|
} |
|
|
|
|
@ -53,21 +51,27 @@ class FiltersListActivity : BaseActivity() { |
|
|
|
|
|
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) { |
|
|
|
|
super.onCreate(savedInstanceState) |
|
|
|
|
|
|
|
|
|
initData() |
|
|
|
|
|
|
|
|
|
setContentView(R.layout.activity_filters_list) |
|
|
|
|
|
|
|
|
|
initUI() |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private fun initData() { |
|
|
|
|
this.model.dataType = LiveData.FILTER |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Init UI |
|
|
|
|
*/ |
|
|
|
|
private fun initUI() { |
|
|
|
|
val dataType = intent.getIntExtra(IntentKey.DATA_TYPE.keyName, 0) |
|
|
|
|
|
|
|
|
|
val showAddButton = intent.getBooleanExtra(IntentKey.SHOW_ADD_BUTTON.keyName, true) |
|
|
|
|
|
|
|
|
|
// val fragment = filtersListFragment as FiltersListFragment |
|
|
|
|
|
|
|
|
|
this.model.dataType = LiveData.values()[dataType] |
|
|
|
|
this.model.showAddButton = showAddButton |
|
|
|
|
|
|
|
|
|
// fragment.setData(dataType) |
|
|
|
|
|