Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-03-22 06:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring: rename ArchiveViewer

Browse source
This commit is contained in:
Ming Ming 2021-08-01 01:02:41 +08:00
parent ed19b1bd82
commit f95251a527
3 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/widget/archive_viewer.dart → lib/widget/archive_browser.dart
View file

@ -24,38 +24,38 @@ import 'package:nc_photos/widget/selection_app_bar.dart';
import 'package:nc_photos/widget/viewer.dart'; import 'package:nc_photos/widget/viewer.dart';
import 'package:nc_photos/widget/zoom_menu_button.dart'; import 'package:nc_photos/widget/zoom_menu_button.dart';
class ArchiveViewerArguments { class ArchiveBrowserArguments {
ArchiveViewerArguments(this.account); ArchiveBrowserArguments(this.account);
final Account account; final Account account;
} }
class ArchiveViewer extends StatefulWidget { class ArchiveBrowser extends StatefulWidget {
static const routeName = "/archive-viewer"; static const routeName = "/archive-browser";
static Route buildRoute(ArchiveViewerArguments args) => MaterialPageRoute( static Route buildRoute(ArchiveBrowserArguments args) => MaterialPageRoute(
builder: (context) => ArchiveViewer.fromArgs(args), builder: (context) => ArchiveBrowser.fromArgs(args),
); );
ArchiveViewer({ ArchiveBrowser({
Key? key, Key? key,
required this.account, required this.account,
}) : super(key: key); }) : super(key: key);
ArchiveViewer.fromArgs(ArchiveViewerArguments args, {Key? key}) ArchiveBrowser.fromArgs(ArchiveBrowserArguments args, {Key? key})
: this( : this(
key: key, key: key,
account: args.account, account: args.account,
); );
@override @override
createState() => _ArchiveViewerState(); createState() => _ArchiveBrowserState();
final Account account; final Account account;
} }
class _ArchiveViewerState extends State<ArchiveViewer> class _ArchiveBrowserState extends State<ArchiveBrowser>
with SelectableItemStreamListMixin<ArchiveViewer> { with SelectableItemStreamListMixin<ArchiveBrowser> {
@override @override
initState() { initState() {
super.initState(); super.initState();
@ -301,7 +301,7 @@ class _ArchiveViewerState extends State<ArchiveViewer>
var _thumbZoomLevel = 0; var _thumbZoomLevel = 0;
static final _log = Logger("widget.archive_viewer._ArchiveViewerState"); static final _log = Logger("widget.archive_browser._ArchiveBrowserState");
} }
abstract class _ListItem implements SelectableItem { abstract class _ListItem implements SelectableItem {

6
lib/widget/home_albums.dart
View file

@ -22,7 +22,7 @@ import 'package:nc_photos/widget/album_grid_item.dart';
import 'package:nc_photos/widget/album_importer.dart'; import 'package:nc_photos/widget/album_importer.dart';
import 'package:nc_photos/widget/album_search_delegate.dart'; import 'package:nc_photos/widget/album_search_delegate.dart';
import 'package:nc_photos/widget/album_viewer.dart'; import 'package:nc_photos/widget/album_viewer.dart';
import 'package:nc_photos/widget/archive_viewer.dart'; import 'package:nc_photos/widget/archive_browser.dart';
import 'package:nc_photos/widget/builder/album_grid_item_builder.dart'; import 'package:nc_photos/widget/builder/album_grid_item_builder.dart';
import 'package:nc_photos/widget/dynamic_album_viewer.dart'; import 'package:nc_photos/widget/dynamic_album_viewer.dart';
import 'package:nc_photos/widget/home_app_bar.dart'; import 'package:nc_photos/widget/home_app_bar.dart';
@ -217,8 +217,8 @@ class _HomeAlbumsState extends State<HomeAlbums>
), ),
title: L10n.of(context).albumArchiveLabel, title: L10n.of(context).albumArchiveLabel,
onTap: () { onTap: () {
Navigator.of(context).pushNamed(ArchiveViewer.routeName, Navigator.of(context).pushNamed(ArchiveBrowser.routeName,
arguments: ArchiveViewerArguments(widget.account)); arguments: ArchiveBrowserArguments(widget.account));
}, },
); );
} }

15
lib/widget/my_app.dart
View file

@ -11,7 +11,7 @@ import 'package:nc_photos/theme.dart';
import 'package:nc_photos/widget/album_dir_picker.dart'; import 'package:nc_photos/widget/album_dir_picker.dart';
import 'package:nc_photos/widget/album_importer.dart'; import 'package:nc_photos/widget/album_importer.dart';
import 'package:nc_photos/widget/album_viewer.dart'; import 'package:nc_photos/widget/album_viewer.dart';
import 'package:nc_photos/widget/archive_viewer.dart'; import 'package:nc_photos/widget/archive_browser.dart';
import 'package:nc_photos/widget/connect.dart'; import 'package:nc_photos/widget/connect.dart';
import 'package:nc_photos/widget/dynamic_album_viewer.dart'; import 'package:nc_photos/widget/dynamic_album_viewer.dart';
import 'package:nc_photos/widget/home.dart'; import 'package:nc_photos/widget/home.dart';
@ -99,7 +99,7 @@ class _MyAppState extends State<MyApp> implements SnackBarHandler {
route ??= _handleRootPickerRoute(settings); route ??= _handleRootPickerRoute(settings);
route ??= _handleAlbumViewerRoute(settings); route ??= _handleAlbumViewerRoute(settings);
route ??= _handleSettingsRoute(settings); route ??= _handleSettingsRoute(settings);
route ??= _handleArchiveViewerRoute(settings); route ??= _handleArchiveBrowserRoute(settings);
route ??= _handleDynamicAlbumViewerRoute(settings); route ??= _handleDynamicAlbumViewerRoute(settings);
route ??= _handleAlbumDirPickerRoute(settings); route ??= _handleAlbumDirPickerRoute(settings);
route ??= _handleAlbumImporterRoute(settings); route ??= _handleAlbumImporterRoute(settings);
@ -198,15 +198,16 @@ class _MyAppState extends State<MyApp> implements SnackBarHandler {
return null; return null;
} }
Route<dynamic>? _handleArchiveViewerRoute(RouteSettings settings) { Route<dynamic>? _handleArchiveBrowserRoute(RouteSettings settings) {
try { try {
if (settings.name == ArchiveViewer.routeName && if (settings.name == ArchiveBrowser.routeName &&
settings.arguments != null) { settings.arguments != null) {
final args = settings.arguments as ArchiveViewerArguments; final args = settings.arguments as ArchiveBrowserArguments;
return ArchiveViewer.buildRoute(args); return ArchiveBrowser.buildRoute(args);
} }
} catch (e) { } catch (e) {
_log.severe("[_handleArchiveViewerRoute] Failed while handling route", e); _log.severe(
"[_handleArchiveBrowserRoute] Failed while handling route", e);
} }
return null; return null;
} }