verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refs #6530 feat:onBack

This commit is contained in:
Sergio De la torre 2024-04-23 08:05:45 +02:00
parent 57ee6f3570
commit 5f78920db5
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt
View File

@ -7,6 +7,7 @@ import android.view.View
import android.view.inputmethod.EditorInfo
import android.widget.ImageView
import android.widget.Toast
import androidx.activity.OnBackPressedDispatcher
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
@ -50,6 +51,7 @@ class LoadUnloadFragment(
private var route = 0
private var addressFk = 0
private lateinit var db: DeliveryDatabase
private lateinit var backDispatcher: OnBackPressedDispatcher
companion object {
var scanned = false
@ -65,6 +67,23 @@ class LoadUnloadFragment(
}
}
/* override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
requireActivity().onBackPressedDispatcher.addCallback(
viewLifecycleOwner,
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
*//* if (!onBackListenerPressed()) {
isEnabled = true
requireActivity().onBackPressedDispatcher
} else {*//*
println("backk UnLoadLoadFragment")
// }
}
})
}*/
override fun getLayoutId(): Int = R.layout.fragment_expedition_loadunload_delivery
override fun init() {
@ -285,7 +304,7 @@ class LoadUnloadFragment(
)
scanning(true)
} else {
ma.messageWithSound("", isError = true, isPlayed = true, isToasted = null)
ma.messageWithSound("", isError = true, isPlayed = true, isToasted = null)
}
}
@ -334,13 +353,25 @@ class LoadUnloadFragment(
counterCalls = 0
}
} else {
ma.messageWithSound(it.errorMessage, isError = true, isPlayed = true, titleWithError = "Error", isToasted = true)
ma.messageWithSound(
it.errorMessage,
isError = true,
isPlayed = true,
titleWithError = "Error",
isToasted = true
)
openSignActivity()
}
}
responseStateList.observe(viewLifecycleOwner) {
ma.messageWithSound(it.errorMessage, isError = true, isPlayed = true, titleWithError = "", isToasted = true)
ma.messageWithSound(
it.errorMessage,
isError = true,
isPlayed = true,
titleWithError = "",
isToasted = true
)
savePendingExpeditions()
openSignActivity()
}

17
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt
View File

@ -36,7 +36,24 @@ class LogExpeditionFragment(
}
override fun getLayoutId(): Int = R.layout.fragment_expedition_log_delivery
/*override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
requireActivity().onBackPressedDispatcher.addCallback(
viewLifecycleOwner,
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
*//* if (!onBackListenerPressed()) {
isEnabled = true
requireActivity().onBackPressedDispatcher
} else {*//*
ma.onMyBackPressed()
//println("backk LogExpeditionFragment")
// }
}
})
}
*/
@RequiresApi(Build.VERSION_CODES.O)
override fun init() {