From 60b5d09805913b258985dab2b2d972db3645082a Mon Sep 17 00:00:00 2001 From: Vadim <44135514+vodemn@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:08:20 +0200 Subject: [PATCH] rename --- integration_test/logbook_test.dart | 2 +- lib/application.dart | 2 ++ lib/navigation/routes.dart | 1 + .../grid_tile/widget_grid_tile_logbook_photo.dart | 0 .../screen_logbook_photos.dart} | 10 +++++----- .../camera/logbook/widget_list_tile_logbook.dart | 6 ++---- screenshots/generate_screenshots.dart | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) rename lib/screens/{logbook => logbook_photos}/components/grid_tile/widget_grid_tile_logbook_photo.dart (100%) rename lib/screens/{logbook/screen_logbook.dart => logbook_photos/screen_logbook_photos.dart} (90%) diff --git a/integration_test/logbook_test.dart b/integration_test/logbook_test.dart index feade70..373242b 100644 --- a/integration_test/logbook_test.dart +++ b/integration_test/logbook_test.dart @@ -3,8 +3,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:lightmeter/data/models/ev_source_type.dart'; import 'package:lightmeter/data/shared_prefs_service.dart'; import 'package:lightmeter/generated/l10n.dart'; -import 'package:lightmeter/screens/logbook/components/grid_tile/widget_grid_tile_logbook_photo.dart'; import 'package:lightmeter/screens/logbook_photo_edit/screen_logbook_photo_edit.dart'; +import 'package:lightmeter/screens/logbook_photos/components/grid_tile/widget_grid_tile_logbook_photo.dart'; import 'package:lightmeter/screens/settings/components/shared/dialog_picker/widget_dialog_picker.dart'; import 'package:lightmeter/screens/settings/screen_settings.dart'; import 'package:lightmeter/utils/platform_utils.dart'; diff --git a/lib/application.dart b/lib/application.dart index 0aa812b..abc3a1f 100644 --- a/lib/application.dart +++ b/lib/application.dart @@ -13,6 +13,7 @@ import 'package:lightmeter/screens/film_edit/flow_film_edit.dart'; import 'package:lightmeter/screens/films/screen_films.dart'; import 'package:lightmeter/screens/lightmeter_pro/screen_lightmeter_pro.dart'; import 'package:lightmeter/screens/logbook_photo_edit/flow_logbook_photo_edit.dart'; +import 'package:lightmeter/screens/logbook_photos/screen_logbook_photos.dart'; import 'package:lightmeter/screens/metering/flow_metering.dart'; import 'package:lightmeter/screens/settings/flow_settings.dart'; import 'package:lightmeter/screens/shared/release_notes_dialog/flow_dialog_release_notes.dart'; @@ -60,6 +61,7 @@ class Application extends StatelessWidget { NavigationRoutes.filmEditScreen.name: (context) => FilmEditFlow(args: context.routeArgs()), NavigationRoutes.proFeaturesScreen.name: (_) => LightmeterProScreen(), NavigationRoutes.timerScreen.name: (context) => TimerFlow(args: context.routeArgs()), + NavigationRoutes.logbookPhotosListScreen.name: (_) => const LogbookPhotosScreen(), NavigationRoutes.logbookPhotoEditScreen.name: (context) => LogbookPhotoEditFlow(args: LogbookPhotoEditArgs(photo: context.routeArgs())), }, diff --git a/lib/navigation/routes.dart b/lib/navigation/routes.dart index f40b764..e8fd4ff 100644 --- a/lib/navigation/routes.dart +++ b/lib/navigation/routes.dart @@ -7,5 +7,6 @@ enum NavigationRoutes { filmEditScreen, proFeaturesScreen, timerScreen, + logbookPhotosListScreen, logbookPhotoEditScreen, } diff --git a/lib/screens/logbook/components/grid_tile/widget_grid_tile_logbook_photo.dart b/lib/screens/logbook_photos/components/grid_tile/widget_grid_tile_logbook_photo.dart similarity index 100% rename from lib/screens/logbook/components/grid_tile/widget_grid_tile_logbook_photo.dart rename to lib/screens/logbook_photos/components/grid_tile/widget_grid_tile_logbook_photo.dart diff --git a/lib/screens/logbook/screen_logbook.dart b/lib/screens/logbook_photos/screen_logbook_photos.dart similarity index 90% rename from lib/screens/logbook/screen_logbook.dart rename to lib/screens/logbook_photos/screen_logbook_photos.dart index 8eeba8f..f351e23 100644 --- a/lib/screens/logbook/screen_logbook.dart +++ b/lib/screens/logbook_photos/screen_logbook_photos.dart @@ -4,19 +4,19 @@ import 'package:lightmeter/navigation/routes.dart'; import 'package:lightmeter/platform_config.dart'; import 'package:lightmeter/providers/logbook_photos_provider.dart'; import 'package:lightmeter/res/dimens.dart'; -import 'package:lightmeter/screens/logbook/components/grid_tile/widget_grid_tile_logbook_photo.dart'; +import 'package:lightmeter/screens/logbook_photos/components/grid_tile/widget_grid_tile_logbook_photo.dart'; import 'package:lightmeter/screens/shared/icon_placeholder/widget_icon_placeholder.dart'; import 'package:lightmeter/screens/shared/sliver_screen/screen_sliver.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -class LogbookScreen extends StatefulWidget { - const LogbookScreen({super.key}); +class LogbookPhotosScreen extends StatefulWidget { + const LogbookPhotosScreen({super.key}); @override - State createState() => _LogbookScreenState(); + State createState() => _LogbookPhotosScreenState(); } -class _LogbookScreenState extends State with SingleTickerProviderStateMixin { +class _LogbookPhotosScreenState extends State with SingleTickerProviderStateMixin { @override Widget build(BuildContext context) { return SliverScreen( diff --git a/lib/screens/settings/components/camera/logbook/widget_list_tile_logbook.dart b/lib/screens/settings/components/camera/logbook/widget_list_tile_logbook.dart index b719ecd..1beb4bc 100644 --- a/lib/screens/settings/components/camera/logbook/widget_list_tile_logbook.dart +++ b/lib/screens/settings/components/camera/logbook/widget_list_tile_logbook.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; -import 'package:lightmeter/screens/logbook/screen_logbook.dart'; +import 'package:lightmeter/navigation/routes.dart'; import 'package:lightmeter/screens/settings/components/shared/iap_list_tile/widget_list_tile_iap.dart'; class LogbookListTile extends StatelessWidget { @@ -12,9 +12,7 @@ class LogbookListTile extends StatelessWidget { leading: const Icon(Icons.book_outlined), title: Text(S.of(context).logbook), onTap: () { - Navigator.of(context).push( - MaterialPageRoute(builder: (_) => const LogbookScreen()), - ); + Navigator.of(context).pushNamed(NavigationRoutes.logbookPhotosListScreen.name); }, ); } diff --git a/screenshots/generate_screenshots.dart b/screenshots/generate_screenshots.dart index 6d18555..109ae70 100644 --- a/screenshots/generate_screenshots.dart +++ b/screenshots/generate_screenshots.dart @@ -17,7 +17,7 @@ import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/providers/logbook_photos_provider.dart'; import 'package:lightmeter/res/dimens.dart'; import 'package:lightmeter/res/theme.dart'; -import 'package:lightmeter/screens/logbook/components/grid_tile/widget_grid_tile_logbook_photo.dart'; +import 'package:lightmeter/screens/logbook_photos/components/grid_tile/widget_grid_tile_logbook_photo.dart'; import 'package:lightmeter/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart'; import 'package:lightmeter/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart'; import 'package:lightmeter/screens/metering/screen_metering.dart';