This repository has been archived by the owner on Oct 10, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 464
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thanks for contributing 🙂 Please merge the current master branch in your branch. |
devtronic
suggested changes
Apr 14, 2020
android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
Outdated
Show resolved
Hide resolved
android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
Show resolved
Hide resolved
…reader into cancel # Conflicts: # android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
Hello, can you check? Not sure, if I did right. |
@devtronic when will this merge? :) |
I'll review the changes today |
@devtronic thanks for the update 😊 |
devtronic
suggested changes
Apr 17, 2020
android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
Outdated
Show resolved
Hide resolved
@iRaySpace I can't build the project since there is a variable getting defined twice. I added a comment on the corresponding line in the |
Hello @devtronic Thank you, and also I have put up the changes. |
devtronic
approved these changes
Apr 20, 2020
Merged
devtronic
added a commit
that referenced
this pull request
May 8, 2020
* feat: added cancel for ux (#198) * feat: added cancel for ux * re(feat): apply cancel functionality to merged * fix: return true * fix(syntax): flashButton and cancelButton * fix: syntax * Changelog updated * add fix for autofocus with logging * add comment and remove log for merge on master project * Update the 3.x branch (#229) * Update issue templates * Update UPGRADE.md * Fix camera selection in Android. * CHANGELOG updated * Release prepared Co-authored-by: Ivan Ray Altomera <iRaySpace@users.noreply.github.com> Co-authored-by: Vincenzo <vincenzo.salerno@live.it> Co-authored-by: GabrieleVolpato <6254043+GabrieleVolpato@users.noreply.github.com>
devtronic
added a commit
that referenced
this pull request
Sep 14, 2020
* 3.0.1 (#237) * feat: added cancel for ux (#198) * feat: added cancel for ux * re(feat): apply cancel functionality to merged * fix: return true * fix(syntax): flashButton and cancelButton * fix: syntax * Changelog updated * add fix for autofocus with logging * add comment and remove log for merge on master project * Update the 3.x branch (#229) * Update issue templates * Update UPGRADE.md * Fix camera selection in Android. * CHANGELOG updated * Release prepared Co-authored-by: Ivan Ray Altomera <iRaySpace@users.noreply.github.com> Co-authored-by: Vincenzo <vincenzo.salerno@live.it> Co-authored-by: GabrieleVolpato <6254043+GabrieleVolpato@users.noreply.github.com> * Update issue templates * Scan Options Descriptions correction. (#270) Co-authored-by: Ivan Ray Altomera <iRaySpace@users.noreply.github.com> Co-authored-by: Vincenzo <vincenzo.salerno@live.it> Co-authored-by: GabrieleVolpato <6254043+GabrieleVolpato@users.noreply.github.com> Co-authored-by: Muzammil Bilwani <muzammil.bilwani@hotmail.com>
devtronic
added a commit
that referenced
this pull request
Sep 14, 2020
* 3.0.1 (#237) * feat: added cancel for ux (#198) * feat: added cancel for ux * re(feat): apply cancel functionality to merged * fix: return true * fix(syntax): flashButton and cancelButton * fix: syntax * Changelog updated * add fix for autofocus with logging * add comment and remove log for merge on master project * Update the 3.x branch (#229) * Update issue templates * Update UPGRADE.md * Fix camera selection in Android. * CHANGELOG updated * Release prepared Co-authored-by: Ivan Ray Altomera <iRaySpace@users.noreply.github.com> Co-authored-by: Vincenzo <vincenzo.salerno@live.it> Co-authored-by: GabrieleVolpato <6254043+GabrieleVolpato@users.noreply.github.com> * Update issue templates * Scan Options Descriptions correction. (#270) * Update README.md Update Kotlin plugin installation link, add protobuf-gradle-plugin dependency for Gradle build Co-authored-by: Julian Finkler <julian@mintware.de> Co-authored-by: Ivan Ray Altomera <iRaySpace@users.noreply.github.com> Co-authored-by: Vincenzo <vincenzo.salerno@live.it> Co-authored-by: GabrieleVolpato <6254043+GabrieleVolpato@users.noreply.github.com> Co-authored-by: Julian Finkler <julian@developer-heaven.de> Co-authored-by: Muzammil Bilwani <muzammil.bilwani@hotmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are users that doesn't know back button. Added the Cancel button for UX purposes. Only modified for Android. Haven't done for iOS