Skip to content

#20 Fixed bug with preview stretch on orientation change #23

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
merged 5 commits into from
Sep 5, 2017
Merged

#20 Fixed bug with preview stretch on orientation change #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e16ca8f
#20 Fixed bug with preview stretch on orientation change
m1r0n41k Sep 4, 2017
f69c9d9
Merge branch 'master' into bug_preview_stretch
natario1 Sep 5, 2017
af7108c
Merge branch 'master' into bug_preview_stretch
natario1 Sep 5, 2017
6f0a022
Merge branch 'master' into bug_preview_stretch
natario1 Sep 5, 2017
6f6b928
Changed OrientationHelper
m1r0n41k Sep 5, 2017
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
2 changes: 1 addition & 1 deletion cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ public void run() {

@Override
boolean shouldFlipSizes() {
return mSensorOffset % 180 != 0;
return (mDeviceOrientation + mSensorOffset) % 180 != 0;
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.util.Log;
import android.view.Display;
import android.view.MotionEvent;
import android.view.ViewGroup;
import android.view.WindowManager;
Expand Down Expand Up @@ -169,8 +170,7 @@ protected CameraController instantiateCameraController(CameraCallbacks callbacks
protected void onAttachedToWindow() {
super.onAttachedToWindow();
if (!isInEditMode()) {
WindowManager manager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
mOrientationHelper.enable(manager.getDefaultDisplay());
mOrientationHelper.enable(getContext());
}
}

Expand Down Expand Up @@ -487,6 +487,8 @@ public void start() {

if (checkPermissions(getSessionType())) {
mIsStarted = true;
// Update display orientation for current CameraController
mOrientationHelper.enable(getContext());
mCameraController.start();
}
}
Expand Down
7 changes: 4 additions & 3 deletions cameraview/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import android.view.Display;
import android.view.OrientationEventListener;
import android.view.Surface;
import android.view.WindowManager;

class OrientationHelper {

Expand Down Expand Up @@ -67,10 +68,10 @@ public void onOrientationChanged(int orientation) {
};
}

void enable(Display display) {
mDisplay = display;
void enable(Context context) {
mDisplay = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
mListener.enable();
mLastKnownDisplayOffset = DISPLAY_ORIENTATIONS.get(display.getRotation());
mLastKnownDisplayOffset = DISPLAY_ORIENTATIONS.get(mDisplay.getRotation());
mCallbacks.onDisplayOffsetChanged(mLastKnownDisplayOffset);
}

Expand Down