Merge pull request #113 from mylxsw/feature/nav-optimize

Feature/nav optimize
mylxsw · Jun 12, 2024 · 66722c4 · 66722c4
2 parents 4dd7020 + 568af09
commit 66722c4
Show file tree

Hide file tree

Showing 19 changed files with 907 additions and 377 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+Makefile.local
diff --git a/docker-build.sh b/docker-build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION=1.0.13.1
+VERSION=1.0.14
 
 rm -fr build/web
 

diff --git a/lib/helper/constant.dart b/lib/helper/constant.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 // 客户端应用版本号
-const clientVersion = '1.0.14';
+const clientVersion = '1.0.15';
 // 本地数据库版本号
 const databaseVersion = 26;
 

diff --git a/lib/helper/model.dart b/lib/helper/model.dart
@@ -34,6 +34,9 @@ class ModelAggregate {
               tag: e.tag,
               avatarUrl: e.avatarUrl,
               supportVision: e.supportVision,
+              tagTextColor: e.tagTextColor,
+              tagBgColor: e.tagBgColor,
+              isNew: e.isNew,
             ),
           )
           .toList());

diff --git a/lib/lang/lang.dart b/lib/lang/lang.dart
@@ -205,6 +205,11 @@ mixin AppLocale {
   static const String customHomeModels = 'custom-home-models';
   static const String userApiKeys = "user-api-keys";
 
+  static const String others = 'others';
+  static const String recentlyUsed = 'recently-used';
+  static const String visionTag = 'vision-tag';
+  static const String newTag = 'new-tag';
+
   static const Map<String, dynamic> zh = {
     required: '必填',
     systemInfo: '系统信息',
@@ -398,6 +403,10 @@ mixin AppLocale {
     discover: '绘玩',
     customHomeModels: '常用模型',
     userApiKeys: 'API Keys',
+    others: '其它',
+    recentlyUsed: '最近使用',
+    visionTag: '视觉',
+    newTag: '新',
   };
 
   static const Map<String, dynamic> en = {
@@ -607,6 +616,10 @@ mixin AppLocale {
     discover: 'Discover',
     customHomeModels: 'Favorite Models',
     userApiKeys: 'API Keys',
+    others: 'Others',
+    recentlyUsed: 'Recently Used',
+    visionTag: 'Vision',
+    newTag: 'New',
   };
 }
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -20,6 +20,7 @@ import 'package:askaide/page/admin/users.dart';
 import 'package:askaide/page/balance/web_payment_proxy.dart';
 import 'package:askaide/page/balance/web_payment_result.dart';
 import 'package:askaide/page/creative_island/draw/artistic_wordart.dart';
+import 'package:flutter_phoenix/flutter_phoenix.dart';
 import 'package:path/path.dart';
 
 import 'package:askaide/bloc/account_bloc.dart';
@@ -198,7 +199,7 @@ void main() async {
   );
 
   final creativeIslandRepo =
-  CreativeIslandRepository(CreativeIslandDataProvider(db));
+      CreativeIslandRepository(CreativeIslandDataProvider(db));
 
   // 聊天状态加载器
   final stateManager = MessageStateManager(cacheRepo);
@@ -247,13 +248,15 @@ void main() async {
     );
   });
 
-  runApp(MyApp(
-    settingRepo: settingRepo,
-    chatMsgRepo: chatMsgRepo,
-    openAIRepo: openAIRepo,
-    cacheRepo: cacheRepo,
-    creativeIslandRepo: creativeIslandRepo,
-    messageStateManager: stateManager,
+  runApp(Phoenix(
+    child: MyApp(
+      settingRepo: settingRepo,
+      chatMsgRepo: chatMsgRepo,
+      openAIRepo: openAIRepo,
+      cacheRepo: cacheRepo,
+      creativeIslandRepo: creativeIslandRepo,
+      messageStateManager: stateManager,
+    ),
   ));
 }
 
@@ -293,11 +296,11 @@ class MyApp extends StatefulWidget {
     var usingGuestMode = settingRepo.boolDefault(settingUsingGuestMode, false);
 
     final openAISelfHosted =
-    settingRepo.boolDefault(settingOpenAISelfHosted, false);
+        settingRepo.boolDefault(settingOpenAISelfHosted, false);
     final deepAISelfHosted =
-    settingRepo.boolDefault(settingDeepAISelfHosted, false);
+        settingRepo.boolDefault(settingDeepAISelfHosted, false);
     final stabilityAISelfHosted =
-    settingRepo.boolDefault(settingStabilityAISelfHosted, false);
+        settingRepo.boolDefault(settingStabilityAISelfHosted, false);
 
     final shouldLogin = (apiServerToken == null || apiServerToken == '') &&
         !usingGuestMode &&
@@ -316,10 +319,10 @@ class MyApp extends StatefulWidget {
           // navigatorKey: _shellNavigatorKey,
           //parentNavigatorKey: _rootNavigatorKey,
           builder: (
-              BuildContext context,
-              GoRouterState state,
-              StatefulNavigationShell navigationShell,
-              ) {
+            BuildContext context,
+            GoRouterState state,
+            StatefulNavigationShell navigationShell,
+          ) {
             return AppScaffold(
               settingRepo: settingRepo,
               navigationShell: navigationShell,
@@ -340,10 +343,10 @@ class MyApp extends StatefulWidget {
                     child: HomePage(
                       setting: settingRepo,
                       showInitialDialog:
-                      state.queryParameters['show_initial_dialog'] ==
-                          'true',
+                          state.queryParameters['show_initial_dialog'] ==
+                              'true',
                       reward:
-                      int.tryParse(state.queryParameters['reward'] ?? '0'),
+                          int.tryParse(state.queryParameters['reward'] ?? '0'),
                     ),
                   ),
                 ),
@@ -481,7 +484,7 @@ class MyApp extends StatefulWidget {
                   value: ChatBlocManager().getBloc(
                     chatAnywhereRoomId,
                     chatHistoryId:
-                    int.tryParse(state.queryParameters['chat_id'] ?? ''),
+                        int.tryParse(state.queryParameters['chat_id'] ?? ''),
                   ),
                 ),
                 BlocProvider.value(value: chatRoomBloc),
@@ -610,7 +613,7 @@ class MyApp extends StatefulWidget {
                         CreativeIslandBloc(creativeIslandRepo)),
               ],
               child:
-              UserCenterScreen(settings: context.read<SettingRepository>()),
+                  UserCenterScreen(settings: context.read<SettingRepository>()),
             ),
           ),
         ),
@@ -1345,7 +1348,7 @@ class _MyAppState extends State<MyApp> {
             create: (context) => widget.cacheRepo),
       ],
       child: ChangeNotifierProvider(
-          create: (context) => AppTheme.instance
+          create: (context) => AppTheme.get()
             ..mode = AppTheme.themeModeFormString(
                 widget.settingRepo.stringDefault(settingThemeMode, 'system')),
           builder: (context, _) {
@@ -1363,25 +1366,25 @@ class _MyAppState extends State<MyApp> {
                     // TODO 后面要增加一个设置项，允许用户自定义字体大小
                     return MediaQuery(
                       data:
-                      MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+                          MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
                       child: BotToastInit()(context, child),
                     );
                   },
                   routerConfig: widget._router,
                   supportedLocales: widget.localization.supportedLocales,
                   localizationsDelegates:
-                  widget.localization.localizationsDelegates,
+                      widget.localization.localizationsDelegates,
                   scrollBehavior:
-                  PlatformTool.isAndroid() || PlatformTool.isIOS()
-                      ? null
-                      : const MaterialScrollBehavior().copyWith(
-                    dragDevices: {
-                      PointerDeviceKind.touch,
-                      PointerDeviceKind.mouse,
-                      PointerDeviceKind.stylus,
-                      PointerDeviceKind.trackpad,
-                    },
-                  ),
+                      PlatformTool.isAndroid() || PlatformTool.isIOS()
+                          ? null
+                          : const MaterialScrollBehavior().copyWith(
+                              dragDevices: {
+                                PointerDeviceKind.touch,
+                                PointerDeviceKind.mouse,
+                                PointerDeviceKind.stylus,
+                                PointerDeviceKind.trackpad,
+                              },
+                            ),
                 );
               },
             );
@@ -1401,10 +1404,10 @@ ThemeData createLightThemeData() {
     ),
     iconButtonTheme: PlatformTool.isMacOS()
         ? IconButtonThemeData(
-      style: ButtonStyle(
-        overlayColor: MaterialStateProperty.all(Colors.transparent),
-      ),
-    )
+            style: ButtonStyle(
+              overlayColor: MaterialStateProperty.all(Colors.transparent),
+            ),
+          )
         : null,
     dividerColor: Colors.transparent,
     dialogBackgroundColor: Colors.white,
@@ -1434,10 +1437,10 @@ ThemeData createDarkThemeData() {
     ),
     iconButtonTheme: PlatformTool.isMacOS()
         ? IconButtonThemeData(
-      style: ButtonStyle(
-        overlayColor: MaterialStateProperty.all(Colors.transparent),
-      ),
-    )
+            style: ButtonStyle(
+              overlayColor: MaterialStateProperty.all(Colors.transparent),
+            ),
+          )
         : null,
     dividerColor: Colors.transparent,
     dialogBackgroundColor: const Color.fromARGB(255, 48, 48, 48),