-
Notifications
You must be signed in to change notification settings - Fork 40
feat: Use hint and return barcode format #86
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.
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
Merged
Merged
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
39944bf
chore: update dependencies
OS-pedrogustavobilro b75217e
chore(ci): Use macos-14 instead of 13
OS-pedrogustavobilro 4d990bc
chore(ci): Add verify and example app build
OS-pedrogustavobilro 3449fd2
feat: Use hint and return barcode format
OS-pedrogustavobilro 46326d5
docs: Update changelog from previous release
OS-pedrogustavobilro 4450322
chore: Update example app to allow to configure options
OS-pedrogustavobilro 76b8499
feat(web): Return format in scan result
OS-pedrogustavobilro 88a8170
fix(web): provide hint to html5qrcode library
OS-pedrogustavobilro e987a19
chore: Merge branch 'main' into feat/RMET-4433/hint-and-format
OS-pedrogustavobilro 72fa47a
chore: fix lint issues.
OS-pedrogustavobilro e6265ee
chore: Use stricter Typescript version
OS-pedrogustavobilro 2d88657
chore: remove duplicate file
OS-pedrogustavobilro 875742a
chore: remove @retroactive
OS-pedrogustavobilro 086b8ee
chore(ci): remove unnecessary steps from example app
OS-pedrogustavobilro c04acb4
chore(ci): replace ionic cli call
OS-pedrogustavobilro 3a2cfe7
docs: Update Readme with information regarding hint
OS-pedrogustavobilro 100eaca
docs: fix info for iOS hints
OS-pedrogustavobilro a3fa026
docs: mention Maxicode in readme
OS-pedrogustavobilro f0b7d11
chore: Update barcode native lib
OS-pedrogustavobilro 9621a58
docs(ios): Fix mention of Apple Vision UPC-A ambiguity
OS-pedrogustavobilro b1842c5
Apply suggestions from code review
OS-pedrogustavobilro File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,6 @@ | ||
| // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN | ||
| include ':capacitor-android' | ||
| project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/android/capacitor') | ||
|
|
||
| include ':capacitor-app' | ||
| project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/app/android') | ||
| project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@7.4.3_@capacitor+core@7.4.3/node_modules/@capacitor/android/capacitor') | ||
|
|
||
| include ':capacitor-barcode-scanner' | ||
| project(':capacitor-barcode-scanner').projectDir = new File('../../plugin/android') | ||
|
|
||
| include ':capacitor-haptics' | ||
| project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/haptics/android') | ||
|
|
||
| include ':capacitor-keyboard' | ||
| project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/keyboard/android') | ||
|
|
||
| include ':capacitor-status-bar' | ||
| project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/status-bar/android') |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,35 @@ | ||
| PODS: | ||
| - Capacitor (7.0.0-rc.0): | ||
| - Capacitor (7.4.3): | ||
| - CapacitorCordova | ||
| - CapacitorApp (7.0.0-rc.0): | ||
| - CapacitorBarcodeScanner (2.0.4): | ||
| - Capacitor | ||
| - CapacitorBarcodeScanner (2.0.1): | ||
| - Capacitor | ||
| - OSBarcodeLib (~> 1.1.3) | ||
| - CapacitorCordova (7.0.0-rc.0) | ||
| - CapacitorHaptics (7.0.0-rc.0): | ||
| - Capacitor | ||
| - CapacitorKeyboard (7.0.0-rc.0): | ||
| - Capacitor | ||
| - CapacitorStatusBar (7.0.0-rc.0): | ||
| - Capacitor | ||
| - OSBarcodeLib (1.1.3) | ||
| - OSBarcodeLib (= 2.0.1) | ||
| - CapacitorCordova (7.4.3) | ||
| - OSBarcodeLib (2.0.1) | ||
|
|
||
| DEPENDENCIES: | ||
| - "Capacitor (from `../../../node_modules/.pnpm/@capacitor+ios@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/ios`)" | ||
| - "CapacitorApp (from `../../../node_modules/.pnpm/@capacitor+app@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/app`)" | ||
| - "Capacitor (from `../../../node_modules/.pnpm/@capacitor+ios@7.4.3_@capacitor+core@7.4.3/node_modules/@capacitor/ios`)" | ||
| - CapacitorBarcodeScanner (from `../../../plugin`) | ||
| - "CapacitorCordova (from `../../../node_modules/.pnpm/@capacitor+ios@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/ios`)" | ||
| - "CapacitorHaptics (from `../../../node_modules/.pnpm/@capacitor+haptics@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/haptics`)" | ||
| - "CapacitorKeyboard (from `../../../node_modules/.pnpm/@capacitor+keyboard@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/keyboard`)" | ||
| - "CapacitorStatusBar (from `../../../node_modules/.pnpm/@capacitor+status-bar@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/status-bar`)" | ||
| - "CapacitorCordova (from `../../../node_modules/.pnpm/@capacitor+ios@7.4.3_@capacitor+core@7.4.3/node_modules/@capacitor/ios`)" | ||
|
|
||
| SPEC REPOS: | ||
| trunk: | ||
| - OSBarcodeLib | ||
|
|
||
| EXTERNAL SOURCES: | ||
| Capacitor: | ||
| :path: "../../../node_modules/.pnpm/@capacitor+ios@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/ios" | ||
| CapacitorApp: | ||
| :path: "../../../node_modules/.pnpm/@capacitor+app@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/app" | ||
| :path: "../../../node_modules/.pnpm/@capacitor+ios@7.4.3_@capacitor+core@7.4.3/node_modules/@capacitor/ios" | ||
| CapacitorBarcodeScanner: | ||
| :path: "../../../plugin" | ||
| CapacitorCordova: | ||
| :path: "../../../node_modules/.pnpm/@capacitor+ios@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/ios" | ||
| CapacitorHaptics: | ||
| :path: "../../../node_modules/.pnpm/@capacitor+haptics@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/haptics" | ||
| CapacitorKeyboard: | ||
| :path: "../../../node_modules/.pnpm/@capacitor+keyboard@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/keyboard" | ||
| CapacitorStatusBar: | ||
| :path: "../../../node_modules/.pnpm/@capacitor+status-bar@7.0.0-rc.0_@capacitor+core@7.0.0-rc.0/node_modules/@capacitor/status-bar" | ||
| :path: "../../../node_modules/.pnpm/@capacitor+ios@7.4.3_@capacitor+core@7.4.3/node_modules/@capacitor/ios" | ||
|
|
||
| SPEC CHECKSUMS: | ||
| Capacitor: e79eb426d47f13ee0e2fdaff9ef0e9990db34a48 | ||
| CapacitorApp: a50750608d62c0ff1fe7f33d38365dd915bb0f31 | ||
| CapacitorBarcodeScanner: 67bdccc07abc05c3993e83da0196fedef7f5d508 | ||
| CapacitorCordova: 8f4f6826f0b40f7b506eb13b832039b7140a88b4 | ||
| CapacitorHaptics: 51c7ca77b24d5448bd716db4f6d5b47302ab9566 | ||
| CapacitorKeyboard: 342c56b26934429f58ec25fdbe9d4b6553969f8d | ||
| CapacitorStatusBar: 89f0dc71f6544cef1dd250dfdb347a25547532b4 | ||
| OSBarcodeLib: f2e981270a64faf476cb790864262b29ab8cd68a | ||
| Capacitor: b4741ca7affb32c1b70debd03df92cbf522d8a80 | ||
| CapacitorBarcodeScanner: b8a3d4ed0a0d2ed2cd78a16b76737cacbf8da207 | ||
| CapacitorCordova: 435121e81a2df4d0034f0fb11fcefab5104cfdb5 | ||
| OSBarcodeLib: 57987d2eb1f916f701f4554e20e349b3cb83f023 | ||
|
|
||
| PODFILE CHECKSUM: 7bd915a9b237ee006f510f6135ab6eb2a3e55593 | ||
| PODFILE CHECKSUM: fdf735c62a9097dffa919e728a30c55c44e3a7f6 | ||
|
|
||
| COCOAPODS: 1.16.2 |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| .scanner-textarea { | ||
| max-height: 200px; /* can grow up to 200px */ | ||
| overflow-y: auto; /* scroll if content exceeds max */ | ||
| white-space: pre-wrap; | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.