Merge pull request #576 from project-violet/remove-main

Refactor 009: Remove main page

violet/assets/locale/en.json

@@ -304,7 +304,6 @@
   "aligngroup": "Sort by Group",
   "alignpage": "Sort by Page Count",
   "alignrecentread": "Sort by Recent Read",
-  "litemode": "Lite Mode",
   "hot": "Hot",
   "faq": "Frequently Asked Questions",
   "usermanual": "User Manual",

violet/assets/locale/eo.json

@@ -304,7 +304,6 @@
   "aligngroup": "Sort by Group",
   "alignpage": "Sort by Page Count",
   "alignrecentread": "Sort by Recent Read",
-  "litemode": "Lite Mode",
   "hot": "Hot",
   "faq": "Frequently Asked Questions",
   "usermanual": "User Manual",

violet/assets/locale/it.json

@@ -304,7 +304,6 @@
   "aligngroup": "Sort by Group",
   "alignpage": "Sort by Page Count",
   "alignrecentread": "Sort by Recent Read",
-  "litemode": "Lite Mode",
   "hot": "Hot",
   "faq": "Frequently Asked Questions",
   "usermanual": "User Manual",

violet/assets/locale/ja.json

@@ -304,7 +304,6 @@
   "aligngroup": "Sort by Group",
   "alignpage": "Sort by Page Count",
   "alignrecentread": "Sort by Recent Read",
-  "litemode": "Lite Mode",
   "hot": "Hot",
   "faq": "Frequently Asked Questions",
   "usermanual": "User Manual",

violet/assets/locale/ko.json

@@ -304,7 +304,6 @@
   "aligngroup": "그룹 순으로 정렬",
   "alignpage": "페이지수순으로 정렬",
   "alignrecentread": "최근 읽은 순으로 정렬",
-  "litemode": "라이트 모드",
   "hot": "인기",
   "faq": "자주 묻는 질문",
   "usermanual": "유저 메뉴얼",

violet/assets/locale/pt.json

@@ -304,7 +304,6 @@
   "aligngroup": "Ordenar por grupos",
   "alignpage": "Ordenar por contagem de páginas",
   "alignrecentread": "Ordenar por lidos recentemente",
-  "litemode": "Lite Mode",
   "hot": "Hot",
   "faq": "Frequently Asked Questions",
   "usermanual": "User Manual",

violet/assets/locale/zh.json

@@ -304,7 +304,6 @@
   "aligngroup": "Sort by Group",
   "alignpage": "Sort by Page Count",
   "alignrecentread": "Sort by Recent Read",
-  "litemode": "Lite Mode",
   "hot": "Hot",
   "faq": "Frequently Asked Questions",
   "usermanual": "User Manual",

violet/assets/locale/zh_Hans.json

@@ -304,7 +304,6 @@
   "aligngroup": "Sort by Group",
   "alignpage": "Sort by Page Count",
   "alignrecentread": "Sort by Recent Read",
-  "litemode": "Lite Mode",
   "hot": "Hot",
   "faq": "Frequently Asked Questions",
   "usermanual": "User Manual",

violet/assets/locale/zh_Hant.json

@@ -304,7 +304,6 @@
   "aligngroup": "Sort by Group",
   "alignpage": "Sort by Page Count",
   "alignrecentread": "Sort by Recent Read",
-  "litemode": "Lite Mode",
   "hot": "Hot",
   "faq": "Frequently Asked Questions",
   "usermanual": "User Manual",

violet/lib/pages/after_loading/afterloading_page.dart

@@ -21,7 +21,6 @@ import 'package:violet/pages/common/utils.dart';
 import 'package:violet/pages/download/download_page.dart';
 import 'package:violet/pages/hot/hot_page.dart';
 import 'package:violet/pages/lock/lock_screen.dart';
-import 'package:violet/pages/main/main_page.dart';
 import 'package:violet/pages/search/search_page.dart';
 import 'package:violet/pages/segment/double_tap_to_top.dart';
 import 'package:violet/pages/settings/settings_page.dart';
@@ -117,7 +116,7 @@ class AfterLoadingPageState extends State<AfterLoadingPage>
   bool _isDoubleTap = false;
 
   late final List<GlobalKey<State>> _widgetKeys =
-      List.generate(7, (index) => GlobalKey());
+      List.generate(5, (index) => GlobalKey());
 
   Widget _buildBottomNavigationBar(BuildContext context) {
     final translations = Translations.instance!;
@@ -159,7 +158,6 @@ class AfterLoadingPageState extends State<AfterLoadingPage>
           } else {
             if (_isDoubleTap) {
               // something to do for double tap
-              if (index >= 2 || Settings.liteMode) index += 1;
               (_widgetKeys[index].currentState as DoubleTapToTopMixin)
                   .animateToTop();
 
@@ -173,9 +171,8 @@ class AfterLoadingPageState extends State<AfterLoadingPage>
           }
         },
         items: <BottomNavigationBarItem>[
-          if (!Settings.liteMode) buildItem(MdiIcons.home, 'main'),
           buildItem(Icons.search, 'search'),
-          if (Settings.liteMode) buildItem(MdiIcons.fire, 'hot'),
+          buildItem(MdiIcons.fire, 'hot'),
           buildItem(Icons.bookmark, 'bookmark'),
           buildItem(Icons.file_download, 'download'),
           buildItem(Icons.settings, 'settings'),
@@ -281,9 +278,8 @@ class AfterLoadingPageState extends State<AfterLoadingPage>
                 ],
               ),
             ),
-            if (!Settings.liteMode) buildButton(MdiIcons.home, 0, 'main'),
-            buildButton(Icons.search, !Settings.liteMode ? 1 : 0, 'search'),
-            if (Settings.liteMode) buildButton(MdiIcons.fire, 1, 'hot'),
+            buildButton(Icons.search, 0, 'search'),
+            buildButton(MdiIcons.fire, 1, 'hot'),
             buildButton(MdiIcons.bookmark, 2, 'bookmark'),
             buildButton(MdiIcons.download, 3, 'download'),
             buildButton(Icons.settings, 4, 'settings'),
@@ -357,12 +353,11 @@ class AfterLoadingPageState extends State<AfterLoadingPage>
                   setState(() {});
                 },
                 children: <Widget>[
-                  if (!Settings.liteMode) MainPage(key: _widgetKeys[0]),
-                  SearchPage(key: _widgetKeys[1]),
-                  if (Settings.liteMode) HotPage(key: _widgetKeys[2]),
-                  BookmarkPage(key: _widgetKeys[3]),
-                  DownloadPage(key: _widgetKeys[4]),
-                  SettingsPage(key: _widgetKeys[5]),
+                  SearchPage(key: _widgetKeys[0]),
+                  HotPage(key: _widgetKeys[1]),
+                  BookmarkPage(key: _widgetKeys[2]),
+                  DownloadPage(key: _widgetKeys[3]),
+                  SettingsPage(key: _widgetKeys[4]),
                 ],
               ),
             ],

violet/lib/pages/article_info/article_info_page.dart

@@ -36,7 +36,7 @@ import 'package:violet/pages/artist_info/artist_info_page.dart';
 import 'package:violet/pages/common/toast.dart';
 import 'package:violet/pages/common/utils.dart';
 import 'package:violet/pages/download/download_page.dart';
-import 'package:violet/pages/main/info/lab/search_comment_author.dart';
+import 'package:violet/pages/lab/lab/search_comment_author.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/pages/viewer/viewer_page.dart';
 import 'package:violet/pages/viewer/viewer_page_provider.dart';

violet/lib/pages/main/info/lab/artist_search/artist_search.dart → violet/lib/pages/lab/lab/artist_search/artist_search.dart

@@ -13,7 +13,7 @@ import 'package:violet/database/query.dart';
 import 'package:violet/database/user/bookmark.dart';
 import 'package:violet/locale/locale.dart';
 import 'package:violet/pages/artist_info/artist_info_page.dart';
-import 'package:violet/pages/main/info/lab/artist_search/tag_group_modify.dart';
+import 'package:violet/pages/lab/lab/artist_search/tag_group_modify.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:community_charts_flutter/community_charts_flutter.dart'
     as charts;

violet/lib/pages/main/info/lab/artist_search/tag_group_modify.dart → violet/lib/pages/lab/lab/artist_search/tag_group_modify.dart

@@ -7,7 +7,7 @@ import 'package:get/get.dart';
 import 'package:uuid/uuid.dart';
 import 'package:violet/locale/locale.dart' as trans;
 import 'package:violet/other/dialogs.dart';
-import 'package:violet/pages/main/info/lab/artist_search/tag_group_modify_controller.dart';
+import 'package:violet/pages/lab/lab/artist_search/tag_group_modify_controller.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/settings/tag_selector.dart';
 import 'package:violet/settings/settings.dart';

violet/lib/pages/main/info/lab/bookmark/bookmarks.dart → violet/lib/pages/lab/lab/bookmark/bookmarks.dart

@@ -7,8 +7,8 @@ import 'package:sqflite/sqflite.dart';
 import 'package:violet/database/user/bookmark.dart';
 import 'package:violet/locale/locale.dart';
 import 'package:violet/other/dialogs.dart';
-import 'package:violet/pages/main/info/lab/bookmark/bookmarks_article_list.dart';
-import 'package:violet/pages/main/info/lab/bookmark/bookmarks_records.dart';
+import 'package:violet/pages/lab/lab/bookmark/bookmarks_article_list.dart';
+import 'package:violet/pages/lab/lab/bookmark/bookmarks_records.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/server/violet.dart';
 import 'package:violet/settings/settings.dart';

violet/lib/pages/main/info/lab/bookmark/bookmarks_article_list.dart → violet/lib/pages/lab/lab/bookmark/bookmarks_article_list.dart

@@ -12,7 +12,7 @@ import 'package:violet/database/user/bookmark.dart';
 import 'package:violet/model/article_list_item.dart';
 import 'package:violet/network/wrapper.dart' as http;
 import 'package:violet/pages/artist_info/search_type2.dart';
-import 'package:violet/pages/main/info/lab/bookmark/bookmarks_artist_list.dart';
+import 'package:violet/pages/lab/lab/bookmark/bookmarks_artist_list.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/segment/filter_page.dart';
 import 'package:violet/pages/segment/filter_page_controller.dart';

violet/lib/pages/main/info/lab/bookmark_spy.dart → violet/lib/pages/lab/lab/bookmark_spy.dart

@@ -6,7 +6,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:violet/database/user/bookmark.dart';
-import 'package:violet/pages/main/info/lab/bookmark/bookmarks.dart';
+import 'package:violet/pages/lab/lab/bookmark/bookmarks.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/server/violet.dart';

violet/lib/pages/main/info/lab/global_comments.dart → violet/lib/pages/lab/lab/global_comments.dart

@@ -7,7 +7,7 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 import 'package:mdi/mdi.dart';
 import 'package:violet/locale/locale.dart';
 import 'package:violet/other/dialogs.dart';
-import 'package:violet/pages/main/info/lab/recent_user_record.dart';
+import 'package:violet/pages/lab/lab/recent_user_record.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/server/community/anon.dart';

violet/lib/pages/main/info/lab/recent_record_u.dart → violet/lib/pages/lab/lab/recent_record_u.dart

@@ -12,7 +12,7 @@ import 'package:violet/database/query.dart';
 import 'package:violet/locale/locale.dart';
 import 'package:violet/log/log.dart';
 import 'package:violet/model/article_list_item.dart';
-import 'package:violet/pages/main/info/lab/recent_user_record.dart';
+import 'package:violet/pages/lab/lab/recent_user_record.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/server/violet.dart';

violet/lib/pages/main/info/lab/search_comment.dart → violet/lib/pages/lab/lab/search_comment.dart

@@ -4,7 +4,7 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:violet/pages/common/utils.dart';
-import 'package:violet/pages/main/info/lab/search_comment_author.dart';
+import 'package:violet/pages/lab/lab/search_comment_author.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/server/violet.dart';

violet/lib/pages/main/info/lab/search_message.dart → violet/lib/pages/lab/lab/search_message.dart

@@ -13,7 +13,7 @@ import 'package:violet/component/image_provider.dart';
 import 'package:violet/network/wrapper.dart' as http;
 import 'package:violet/other/dialogs.dart';
 import 'package:violet/pages/common/utils.dart';
-import 'package:violet/pages/main/info/lab/search_message_rank.dart';
+import 'package:violet/pages/lab/lab/search_message_rank.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/script/script_manager.dart';

violet/lib/pages/main/info/lab/user_bookmark_page.dart → violet/lib/pages/lab/lab/user_bookmark_page.dart

@@ -4,7 +4,7 @@
 import 'package:flutter/material.dart';
 import 'package:violet/database/user/bookmark.dart';
 import 'package:violet/pages/bookmark/group_modify.dart';
-import 'package:violet/pages/main/info/lab/recent_user_record.dart';
+import 'package:violet/pages/lab/lab/recent_user_record.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/settings/settings.dart';

violet/lib/pages/main/info/lab_page.dart → violet/lib/pages/lab/lab_page.dart

@@ -16,17 +16,17 @@ import 'package:violet/log/act_log.dart';
 import 'package:violet/other/dialogs.dart';
 import 'package:violet/pages/artist_info/article_list_page.dart';
 import 'package:violet/pages/bookmark/crop_bookmark.dart';
-import 'package:violet/pages/main/info/lab/artist_search/artist_search.dart';
-import 'package:violet/pages/main/info/lab/bookmark_spy.dart';
-import 'package:violet/pages/main/info/lab/recent_comments.dart';
-import 'package:violet/pages/main/info/lab/recent_record.dart';
-import 'package:violet/pages/main/info/lab/recent_record_u.dart';
-import 'package:violet/pages/main/info/lab/search_comment.dart';
-import 'package:violet/pages/main/info/lab/search_message.dart';
-import 'package:violet/pages/main/info/lab/setting.dart';
-import 'package:violet/pages/main/info/lab/statistics.dart';
-import 'package:violet/pages/main/info/lab/top_recent.dart';
-import 'package:violet/pages/main/info/lab/user_bookmark_page.dart';
+import 'package:violet/pages/lab/lab/artist_search/artist_search.dart';
+import 'package:violet/pages/lab/lab/bookmark_spy.dart';
+import 'package:violet/pages/lab/lab/recent_comments.dart';
+import 'package:violet/pages/lab/lab/recent_record.dart';
+import 'package:violet/pages/lab/lab/recent_record_u.dart';
+import 'package:violet/pages/lab/lab/search_comment.dart';
+import 'package:violet/pages/lab/lab/search_message.dart';
+import 'package:violet/pages/lab/lab/setting.dart';
+import 'package:violet/pages/lab/lab/statistics.dart';
+import 'package:violet/pages/lab/lab/top_recent.dart';
+import 'package:violet/pages/lab/lab/user_bookmark_page.dart';
 import 'package:violet/pages/segment/card_panel.dart';
 import 'package:violet/pages/segment/platform_navigator.dart';
 import 'package:violet/pages/settings/log_page.dart';