flutter 3.38.3

lib/pages/local_comics_page.dart

@@ -258,41 +258,29 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
           else if (searchMode)
             SliverAppbar(
               leading: Tooltip(
-                message: multiSelectMode ? "Cancel".tl : "Cancel".tl,
+                message: "Cancel".tl,
                 child: IconButton(
-                  icon: multiSelectMode
+                  icon: const Icon(Icons.close),
-                      ? const Icon(Icons.close)
-                      : const Icon(Icons.close),
                   onPressed: () {
-                    if (multiSelectMode) {
+                    setState(() {
-                      setState(() {
+                      searchMode = false;
-                        multiSelectMode = false;
+                      keyword = "";
-                        selectedComics.clear();
+                      update();
-                      });
+                    });
-                    } else {
-                      setState(() {
-                        searchMode = false;
-                        keyword = "";
-                        update();
-                      });
-                    }
                   },
                 ),
               ),
-              title: multiSelectMode
+              title: TextField(
-                  ? Text(selectedComics.length.toString())
+                autofocus: true,
-                  : TextField(
+                decoration: InputDecoration(
-                      autofocus: true,
+                  hintText: "Search".tl,
-                      decoration: InputDecoration(
+                  border: InputBorder.none,
-                        hintText: "Search".tl,
+                ),
-                        border: InputBorder.none,
+                onChanged: (v) {
-                      ),
+                  keyword = v;
-                      onChanged: (v) {
+                  update();
-                        keyword = v;
+                },
-                        update();
+              ),
-                      },
-                    ),
-              actions: multiSelectMode ? selectActions : null,
             ),
           SliverGridComics(
             comics: comics,
@@ -356,7 +344,6 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
     return PopScope(
       canPop: !multiSelectMode && !searchMode,
       onPopInvokedWithResult: (didPop, result) {
-        if (didPop) return;
         if (multiSelectMode) {
           setState(() {
             multiSelectMode = false;