refs #3520 feat:silex→salix
This commit is contained in:
parent
99ec7c7fc3
commit
92136fe797
|
@ -51,7 +51,7 @@ class ReubicationCollectionFragment(
|
||||||
override fun init() {
|
override fun init() {
|
||||||
customDialogInputTwoValues = CustomDialogInputTwoValues(requireContext())
|
customDialogInputTwoValues = CustomDialogInputTwoValues(requireContext())
|
||||||
ma.hideBottomNavigation(GONE)
|
ma.hideBottomNavigation(GONE)
|
||||||
binding.splashProgress.visibility = GONE
|
|
||||||
binding.mainToolbar.toolbarTitle.text =
|
binding.mainToolbar.toolbarTitle.text =
|
||||||
"${getString(R.string.wagoon)}:${shelving.uppercase()}"
|
"${getString(R.string.wagoon)}:${shelving.uppercase()}"
|
||||||
setEvents()
|
setEvents()
|
||||||
|
@ -152,7 +152,6 @@ class ReubicationCollectionFragment(
|
||||||
customDialogMerge(itemReubication)
|
customDialogMerge(itemReubication)
|
||||||
|
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
binding.splashProgress.visibility = GONE
|
|
||||||
customDialogInputTwoValues.setValueTwo("")
|
customDialogInputTwoValues.setValueTwo("")
|
||||||
scanRequest()
|
scanRequest()
|
||||||
customDialogInputTwoValues.dismiss()
|
customDialogInputTwoValues.dismiss()
|
||||||
|
@ -201,8 +200,6 @@ class ReubicationCollectionFragment(
|
||||||
|
|
||||||
loadReubicationList.observe(viewLifecycleOwner) { event ->
|
loadReubicationList.observe(viewLifecycleOwner) { event ->
|
||||||
event.getContentIfNotHandled().notNull {
|
event.getContentIfNotHandled().notNull {
|
||||||
binding.splashProgress.visibility = GONE
|
|
||||||
|
|
||||||
|
|
||||||
if (it.list.isEmpty()) {
|
if (it.list.isEmpty()) {
|
||||||
|
|
||||||
|
@ -235,7 +232,6 @@ class ReubicationCollectionFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun callItemShelvingReturn() {
|
private fun callItemShelvingReturn() {
|
||||||
binding.splashProgress.visibility = VISIBLE
|
|
||||||
viewModel.itemShelvingAlternative(
|
viewModel.itemShelvingAlternative(
|
||||||
shelvingFk = shelving,
|
shelvingFk = shelving,
|
||||||
)
|
)
|
||||||
|
|
|
@ -57,7 +57,7 @@ class ReubicationFragment(var entrypoint: String) :
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
|
||||||
goBack = false
|
goBack = false
|
||||||
if (!binding.scanInput.text.isNullOrEmpty()) {
|
if (!binding.scanInput.text.isNullOrEmpty()) {
|
||||||
binding.splashProgress.visibility = VISIBLE
|
|
||||||
shelvingScaned = binding.scanInput.text.toString()
|
shelvingScaned = binding.scanInput.text.toString()
|
||||||
viewModel.itemShelvingAlternative(
|
viewModel.itemShelvingAlternative(
|
||||||
shelvingFk = binding.scanInput.text.toString(),
|
shelvingFk = binding.scanInput.text.toString(),
|
||||||
|
@ -77,8 +77,6 @@ class ReubicationFragment(var entrypoint: String) :
|
||||||
with(viewModel) {
|
with(viewModel) {
|
||||||
loadReubicationList.observe(viewLifecycleOwner) { event ->
|
loadReubicationList.observe(viewLifecycleOwner) { event ->
|
||||||
event.getContentIfNotHandled().notNull {
|
event.getContentIfNotHandled().notNull {
|
||||||
binding.splashProgress.visibility = GONE
|
|
||||||
|
|
||||||
|
|
||||||
if (it.list.isEmpty()) {
|
if (it.list.isEmpty()) {
|
||||||
ma.messageWithSound(
|
ma.messageWithSound(
|
||||||
|
|
Loading…
Reference in New Issue