feat: update init page

tuihub · Nov 16, 2024 · b1bdff0 · b1bdff0
1 parent ddd6f2e
commit b1bdff0
Show file tree

Hide file tree

Showing 12 changed files with 251 additions and 191 deletions.
diff --git a/l10n_arb/intl_zh_CN.arb b/l10n_arb/intl_zh_CN.arb
@@ -23,6 +23,7 @@
   "hide": "隐藏",
   "add": "添加",
   "requiredField": "必填",
+  "skipLoading": "跳过加载",
 
   "durationJustNow": "刚刚",
   "durationSeconds": "{number} 秒前",

diff --git a/lib/l10n/intl/messages_zh-CN.dart b/lib/l10n/intl/messages_zh-CN.dart
@@ -242,6 +242,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "serverSetup": MessageLookupByLibrary.simpleMessage("服务器设置"),
         "settings": MessageLookupByLibrary.simpleMessage("设置"),
         "showServerConfig": MessageLookupByLibrary.simpleMessage("查看服务器信息"),
+        "skipLoading": MessageLookupByLibrary.simpleMessage("跳过加载"),
         "steamScanResultFinished": MessageLookupByLibrary.simpleMessage("扫描完成"),
         "steamScanResultLibraryEmpty":
             MessageLookupByLibrary.simpleMessage("Steam游戏库为空"),

diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart
diff --git a/lib/main_window.dart b/lib/main_window.dart
@@ -8,7 +8,6 @@ import 'package:go_router/go_router.dart';
 import 'bloc/deeplink_bloc.dart';
 import 'bloc/main_bloc.dart';
 import 'common/platform.dart';
-import 'view/pages/server_select_overlay.dart';
 import 'view/specialized/theme_mode_toggle.dart';
 import 'view/specialized/title_bar.dart';
 
@@ -27,9 +26,7 @@ class MainWindow extends StatelessWidget {
             maintainBottomViewPadding: true,
             child: Stack(
               children: [
-                ClipRect(
-                  child: ServerSelectOverlay(child: child),
-                ),
+                child,
                 const TitleBar(
                   actions: [ThemeModeToggle()],
                 ),

diff --git a/lib/route.dart b/lib/route.dart
@@ -149,7 +149,7 @@ class InitRoute extends GoRouteData {
   const InitRoute();
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) =>
+  Page<void> buildPage(BuildContext context, GoRouterState state) =>
       NoTransitionPage(
         child: MainWindow(
           key: mainWindowKey,
@@ -163,7 +163,7 @@ class WebLandingRoute extends GoRouteData {
   const WebLandingRoute();
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) =>
+  Page<void> buildPage(BuildContext context, GoRouterState state) =>
       NoTransitionPage(
         child: MainWindow(
           key: mainWindowKey,
@@ -180,8 +180,7 @@ class ImageViewerRoute extends GoRouteData {
   final List<PicSwiperItem>? $extra;
 
   @override
-  CustomTransitionPage<void> buildPage(
-      BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     return CustomTransitionPage(
       fullscreenDialog: true,
       opaque: false,
@@ -236,7 +235,7 @@ class ModuleRoute extends StatefulShellRouteData {
   const ModuleRoute();
 
   @override
-  NoTransitionPage<void> pageBuilder(
+  Page<void> pageBuilder(
     BuildContext context,
     GoRouterState state,
     StatefulNavigationShell navigationShell,
@@ -275,7 +274,7 @@ class TipherethRootRoute extends GoRouteData {
   const TipherethRootRoute();
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     context.read<TipherethBloc>().add(TipherethGetAccountsEvent());
     return const NoTransitionPage(
       child: ModuleFramePage(
@@ -308,7 +307,7 @@ class YesodFunctionRoute extends GoRouteData {
   final dynamic $extra;
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     final yesodPages = {
       YesodFunctions.recent: const YesodRecentPage(),
       YesodFunctions.timeline: Container(),
@@ -397,7 +396,7 @@ class GeburaStoreRoute extends GoRouteData {
   const GeburaStoreRoute();
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     return NoTransitionPage(
       child: GeburaRoute.rootWidget(
         child: const ModuleFramePage(
@@ -415,7 +414,7 @@ class GeburaLibraryRoute extends GoRouteData {
   const GeburaLibraryRoute();
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     return NoTransitionPage(
       child: GeburaRoute.rootWidget(
         child: const ModuleFramePage(
@@ -441,7 +440,7 @@ class GeburaLibrarySettingsRoute extends GoRouteData {
   final dynamic $extra;
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     final actions = {
       GeburaLibrarySettingsActions.commonAppScanResult:
           GeburaCommonAppScanResultPanel(
@@ -475,7 +474,7 @@ class GeburaLibraryDetailRoute extends GoRouteData {
   final String uuid;
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     final actions = {
       GeburaLibraryDetailActions.assignApp: const GeburaAssignAppPanel(),
     };
@@ -504,7 +503,7 @@ class ChesedRootRoute extends GoRouteData {
   const ChesedRootRoute();
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     context.read<ChesedBloc>().add(ChesedSearchImagesEvent(''));
     return const NoTransitionPage(
       child: ModuleFramePage(
@@ -525,7 +524,7 @@ class NotificationRootRoute extends GoRouteData {
   const NotificationRootRoute();
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     context.read<NetzachBloc>().add(NetzachSystemNotificationLoadEvent(1));
     return const NoTransitionPage(
       child: ModuleFramePage(
@@ -558,7 +557,7 @@ class SettingsFunctionRoute extends GoRouteData {
   final dynamic $extra;
 
   @override
-  NoTransitionPage<void> buildPage(BuildContext context, GoRouterState state) {
+  Page<void> buildPage(BuildContext context, GoRouterState state) {
     final settingsPages = {
       SettingsFunctions.client: const ClientSettingPage(),
       SettingsFunctions.session: const SessionManagePage(),

diff --git a/lib/view/pages/gebura/gebura_nav.dart b/lib/view/pages/gebura/gebura_nav.dart
@@ -9,6 +9,7 @@ import '../../../bloc/gebura/gebura_bloc.dart';
 import '../../../l10n/l10n.dart';
 import '../../../model/gebura_model.dart';
 import '../../../route.dart';
+import '../../helper/connection.dart';
 import '../../layout/overlapping_panels.dart';
 import '../../universal/universal.dart';
 import 'gebura_common.dart';
@@ -33,15 +34,16 @@ class GeburaNav extends StatelessWidget {
       builder: (context, state) {
         return Column(
           children: [
-            UniversalListTile(
-              leading: Icon(UniversalUI.of(context).icons.shoppingCart),
-              onTap: () {
-                const GeburaStoreRoute().go(context);
-                OverlappingPanels.of(context)?.reveal(RevealSide.main);
-              },
-              title: Text(S.of(context).store),
-              selected: function == GeburaFunctions.store,
-            ),
+            if (ConnectionHelper.isNotLocal(context))
+              UniversalListTile(
+                leading: Icon(UniversalUI.of(context).icons.shoppingCart),
+                onTap: () {
+                  const GeburaStoreRoute().go(context);
+                  OverlappingPanels.of(context)?.reveal(RevealSide.main);
+                },
+                title: Text(S.of(context).store),
+                selected: function == GeburaFunctions.store,
+              ),
             UniversalListTile(
               leading: Icon(UniversalUI.of(context).icons.apps),
               onTap: () {