opt publish page

Signed-off-by: dom <githubaccount56556@proton.me>

lib/pages/common/publish/common_publish_page.dart

@@ -27,7 +27,8 @@ abstract class CommonPublishPage<T> extends StatefulWidget {
 abstract class CommonPublishPageState<T extends CommonPublishPage>
     extends State<T>
     with WidgetsBindingObserver {
-  late final FocusNode focusNode;
+  late bool _paused = false;
+  final FocusNode focusNode = FocusNode();
   late final controller = ChatBottomPanelContainerController<PanelType>(
     uiScale: Pref.uiScale,
   );
@@ -42,23 +43,19 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
   bool hasPub = false;
   void initPubState();
 
+  bool get handleKeyboard => Platform.isAndroid && widget.autofocus;
+
   @override
   void initState() {
     super.initState();
-    if (Platform.isAndroid) {
+    if (handleKeyboard) {
       WidgetsBinding.instance.addObserver(this);
     }
 
-    focusNode = FocusNode();
-
     initPubState();
 
     if (widget.autofocus) {
-      Future.delayed(const Duration(milliseconds: 300), () {
+      _requestFocus(duration: const Duration(milliseconds: 300));
-        if (mounted) {
-          focusNode.requestFocus();
-        }
-      });
     }
   }
 
@@ -69,24 +66,29 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
     }
     focusNode.dispose();
     editController.dispose();
-    if (Platform.isAndroid) {
+    if (handleKeyboard) {
       WidgetsBinding.instance.removeObserver(this);
     }
     super.dispose();
   }
 
-  void _requestFocus() {
+  void _safeRequestFocus() {
-    Future.delayed(const Duration(microseconds: 200), focusNode.requestFocus);
+    if (mounted) {
+      focusNode.requestFocus();
+    }
+  }
+
+  void _requestFocus({Duration duration = const Duration(microseconds: 200)}) {
+    Future.delayed(duration, _safeRequestFocus);
   }
 
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
-    if (state == AppLifecycleState.resumed) {
+    if (state == .resumed) {
-      if (mounted &&
+      if (_paused) {
-          widget.autofocus &&
+        _paused = false;
-          (panelType.value == PanelType.keyboard ||
+        final panelType = this.panelType.value;
-              panelType.value == PanelType.none)) {
+        if (panelType == .keyboard || panelType == .none) {
-        controller.restoreChatPanel();
           WidgetsBinding.instance.addPostFrameCallback((_) {
             if (focusNode.hasFocus) {
               focusNode.unfocus();
@@ -96,8 +98,9 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
             }
           });
         }
-    } else if (state == AppLifecycleState.paused) {
+      }
-      controller.keepChatPanel();
+    } else if (state == .paused) {
+      _paused = true;
       if (focusNode.hasFocus) {
         focusNode.unfocus();
       }

lib/pages/common/publish/common_rich_text_pub_page.dart

@@ -111,9 +111,7 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
       clipBehavior: Clip.none,
       children: [
         GestureDetector(
-          onTap: () async {
+          onTap: () => PageUtils.imageView(
-            controller.keepChatPanel();
-            await PageUtils.imageView(
             imgList: imageList
                 .map(
                   (img) => switch (img) {
@@ -129,9 +127,7 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
                 )
                 .toList(),
             initialPage: index,
-            );
+          ),
-            controller.restoreChatPanel();
-          },
           onLongPress: () {
             Feedback.forLongPress(context);
             onClear();
@@ -328,7 +324,6 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
 
   late double _mentionOffset = 0;
   Future<void>? onMention([bool fromClick = false]) async {
-    controller.keepChatPanel();
     final res = await DynMentionPanel.onDynMention(
       context,
       offset: _mentionOffset,
@@ -345,7 +340,6 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
         res.clear();
       }
     }
-    controller.restoreChatPanel();
   }
 
   void _onInsertUser(MentionItem e, bool fromClick) {

lib/pages/dynamics_create/view.dart

@@ -502,7 +502,6 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
           onPressed: _isEdit || _isPrivate.value
               ? null
               : () async {
-                  controller.keepChatPanel();
                   DateTime nowDate = DateTime.now();
                   final selectedDate = await showDatePicker(
                     context: context,
@@ -548,7 +547,6 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
                       );
                     }
                   }
-                  controller.restoreChatPanel();
                 },
           child: const Text('定时发布'),
         )
@@ -653,7 +651,6 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
 
   Widget get voteBtn => ToolbarIconButton(
     onPressed: () async {
-      controller.keepChatPanel();
       final voteItem = editController.items.firstWhereOrNull(
         (e) => e.type == RichTextType.vote,
       );
@@ -698,7 +695,6 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
           );
         }
       }
-      controller.restoreChatPanel();
     },
     icon: const Icon(Icons.bar_chart_rounded, size: 24),
     tooltip: '投票',
@@ -814,7 +810,6 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
 
   double _topicOffset = 0;
   Future<void> _onSelectTopic() async {
-    controller.keepChatPanel();
     TopicItem? res = await SelectTopicPanel.onSelectTopic(
       context,
       offset: _topicOffset,
@@ -823,7 +818,6 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
     if (res != null) {
       _topic.value = Pair(first: res.id, second: res.name);
     }
-    controller.restoreChatPanel();
   }
 
   @override
@@ -881,7 +875,6 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
   }
 
   Future<void> _onReserve() async {
-    controller.keepChatPanel();
     final ReserveInfoData? reserveInfo = await Navigator.of(context).push(
       GetPageRoute(
         page: () => CreateReservePage(sid: _reserveCard.value?.id),
@@ -890,6 +883,5 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
     if (reserveInfo != null) {
       _reserveCard.value = reserveInfo;
     }
-    controller.restoreChatPanel();
   }
 }

lib/pages/main/controller.dart

@@ -233,7 +233,7 @@ class MainController extends GetxController
     }
     this.navigationBars = navigationBars;
     final defPage = Pref.defaultHomePage;
-    selectedIndex.value = navigationBars.indexWhere((e) => e == defPage);
+    selectedIndex.value = navigationBars.indexOf(defPage);
   }
 
   void checkDefaultSearch([bool shouldCheck = false]) {

lib/pages/video/reply_new/view.dart

@@ -290,7 +290,6 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
         children: [
           item(
             onTap: () async {
-              controller.keepChatPanel();
               final ({String title, String url})? res = await Get.to(
                 ReplySearchPage(type: widget.replyType, oid: widget.oid),
               );
@@ -301,7 +300,6 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
                   rawText: '${res.url} ',
                 );
               }
-              controller.restoreChatPanel();
             },
             icon: Icon(Icons.post_add, size: 28, color: color),
             title: '插入内容',

lib/pages/video/send_danmaku/view.dart

@@ -428,9 +428,8 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
     );
   }
 
-  Future<void> _showColorPicker() async {
+  void _showColorPicker() {
-    controller.keepChatPanel();
+    showDialog(
-    await showDialog(
       context: context,
       builder: (context) => AlertDialog(
         clipBehavior: Clip.hardEdge,
@@ -446,7 +445,6 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
         ),
       ),
     );
-    controller.restoreChatPanel();
   }
 
   @override

pubspec.lock

@@ -255,11 +255,11 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/chat_bottom_container"
-      ref: main
+      ref: dev
-      resolved-ref: dba2bf10db4a6f89564d9be63ce17b18f0f7e3e5
+      resolved-ref: "88d5d2c3c76855258ead306d8921ef706033beef"
       url: "https://github.com/bggRGjQaUbCoE/flutter_chat_packages.git"
     source: git
-    version: "0.3.2"
+    version: "0.5.0"
   checked_yaml:
     dependency: transitive
     description:

pubspec.yaml

@@ -54,7 +54,7 @@ dependencies:
   chat_bottom_container:
     git:
       url: https://github.com/bggRGjQaUbCoE/flutter_chat_packages.git
-      ref: main
+      ref: dev
       path: packages/chat_bottom_container
   collection: ^1.19.1
   connectivity_plus: ^7.1.1