new: option of scroll switch chat (#35)

lollipopkit · Jun 21, 2024 · 9be4b06 · 9be4b06
1 parent 649ded8
commit 9be4b06
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 32 deletions.
diff --git a/lib/data/store/setting.dart b/lib/data/store/setting.dart
@@ -68,4 +68,6 @@ class SettingStore extends PersistentStore {
 
   /// Save the chat after each message sent or received even if it has error.
   late final saveErrChat = property('saveErrChat', false);
+
+  late final scrollSwitchChat = property('scrollSwitchChat', true);
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -103,6 +103,7 @@
   "save": "Save",
   "saveErrChat": "Save chat with errors",
   "saveErrChatTip": "Save the chat after each message sent or received even if it has error.",
+  "scrollSwitchChat": "Scroll to switch chat",
   "search": "Search",
   "secretKey": "Secret key",
   "select": "Select",

diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
@@ -103,6 +103,7 @@
   "save": "保存",
   "saveErrChat": "保存聊天错误",
   "saveErrChatTip": "在接收/发送每条消息后保存，即使有报错",
+  "scrollSwitchChat": "上下滑动切换聊天",
   "search": "搜索",
   "secretKey": "密钥",
   "select": "选择",

diff --git a/lib/view/page/home/chat.dart b/lib/view/page/home/chat.dart
@@ -84,6 +84,44 @@ class _ChatPageState extends State<_ChatPage>
 
   Widget _buildChat() {
     var switchDirection = SwitchDirection.next;
+    final scrollSwitchChat = Stores.setting.scrollSwitchChat.fetch();
+
+    final child = ListenBuilder(
+      listenable: _chatRN,
+      builder: () {
+        final item = _curChat?.items;
+        if (item == null) return UIs.placeholder;
+        final listView = ListView.builder(
+          key: Key(_curChatId),
+          controller: _chatScrollCtrl,
+          padding: const EdgeInsets.all(7),
+          physics: const AlwaysScrollableScrollPhysics(
+            parent: BouncingScrollPhysics(),
+          ),
+          itemCount: item.length,
+          itemBuilder: (_, index) {
+            return _buildChatItem(item, index);
+          },
+        );
+        if (!scrollSwitchChat) return listView;
+        return AnimatedSwitcher(
+          duration: _durationShort,
+          switchInCurve: Easing.standardDecelerate,
+          switchOutCurve: Easing.standardDecelerate,
+          transitionBuilder: (child, animation) => SlideTransitionX(
+            position: animation,
+            direction: switchDirection == SwitchDirection.next
+                ? AxisDirection.up
+                : AxisDirection.down,
+            child: child,
+          ),
+          child: listView,
+        );
+      },
+    );
+
+    if (!scrollSwitchChat) return child;
+
     return SwitchIndicator(
       onSwitchPage: (direction) {
         switchDirection = direction;
@@ -97,37 +135,7 @@ class _ChatPageState extends State<_ChatPage>
         }
         return Future.value();
       },
-      child: ListenBuilder(
-        listenable: _chatRN,
-        builder: () {
-          final item = _curChat?.items;
-          if (item == null) return UIs.placeholder;
-          return AnimatedSwitcher(
-            duration: _durationShort,
-            switchInCurve: Easing.standardDecelerate,
-            switchOutCurve: Easing.standardDecelerate,
-            transitionBuilder: (child, animation) => SlideTransitionX(
-              position: animation,
-              direction: switchDirection == SwitchDirection.next
-                  ? AxisDirection.up
-                  : AxisDirection.down,
-              child: child,
-            ),
-            child: ListView.builder(
-              key: Key(_curChatId),
-              controller: _chatScrollCtrl,
-              padding: const EdgeInsets.all(7),
-              physics: const AlwaysScrollableScrollPhysics(
-                parent: BouncingScrollPhysics(),
-              ),
-              itemCount: item.length,
-              itemBuilder: (_, index) {
-                return _buildChatItem(item, index);
-              },
-            ),
-          );
-        },
-      ),
+      child: child,
     );
   }
 

diff --git a/lib/view/page/setting.dart b/lib/view/page/setting.dart
@@ -93,6 +93,7 @@ class _SettingPageState extends State<SettingPage> {
 
   Widget _buildMore() {
     final children = [
+      _buildScrollSwitchChat(),
       _buildSaveErrChat(),
       _buildCompressImg(),
       _buildFollowChatModel(),
@@ -767,4 +768,13 @@ class _SettingPageState extends State<SettingPage> {
       trailing: StoreSwitch(prop: _store.saveErrChat),
     );
   }
+
+  Widget _buildScrollSwitchChat() {
+    return ListTile(
+      leading: const Icon(Icons.swap_vert),
+      title: Text(l10n.scrollSwitchChat),
+      subtitle: Text(l10n.needRestart, style: UIs.textGrey),
+      trailing: StoreSwitch(prop: _store.scrollSwitchChat),
+    );
+  }
 }
diff --git a/lib/view/widget/code.dart b/lib/view/widget/code.dart
@@ -16,7 +16,7 @@ class CodeElementBuilder extends MarkdownElementBuilder {
   CodeElementBuilder({this.onCopy, this.isForCapture = false});
 
   static final _bgPaint = Paint()
-    ..color = const Color.fromARGB(28, 159, 159, 159);
+    ..color = const Color.fromARGB(23, 159, 159, 159);
 
   @override
   Widget? visitElementAfter(md.Element element, TextStyle? preferredStyle) {