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

#115 Device orientation for isFlat #116

Closed
wants to merge 7 commits into from
Closed

#115 Device orientation for isFlat #116

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7885654
Add screen size to barcode result so that you can map it however you …
CmdrDats Dec 27, 2023
7884b53
commit changeset
CmdrDats Dec 27, 2023
d53681b
small changelog tweak
CmdrDats Dec 27, 2023
bafb2fb
Redact screenSize - window.devicePixelRatio is the correct method for…
CmdrDats Dec 28, 2023
8a355b5
Clean up PR a touch
CmdrDats Dec 28, 2023
2526326
spurious whitespace
CmdrDats Dec 28, 2023
0b8ef13
To get the `isPortrait`, we need to sift it through from source.
CmdrDats Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/two-steaks-impress.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@capacitor-mlkit/barcode-scanning': patch
---

Tweak the ios orientation to default 'portrait' when it reports 'flat'
2 changes: 1 addition & 1 deletion packages/barcode-scanning/ios/Plugin/BarcodeScannerHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class BarcodeScannerHelper {
let screenSize: CGRect = UIScreen.main.bounds
let imageWidth = imageSize.width
let imageHeight = imageSize.height
let isPortrait = UIDevice.current.orientation == .portrait || UIDevice.current.orientation == .portraitUpsideDown
let isPortrait = UIDevice.current.orientation.isPortrait || UIDevice.current.orientation.isFlat
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't isFlat also be true if the device was in a landscape orientation before so that the UI is still in landscape mode or am I misunderstanding isFlat?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ye, that's why I'm uncomfortable with this 'solution' - works for my case (I only support portrait mode UI), but then breaks the landscape case. The method for figuring out actual UI orientation seems to need to run on the main UI thread (I'm not quite sure how to sample that here, seeing as this is my first time ever touching swift 🙈 )

An alternative not-really-a-solution is to send through the orientation and let the underlying app decide how to correct, but that seems iffy.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The method for figuring out actual UI orientation seems to need to run on the main UI thread (I'm not quite sure how to sample that here, seeing as this is my first time ever touching swift 🙈 )

You can take a look at our Screen Orientation plugin: https://github.com/capawesome-team/capacitor-plugins/blob/main/packages/screen-orientation/ios/Plugin/ScreenOrientation.swift#L73:L79
Maybe you can find a better solution.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked around, and the most accurate thing I can see is to bubble it through from the interfaceOrientation in layoutSubviews https://github.com/capawesome-team/capacitor-mlkit/pull/116/files#diff-8b77d4c809bf757f8fef70caf790b8b021e201d15987c2d724bf0af350b14b97R113

This works correctly in testing on all orientations now, except that I needed to add 1- on the landscape coords for it to map correctly in my testing - I'm not sure why this is?

var normalizedCornerPoints = [NSValue]()
for cornerPoint in cornerPoints {
var x = Int((cornerPoint.cgPointValue.x / CGFloat(imageWidth)) * screenSize.width * scale)
Expand Down