Skip to content

[camera_android] Remove TestUtils.java #6490

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
auto-submit merged 6 commits into from
Apr 8, 2024
Merged

[camera_android] Remove TestUtils.java #6490

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b96d07
partial removal, all but one slightly more complicated class of usage…
mackall-work Apr 8, 2024
7be36cb
remove from methodcallhandlerimpltest
mackall-work Apr 8, 2024
ad2de44
delete forgotten unused import
mackall-work Apr 8, 2024
226138f
finish deletion
mackall-work Apr 8, 2024
fc63e2c
changelog and pubspec
mackall-work Apr 8, 2024
cf4a1ae
format
mackall-work Apr 8, 2024
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
18 changes: 12 additions & 6 deletions packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,18 @@ class Camera
* Takes an input/output surface and orients the recording correctly. This is needed because
* switching cameras while recording causes the wrong orientation.
*/
private VideoRenderer videoRenderer;
@VisibleForTesting
VideoRenderer videoRenderer;

/**
* Whether or not the camera aligns with the initial way the camera was facing if the camera was
* flipped.
*/
private int initialCameraFacing;
@VisibleForTesting
int initialCameraFacing;

private final SurfaceTextureEntry flutterTexture;
@VisibleForTesting
final SurfaceTextureEntry flutterTexture;
private final VideoCaptureSettings videoCaptureSettings;
private final Context applicationContext;
final DartMessenger dartMessenger;
Expand All @@ -130,16 +133,19 @@ class Camera

CameraDeviceWrapper cameraDevice;
CameraCaptureSession captureSession;
private ImageReader pictureImageReader;
@VisibleForTesting
ImageReader pictureImageReader;
ImageStreamReader imageStreamReader;
/** {@link CaptureRequest.Builder} for the camera preview */
CaptureRequest.Builder previewRequestBuilder;

private MediaRecorder mediaRecorder;
@VisibleForTesting
MediaRecorder mediaRecorder;
/** True when recording video. */
boolean recordingVideo;
/** True when the preview is paused. */
private boolean pausedPreview;
@VisibleForTesting
boolean pausedPreview;

private File captureFile;

Expand Down
5 changes: 4 additions & 1 deletion ...camera_android/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import android.os.Looper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;

import io.flutter.embedding.engine.systemchannels.PlatformChannel;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.EventChannel;
Expand All @@ -36,7 +38,8 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
private final TextureRegistry textureRegistry;
private final MethodChannel methodChannel;
private final EventChannel imageStreamChannel;
private @Nullable Camera camera;
@VisibleForTesting
@Nullable Camera camera;

MethodCallHandlerImpl(
Activity activity,
Expand Down
Loading