misc #433: add some minor changes to codes

DanXi-Dev · Dec 10, 2024 · ab49c1b · ab49c1b
1 parent 4a5543e
commit ab49c1b
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/lib/page/forum/hole_detail.dart b/lib/page/forum/hole_detail.dart
@@ -306,7 +306,8 @@ class BBSPostDetailState extends State<BBSPostDetail> {
         ),
         trailingActions: [
           if (_renderModel
-              case Normal(hole: var hole, onlyShowDZ: var onlyShowDZ)) ...[
+              case Normal(hole: var hole, onlyShowSelectedPerson: var onlyShowSelectedPerson,
+                          selectedPerson: var selectedPerson)) ...[
             _buildSubscribeActionButton(),
             _buildFavoredActionButton(),
             PlatformIconButton(
@@ -327,12 +328,22 @@ class BBSPostDetailState extends State<BBSPostDetail> {
                     label: S.of(context).scroll_to_end,
                     onTap: _onTapScrollToEnd),
                 PopupMenuOption(
-                    label: onlyShowDZ
+                    label: onlyShowSelectedPerson && selectedPerson == hole.floors?.first_floor?.anonyname
                         ? S.of(context).show_all_replies
                         : S.of(context).only_show_dz,
                     onTap: (_) {
-                      setState(() =>
-                          (_renderModel as Normal).onlyShowDZ = !onlyShowDZ);
+                      setState(() {
+                        if ((_renderModel as Normal).onlyShowSelectedPerson &&
+                            (_renderModel as Normal).selectedPerson != hole.floors?.first_floor?.anonyname) {
+                          (_renderModel as Normal).selectedPerson = hole.floors?.first_floor?.anonyname;
+                        }
+                        else {
+                          (_renderModel as Normal).onlyShowSelectedPerson =
+                          !onlyShowSelectedPerson;
+                          (_renderModel as Normal).selectedPerson = hole.floors
+                              ?.first_floor?.anonyname;
+                        }
+                      });
                       refreshListView();
                     }),
                 PopupMenuOption(
@@ -886,9 +897,6 @@ class BBSPostDetailState extends State<BBSPostDetail> {
             refreshListView();
           } else {
             (_renderModel as Normal).selectedPerson = e.anonyname;
-            if ((_renderModel as Normal).onlyShowDZ) {
-              (_renderModel as Normal).onlyShowDZ = false;
-            }
             setState(() =>
             (_renderModel as Normal).onlyShowSelectedPerson = true);
             refreshListView();
@@ -1033,12 +1041,6 @@ class BBSPostDetailState extends State<BBSPostDetail> {
         return nil;
       }
     }
-    if (_renderModel case Normal(onlyShowDZ: var onlyShowDZ, hole: var hole)) {
-      if (onlyShowDZ &&
-          floor.anonyname != hole.floors?.first_floor?.anonyname) {
-        return nil;
-      }
-    }
 
     Future<List<ImageUrlInfo>?> loadPageImage(
         BuildContext pageContext, int pageIndex) async {
@@ -1214,7 +1216,6 @@ sealed class RenderModel {}
 class Normal extends RenderModel {
   OTHole hole;
   bool? isFavored, isSubscribed;
-  bool onlyShowDZ = false;
   bool onlyShowSelectedPerson = false;
 
   String? selectedPerson;