|
|
|
|
@ -45,15 +45,13 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { |
|
|
|
|
|
|
|
|
|
companion object { |
|
|
|
|
|
|
|
|
|
const val REQUEST_CODE_MENU = 100 |
|
|
|
|
const val REQUEST_CODE_TRANSACTION_DETAILS = 101 |
|
|
|
|
|
|
|
|
|
fun newInstance(): FeedFragment { |
|
|
|
|
val fragment = FeedFragment() |
|
|
|
|
val bundle = Bundle() |
|
|
|
|
fragment.arguments = bundle |
|
|
|
|
return fragment |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private lateinit var feedSessionAdapter: FeedSessionRowRepresentableAdapter |
|
|
|
|
@ -121,13 +119,13 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { |
|
|
|
|
|
|
|
|
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { |
|
|
|
|
super.onActivityResult(requestCode, resultCode, data) |
|
|
|
|
if (requestCode == REQUEST_CODE_MENU && resultCode == RESULT_OK && data != null) { |
|
|
|
|
if (requestCode == RequestCode.FEED_MENU.value && resultCode == RESULT_OK && data != null) { |
|
|
|
|
when (data.getIntExtra(NewDataMenuActivity.IntentKey.CHOICE.keyName, -1)) { |
|
|
|
|
0 -> createNewSession(false) |
|
|
|
|
1 -> createNewSession(true) |
|
|
|
|
2 -> createNewTransaction() |
|
|
|
|
} |
|
|
|
|
} else if (requestCode == REQUEST_CODE_TRANSACTION_DETAILS && resultCode == RESULT_OK && data != null) { |
|
|
|
|
} else if (requestCode == RequestCode.FEED_TRANSACTION_DETAILS.value && resultCode == RESULT_OK && data != null) { |
|
|
|
|
if (data.getStringExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName) != null) { |
|
|
|
|
deleteSelectedTransaction() |
|
|
|
|
} |
|
|
|
|
@ -158,7 +156,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { |
|
|
|
|
this, |
|
|
|
|
LiveData.TRANSACTION, |
|
|
|
|
row.id, |
|
|
|
|
REQUEST_CODE_TRANSACTION_DETAILS |
|
|
|
|
RequestCode.FEED_TRANSACTION_DETAILS.value |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -195,7 +193,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { |
|
|
|
|
activity?.let { |
|
|
|
|
val options = ActivityOptionsCompat.makeSceneTransitionAnimation(it) |
|
|
|
|
val intent = Intent(requireContext(), NewDataMenuActivity::class.java) |
|
|
|
|
startActivityForResult(intent, REQUEST_CODE_MENU, options.toBundle()) |
|
|
|
|
startActivityForResult(intent, RequestCode.FEED_MENU.value, options.toBundle()) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|