Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Remove redundant video editor prefixes

Neeraj Gupta3e257c96c21e
diff --git a/mobile/apps/photos/integration_test/video_editor_test.dart b/mobile/apps/photos/integration_test/video_editor_test.dart
index 551888109a..c6e02c4ef9 100644
--- a/mobile/apps/photos/integration_test/video_editor_test.dart
+++ b/mobile/apps/photos/integration_test/video_editor_test.dart
@@ -20,7 +20,7 @@ import 'package:photos/services/file_magic_service.dart';
import 'package:photos/ui/tools/editor/native_video_export_service.dart';
import 'package:photos/ui/tools/editor/video_crop_util.dart';
import 'package:photos/ui/tools/editor/video_editor/crop_value.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
import 'package:shared_preferences/shared_preferences.dart';
/// Trim configuration
@@ -492,7 +492,7 @@ Future<IterationResult> _processVideoIteration({
required String description,
required Logger logger,
}) async {
- EnteVideoEditorController? controller;
+ VideoEditorController? controller;
File? tempOutputFile;
final failures = <ValidationFailure>[];
CropCalculation? cropCalc;
@@ -500,7 +500,7 @@ Future<IterationResult> _processVideoIteration({
try {
// Step 1: Initialize video editor controller
logger.info(' β†’ Initializing video editor controller...');
- controller = EnteVideoEditorController.file(
+ controller = VideoEditorController.file(
sourceIoFile,
minDuration: const Duration(
milliseconds: 100,
@@ -633,9 +633,7 @@ Future<IterationResult> _processVideoIteration({
logger.info(' β†’ Exporting video with native editor...');
// Create temp output path
- final tempDir = Directory.systemTemp.createTempSync(
- 'ente_video_export_test',
- );
+ final tempDir = Directory.systemTemp.createTempSync('video_export_test');
final outputPath = path_helper.join(
tempDir.path,
'export_${DateTime.now().millisecondsSinceEpoch}.mp4',
diff --git a/mobile/apps/photos/lib/ui/tools/editor/export_video_service.dart b/mobile/apps/photos/lib/ui/tools/editor/export_video_service.dart
index 662e407816..a434c99852 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/export_video_service.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/export_video_service.dart
@@ -7,7 +7,7 @@ import 'package:ffmpeg_kit_flutter/return_code.dart';
import 'package:ffmpeg_kit_flutter/statistics.dart';
import 'package:logging/logging.dart';
import 'package:photos/ui/tools/editor/video_crop_util.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
class FfmpegVideoExportPlan {
const FfmpegVideoExportPlan({
@@ -25,7 +25,7 @@ class ExportService {
static final _logger = Logger('ExportService');
static FfmpegVideoExportPlan createPlan({
- required EnteVideoEditorController controller,
+ required VideoEditorController controller,
required String outputPath,
}) {
CropCalculation? crop;
@@ -131,7 +131,7 @@ class ExportService {
}
static Future<File> exportVideo({
- required EnteVideoEditorController controller,
+ required VideoEditorController controller,
required String outputPath,
void Function(double)? onProgress,
void Function(Object, StackTrace)? onError,
diff --git a/mobile/apps/photos/lib/ui/tools/editor/native_video_export_service.dart b/mobile/apps/photos/lib/ui/tools/editor/native_video_export_service.dart
index 4aab6efcb2..9d80c47dce 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/native_video_export_service.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/native_video_export_service.dart
@@ -4,11 +4,11 @@ import 'dart:ui';
import 'package:native_video_editor/native_video_editor.dart';
import 'package:photos/ui/tools/editor/video_crop_util.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
class NativeVideoExportService {
static Future<File> exportVideo({
- required EnteVideoEditorController controller,
+ required VideoEditorController controller,
required String outputPath,
void Function(double)? onProgress,
void Function(Object, StackTrace)? onError,
@@ -28,7 +28,7 @@ class NativeVideoExportService {
static Future<VideoEditResult> _performNativeOperations({
required String outputPath,
- required EnteVideoEditorController controller,
+ required VideoEditorController controller,
void Function(double)? onProgress,
}) async {
final inputPath = controller.file.path;
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_crop_page.dart b/mobile/apps/photos/lib/ui/tools/editor/video_crop_page.dart
index 97a4768925..5ecd0f14bb 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_crop_page.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_crop_page.dart
@@ -1,14 +1,14 @@
import 'package:flutter/material.dart';
import "package:photos/ui/tools/editor/video_editor/crop_value.dart";
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart";
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_widgets.dart";
import "package:photos/ui/tools/editor/video_editor/video_editor_bottom_action.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_controller.dart";
import "package:photos/ui/tools/editor/video_editor/video_editor_main_actions.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_widgets.dart";
class VideoCropPage extends StatefulWidget {
const VideoCropPage({super.key, required this.controller});
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
@override
State<VideoCropPage> createState() => _VideoCropPageState();
@@ -46,9 +46,9 @@ class _VideoCropPageState extends State<VideoCropPage> {
@override
Widget build(BuildContext context) {
- return EnteVideoEditorSubPage(
+ return VideoEditorSubPage(
controller: widget.controller,
- preview: EnteVideoCropEditor(controller: widget.controller),
+ preview: VideoCropEditor(controller: widget.controller),
actions: AnimatedBuilder(
animation: widget.controller,
builder: (_, _) => VideoEditorMainActions(
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_crop_util.dart b/mobile/apps/photos/lib/ui/tools/editor/video_crop_util.dart
index 5fe445c988..ca1e125291 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_crop_util.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_crop_util.dart
@@ -1,6 +1,6 @@
import 'dart:ui';
import 'package:flutter/foundation.dart' show visibleForTesting;
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
class CropCalculation {
const CropCalculation({
@@ -37,7 +37,7 @@ class VideoCropUtil {
///
/// Returns a Rect in display-space so the native plugins can transform to file-space.
static Rect calculateDisplaySpaceCropRect({
- required EnteVideoEditorController controller,
+ required VideoEditorController controller,
}) {
return calculateDisplaySpaceCropRectFromData(
minCrop: controller.minCrop,
@@ -106,7 +106,7 @@ class VideoCropUtil {
/// Convert the normalised crop selection into file-space coordinates.
static CropCalculation calculateFileSpaceCrop({
- required EnteVideoEditorController controller,
+ required VideoEditorController controller,
}) {
final crop = calculateDisplaySpaceCropRect(controller: controller);
return CropCalculation(
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_editor_controller.dart b/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_controller.dart
similarity index 98%
rename from mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_editor_controller.dart
rename to mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_controller.dart
index 2a16ade138..0e35d14e59 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_editor_controller.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_controller.dart
@@ -33,8 +33,8 @@ class VideoEditorState {
final double? preferredCropAspectRatio;
}
-class EnteVideoEditorController extends ChangeNotifier {
- EnteVideoEditorController.file(
+class VideoEditorController extends ChangeNotifier {
+ VideoEditorController.file(
this.file, {
this.minDuration = const Duration(seconds: 1),
}) : video = VideoPlayerController.file(file);
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_player_control.dart b/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_player_control.dart
index 2642b050cd..41c9a835cf 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_player_control.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_player_control.dart
@@ -1,11 +1,11 @@
import "package:flutter/material.dart";
import "package:photos/ente_theme_data.dart";
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_controller.dart";
class VideoEditorPlayerControl extends StatelessWidget {
const VideoEditorPlayerControl({super.key, required this.controller});
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
@override
Widget build(BuildContext context) {
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_editor_widgets.dart b/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_widgets.dart
similarity index 94%
rename from mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_editor_widgets.dart
rename to mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_widgets.dart
index 94a272d685..0a85494d40 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_editor_widgets.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_editor_widgets.dart
@@ -3,28 +3,28 @@ import 'dart:math' as math;
import 'package:ente_strings/ente_strings.dart';
import 'package:flutter/material.dart';
import 'package:photos/theme/ente_theme.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
import 'package:photos/ui/tools/editor/video_editor/video_editor_app_bar.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
import 'package:photos/ui/tools/editor/video_editor/video_editor_player_control.dart';
import 'package:video_player/video_player.dart';
-class EnteVideoEditorSubPage extends StatefulWidget {
- const EnteVideoEditorSubPage({
+class VideoEditorSubPage extends StatefulWidget {
+ const VideoEditorSubPage({
super.key,
required this.controller,
required this.preview,
required this.actions,
});
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
final Widget preview;
final Widget actions;
@override
- State<EnteVideoEditorSubPage> createState() => _EnteVideoEditorSubPageState();
+ State<VideoEditorSubPage> createState() => _VideoEditorSubPageState();
}
-class _EnteVideoEditorSubPageState extends State<EnteVideoEditorSubPage> {
+class _VideoEditorSubPageState extends State<VideoEditorSubPage> {
late final VideoEditorState _initialState;
bool _keepChanges = false;
@@ -92,10 +92,10 @@ class _EnteVideoEditorSubPageState extends State<EnteVideoEditorSubPage> {
}
}
-class EnteVideoPreview extends StatelessWidget {
- const EnteVideoPreview({super.key, required this.controller});
+class VideoEditorPreview extends StatelessWidget {
+ const VideoEditorPreview({super.key, required this.controller});
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
@override
Widget build(BuildContext context) {
@@ -145,13 +145,13 @@ class EnteVideoPreview extends StatelessWidget {
}
}
-class EnteVideoCropEditor extends StatefulWidget {
- const EnteVideoCropEditor({super.key, required this.controller});
+class VideoCropEditor extends StatefulWidget {
+ const VideoCropEditor({super.key, required this.controller});
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
@override
- State<EnteVideoCropEditor> createState() => _EnteVideoCropEditorState();
+ State<VideoCropEditor> createState() => _VideoCropEditorState();
}
enum _CropDrag {
@@ -166,7 +166,7 @@ enum _CropDrag {
bottomRight,
}
-class _EnteVideoCropEditorState extends State<EnteVideoCropEditor> {
+class _VideoCropEditorState extends State<VideoCropEditor> {
_CropDrag? _drag;
Rect? _startRect;
Offset? _startPosition;
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_trim_slider.dart b/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_trim_slider.dart
similarity index 96%
rename from mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_trim_slider.dart
rename to mobile/apps/photos/lib/ui/tools/editor/video_editor/video_trim_slider.dart
index f49e2927bc..3bb2d23aa0 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_editor/ente_video_trim_slider.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_editor/video_trim_slider.dart
@@ -5,27 +5,27 @@ import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:native_video_editor/native_video_editor.dart';
import 'package:path/path.dart' as path;
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
-class EnteVideoTrimSlider extends StatefulWidget {
- const EnteVideoTrimSlider({
+class VideoTrimSlider extends StatefulWidget {
+ const VideoTrimSlider({
super.key,
required this.controller,
this.height = 60,
this.horizontalMargin = 15,
});
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
final double height;
final double horizontalMargin;
@override
- State<EnteVideoTrimSlider> createState() => _EnteVideoTrimSliderState();
+ State<VideoTrimSlider> createState() => _VideoTrimSliderState();
}
enum _TrimDrag { start, end, seek }
-class _EnteVideoTrimSliderState extends State<EnteVideoTrimSlider> {
+class _VideoTrimSliderState extends State<VideoTrimSlider> {
Directory? _directory;
List<File> _frames = const [];
String? _requestId;
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_editor_page.dart b/mobile/apps/photos/lib/ui/tools/editor/video_editor_page.dart
index 89bf81e5b4..4e9c197b44 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_editor_page.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_editor_page.dart
@@ -24,12 +24,12 @@ import "package:photos/ui/tools/editor/export_video_service.dart";
import "package:photos/ui/tools/editor/native_video_export_service.dart";
import 'package:photos/ui/tools/editor/video_crop_page.dart';
import "package:photos/ui/tools/editor/video_crop_util.dart";
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart";
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_widgets.dart";
import "package:photos/ui/tools/editor/video_editor/video_editor_app_bar.dart";
import "package:photos/ui/tools/editor/video_editor/video_editor_bottom_action.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_controller.dart";
import "package:photos/ui/tools/editor/video_editor/video_editor_main_actions.dart";
import "package:photos/ui/tools/editor/video_editor/video_editor_player_control.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_widgets.dart";
import "package:photos/ui/tools/editor/video_rotate_page.dart";
import "package:photos/ui/tools/editor/video_trim_page.dart";
import "package:photos/ui/viewer/file/detail_page.dart";
@@ -55,7 +55,7 @@ class _VideoEditorPageState extends State<VideoEditorPage> {
final _isExporting = ValueNotifier<bool>(false);
final _logger = Logger("VideoEditor");
- EnteVideoEditorController? _controller;
+ VideoEditorController? _controller;
/// Toggle state for internal users to switch between native and FFmpeg export
/// Initially set to the flag service value
@@ -68,7 +68,7 @@ class _VideoEditorPageState extends State<VideoEditorPage> {
// Initialize toggle with flagService value
_useNativeExport = flagService.useNativeVideoEditor;
- _controller = EnteVideoEditorController.file(widget.ioFile);
+ _controller = VideoEditorController.file(widget.ioFile);
unawaited(_initializeController());
}
@@ -143,7 +143,7 @@ class _VideoEditorPageState extends State<VideoEditorPage> {
Positioned.fill(
child: Hero(
tag: "video-editor-preview",
- child: EnteVideoPreview(
+ child: VideoEditorPreview(
controller: _controller!,
),
),
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_rotate_page.dart b/mobile/apps/photos/lib/ui/tools/editor/video_rotate_page.dart
index 8cec1ea756..fe0999a254 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_rotate_page.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_rotate_page.dart
@@ -1,20 +1,20 @@
import "package:ente_strings/ente_strings.dart";
import 'package:flutter/material.dart';
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart";
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_widgets.dart";
import "package:photos/ui/tools/editor/video_editor/video_editor_bottom_action.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_controller.dart";
import "package:photos/ui/tools/editor/video_editor/video_editor_main_actions.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_widgets.dart";
class VideoRotatePage extends StatelessWidget {
const VideoRotatePage({super.key, required this.controller});
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
@override
Widget build(BuildContext context) {
- return EnteVideoEditorSubPage(
+ return VideoEditorSubPage(
controller: controller,
- preview: EnteVideoPreview(controller: controller),
+ preview: VideoEditorPreview(controller: controller),
actions: VideoEditorMainActions(
children: [
VideoEditorBottomAction(
diff --git a/mobile/apps/photos/lib/ui/tools/editor/video_trim_page.dart b/mobile/apps/photos/lib/ui/tools/editor/video_trim_page.dart
index 6289dcca7d..da7ac534ab 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/video_trim_page.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/video_trim_page.dart
@@ -1,22 +1,22 @@
import 'package:flutter/material.dart';
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart";
-import "package:photos/ui/tools/editor/video_editor/ente_video_editor_widgets.dart";
-import "package:photos/ui/tools/editor/video_editor/ente_video_trim_slider.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_controller.dart";
+import "package:photos/ui/tools/editor/video_editor/video_editor_widgets.dart";
+import "package:photos/ui/tools/editor/video_editor/video_trim_slider.dart";
class VideoTrimPage extends StatelessWidget {
const VideoTrimPage({super.key, required this.controller});
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
@override
Widget build(BuildContext context) {
const height = 60.0;
- return EnteVideoEditorSubPage(
+ return VideoEditorSubPage(
controller: controller,
- preview: EnteVideoPreview(controller: controller),
+ preview: VideoEditorPreview(controller: controller),
actions: Padding(
padding: const EdgeInsets.only(top: 16),
- child: EnteVideoTrimSlider(
+ child: VideoTrimSlider(
controller: controller,
height: height,
horizontalMargin: height / 4,
diff --git a/mobile/apps/photos/test/ui/tools/editor/video_editor_contract_test.dart b/mobile/apps/photos/test/ui/tools/editor/video_editor_contract_test.dart
index 5edd9bd198..6aa0e32374 100644
--- a/mobile/apps/photos/test/ui/tools/editor/video_editor_contract_test.dart
+++ b/mobile/apps/photos/test/ui/tools/editor/video_editor_contract_test.dart
@@ -4,7 +4,7 @@ import 'dart:ui';
import 'package:flutter_test/flutter_test.dart';
import 'package:photos/ui/tools/editor/export_video_service.dart';
import 'package:photos/ui/tools/editor/video_crop_util.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
void main() {
group('calculateDisplaySpaceCropRectFromData', () {
@@ -58,7 +58,7 @@ void main() {
});
test('FFmpeg plan preserves file paths as structured arguments', () {
- final controller = EnteVideoEditorController.file(
+ final controller = VideoEditorController.file(
File("/tmp/input video's source.mp4"),
);
addTearDown(controller.dispose);
diff --git a/mobile/apps/photos/test/ui/tools/editor/ente_video_editor_controller_test.dart b/mobile/apps/photos/test/ui/tools/editor/video_editor_controller_test.dart
similarity index 91%
rename from mobile/apps/photos/test/ui/tools/editor/ente_video_editor_controller_test.dart
rename to mobile/apps/photos/test/ui/tools/editor/video_editor_controller_test.dart
index c50729d610..89389448e3 100644
--- a/mobile/apps/photos/test/ui/tools/editor/ente_video_editor_controller_test.dart
+++ b/mobile/apps/photos/test/ui/tools/editor/video_editor_controller_test.dart
@@ -1,8 +1,8 @@
import 'dart:ui';
import 'package:flutter_test/flutter_test.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_widgets.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_widgets.dart';
void main() {
const sourceCrop = Rect.fromLTRB(0.1, 0.2, 0.6, 0.8);
diff --git a/mobile/apps/photos/test/ui/tools/editor/ente_video_editor_sub_page_test.dart b/mobile/apps/photos/test/ui/tools/editor/video_editor_sub_page_test.dart
similarity index 85%
rename from mobile/apps/photos/test/ui/tools/editor/ente_video_editor_sub_page_test.dart
rename to mobile/apps/photos/test/ui/tools/editor/video_editor_sub_page_test.dart
index 966b7afd1c..a74aabf5a2 100644
--- a/mobile/apps/photos/test/ui/tools/editor/ente_video_editor_sub_page_test.dart
+++ b/mobile/apps/photos/test/ui/tools/editor/video_editor_sub_page_test.dart
@@ -5,12 +5,12 @@ import 'package:ente_strings/ente_strings.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:photos/ente_theme_data.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_controller.dart';
-import 'package:photos/ui/tools/editor/video_editor/ente_video_editor_widgets.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_controller.dart';
+import 'package:photos/ui/tools/editor/video_editor/video_editor_widgets.dart';
void main() {
testWidgets('system back restores state while Done keeps it', (tester) async {
- final controller = EnteVideoEditorController.file(File('unused.mp4'));
+ final controller = VideoEditorController.file(File('unused.mp4'));
addTearDown(controller.dispose);
await tester.pumpWidget(
@@ -50,11 +50,11 @@ void main() {
class _SubPage extends StatelessWidget {
const _SubPage(this.controller);
- final EnteVideoEditorController controller;
+ final VideoEditorController controller;
@override
Widget build(BuildContext context) {
- return EnteVideoEditorSubPage(
+ return VideoEditorSubPage(
controller: controller,
preview: const ColoredBox(color: Colors.black),
actions: TextButton(
diff --git a/mobile/packages/native_video_editor/ios/Package.swift b/mobile/packages/native_video_editor/ios/Package.swift
index 053b2a267b..1e6a8d6942 100644
--- a/mobile/packages/native_video_editor/ios/Package.swift
+++ b/mobile/packages/native_video_editor/ios/Package.swift
@@ -3,23 +3,23 @@
import PackageDescription
let package = Package(
- name: "EnteVideoCore",
+ name: "VideoEditorCore",
platforms: [
.iOS(.v15),
.macOS(.v12),
],
products: [
- .library(name: "EnteVideoCore", targets: ["EnteVideoCore"])
+ .library(name: "VideoEditorCore", targets: ["VideoEditorCore"])
],
targets: [
.target(
- name: "EnteVideoCore",
+ name: "VideoEditorCore",
path: "Classes",
exclude: ["NativeVideoEditorPlugin.swift"]
),
.testTarget(
- name: "EnteVideoCoreTests",
- dependencies: ["EnteVideoCore"],
+ name: "VideoEditorCoreTests",
+ dependencies: ["VideoEditorCore"],
path: "Tests"
),
],
diff --git a/mobile/packages/native_video_editor/ios/Tests/VideoTransformPlannerTests.swift b/mobile/packages/native_video_editor/ios/Tests/VideoTransformPlannerTests.swift
index cbe5a77b86..916d5140cc 100644
--- a/mobile/packages/native_video_editor/ios/Tests/VideoTransformPlannerTests.swift
+++ b/mobile/packages/native_video_editor/ios/Tests/VideoTransformPlannerTests.swift
@@ -1,6 +1,6 @@
import CoreGraphics
import XCTest
-@testable import EnteVideoCore
+@testable import VideoEditorCore
final class VideoTransformPlannerTests: XCTestCase {
func testClockwiseQuarterTurnProducesNormalizedPortraitBounds() throws {