Skip to content

fix(android): broken interface computation #89

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

Merged
gladiuscode merged 9 commits into from
Jul 27, 2025
Merged

fix(android): broken interface computation #89

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ca4078
fix: remove interface computation from device orientation, use displa…
gladiuscode Jul 19, 2025
7054749
fix: convertToOrientationFromScreenRotation method
gladiuscode Jul 19, 2025
d605a33
revert: "fix: convertToOrientationFromScreenRotation method"
gladiuscode Jul 19, 2025
c0dfaf3
fix: explicitly invert interface landscape orientation to match iOS
gladiuscode Jul 19, 2025
4951d29
fix: simplify convertToDeviceOrientation from logic
gladiuscode Jul 19, 2025
fb5ceaf
fix: missing orientationAngles validation
gladiuscode Jul 19, 2025
86a4706
fix: face up and face down detection
gladiuscode Jul 19, 2025
7cfd1ec
fix(lint): kotlin code
gladiuscode Jul 19, 2025
2e4868a
feat: fix invert interface orientation only based on device one
gladiuscode Jul 27, 2025
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
44 changes: 8 additions & 36 deletions ...oid/src/main/java/com/orientationdirector/implementation/OrientationDirectorModuleImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class OrientationDirectorModuleImpl internal constructor(private val context: Re
mAutoRotationObserver.enable()

mBroadcastReceiver.setOnReceiveCallback {
adaptInterfaceTo(lastDeviceOrientation, false)
checkInterfaceOrientation(false)
}

context.addLifecycleEventListener(mLifecycleListener)
Expand Down Expand Up @@ -113,7 +113,7 @@ class OrientationDirectorModuleImpl internal constructor(private val context: Re
context.currentActivity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED

updateIsLockedTo(false)
adaptInterfaceTo(lastDeviceOrientation)
checkInterfaceOrientation()
}

fun resetSupportedInterfaceOrientations() {
Expand Down Expand Up @@ -161,53 +161,25 @@ class OrientationDirectorModuleImpl internal constructor(private val context: Re
mEventManager.sendDeviceOrientationDidChange(deviceOrientation.ordinal)
lastDeviceOrientation = deviceOrientation

adaptInterfaceTo(deviceOrientation)
checkInterfaceOrientation()

if (!didComputeInitialDeviceOrientation) {
didComputeInitialDeviceOrientation = true
mOrientationSensorsEventListener.disable()
}
}

private fun adaptInterfaceTo(deviceOrientation: Orientation, checkLastAutoRotationStatus: Boolean = true) {
if (checkLastAutoRotationStatus && !mAutoRotationObserver.getLastAutoRotationStatus()) {
private fun checkInterfaceOrientation(skipIfAutoRotationIsDisabled: Boolean = true) {
if (skipIfAutoRotationIsDisabled && !mAutoRotationObserver.getLastAutoRotationStatus()) {
return
}

val supportsLandscape =
mUtils.getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
if (isLocked && !supportsLandscape) {
return
}

var newInterfaceOrientation = mUtils.convertToInterfaceOrientationFrom(deviceOrientation);

/**
* When the device orientation is either face up or face down,
* we can't match it to an interface orientation, because
* it could be either portrait or any landscape.
* So we read it from the system itself.
*/
if (newInterfaceOrientation == Orientation.UNKNOWN) {
val rotation = mUtils.getInterfaceRotation()
newInterfaceOrientation = mUtils.convertToOrientationFromScreenRotation(rotation)
}

/**
* This differs from iOS because we can't read the actual orientation of the interface,
* we read its rotation.
* This means that even if the requestedOrientation of the currentActivity is locked to landscape
* it reads every possible orientation and this is not what we want.
* Instead, we check that its value is either LANDSCAPE_RIGHT or LANDSCAPE_LEFT, otherwise we
* exit
*/
val newInterfaceOrientationIsNotLandscape =
newInterfaceOrientation != Orientation.LANDSCAPE_RIGHT
&& newInterfaceOrientation != Orientation.LANDSCAPE_LEFT;
if (supportsLandscape && newInterfaceOrientationIsNotLandscape) {
if (isLocked) {
return
}

val rotation = mUtils.getInterfaceRotation()
val newInterfaceOrientation = mUtils.convertToOrientationFromScreenRotation(rotation)
if (newInterfaceOrientation == lastInterfaceOrientation) {
return
}
Expand Down
4 changes: 2 additions & 2 deletions android/src/main/java/com/orientationdirector/implementation/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class Utils(private val context: ReactContext) {

fun convertToOrientationFromScreenRotation(screenRotation: Int): Orientation {
return when (screenRotation) {
Surface.ROTATION_270 -> Orientation.LANDSCAPE_RIGHT
Surface.ROTATION_90 -> Orientation.LANDSCAPE_LEFT
Surface.ROTATION_270 -> Orientation.LANDSCAPE_LEFT
Surface.ROTATION_90 -> Orientation.LANDSCAPE_RIGHT
Surface.ROTATION_180 -> Orientation.PORTRAIT_UPSIDE_DOWN
else -> Orientation.PORTRAIT
}
Expand Down