Skip to content

armgit / ente

Public Imported from GitHub
0

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

refactor(photos): group image zoom files

ashil-pilot356b1ccd2299
diff --git a/mobile/apps/photos/lib/ui/viewer/actions/file_viewer.dart b/mobile/apps/photos/lib/ui/viewer/actions/file_viewer.dart
index 7998c77567..8b26daa28d 100644
--- a/mobile/apps/photos/lib/ui/viewer/actions/file_viewer.dart
+++ b/mobile/apps/photos/lib/ui/viewer/actions/file_viewer.dart
@@ -18,7 +18,7 @@ import "package:photos/module/metadata/local_file.dart";
import "package:photos/module/metadata/video.dart";
import "package:photos/services/app_lifecycle_service.dart";
import "package:photos/ui/viewer/file/detail_page.dart";
-import "package:photos/ui/viewer/file/image_zoom_viewer.dart";
+import "package:photos/ui/viewer/file/image_zoom/image_zoom_viewer.dart";
import "package:receive_sharing_intent/receive_sharing_intent.dart";
import "package:video_player/video_player.dart";
diff --git a/mobile/apps/photos/lib/ui/viewer/file/image_zoom_geometry.dart b/mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_geometry.dart
similarity index 100%
rename from mobile/apps/photos/lib/ui/viewer/file/image_zoom_geometry.dart
rename to mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_geometry.dart
diff --git a/mobile/apps/photos/lib/ui/viewer/file/image_zoom_stage_policy.dart b/mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_stage_policy.dart
similarity index 100%
rename from mobile/apps/photos/lib/ui/viewer/file/image_zoom_stage_policy.dart
rename to mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_stage_policy.dart
diff --git a/mobile/apps/photos/lib/ui/viewer/file/image_zoom_viewer.dart b/mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_viewer.dart
similarity index 99%
rename from mobile/apps/photos/lib/ui/viewer/file/image_zoom_viewer.dart
rename to mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_viewer.dart
index b6aa19e5dd..3d11af63ae 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/image_zoom_viewer.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_viewer.dart
@@ -1,10 +1,10 @@
import "dart:async";
import "package:flutter/material.dart";
-import "package:photos/ui/viewer/file/image_zoom_geometry.dart";
-import "package:photos/ui/viewer/file/image_zoom_stage_policy.dart";
+import "package:photos/ui/viewer/file/image_zoom/image_zoom_geometry.dart";
+import "package:photos/ui/viewer/file/image_zoom/image_zoom_stage_policy.dart";
-export "package:photos/ui/viewer/file/image_zoom_stage_policy.dart"
+export "package:photos/ui/viewer/file/image_zoom/image_zoom_stage_policy.dart"
show ImageZoomStage;
const double _kZoomEpsilon = 0.001;
diff --git a/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart b/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart
index a5221d758c..984272afe7 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart
@@ -24,7 +24,7 @@ import "package:photos/service_locator.dart" show flagService;
import "package:photos/src/rust/api/image_processing_api.dart" as rust_image;
import "package:photos/states/detail_page_state.dart";
import "package:photos/ui/actions/file/file_actions.dart";
-import "package:photos/ui/viewer/file/image_zoom_viewer.dart";
+import "package:photos/ui/viewer/file/image_zoom/image_zoom_viewer.dart";
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
import 'package:photos/utils/image_util.dart';
import "package:photos/utils/ram_check_util.dart";
diff --git a/mobile/apps/photos/test/ui/viewer/file/image_zoom_geometry_test.dart b/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_geometry_test.dart
similarity index 97%
rename from mobile/apps/photos/test/ui/viewer/file/image_zoom_geometry_test.dart
rename to mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_geometry_test.dart
index 68de693cbc..6e484f06a2 100644
--- a/mobile/apps/photos/test/ui/viewer/file/image_zoom_geometry_test.dart
+++ b/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_geometry_test.dart
@@ -1,6 +1,6 @@
import "package:flutter/material.dart";
import "package:flutter_test/flutter_test.dart";
-import "package:photos/ui/viewer/file/image_zoom_geometry.dart";
+import "package:photos/ui/viewer/file/image_zoom/image_zoom_geometry.dart";
void main() {
group("ImageZoomGeometry", () {
diff --git a/mobile/apps/photos/test/ui/viewer/file/image_zoom_stage_policy_test.dart b/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_stage_policy_test.dart
similarity index 94%
rename from mobile/apps/photos/test/ui/viewer/file/image_zoom_stage_policy_test.dart
rename to mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_stage_policy_test.dart
index c373d4e4af..0aa39bec9d 100644
--- a/mobile/apps/photos/test/ui/viewer/file/image_zoom_stage_policy_test.dart
+++ b/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_stage_policy_test.dart
@@ -1,5 +1,5 @@
import "package:flutter_test/flutter_test.dart";
-import "package:photos/ui/viewer/file/image_zoom_stage_policy.dart";
+import "package:photos/ui/viewer/file/image_zoom/image_zoom_stage_policy.dart";
void main() {
test("duplicate or clamped stages are skipped", () {
diff --git a/mobile/apps/photos/test/ui/viewer/file/zoom_to_tapped_point_test.dart b/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_viewer_test.dart
similarity index 99%
rename from mobile/apps/photos/test/ui/viewer/file/zoom_to_tapped_point_test.dart
rename to mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_viewer_test.dart
index db0084ef11..a896ba7c42 100644
--- a/mobile/apps/photos/test/ui/viewer/file/zoom_to_tapped_point_test.dart
+++ b/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_viewer_test.dart
@@ -6,7 +6,7 @@ import "package:flutter/gestures.dart";
import "package:flutter/material.dart";
import "package:flutter/rendering.dart";
import "package:flutter_test/flutter_test.dart";
-import "package:photos/ui/viewer/file/image_zoom_viewer.dart";
+import "package:photos/ui/viewer/file/image_zoom/image_zoom_viewer.dart";
const _viewportSize = Size(400, 400);
const _landscapeSize = Size(1200, 800);