mirror of
https://github.com/twonlyapp/twonly-app.git
synced 2026-01-15 06:28:41 +00:00
splitting the logic for #327
This commit is contained in:
otsmr
parent
3265b6259c
commit
b3ec419411
6 changed files with 266 additions and 357 deletions
|
|
@ -1,23 +1,21 @@
|
|||
import 'package:camera/camera.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:screenshot/screenshot.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
|
||||
import 'package:twonly/src/views/components/media_view_sizing.dart';
|
||||
|
||||
class HomeViewCameraPreview extends StatelessWidget {
|
||||
const HomeViewCameraPreview({
|
||||
required this.controller,
|
||||
required this.screenshotController,
|
||||
required this.customPaint,
|
||||
class MainCameraPreview extends StatelessWidget {
|
||||
const MainCameraPreview({
|
||||
required this.mainCameraController,
|
||||
super.key,
|
||||
});
|
||||
|
||||
final CameraController? controller;
|
||||
final CustomPaint? customPaint;
|
||||
final ScreenshotController screenshotController;
|
||||
final MainCameraController mainCameraController;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (controller == null || !controller!.value.isInitialized) {
|
||||
if (mainCameraController.cameraController == null ||
|
||||
!mainCameraController.cameraController!.value.isInitialized) {
|
||||
return Container();
|
||||
}
|
||||
return Positioned.fill(
|
||||
|
|
@ -26,58 +24,21 @@ class HomeViewCameraPreview extends StatelessWidget {
|
|||
additionalPadding: 59,
|
||||
bottomNavigation: Container(),
|
||||
child: Screenshot(
|
||||
controller: screenshotController,
|
||||
controller: mainCameraController.screenshotController,
|
||||
child: AspectRatio(
|
||||
aspectRatio: 9 / 16,
|
||||
child: ClipRect(
|
||||
child: FittedBox(
|
||||
fit: BoxFit.cover,
|
||||
child: SizedBox(
|
||||
width: controller!.value.previewSize!.height,
|
||||
height: controller!.value.previewSize!.width,
|
||||
child: CameraPreview(controller!, child: customPaint),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class SendToCameraPreview extends StatelessWidget {
|
||||
const SendToCameraPreview({
|
||||
required this.cameraController,
|
||||
required this.screenshotController,
|
||||
required this.customPaint,
|
||||
super.key,
|
||||
});
|
||||
|
||||
final CameraController? cameraController;
|
||||
final ScreenshotController screenshotController;
|
||||
final CustomPaint? customPaint;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (cameraController == null || !cameraController!.value.isInitialized) {
|
||||
return Container();
|
||||
}
|
||||
return Positioned.fill(
|
||||
child: MediaViewSizing(
|
||||
requiredHeight: 0,
|
||||
additionalPadding: 59,
|
||||
child: Screenshot(
|
||||
controller: screenshotController,
|
||||
child: AspectRatio(
|
||||
aspectRatio: 9 / 16,
|
||||
child: ClipRect(
|
||||
child: FittedBox(
|
||||
fit: BoxFit.cover,
|
||||
child: SizedBox(
|
||||
width: cameraController!.value.previewSize!.height,
|
||||
height: cameraController!.value.previewSize!.width,
|
||||
child: CameraPreview(cameraController!, child: customPaint),
|
||||
width: mainCameraController
|
||||
.cameraController!.value.previewSize!.height,
|
||||
height: mainCameraController
|
||||
.cameraController!.value.previewSize!.width,
|
||||
child: CameraPreview(
|
||||
mainCameraController.cameraController!,
|
||||
child: mainCameraController.customPaint,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:camera/camera.dart';
|
||||
import 'package:device_info_plus/device_info_plus.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
|
@ -9,7 +10,6 @@ import 'package:flutter_volume_controller/flutter_volume_controller.dart';
|
|||
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||
import 'package:image_picker/image_picker.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
import 'package:screenshot/screenshot.dart';
|
||||
import 'package:twonly/globals.dart';
|
||||
import 'package:twonly/src/database/tables/mediafiles.table.dart';
|
||||
import 'package:twonly/src/database/twonly.db.dart';
|
||||
|
|
@ -22,6 +22,7 @@ import 'package:twonly/src/views/camera/camera_preview_components/send_to.dart';
|
|||
import 'package:twonly/src/views/camera/camera_preview_components/video_recording_time.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/zoom_selector.dart';
|
||||
import 'package:twonly/src/views/camera/image_editor/action_button.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
|
||||
import 'package:twonly/src/views/camera/share_image_editor_view.dart';
|
||||
import 'package:twonly/src/views/components/media_view_sizing.dart';
|
||||
import 'package:twonly/src/views/home.view.dart';
|
||||
|
|
@ -89,20 +90,14 @@ class SelectedCameraDetails {
|
|||
|
||||
class CameraPreviewControllerView extends StatelessWidget {
|
||||
const CameraPreviewControllerView({
|
||||
required this.cameraController,
|
||||
required this.selectCamera,
|
||||
required this.selectedCameraDetails,
|
||||
required this.screenshotController,
|
||||
required this.mainController,
|
||||
required this.isVisible,
|
||||
super.key,
|
||||
this.sendToGroup,
|
||||
});
|
||||
|
||||
final MainCameraController mainController;
|
||||
final Group? sendToGroup;
|
||||
final Future<CameraController?> Function(int sCameraId, bool init)
|
||||
selectCamera;
|
||||
final CameraController? cameraController;
|
||||
final SelectedCameraDetails selectedCameraDetails;
|
||||
final ScreenshotController screenshotController;
|
||||
final bool isVisible;
|
||||
|
||||
@override
|
||||
|
|
@ -114,16 +109,13 @@ class CameraPreviewControllerView extends StatelessWidget {
|
|||
if (snap.data!) {
|
||||
return CameraPreviewView(
|
||||
sendToGroup: sendToGroup,
|
||||
selectCamera: selectCamera,
|
||||
cameraController: cameraController,
|
||||
selectedCameraDetails: selectedCameraDetails,
|
||||
screenshotController: screenshotController,
|
||||
mainCameraController: mainController,
|
||||
isVisible: isVisible,
|
||||
);
|
||||
} else {
|
||||
return PermissionHandlerView(
|
||||
onSuccess: () {
|
||||
selectCamera(0, true);
|
||||
mainController.selectCamera(0, true);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
|
@ -137,22 +129,14 @@ class CameraPreviewControllerView extends StatelessWidget {
|
|||
|
||||
class CameraPreviewView extends StatefulWidget {
|
||||
const CameraPreviewView({
|
||||
required this.selectCamera,
|
||||
required this.cameraController,
|
||||
required this.selectedCameraDetails,
|
||||
required this.screenshotController,
|
||||
required this.mainCameraController,
|
||||
required this.isVisible,
|
||||
super.key,
|
||||
this.sendToGroup,
|
||||
});
|
||||
|
||||
final MainCameraController mainCameraController;
|
||||
final Group? sendToGroup;
|
||||
final Future<CameraController?> Function(
|
||||
int sCameraId,
|
||||
bool init,
|
||||
) selectCamera;
|
||||
final CameraController? cameraController;
|
||||
final SelectedCameraDetails selectedCameraDetails;
|
||||
final ScreenshotController screenshotController;
|
||||
final bool isVisible;
|
||||
|
||||
@override
|
||||
|
|
@ -174,6 +158,8 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
final GlobalKey keyTriggerButton = GlobalKey();
|
||||
final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
|
||||
|
||||
MainCameraController get mc => widget.mainCameraController;
|
||||
|
||||
StreamSubscription<HardwareButton>? androidVolumeDownSub;
|
||||
|
||||
@override
|
||||
|
|
@ -282,18 +268,18 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
}
|
||||
|
||||
Future<void> updateScaleFactor(double newScale) async {
|
||||
if (widget.selectedCameraDetails.scaleFactor == newScale ||
|
||||
widget.cameraController == null) {
|
||||
if (mc.selectedCameraDetails.scaleFactor == newScale ||
|
||||
mc.cameraController == null) {
|
||||
return;
|
||||
}
|
||||
await widget.cameraController?.setZoomLevel(
|
||||
await mc.cameraController?.setZoomLevel(
|
||||
newScale.clamp(
|
||||
widget.selectedCameraDetails.minAvailableZoom,
|
||||
widget.selectedCameraDetails.maxAvailableZoom,
|
||||
mc.selectedCameraDetails.minAvailableZoom,
|
||||
mc.selectedCameraDetails.maxAvailableZoom,
|
||||
),
|
||||
);
|
||||
setState(() {
|
||||
widget.selectedCameraDetails.scaleFactor = newScale;
|
||||
mc.selectedCameraDetails.scaleFactor = newScale;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -325,31 +311,31 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
setState(() {
|
||||
_sharePreviewIsShown = true;
|
||||
});
|
||||
if (widget.selectedCameraDetails.isFlashOn) {
|
||||
if (mc.selectedCameraDetails.isFlashOn) {
|
||||
if (isFront) {
|
||||
setState(() {
|
||||
_showSelfieFlash = true;
|
||||
});
|
||||
} else {
|
||||
await widget.cameraController?.setFlashMode(FlashMode.torch);
|
||||
await mc.cameraController?.setFlashMode(FlashMode.torch);
|
||||
}
|
||||
await Future.delayed(const Duration(milliseconds: 1000));
|
||||
}
|
||||
|
||||
await widget.cameraController?.pausePreview();
|
||||
await mc.cameraController?.pausePreview();
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (Platform.isIOS) {
|
||||
// android has a problem with this. Flash is turned off in the pausePreview function.
|
||||
await widget.cameraController?.setFlashMode(FlashMode.off);
|
||||
await mc.cameraController?.setFlashMode(FlashMode.off);
|
||||
}
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
imageBytes = widget.screenshotController
|
||||
imageBytes = mc.screenshotController
|
||||
.capture(pixelRatio: MediaQuery.of(context).devicePixelRatio);
|
||||
|
||||
if (await pushMediaEditor(imageBytes, null)) {
|
||||
|
|
@ -426,33 +412,33 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
}
|
||||
return true;
|
||||
}
|
||||
await widget.selectCamera(
|
||||
widget.selectedCameraDetails.cameraId,
|
||||
await mc.selectCamera(
|
||||
mc.selectedCameraDetails.cameraId,
|
||||
false,
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool get isFront =>
|
||||
widget.cameraController?.description.lensDirection ==
|
||||
mc.cameraController?.description.lensDirection ==
|
||||
CameraLensDirection.front;
|
||||
|
||||
Future<void> onPanUpdate(dynamic details) async {
|
||||
if (isFront || details == null) {
|
||||
return;
|
||||
}
|
||||
if (widget.cameraController == null ||
|
||||
!widget.cameraController!.value.isInitialized) {
|
||||
if (mc.cameraController == null ||
|
||||
!mc.cameraController!.value.isInitialized) {
|
||||
return;
|
||||
}
|
||||
|
||||
widget.selectedCameraDetails.scaleFactor = (_baseScaleFactor +
|
||||
mc.selectedCameraDetails.scaleFactor = (_baseScaleFactor +
|
||||
// ignore: avoid_dynamic_calls
|
||||
(_basePanY - (details.localPosition.dy as double)) / 30)
|
||||
.clamp(1, widget.selectedCameraDetails.maxAvailableZoom);
|
||||
.clamp(1, mc.selectedCameraDetails.maxAvailableZoom);
|
||||
|
||||
await widget.cameraController!
|
||||
.setZoomLevel(widget.selectedCameraDetails.scaleFactor);
|
||||
await mc.cameraController!
|
||||
.setZoomLevel(mc.selectedCameraDetails.scaleFactor);
|
||||
if (mounted) {
|
||||
setState(() {});
|
||||
}
|
||||
|
|
@ -509,8 +495,8 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
}
|
||||
|
||||
Future<void> startVideoRecording() async {
|
||||
if (widget.cameraController != null &&
|
||||
widget.cameraController!.value.isRecordingVideo) {
|
||||
if (mc.cameraController != null &&
|
||||
mc.cameraController!.value.isRecordingVideo) {
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
|
|
@ -518,7 +504,7 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
});
|
||||
|
||||
try {
|
||||
await widget.cameraController?.startVideoRecording();
|
||||
await mc.cameraController?.startVideoRecording();
|
||||
_videoRecordingTimer =
|
||||
Timer.periodic(const Duration(milliseconds: 15), (timer) {
|
||||
setState(() {
|
||||
|
|
@ -556,8 +542,8 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
_isVideoRecording = false;
|
||||
});
|
||||
|
||||
if (widget.cameraController == null ||
|
||||
!widget.cameraController!.value.isRecordingVideo) {
|
||||
if (mc.cameraController == null ||
|
||||
!mc.cameraController!.value.isRecordingVideo) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -566,9 +552,9 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
});
|
||||
|
||||
try {
|
||||
final videoPath = await widget.cameraController?.stopVideoRecording();
|
||||
final videoPath = await mc.cameraController?.stopVideoRecording();
|
||||
if (videoPath == null) return;
|
||||
await widget.cameraController?.pausePreview();
|
||||
await mc.cameraController?.pausePreview();
|
||||
if (await pushMediaEditor(null, File(videoPath.path))) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -595,8 +581,8 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (widget.selectedCameraDetails.cameraId >= gCameras.length ||
|
||||
widget.cameraController == null) {
|
||||
if (mc.selectedCameraDetails.cameraId >= gCameras.length ||
|
||||
mc.cameraController == null) {
|
||||
return Container();
|
||||
}
|
||||
return MediaViewSizing(
|
||||
|
|
@ -610,14 +596,14 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
}
|
||||
setState(() {
|
||||
_basePanY = details.localPosition.dy;
|
||||
_baseScaleFactor = widget.selectedCameraDetails.scaleFactor;
|
||||
_baseScaleFactor = mc.selectedCameraDetails.scaleFactor;
|
||||
});
|
||||
},
|
||||
onLongPressMoveUpdate: onPanUpdate,
|
||||
onLongPressStart: (details) {
|
||||
setState(() {
|
||||
_basePanY = details.localPosition.dy;
|
||||
_baseScaleFactor = widget.selectedCameraDetails.scaleFactor;
|
||||
_baseScaleFactor = mc.selectedCameraDetails.scaleFactor;
|
||||
});
|
||||
// Get the position of the pointer
|
||||
final renderBox =
|
||||
|
|
@ -670,29 +656,29 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
Icons.repeat_rounded,
|
||||
tooltipText: context.lang.switchFrontAndBackCamera,
|
||||
onPressed: () async {
|
||||
await widget.selectCamera(
|
||||
(widget.selectedCameraDetails.cameraId + 1) % 2,
|
||||
await mc.selectCamera(
|
||||
(mc.selectedCameraDetails.cameraId + 1) % 2,
|
||||
false,
|
||||
);
|
||||
},
|
||||
),
|
||||
ActionButton(
|
||||
widget.selectedCameraDetails.isFlashOn
|
||||
mc.selectedCameraDetails.isFlashOn
|
||||
? Icons.flash_on_rounded
|
||||
: Icons.flash_off_rounded,
|
||||
tooltipText: context.lang.toggleFlashLight,
|
||||
color: widget.selectedCameraDetails.isFlashOn
|
||||
color: mc.selectedCameraDetails.isFlashOn
|
||||
? Colors.white
|
||||
: Colors.white.withAlpha(160),
|
||||
onPressed: () async {
|
||||
if (widget.selectedCameraDetails.isFlashOn) {
|
||||
await widget.cameraController
|
||||
if (mc.selectedCameraDetails.isFlashOn) {
|
||||
await mc.cameraController
|
||||
?.setFlashMode(FlashMode.off);
|
||||
widget.selectedCameraDetails.isFlashOn = false;
|
||||
mc.selectedCameraDetails.isFlashOn = false;
|
||||
} else {
|
||||
await widget.cameraController
|
||||
await mc.cameraController
|
||||
?.setFlashMode(FlashMode.always);
|
||||
widget.selectedCameraDetails.isFlashOn = true;
|
||||
mc.selectedCameraDetails.isFlashOn = true;
|
||||
}
|
||||
setState(() {});
|
||||
},
|
||||
|
|
@ -719,20 +705,19 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
|
|||
alignment: Alignment.bottomCenter,
|
||||
child: Column(
|
||||
children: [
|
||||
if (widget.cameraController!.value.isInitialized &&
|
||||
widget.selectedCameraDetails.isZoomAble &&
|
||||
if (mc.cameraController!.value.isInitialized &&
|
||||
mc.selectedCameraDetails.isZoomAble &&
|
||||
!isFront &&
|
||||
!_isVideoRecording)
|
||||
SizedBox(
|
||||
width: 120,
|
||||
child: CameraZoomButtons(
|
||||
key: widget.key,
|
||||
scaleFactor:
|
||||
widget.selectedCameraDetails.scaleFactor,
|
||||
scaleFactor: mc.selectedCameraDetails.scaleFactor,
|
||||
updateScaleFactor: updateScaleFactor,
|
||||
selectCamera: widget.selectCamera,
|
||||
selectedCameraDetails: widget.selectedCameraDetails,
|
||||
controller: widget.cameraController!,
|
||||
selectCamera: mc.selectCamera,
|
||||
selectedCameraDetails: mc.selectedCameraDetails,
|
||||
controller: mc.cameraController!,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 30),
|
||||
|
|
@ -0,0 +1,155 @@
|
|||
import 'dart:io';
|
||||
import 'package:camera/camera.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:google_mlkit_barcode_scanning/google_mlkit_barcode_scanning.dart';
|
||||
import 'package:screenshot/screenshot.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
|
||||
import 'package:twonly/src/views/camera/painters/barcode_detector_painter.dart';
|
||||
|
||||
class MainCameraController {
|
||||
late void Function() setState;
|
||||
CameraController? cameraController;
|
||||
ScreenshotController screenshotController = ScreenshotController();
|
||||
SelectedCameraDetails selectedCameraDetails = SelectedCameraDetails();
|
||||
bool initCameraStarted = true;
|
||||
|
||||
Future<void> closeCamera() async {
|
||||
await cameraController?.stopImageStream();
|
||||
await cameraController?.dispose();
|
||||
cameraController = null;
|
||||
initCameraStarted = false;
|
||||
selectedCameraDetails = SelectedCameraDetails();
|
||||
}
|
||||
|
||||
Future<CameraController?> selectCamera(int sCameraId, bool init) async {
|
||||
initCameraStarted = true;
|
||||
final opts = await initializeCameraController(
|
||||
selectedCameraDetails,
|
||||
sCameraId,
|
||||
init,
|
||||
);
|
||||
if (opts != null) {
|
||||
selectedCameraDetails = opts.$1;
|
||||
cameraController = opts.$2;
|
||||
}
|
||||
if (cameraController?.description.lensDirection ==
|
||||
CameraLensDirection.back) {
|
||||
await cameraController?.startImageStream(_processCameraImage);
|
||||
}
|
||||
setState();
|
||||
return cameraController;
|
||||
}
|
||||
|
||||
Future<void> toggleSelectedCamera() async {
|
||||
if (cameraController == null) return;
|
||||
// do not allow switching camera when recording
|
||||
if (cameraController!.value.isRecordingVideo) {
|
||||
return;
|
||||
}
|
||||
await cameraController!.stopImageStream();
|
||||
await cameraController!.dispose();
|
||||
cameraController = null;
|
||||
await selectCamera((selectedCameraDetails.cameraId + 1) % 2, false);
|
||||
}
|
||||
|
||||
final BarcodeScanner _barcodeScanner = BarcodeScanner();
|
||||
bool _isBusy = false;
|
||||
CustomPaint? customPaint;
|
||||
|
||||
final Map<DeviceOrientation, int> _orientations = {
|
||||
DeviceOrientation.portraitUp: 0,
|
||||
DeviceOrientation.landscapeLeft: 90,
|
||||
DeviceOrientation.portraitDown: 180,
|
||||
DeviceOrientation.landscapeRight: 270,
|
||||
};
|
||||
|
||||
void _processCameraImage(CameraImage image) {
|
||||
final inputImage = _inputImageFromCameraImage(image);
|
||||
if (inputImage == null) return;
|
||||
_processImage(inputImage);
|
||||
}
|
||||
|
||||
InputImage? _inputImageFromCameraImage(CameraImage image) {
|
||||
if (cameraController == null) return null;
|
||||
|
||||
// get image rotation
|
||||
// it is used in android to convert the InputImage from Dart to Java: https://github.com/flutter-ml/google_ml_kit_flutter/blob/master/packages/google_mlkit_commons/android/src/main/java/com/google_mlkit_commons/InputImageConverter.java
|
||||
// `rotation` is not used in iOS to convert the InputImage from Dart to Obj-C: https://github.com/flutter-ml/google_ml_kit_flutter/blob/master/packages/google_mlkit_commons/ios/Classes/MLKVisionImage%2BFlutterPlugin.m
|
||||
// in both platforms `rotation` and `camera.lensDirection` can be used to compensate `x` and `y` coordinates on a canvas: https://github.com/flutter-ml/google_ml_kit_flutter/blob/master/packages/example/lib/vision_detector_views/painters/coordinates_translator.dart
|
||||
final camera = cameraController!.description;
|
||||
final sensorOrientation = camera.sensorOrientation;
|
||||
// print(
|
||||
// 'lensDirection: ${camera.lensDirection}, sensorOrientation: $sensorOrientation, ${_controller?.value.deviceOrientation} ${_controller?.value.lockedCaptureOrientation} ${_controller?.value.isCaptureOrientationLocked}');
|
||||
InputImageRotation? rotation;
|
||||
if (Platform.isIOS) {
|
||||
rotation = InputImageRotationValue.fromRawValue(sensorOrientation);
|
||||
} else if (Platform.isAndroid) {
|
||||
var rotationCompensation =
|
||||
_orientations[cameraController!.value.deviceOrientation];
|
||||
if (rotationCompensation == null) return null;
|
||||
if (camera.lensDirection == CameraLensDirection.front) {
|
||||
// front-facing
|
||||
rotationCompensation = (sensorOrientation + rotationCompensation) % 360;
|
||||
} else {
|
||||
// back-facing
|
||||
rotationCompensation =
|
||||
(sensorOrientation - rotationCompensation + 360) % 360;
|
||||
}
|
||||
rotation = InputImageRotationValue.fromRawValue(rotationCompensation);
|
||||
// print('rotationCompensation: $rotationCompensation');
|
||||
}
|
||||
if (rotation == null) return null;
|
||||
// print('final rotation: $rotation');
|
||||
|
||||
// get image format
|
||||
var format = InputImageFormatValue.fromRawValue(image.format.raw as int);
|
||||
// validate format depending on platform
|
||||
// only supported formats:
|
||||
// * nv21 for Android
|
||||
// * bgra8888 for iOS
|
||||
if (Platform.isAndroid && format == InputImageFormat.yuv420) {
|
||||
// https://developer.android.com/reference/kotlin/androidx/camera/core/ImageAnalysis#OUTPUT_IMAGE_FORMAT_NV21()
|
||||
format = InputImageFormat.nv21;
|
||||
}
|
||||
if (format == null ||
|
||||
(Platform.isAndroid && format != InputImageFormat.nv21) ||
|
||||
(Platform.isIOS && format != InputImageFormat.bgra8888)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// since format is constraint to nv21 or bgra8888, both only have one plane
|
||||
if (image.planes.length != 1) return null;
|
||||
final plane = image.planes.first;
|
||||
|
||||
// compose InputImage using bytes
|
||||
return InputImage.fromBytes(
|
||||
bytes: plane.bytes,
|
||||
metadata: InputImageMetadata(
|
||||
size: Size(image.width.toDouble(), image.height.toDouble()),
|
||||
rotation: rotation, // used only in Android
|
||||
format: format, // used only in iOS
|
||||
bytesPerRow: plane.bytesPerRow, // used only in iOS
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _processImage(InputImage inputImage) async {
|
||||
if (_isBusy) return;
|
||||
_isBusy = true;
|
||||
final barcodes = await _barcodeScanner.processImage(inputImage);
|
||||
if (inputImage.metadata?.size != null &&
|
||||
inputImage.metadata?.rotation != null &&
|
||||
cameraController != null) {
|
||||
final painter = BarcodeDetectorPainter(
|
||||
barcodes,
|
||||
inputImage.metadata!.size,
|
||||
inputImage.metadata!.rotation,
|
||||
cameraController!.description.lensDirection,
|
||||
);
|
||||
customPaint = CustomPaint(painter: painter);
|
||||
}
|
||||
_isBusy = false;
|
||||
setState();
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ import 'dart:math';
|
|||
import 'package:camera/camera.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:twonly/globals.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_controller_view.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
|
||||
|
||||
class CameraZoomButtons extends StatefulWidget {
|
||||
const CameraZoomButtons({
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:camera/camera.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:screenshot/screenshot.dart';
|
||||
import 'package:twonly/src/database/twonly.db.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/camera_preview.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_controller_view.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
|
||||
|
||||
class CameraSendToView extends StatefulWidget {
|
||||
const CameraSendToView(this.sendToGroup, {super.key});
|
||||
|
|
@ -15,71 +13,36 @@ class CameraSendToView extends StatefulWidget {
|
|||
}
|
||||
|
||||
class CameraSendToViewState extends State<CameraSendToView> {
|
||||
CameraController? cameraController;
|
||||
ScreenshotController screenshotController = ScreenshotController();
|
||||
SelectedCameraDetails selectedCameraDetails = SelectedCameraDetails();
|
||||
final MainCameraController _mainCameraController = MainCameraController();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
unawaited(selectCamera(0, true));
|
||||
_mainCameraController.setState = () {
|
||||
if (mounted) setState(() {});
|
||||
};
|
||||
unawaited(_mainCameraController.selectCamera(0, true));
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
cameraController?.dispose();
|
||||
cameraController = null;
|
||||
selectedCameraDetails = SelectedCameraDetails();
|
||||
_mainCameraController.closeCamera();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Future<CameraController?> selectCamera(
|
||||
int sCameraId,
|
||||
bool init,
|
||||
) async {
|
||||
final opts = await initializeCameraController(
|
||||
selectedCameraDetails,
|
||||
sCameraId,
|
||||
init,
|
||||
);
|
||||
if (opts != null) {
|
||||
selectedCameraDetails = opts.$1;
|
||||
cameraController = opts.$2;
|
||||
}
|
||||
setState(() {});
|
||||
return cameraController;
|
||||
}
|
||||
|
||||
/// same function also in home.view.dart
|
||||
Future<void> toggleSelectedCamera() async {
|
||||
if (cameraController == null) return;
|
||||
// do not allow switching camera when recording
|
||||
if (cameraController!.value.isRecordingVideo) {
|
||||
return;
|
||||
}
|
||||
await cameraController!.dispose();
|
||||
cameraController = null;
|
||||
await selectCamera((selectedCameraDetails.cameraId + 1) % 2, false);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: GestureDetector(
|
||||
onDoubleTap: toggleSelectedCamera,
|
||||
onDoubleTap: _mainCameraController.toggleSelectedCamera,
|
||||
child: Stack(
|
||||
children: [
|
||||
SendToCameraPreview(
|
||||
cameraController: cameraController,
|
||||
screenshotController: screenshotController,
|
||||
customPaint: null,
|
||||
MainCameraPreview(
|
||||
mainCameraController: _mainCameraController,
|
||||
),
|
||||
CameraPreviewControllerView(
|
||||
selectCamera: selectCamera,
|
||||
mainController: _mainCameraController,
|
||||
sendToGroup: widget.sendToGroup,
|
||||
cameraController: cameraController,
|
||||
selectedCameraDetails: selectedCameraDetails,
|
||||
screenshotController: screenshotController,
|
||||
isVisible: true,
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,19 +1,14 @@
|
|||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
import 'package:camera/camera.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
|
||||
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||
import 'package:google_mlkit_barcode_scanning/google_mlkit_barcode_scanning.dart';
|
||||
import 'package:screenshot/screenshot.dart';
|
||||
import 'package:twonly/globals.dart';
|
||||
import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
|
||||
import 'package:twonly/src/services/notifications/setup.notifications.dart';
|
||||
import 'package:twonly/src/utils/misc.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/camera_preview.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_controller_view.dart';
|
||||
import 'package:twonly/src/views/camera/painters/barcode_detector_painter.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
|
||||
import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
|
||||
import 'package:twonly/src/views/camera/share_image_editor_view.dart';
|
||||
import 'package:twonly/src/views/chats/chat_list.view.dart';
|
||||
import 'package:twonly/src/views/memories/memories.view.dart';
|
||||
|
|
@ -51,6 +46,8 @@ class Shade extends StatelessWidget {
|
|||
class HomeViewState extends State<HomeView> {
|
||||
int activePageIdx = 0;
|
||||
|
||||
final MainCameraController _mainCameraController = MainCameraController();
|
||||
|
||||
final PageController homeViewPageController = PageController(initialPage: 1);
|
||||
|
||||
double buttonDiameter = 100;
|
||||
|
|
@ -59,11 +56,6 @@ class HomeViewState extends State<HomeView> {
|
|||
double lastChange = 0;
|
||||
|
||||
Timer? disableCameraTimer;
|
||||
bool initCameraStarted = true;
|
||||
|
||||
CameraController? cameraController;
|
||||
ScreenshotController screenshotController = ScreenshotController();
|
||||
SelectedCameraDetails selectedCameraDetails = SelectedCameraDetails();
|
||||
|
||||
bool onPageView(ScrollNotification notification) {
|
||||
disableCameraTimer?.cancel();
|
||||
|
|
@ -75,15 +67,19 @@ class HomeViewState extends State<HomeView> {
|
|||
offsetRatio = offsetFromOne.abs();
|
||||
});
|
||||
}
|
||||
if (cameraController == null && !initCameraStarted && offsetRatio < 1) {
|
||||
initCameraStarted = true;
|
||||
unawaited(selectCamera(selectedCameraDetails.cameraId, false));
|
||||
if (_mainCameraController.cameraController == null &&
|
||||
!_mainCameraController.initCameraStarted &&
|
||||
offsetRatio < 1) {
|
||||
unawaited(
|
||||
_mainCameraController.selectCamera(
|
||||
_mainCameraController.selectedCameraDetails.cameraId,
|
||||
false,
|
||||
),
|
||||
);
|
||||
}
|
||||
if (offsetRatio == 1) {
|
||||
disableCameraTimer = Timer(const Duration(milliseconds: 500), () async {
|
||||
await cameraController?.dispose();
|
||||
cameraController = null;
|
||||
selectedCameraDetails = SelectedCameraDetails();
|
||||
await _mainCameraController.closeCamera();
|
||||
disableCameraTimer = null;
|
||||
});
|
||||
}
|
||||
|
|
@ -93,6 +89,9 @@ class HomeViewState extends State<HomeView> {
|
|||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_mainCameraController.setState = () {
|
||||
if (mounted) setState(() {});
|
||||
};
|
||||
activePageIdx = widget.initialPage;
|
||||
globalUpdateOfHomeViewPageIndex = (index) {
|
||||
homeViewPageController.jumpToPage(index);
|
||||
|
|
@ -104,7 +103,7 @@ class HomeViewState extends State<HomeView> {
|
|||
.listen((NotificationResponse? response) async {
|
||||
globalUpdateOfHomeViewPageIndex(0);
|
||||
});
|
||||
unawaited(selectCamera(0, true));
|
||||
unawaited(_mainCameraController.selectCamera(0, true));
|
||||
unawaited(initAsync());
|
||||
}
|
||||
|
||||
|
|
@ -112,159 +111,10 @@ class HomeViewState extends State<HomeView> {
|
|||
void dispose() {
|
||||
unawaited(selectNotificationStream.close());
|
||||
disableCameraTimer?.cancel();
|
||||
cameraController?.stopImageStream();
|
||||
cameraController?.dispose();
|
||||
cameraController = null;
|
||||
_mainCameraController.closeCamera();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Future<CameraController?> selectCamera(int sCameraId, bool init) async {
|
||||
final opts = await initializeCameraController(
|
||||
selectedCameraDetails,
|
||||
sCameraId,
|
||||
init,
|
||||
);
|
||||
if (opts != null) {
|
||||
selectedCameraDetails = opts.$1;
|
||||
cameraController = opts.$2;
|
||||
initCameraStarted = false;
|
||||
}
|
||||
if (cameraController?.description.lensDirection ==
|
||||
CameraLensDirection.back) {
|
||||
await cameraController?.startImageStream(_processCameraImage);
|
||||
}
|
||||
setState(() {});
|
||||
return cameraController;
|
||||
}
|
||||
|
||||
/// same function also in camera_send_to_view
|
||||
Future<void> toggleSelectedCamera() async {
|
||||
if (cameraController == null) return;
|
||||
// do not allow switching camera when recording
|
||||
if (cameraController!.value.isRecordingVideo) {
|
||||
return;
|
||||
}
|
||||
await cameraController!.stopImageStream();
|
||||
await cameraController!.dispose();
|
||||
cameraController = null;
|
||||
await selectCamera((selectedCameraDetails.cameraId + 1) % 2, false);
|
||||
}
|
||||
|
||||
final BarcodeScanner _barcodeScanner = BarcodeScanner();
|
||||
bool _canProcess = true;
|
||||
bool _isBusy = false;
|
||||
CustomPaint? _customPaint;
|
||||
String? _text;
|
||||
|
||||
final Map<DeviceOrientation, int> _orientations = {
|
||||
DeviceOrientation.portraitUp: 0,
|
||||
DeviceOrientation.landscapeLeft: 90,
|
||||
DeviceOrientation.portraitDown: 180,
|
||||
DeviceOrientation.landscapeRight: 270,
|
||||
};
|
||||
|
||||
void _processCameraImage(CameraImage image) {
|
||||
final inputImage = _inputImageFromCameraImage(image);
|
||||
if (inputImage == null) return;
|
||||
_processImage(inputImage);
|
||||
}
|
||||
|
||||
InputImage? _inputImageFromCameraImage(CameraImage image) {
|
||||
if (cameraController == null) return null;
|
||||
|
||||
// get image rotation
|
||||
// it is used in android to convert the InputImage from Dart to Java: https://github.com/flutter-ml/google_ml_kit_flutter/blob/master/packages/google_mlkit_commons/android/src/main/java/com/google_mlkit_commons/InputImageConverter.java
|
||||
// `rotation` is not used in iOS to convert the InputImage from Dart to Obj-C: https://github.com/flutter-ml/google_ml_kit_flutter/blob/master/packages/google_mlkit_commons/ios/Classes/MLKVisionImage%2BFlutterPlugin.m
|
||||
// in both platforms `rotation` and `camera.lensDirection` can be used to compensate `x` and `y` coordinates on a canvas: https://github.com/flutter-ml/google_ml_kit_flutter/blob/master/packages/example/lib/vision_detector_views/painters/coordinates_translator.dart
|
||||
final camera = cameraController!.description;
|
||||
final sensorOrientation = camera.sensorOrientation;
|
||||
// print(
|
||||
// 'lensDirection: ${camera.lensDirection}, sensorOrientation: $sensorOrientation, ${_controller?.value.deviceOrientation} ${_controller?.value.lockedCaptureOrientation} ${_controller?.value.isCaptureOrientationLocked}');
|
||||
InputImageRotation? rotation;
|
||||
if (Platform.isIOS) {
|
||||
rotation = InputImageRotationValue.fromRawValue(sensorOrientation);
|
||||
} else if (Platform.isAndroid) {
|
||||
var rotationCompensation =
|
||||
_orientations[cameraController!.value.deviceOrientation];
|
||||
if (rotationCompensation == null) return null;
|
||||
if (camera.lensDirection == CameraLensDirection.front) {
|
||||
// front-facing
|
||||
rotationCompensation = (sensorOrientation + rotationCompensation) % 360;
|
||||
} else {
|
||||
// back-facing
|
||||
rotationCompensation =
|
||||
(sensorOrientation - rotationCompensation + 360) % 360;
|
||||
}
|
||||
rotation = InputImageRotationValue.fromRawValue(rotationCompensation);
|
||||
// print('rotationCompensation: $rotationCompensation');
|
||||
}
|
||||
if (rotation == null) return null;
|
||||
// print('final rotation: $rotation');
|
||||
|
||||
// get image format
|
||||
var format = InputImageFormatValue.fromRawValue(image.format.raw as int);
|
||||
// validate format depending on platform
|
||||
// only supported formats:
|
||||
// * nv21 for Android
|
||||
// * bgra8888 for iOS
|
||||
if (Platform.isAndroid && format == InputImageFormat.yuv420) {
|
||||
// https://developer.android.com/reference/kotlin/androidx/camera/core/ImageAnalysis#OUTPUT_IMAGE_FORMAT_NV21()
|
||||
format = InputImageFormat.nv21;
|
||||
}
|
||||
if (format == null ||
|
||||
(Platform.isAndroid && format != InputImageFormat.nv21) ||
|
||||
(Platform.isIOS && format != InputImageFormat.bgra8888)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// since format is constraint to nv21 or bgra8888, both only have one plane
|
||||
if (image.planes.length != 1) return null;
|
||||
final plane = image.planes.first;
|
||||
|
||||
// compose InputImage using bytes
|
||||
return InputImage.fromBytes(
|
||||
bytes: plane.bytes,
|
||||
metadata: InputImageMetadata(
|
||||
size: Size(image.width.toDouble(), image.height.toDouble()),
|
||||
rotation: rotation, // used only in Android
|
||||
format: format, // used only in iOS
|
||||
bytesPerRow: plane.bytesPerRow, // used only in iOS
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _processImage(InputImage inputImage) async {
|
||||
if (!_canProcess) return;
|
||||
if (_isBusy) return;
|
||||
_isBusy = true;
|
||||
setState(() {
|
||||
_text = '';
|
||||
});
|
||||
final barcodes = await _barcodeScanner.processImage(inputImage);
|
||||
if (inputImage.metadata?.size != null &&
|
||||
inputImage.metadata?.rotation != null &&
|
||||
cameraController != null) {
|
||||
final painter = BarcodeDetectorPainter(
|
||||
barcodes,
|
||||
inputImage.metadata!.size,
|
||||
inputImage.metadata!.rotation,
|
||||
cameraController!.description.lensDirection);
|
||||
_customPaint = CustomPaint(painter: painter);
|
||||
} else {
|
||||
String text = 'Barcodes found: ${barcodes.length}\n\n';
|
||||
for (final barcode in barcodes) {
|
||||
text += 'Barcode: ${barcode.rawValue}\n\n';
|
||||
}
|
||||
_text = text;
|
||||
// TODO: set _customPaint to draw boundingRect on top of image
|
||||
_customPaint = null;
|
||||
}
|
||||
_isBusy = false;
|
||||
if (mounted) {
|
||||
setState(() {});
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> initAsync() async {
|
||||
final notificationAppLaunchDetails =
|
||||
await flutterLocalNotificationsPlugin.getNotificationAppLaunchDetails();
|
||||
|
|
@ -294,14 +144,12 @@ class HomeViewState extends State<HomeView> {
|
|||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: GestureDetector(
|
||||
onDoubleTap: offsetRatio == 0 ? toggleSelectedCamera : null,
|
||||
onDoubleTap: offsetRatio == 0
|
||||
? _mainCameraController.toggleSelectedCamera
|
||||
: null,
|
||||
child: Stack(
|
||||
children: <Widget>[
|
||||
HomeViewCameraPreview(
|
||||
controller: cameraController,
|
||||
screenshotController: screenshotController,
|
||||
customPaint: _customPaint,
|
||||
),
|
||||
MainCameraPreview(mainCameraController: _mainCameraController),
|
||||
Shade(
|
||||
opacity: offsetRatio,
|
||||
),
|
||||
|
|
@ -333,10 +181,7 @@ class HomeViewState extends State<HomeView> {
|
|||
child: Opacity(
|
||||
opacity: 1 - (offsetRatio * 4) % 1,
|
||||
child: CameraPreviewControllerView(
|
||||
cameraController: cameraController,
|
||||
screenshotController: screenshotController,
|
||||
selectedCameraDetails: selectedCameraDetails,
|
||||
selectCamera: selectCamera,
|
||||
mainController: _mainCameraController,
|
||||
isVisible:
|
||||
((1 - (offsetRatio * 4) % 1) == 1) && activePageIdx == 1,
|
||||
),
|
||||
|
|
|
|||
Loading…
Reference in a new issue