Add private novel bookmarks.

Close #14

lib/components/loading.dart

@@ -152,6 +152,7 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
 
   void firstLoad() {
     loadData(_page).then((value) {
+      if (!mounted) return;
       if(value.success) {
         _page++;
         setState(() {

lib/network/novel.dart

@@ -35,15 +35,15 @@ extension NovelExt on Network {
     return getNovelsWithNextUrl(url);
   }
 
-  Future<Res<List<Novel>>> getBookmarkedNovels(String uid) {
+  Future<Res<List<Novel>>> getBookmarkedNovels(String uid, bool public) {
     return getNovelsWithNextUrl(
-        "/v1/user/bookmarks/novel?user_id=$uid&restrict=public");
+        "/v1/user/bookmarks/novel?user_id=$uid&restrict=${public ? "public" : "private"}");
   }
 
-  Future<Res<bool>> favoriteNovel(String id) async {
+  Future<Res<bool>> favoriteNovel(String id, bool public) async {
     var res = await apiPost("/v2/novel/bookmark/add", data: {
       "novel_id": id,
-      "restrict": "public",
+      "restrict": public ? "public" : "private",
     });
     if (res.error) {
       return Res.fromErrorRes(res);

lib/pages/novel_bookmarks_page.dart

@@ -3,6 +3,7 @@ import 'package:pixes/appdata.dart';
 import 'package:pixes/components/grid.dart';
 import 'package:pixes/components/loading.dart';
 import 'package:pixes/components/novel.dart';
+import 'package:pixes/components/segmented_button.dart';
 import 'package:pixes/components/title_bar.dart';
 import 'package:pixes/foundation/widget_utils.dart';
 import 'package:pixes/network/network.dart';
@@ -17,11 +18,41 @@ class NovelBookmarksPage extends StatefulWidget {
 
 class _NovelBookmarksPageState
     extends MultiPageLoadingState<NovelBookmarksPage, Novel> {
+  bool public = true;
+
+  @override
+  Widget? buildFrame(BuildContext context, Widget child) {
+    return Column(
+      children: [
+        TitleBar(
+          title: "Bookmarks".tl,
+          action: SegmentedButton(
+            options: [
+              SegmentedButtonOption("public", "Public".tl),
+              SegmentedButtonOption("private", "Private".tl),
+            ],
+            onPressed: (key) {
+              var newPublic = key == "public";
+              if (newPublic != public) {
+                public = newPublic;
+                nextUrl = null;
+                reset();
+              }
+            },
+            value: public ? "public" : "private",
+          ),
+        ),
+        Expanded(
+          child: child,
+        )
+      ],
+    );
+  }
+
   @override
   Widget buildContent(BuildContext context, List<Novel> data) {
     return Column(
       children: [
-        TitleBar(title: "Bookmarks".tl),
         Expanded(
           child: GridViewWithFixedItemHeight(
             itemCount: data.length,
@@ -45,7 +76,7 @@ class _NovelBookmarksPageState
   Future<Res<List<Novel>>> loadData(int page) async {
     if (nextUrl == "end") return Res.error("No more data");
     var res = nextUrl == null
-        ? await Network().getBookmarkedNovels(appdata.account!.user.id)
+        ? await Network().getBookmarkedNovels(appdata.account!.user.id, public)
         : await Network().getNovelsWithNextUrl(nextUrl!);
     nextUrl = res.subData ?? "end";
     return res;

lib/pages/novel_page.dart

@@ -121,18 +121,18 @@ class _NovelPageState extends State<NovelPage> {
       padding: const EdgeInsets.only(bottom: 10),
       child: Row(
         children: [
-          const SizedBox(
-            width: 2,
-          ),
+          const SizedBox(width: 2),
           Expanded(
             child: Container(
               height: 68,
               decoration: BoxDecoration(
                 border: Border.all(
                   color: ColorScheme.of(context).outlineVariant,
-                      width: 0.6),
-                  borderRadius: BorderRadius.circular(4)),
-              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+                  width: 0.6,
+                ),
+                borderRadius: BorderRadius.circular(4),
+              ),
+              padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
               child: Row(
                 children: [
                   Column(
@@ -148,31 +148,31 @@ class _NovelPageState extends State<NovelPage> {
                       )
                     ],
                   ),
-                  const SizedBox(
-                    width: 12,
-                  ),
+                  const SizedBox(width: 8),
                   Text(
                     widget.novel.totalViews.toString(),
                     style: TextStyle(
                       color: ColorScheme.of(context).primary,
                       fontWeight: FontWeight.w500,
-                        fontSize: 18),
+                      fontSize: 18,
+                    ),
                   )
                 ],
               ),
             ),
           ),
-          const SizedBox(
-            width: 16,
-          ),
+          const SizedBox(width: 16),
           Expanded(
               child: Container(
             height: 68,
             decoration: BoxDecoration(
               border: Border.all(
-                    color: ColorScheme.of(context).outlineVariant, width: 0.6),
-                borderRadius: BorderRadius.circular(4)),
-            padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+                color: ColorScheme.of(context).outlineVariant,
+                width: 0.6,
+              ),
+              borderRadius: BorderRadius.circular(4),
+            ),
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
             child: Row(
               children: [
                 Column(
@@ -188,22 +188,19 @@ class _NovelPageState extends State<NovelPage> {
                     )
                   ],
                 ),
-                const SizedBox(
-                  width: 12,
-                ),
+                const SizedBox(width: 8),
                 Text(
                   widget.novel.totalBookmarks.toString(),
                   style: TextStyle(
                     color: ColorScheme.of(context).primary,
                     fontWeight: FontWeight.w500,
-                      fontSize: 18),
+                    fontSize: 18,
+                  ),
                 )
               ],
             ),
           )),
-          const SizedBox(
-            width: 2,
-          ),
+          const SizedBox(width: 2),
         ],
       ),
     );
@@ -241,15 +238,20 @@ class _NovelPageState extends State<NovelPage> {
                   ),
                 ),
                 const SizedBox(width: 12),
-                Column(
+                Expanded(
+                  child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                    Text(widget.novel.author.name,
+                      Text(
+                        widget.novel.author.name,
                         style: const TextStyle(
                           fontSize: 14,
                           fontWeight: FontWeight.bold,
-                        )),
+                        ),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
                       Text(
                         widget.novel.createDate.toString().substring(0, 10),
                         style: TextStyle(
@@ -259,7 +261,7 @@ class _NovelPageState extends State<NovelPage> {
                       ),
                     ],
                   ),
-                const Spacer(),
+                ),
                 const Icon(MdIcons.chevron_right)
               ],
             ),
@@ -271,15 +273,43 @@ class _NovelPageState extends State<NovelPage> {
 
   bool isAddingFavorite = false;
 
+  var favoriteFlyout = FlyoutController();
+
   Widget buildActions() {
     void favorite() async {
       if (isAddingFavorite) return;
+      bool? public;
+      if (!widget.novel.isBookmarked) {
+        await favoriteFlyout.showFlyout(
+          builder: (context) {
+            return MenuFlyout(
+              items: [
+                MenuFlyoutItem(
+                  text: Text("Public".tl),
+                  onPressed: () {
+                    public = true;
+                  },
+                ),
+                MenuFlyoutItem(
+                  text: Text("Private".tl),
+                  onPressed: () {
+                    public = false;
+                  },
+                ),
+              ],
+            );
+          },
+        );
+        if (public == null) {
+          return;
+        }
+      }
       setState(() {
         isAddingFavorite = true;
       });
       var res = widget.novel.isBookmarked
           ? await Network().deleteFavoriteNovel(widget.novel.id.toString())
-          : await Network().favoriteNovel(widget.novel.id.toString());
+          : await Network().favoriteNovel(widget.novel.id.toString(), public!);
       if (res.error) {
         if (mounted) {
           context.showToast(message: res.errorMessage ?? "Network Error");
@@ -337,7 +367,9 @@ class _NovelPageState extends State<NovelPage> {
                           context.to(() => NovelReadingPage(widget.novel));
                         }),
                     const SizedBox(width: 16),
-                    Button(
+                    FlyoutTarget(
+                      controller: favoriteFlyout,
+                      child: Button(
                         onPressed: favorite,
                         child: Row(
                           mainAxisAlignment: constrains.maxWidth > 420
@@ -370,6 +402,7 @@ class _NovelPageState extends State<NovelPage> {
                             : 64)
                             .fixHeight(32),
                       ),
+                    ),
                     const SizedBox(width: 8),
                     Button(
                         child: Row(