Add AppbarStyle.shadow;

Improve favorites page ui.

lib/components/appbar.dart

@@ -115,6 +115,11 @@ class _AppbarState extends State<Appbar> {
   }
 }
 
+enum AppbarStyle {
+  blur,
+  shadow,
+}
+
 class SliverAppbar extends StatelessWidget {
   const SliverAppbar({
     super.key,
@@ -122,6 +127,7 @@ class SliverAppbar extends StatelessWidget {
     this.leading,
     this.actions,
     this.radius = 0,
+    this.style = AppbarStyle.blur,
   });
 
   final Widget? leading;
@@ -132,6 +138,8 @@ class SliverAppbar extends StatelessWidget {
 
   final double radius;
 
+  final AppbarStyle style;
+
   @override
   Widget build(BuildContext context) {
     return SliverPersistentHeader(
@@ -142,6 +150,7 @@ class SliverAppbar extends StatelessWidget {
         actions: actions,
         topPadding: MediaQuery.of(context).padding.top,
         radius: radius,
+        style: style,
       ),
     );
   }
@@ -160,24 +169,21 @@ class _MySliverAppBarDelegate extends SliverPersistentHeaderDelegate {
 
   final double radius;
 
-  _MySliverAppBarDelegate(
+  final AppbarStyle style;
-      {this.leading,
+
+  _MySliverAppBarDelegate({
+    this.leading,
     required this.title,
     this.actions,
     required this.topPadding,
-      this.radius = 0});
+    this.radius = 0,
+    this.style = AppbarStyle.blur,
+  });
 
   @override
   Widget build(
       BuildContext context, double shrinkOffset, bool overlapsContent) {
-    return SizedBox.expand(
+    var body = Row(
-      child: BlurEffect(
-        blur: 15,
-        child: Material(
-          color: context.colorScheme.surface.withOpacity(0.72),
-          elevation: 0,
-          borderRadius: BorderRadius.circular(radius),
-          child: Row(
       children: [
         const SizedBox(width: 8),
         leading ??
@@ -207,10 +213,30 @@ class _MySliverAppBarDelegate extends SliverPersistentHeaderDelegate {
           width: 8,
         )
       ],
-          ).paddingTop(topPadding),
+    ).paddingTop(topPadding);
+
+    if(style == AppbarStyle.blur) {
+      return SizedBox.expand(
+        child: BlurEffect(
+          blur: 15,
+          child: Material(
+            color: context.colorScheme.surface.withOpacity(0.72),
+            elevation: 0,
+            borderRadius: BorderRadius.circular(radius),
+            child: body,
           ),
         ),
       );
+    } else {
+      return SizedBox.expand(
+        child: Material(
+          color: context.colorScheme.surface,
+          elevation: shrinkOffset == 0 ? 0 : 2,
+          borderRadius: BorderRadius.circular(radius),
+          child: body,
+        ),
+      );
+    }
   }
 
   @override
@@ -224,7 +250,10 @@ class _MySliverAppBarDelegate extends SliverPersistentHeaderDelegate {
     return oldDelegate is! _MySliverAppBarDelegate ||
         leading != oldDelegate.leading ||
         title != oldDelegate.title ||
-        actions != oldDelegate.actions;
+        actions != oldDelegate.actions ||
+        topPadding != oldDelegate.topPadding ||
+        radius != oldDelegate.radius ||
+        style != oldDelegate.style;
   }
 }
 

lib/components/comic.dart

@@ -778,7 +778,7 @@ class _SliverGridComics extends StatelessWidget {
             duration: const Duration(milliseconds: 150),
             decoration: BoxDecoration(
               color: isSelected
-                  ? Theme.of(context).colorScheme.secondaryContainer
+                  ? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.72)
                   : null,
               borderRadius: BorderRadius.circular(12),
             ),

lib/pages/favorites/favorites_page.dart

@@ -9,6 +9,7 @@ import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/comic_type.dart';
+import 'package:venera/foundation/consts.dart';
 import 'package:venera/foundation/favorites.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/foundation/res.dart';

lib/pages/favorites/local_favorites_page.dart

@@ -74,6 +74,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
       body: SmoothCustomScrollView(slivers: [
         if (!searchMode && !multiSelectMode)
           SliverAppbar(
+            style: context.width < changePoint
+                ? AppbarStyle.shadow
+                : AppbarStyle.blur,
             leading: Tooltip(
               message: "Folders".tl,
               child: context.width <= _kTwoPanelChangeWidth
@@ -225,8 +228,7 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
                         showConfirmDialog(
                           context: App.rootContext,
                           title: "Delete".tl,
-                          content:
+                          content: "Delete folder '@f' ?".tlParams({
-                          "Delete folder '@f' ?".tlParams({
                             "f": widget.folder,
                           }),
                           btnColor: context.colorScheme.error,
@@ -243,6 +245,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
           )
         else if (multiSelectMode)
           SliverAppbar(
+            style: context.width < changePoint
+                ? AppbarStyle.shadow
+                : AppbarStyle.blur,
             leading: Tooltip(
               message: "Cancel".tl,
               child: IconButton(
@@ -287,8 +292,8 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
                       showConfirmDialog(
                         context: context,
                         title: "Delete".tl,
-                        content:
+                        content: "Delete @c comics?"
-                          "Delete @c comics?".tlParams({"c": selectedComics.length}),
+                            .tlParams({"c": selectedComics.length}),
                         btnColor: context.colorScheme.error,
                         onConfirm: () {
                           _deleteComicWithId();
@@ -300,6 +305,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
           )
         else if (searchMode)
           SliverAppbar(
+            style: context.width < changePoint
+                ? AppbarStyle.shadow
+                : AppbarStyle.blur,
             leading: Tooltip(
               message: "Cancel".tl,
               child: IconButton(
@@ -407,39 +415,19 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
         .where((folder) => folder != favPage.folder)
         .toList();
 
-    showDialog(
+    showPopUpWidget(
-      context: App.rootContext,
+      App.rootContext,
-      builder: (context) {
+      StatefulBuilder(
-        return StatefulBuilder(
         builder: (context, setState) {
-            return Dialog(
+          return PopUpWidgetScaffold(
-                shape: RoundedRectangleBorder(
+            title: favPage.folder ?? "Unselected".tl,
-                  borderRadius: BorderRadius.circular(12.0),
+            body: Padding(
-                ),
+              padding: EdgeInsets.only(bottom: context.padding.bottom + 16),
-                child: Padding(
-                  padding: const EdgeInsets.only(bottom: 50),
               child: Container(
                 constraints:
                 const BoxConstraints(maxHeight: 700, maxWidth: 500),
                 child: Column(
                   children: [
-                        Container(
-                          decoration: const BoxDecoration(
-                            borderRadius: BorderRadius.vertical(
-                              top: Radius.circular(12.0),
-                            ),
-                          ),
-                          padding: const EdgeInsets.all(16.0),
-                          child: Center(
-                            child: Text(
-                              favPage.folder ?? "Unselected".tl,
-                              style: const TextStyle(
-                                fontSize: 18,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          ),
-                        ),
                     Expanded(
                       child: ListView.builder(
                         itemCount: targetFolders.length + 1,
@@ -452,12 +440,10 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
                                   onPressed: () {
                                     newFolder().then((v) {
                                       setState(() {
-                                            targetFolders =
+                                        targetFolders = LocalFavoritesManager()
-                                                LocalFavoritesManager()
                                             .folderNames
                                             .where((folder) =>
-                                                        folder !=
+                                        folder != favPage.folder)
-                                                        favPage.folder)
                                             .toList();
                                       });
                                     });
@@ -478,12 +464,10 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
                           var disabled = false;
                           if (selectedLocalFolders.isNotEmpty) {
                             if (added.contains(folder) &&
-                                    !added
+                                !added.contains(selectedLocalFolders.first)) {
-                                        .contains(selectedLocalFolders.first)) {
                               disabled = true;
                             } else if (!added.contains(folder) &&
-                                    added
+                                added.contains(selectedLocalFolders.first)) {
-                                        .contains(selectedLocalFolders.first)) {
                               disabled = true;
                             }
                           }
@@ -545,21 +529,20 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
                               }
                             }
                           }
-                              context.pop();
+                          App.rootContext.pop();
                           updateComics();
                           _cancel();
                         },
-                            child:
+                        child: Text(option == 'move' ? "Move".tl : "Add".tl),
-                                Text(option == 'move' ? "Move".tl : "Add".tl),
+                      ),
-                          ).paddingVertical(16),
                     ),
                   ],
                 ),
               ),
-                ));
+            ),
-          },
           );
         },
+      ),
     );
   }
 

lib/pages/favorites/network_favorites_page.dart

@@ -94,6 +94,9 @@ class _NormalFavoritePageState extends State<_NormalFavoritePage> {
     return ComicList(
       key: comicListKey,
       leadingSliver: SliverAppbar(
+        style: context.width < changePoint
+            ? AppbarStyle.shadow
+            : AppbarStyle.blur,
         leading: Tooltip(
           message: "Folders".tl,
           child: context.width <= _kTwoPanelChangeWidth
@@ -211,6 +214,9 @@ class _MultiFolderFavoritesPageState extends State<_MultiFolderFavoritesPage> {
   @override
   Widget build(BuildContext context) {
     var sliverAppBar = SliverAppbar(
+      style: context.width < changePoint
+          ? AppbarStyle.shadow
+          : AppbarStyle.blur,
       leading: Tooltip(
         message: "Folders".tl,
         child: context.width <= _kTwoPanelChangeWidth

pubspec.lock

@@ -393,8 +393,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: HEAD
+      ref: "829a566b738a26ea98e523807f49838e21308543"
-      resolved-ref: "51a27e2ca0e05becfb8ee3a506294dc4460721a8"
+      resolved-ref: "829a566b738a26ea98e523807f49838e21308543"
       url: "https://github.com/pkuislm/flutter_saf.git"
     source: git
     version: "0.0.1"