From f95251a52720db94063cb05be2af619196cc4952 Mon Sep 17 00:00:00 2001
From: Ming Ming <nkming2@gmail.com>
Date: Sun, 1 Aug 2021 01:02:41 +0800
Subject: [PATCH] Refactoring: rename ArchiveViewer

---
 ...chive_viewer.dart => archive_browser.dart} | 24 +++++++++----------
 lib/widget/home_albums.dart                   |  6 ++---
 lib/widget/my_app.dart                        | 15 ++++++------
 3 files changed, 23 insertions(+), 22 deletions(-)
 rename lib/widget/{archive_viewer.dart => archive_browser.dart} (94%)

diff --git a/lib/widget/archive_viewer.dart b/lib/widget/archive_browser.dart
similarity index 94%
rename from lib/widget/archive_viewer.dart
rename to lib/widget/archive_browser.dart
index 0c1b4e35..a744e79b 100644
--- a/lib/widget/archive_viewer.dart
+++ b/lib/widget/archive_browser.dart
@@ -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/zoom_menu_button.dart';
 
-class ArchiveViewerArguments {
-  ArchiveViewerArguments(this.account);
+class ArchiveBrowserArguments {
+  ArchiveBrowserArguments(this.account);
 
   final Account account;
 }
 
-class ArchiveViewer extends StatefulWidget {
-  static const routeName = "/archive-viewer";
+class ArchiveBrowser extends StatefulWidget {
+  static const routeName = "/archive-browser";
 
-  static Route buildRoute(ArchiveViewerArguments args) => MaterialPageRoute(
-        builder: (context) => ArchiveViewer.fromArgs(args),
+  static Route buildRoute(ArchiveBrowserArguments args) => MaterialPageRoute(
+        builder: (context) => ArchiveBrowser.fromArgs(args),
       );
 
-  ArchiveViewer({
+  ArchiveBrowser({
     Key? key,
     required this.account,
   }) : super(key: key);
 
-  ArchiveViewer.fromArgs(ArchiveViewerArguments args, {Key? key})
+  ArchiveBrowser.fromArgs(ArchiveBrowserArguments args, {Key? key})
       : this(
           key: key,
           account: args.account,
         );
 
   @override
-  createState() => _ArchiveViewerState();
+  createState() => _ArchiveBrowserState();
 
   final Account account;
 }
 
-class _ArchiveViewerState extends State<ArchiveViewer>
-    with SelectableItemStreamListMixin<ArchiveViewer> {
+class _ArchiveBrowserState extends State<ArchiveBrowser>
+    with SelectableItemStreamListMixin<ArchiveBrowser> {
   @override
   initState() {
     super.initState();
@@ -301,7 +301,7 @@ class _ArchiveViewerState extends State<ArchiveViewer>
 
   var _thumbZoomLevel = 0;
 
-  static final _log = Logger("widget.archive_viewer._ArchiveViewerState");
+  static final _log = Logger("widget.archive_browser._ArchiveBrowserState");
 }
 
 abstract class _ListItem implements SelectableItem {
diff --git a/lib/widget/home_albums.dart b/lib/widget/home_albums.dart
index a78c89ed..bb8b5191 100644
--- a/lib/widget/home_albums.dart
+++ b/lib/widget/home_albums.dart
@@ -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_search_delegate.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/dynamic_album_viewer.dart';
 import 'package:nc_photos/widget/home_app_bar.dart';
@@ -217,8 +217,8 @@ class _HomeAlbumsState extends State<HomeAlbums>
       ),
       title: L10n.of(context).albumArchiveLabel,
       onTap: () {
-        Navigator.of(context).pushNamed(ArchiveViewer.routeName,
-            arguments: ArchiveViewerArguments(widget.account));
+        Navigator.of(context).pushNamed(ArchiveBrowser.routeName,
+            arguments: ArchiveBrowserArguments(widget.account));
       },
     );
   }
diff --git a/lib/widget/my_app.dart b/lib/widget/my_app.dart
index 41e48c95..a8871f19 100644
--- a/lib/widget/my_app.dart
+++ b/lib/widget/my_app.dart
@@ -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_importer.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/dynamic_album_viewer.dart';
 import 'package:nc_photos/widget/home.dart';
@@ -99,7 +99,7 @@ class _MyAppState extends State<MyApp> implements SnackBarHandler {
     route ??= _handleRootPickerRoute(settings);
     route ??= _handleAlbumViewerRoute(settings);
     route ??= _handleSettingsRoute(settings);
-    route ??= _handleArchiveViewerRoute(settings);
+    route ??= _handleArchiveBrowserRoute(settings);
     route ??= _handleDynamicAlbumViewerRoute(settings);
     route ??= _handleAlbumDirPickerRoute(settings);
     route ??= _handleAlbumImporterRoute(settings);
@@ -198,15 +198,16 @@ class _MyAppState extends State<MyApp> implements SnackBarHandler {
     return null;
   }
 
-  Route<dynamic>? _handleArchiveViewerRoute(RouteSettings settings) {
+  Route<dynamic>? _handleArchiveBrowserRoute(RouteSettings settings) {
     try {
-      if (settings.name == ArchiveViewer.routeName &&
+      if (settings.name == ArchiveBrowser.routeName &&
           settings.arguments != null) {
-        final args = settings.arguments as ArchiveViewerArguments;
-        return ArchiveViewer.buildRoute(args);
+        final args = settings.arguments as ArchiveBrowserArguments;
+        return ArchiveBrowser.buildRoute(args);
       }
     } catch (e) {
-      _log.severe("[_handleArchiveViewerRoute] Failed while handling route", e);
+      _log.severe(
+          "[_handleArchiveBrowserRoute] Failed while handling route", e);
     }
     return null;
   }