Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Flash toggle should not be displayed when the quick view is visible #4538

Merged
merged 1 commit into from Mar 19, 2022
Merged

fix: Flash toggle should not be displayed when the quick view is visible #4538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...c/main/java/openfoodfacts/github/scrachx/openfood/features/scan/ContinuousScanActivity.kt
View file
Open in desktop
Expand Up @@ -516,7 +516,6 @@ class ContinuousScanActivity : BaseActivity(), IProductView {
binding.barcodeScanner.setStatusText(null)
binding.barcodeScanner.setOnClickListener {
quickViewBehavior.state = BottomSheetBehavior.STATE_HIDDEN
binding.barcodeScanner.resume()
}
binding.barcodeScanner.barcodeView.cameraSettings.run {
requestedCameraId = cameraState
Expand Down Expand Up @@ -769,6 +768,15 @@ class ContinuousScanActivity : BaseActivity(), IProductView {
productViewFragment?.showIngredientsTab(action)
}

// The back button will close the bottom sheet if visible
override fun onBackPressed() {
if (quickViewBehavior.state != BottomSheetBehavior.STATE_HIDDEN) {
collapseBottomSheet()
} else {
super.onBackPressed()
}
}

private inner class BarcodeInputListener : OnEditorActionListener {
override fun onEditorAction(textView: TextView, actionId: Int, event: KeyEvent?): Boolean {
// When user search from "having trouble" edit text
Expand Down
50 changes: 27 additions & 23 deletions app/src/main/java/openfoodfacts/github/scrachx/openfood/features/scan/QuickViewCallback.kt
View file
Open in desktop
Expand Up @@ -14,22 +14,12 @@ internal class QuickViewCallback(
internal val peekSmall by lazy { activity.resources.getDimensionPixelSize(R.dimen.scan_summary_peek_small) }
internal val peekLarge by lazy { activity.resources.getDimensionPixelSize(R.dimen.scan_summary_peek_large) }

private fun stopScanner() {
if (activity.useMLScanner) {
activity.mlKitView.updateWorkflowState(WorkflowState.DETECTED)
activity.mlKitView.stopCameraPreview()
} else {
activity.binding.barcodeScanner.pause()
}
}

override fun onStateChanged(bottomSheet: View, newState: Int) {


when (newState) {
BottomSheetBehavior.STATE_HIDDEN -> {
activity.lastBarcode = null
activity.binding.txtProductCallToAction.visibility = View.GONE
startScanner()
}
BottomSheetBehavior.STATE_COLLAPSED -> stopScanner()
BottomSheetBehavior.STATE_EXPANDED -> {
Expand Down Expand Up @@ -70,20 +60,34 @@ internal class QuickViewCallback(
activity.binding.bottomNavigation.bottomNavigation.visibility = View.GONE
}
} else {
if (activity.useMLScanner) {
activity.mlKitView.updateWorkflowState(WorkflowState.DETECTING)
activity.mlKitView.startCameraPreview()
} else {
activity.binding.barcodeScanner.resume()
}
activity.binding.quickViewDetails.visibility = View.VISIBLE
activity.binding.quickViewTags.visibility = if (activity.analysisTagsEmpty) View.GONE else View.VISIBLE
activity.binding.bottomNavigation.bottomNavigation.visibility = View.VISIBLE
if (activity.binding.quickViewProductNotFound.visibility != View.VISIBLE) {
activity.binding.txtProductCallToAction.visibility = View.VISIBLE
}
startScanner()
}
}
previousSlideOffset = slideOffset
}

private fun startScanner() {
if (activity.useMLScanner) {
activity.mlKitView.updateWorkflowState(WorkflowState.DETECTING)
activity.mlKitView.startCameraPreview()
} else {
activity.binding.barcodeScanner.resume()
}

activity.binding.quickViewDetails.visibility = View.VISIBLE
activity.binding.quickViewTags.visibility = if (activity.analysisTagsEmpty) View.GONE else View.VISIBLE
activity.binding.bottomNavigation.bottomNavigation.visibility = View.VISIBLE
activity.binding.toggleFlash.visibility = View.VISIBLE
}

private fun stopScanner() {
if (activity.useMLScanner) {
activity.mlKitView.updateWorkflowState(WorkflowState.DETECTED)
activity.mlKitView.stopCameraPreview()
} else {
activity.binding.barcodeScanner.pause()
}

activity.binding.toggleFlash.visibility = View.GONE
}
}