update build script

.github/workflows/linux.yml

@@ -0,0 +1,23 @@
+name: Build Linux
+run-name: Build Linux
+on:
+  workflow_dispatch: {}
+jobs:
+  Build_Deb:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: subosito/flutter-action@v2
+      with:
+        channel: 'stable'
+        architecture: x64
+    - run: |
+        sudo apt-get update -y
+        sudo apt-get install -y ninja-build libgtk-3-dev
+        dart pub global activate flutter_to_debian
+    - run: python3 debian/build.py
+    - uses: actions/upload-artifact@v3
+      with:
+        name: deb_build
+        path: build/linux/x64/release/debian
+ 

README.md

@@ -1,5 +1,11 @@
 # pixes
 
+[![flutter](https://img.shields.io/badge/flutter-3.22.1-blue)](https://flutter.dev/) 
+[![License](https://img.shields.io/github/license/wgh136/pixes)](https://github.com/wgh136/pixes/blob/master/LICENSE)
+[![Download](https://img.shields.io/github/v/release/wgh136/pixes)](https://github.com/wgh136/PicaComic/pixes)
+[![stars](https://img.shields.io/github/stars/wgh136/pixes)](https://github.com/wgh136/pixes/stargazers)
+[![Telegram Discussion](https://img.shields.io/static/v1?label=Discussion&message=Telegram&color=blue&logo=telegram)](https://t.me/pica_group)
+
 非官方 Pixiv app, 支持 Windows, Android, iOS, macOS
 
 主要功能均已实现
@@ -7,3 +13,6 @@
 ## 屏幕截图
 
 <img src="screenshots/1.png" style="width: 400px">
+<img src="screenshots/2.png" style="width: 400px">
+<img src="screenshots/3.png" style="width: 400px">
+<img src="screenshots/4.png" style="width: 400px">

assets/tr.json

@@ -162,7 +162,18 @@
         "Current quantity": "当前数量",
         "Display the original image on the details page": "在详情页显示原图",
         "Open link": "打开链接",
-        "Read": "阅读"
+        "Read": "阅读",
+        "Error": "错误",
+        "Failed to register URL scheme.": "注册URL协议失败",
+        "Retry": "重试",
+        "Network": "网络",
+        "Save to gallery": "保存到相册",
+        "Choose a way to login": "选择登录方式",
+        "Use Webview: you cannot sign in with Google.": "使用Webview: 无法使用Google登录",
+        "Use an external browser: You can sign in using Google. However, some browsers may not be compatible with the application": "使用外部浏览器: 可以使用Google登录. 但是, 一些浏览器可能与应用程序不兼容",
+        "External browser": "外部浏览器",
+        "Show comments": "显示评论",
+        "Show original image": "显示原图"
     },
     "zh_TW": {
         "Search": "搜索",
@@ -327,6 +338,17 @@
         "Current quantity": "當前數量",
         "Display the original image on the details page": "在詳情頁顯示原圖",
         "Open link": "打開鏈接",
-        "Read": "閱讀"
+        "Read": "閱讀",
+        "Error": "錯誤",
+        "Failed to register URL scheme.": "註冊URL協議失敗",
+        "Retry": "重試",
+        "Network": "網絡",
+        "Save to gallery": "保存到相冊",
+        "Choose a way to login": "選擇登錄方式",
+        "Use Webview: you cannot sign in with Google.": "使用Webview: 無法使用Google登錄",
+        "Use an external browser: You can sign in using Google. However, some browsers may not be compatible with the application": "使用外部瀏覽器: 可以使用Google登錄. 但是, 一些瀏覽器可能與應用程序不兼容",
+        "External browser": "外部瀏覽器",
+        "Show comments": "顯示評論",
+        "Show original image": "顯示原圖"
     }
 }

debian/build.py

@@ -0,0 +1,27 @@
+import subprocess
+import os
+
+debianContent = ''
+desktopContent = ''
+version = ''
+
+with open('debian/debian.yaml', 'r') as f:
+    debianContent = f.read()
+with open('debian/gui/pixes.desktop', 'r') as f:
+    desktopContent = f.read()
+with open('pubspec.yaml', 'r') as f:
+    version = str.split(str.split(f.read(), 'version: ')[1], '+')[0]
+
+with open('debian/debian.yaml', 'w') as f:
+    f.write(debianContent.replace('{{Version}}', version))
+with open('debian/gui/pixes.desktop', 'w') as f:
+    f.write(desktopContent.replace('{{Version}}', version))
+
+subprocess.run(["flutter", "build", "linux"])
+
+subprocess.run(["$HOME/.pub-cache/bin/flutter_to_debian"], shell=True)
+
+with open('debian/debian.yaml', 'w') as f:
+    f.write(debianContent)
+with open('debian/gui/pixes.desktop', 'w') as f:
+    f.write(desktopContent)

debian/debian.yaml

@@ -0,0 +1,18 @@
+flutter_app: 
+  command: pixes
+  arch: x64
+  parent: /usr/local/lib
+  nonInteractive: true
+  execFieldCodes: u
+
+control:
+  Package: pixes
+  Version: {{Version}}
+  Architecture: amd64
+  Priority: optional
+  Depends:
+  Maintainer: nyne
+  Description: Unofficial pixiv application
+  
+#options:
+#  exec_out_dir: debian/packages

debian/gui/pixes.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version={{Version}}
+Name=Pixes
+GenericName=Pixes
+Comment=Unofficial pixiv application
+Terminal=false
+Type=Application
+Categories=Utility
+Keywords=Flutter;share;images;
+MimeType=x-scheme-handler/pixiv;

ios/Runner/Info.plist

@@ -56,5 +56,9 @@
             <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
         </dict>
     </array>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>photo</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>photo</string>
 </dict>
 </plist>

lib/appdata.dart

@@ -32,6 +32,8 @@ class _Appdata {
       LogicalKeyboardKey.enter.keyId,
       LogicalKeyboardKey.keyD.keyId,
       LogicalKeyboardKey.keyF.keyId,
+      LogicalKeyboardKey.keyC.keyId,
+      LogicalKeyboardKey.keyG.keyId,
     ],
     "showOriginalImage": false,
   };
@@ -63,14 +65,25 @@ class _Appdata {
   Future<void> readData() async {
     final file = File("${App.dataPath}/account.json");
     if (file.existsSync()) {
-      account = Account.fromJson(jsonDecode(await file.readAsString()));
+      var json = jsonDecode(await file.readAsString());
+      if (json != null) {
+        account = Account.fromJson(json);
+      }
     }
     final settingsFile = File("${App.dataPath}/settings.json");
     if (settingsFile.existsSync()) {
       var json = jsonDecode(await settingsFile.readAsString());
       for (var key in json.keys) {
-        if(json[key] != null) {
-          settings[key] = json[key];
+        if (json[key] != null) {
+          if (json[key] is List && settings[key] is List) {
+            for (int i = 0;
+                i < json[key].length && i < settings[key].length;
+                i++) {
+              settings[key][i] = json[key][i];
+            }
+          } else {
+            settings[key] = json[key];
+          }
         }
       }
     }

lib/components/button.dart

@@ -0,0 +1,100 @@
+import 'package:fluent_ui/fluent_ui.dart';
+import 'package:pixes/foundation/app.dart';
+
+abstract class BaseButton extends StatelessWidget {
+  const BaseButton({this.enabled = true, this.isLoading = false, super.key});
+
+  final bool enabled;
+
+  final bool isLoading;
+
+  Widget buildNormal(BuildContext context);
+
+  Widget buildLoading(BuildContext context);
+
+  Widget buildDisabled(BuildContext context);
+
+  @override
+  Widget build(BuildContext context) {
+    if (isLoading) {
+      return buildLoading(context);
+    } else if (enabled) {
+      return buildNormal(context);
+    } else {
+      return buildDisabled(context);
+    }
+  }
+}
+
+class FluentButton extends BaseButton {
+  const FluentButton({
+    required this.onPressed,
+    required this.child,
+    this.width,
+    super.enabled,
+    super.isLoading,
+    super.key,
+  });
+
+  final void Function() onPressed;
+
+  final Widget child;
+
+  final double? width;
+
+  static const _kFluentButtonPadding = 12.0;
+
+  @override
+  Widget buildNormal(BuildContext context) {
+    Widget child = this.child;
+    if (width != null) {
+      child = child.fixWidth(width! - _kFluentButtonPadding * 2);
+    }
+    return FilledButton(
+      onPressed: onPressed,
+      child: child,
+    );
+  }
+
+  @override
+  Widget buildLoading(BuildContext context) {
+    Widget child = Center(
+      widthFactor: 1,
+      heightFactor: 1,
+      child: const ProgressRing(
+        strokeWidth: 1.6,
+      ).fixWidth(14).fixHeight(14),
+    );
+    if (width != null) {
+      child = child.fixWidth(width! - _kFluentButtonPadding * 2);
+    }
+    return Container(
+      padding: const EdgeInsets.symmetric(
+          horizontal: _kFluentButtonPadding, vertical: 6.5),
+      decoration: BoxDecoration(
+          color: FluentTheme.of(context).inactiveBackgroundColor,
+          borderRadius: BorderRadius.circular(4)),
+      child: child,
+    );
+  }
+
+  @override
+  Widget buildDisabled(BuildContext context) {
+    Widget child = Center(
+      widthFactor: 1,
+      heightFactor: 1,
+      child: this.child,
+    );
+    if (width != null) {
+      child = child.fixWidth(width! - _kFluentButtonPadding * 2);
+    }
+    return Container(
+      padding: const EdgeInsets.symmetric(
+          horizontal: _kFluentButtonPadding, vertical: 6.5),
+      decoration: BoxDecoration(
+          color: FluentTheme.of(context).inactiveBackgroundColor,
+          borderRadius: BorderRadius.circular(4)),
+      child: child,
+    );
+  }
+}

lib/components/illust_widget.dart

@@ -1,6 +1,7 @@
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:pixes/components/animated_image.dart';
 import 'package:pixes/foundation/app.dart';
+import 'package:pixes/foundation/history.dart';
 import 'package:pixes/foundation/image_provider.dart';
 import 'package:pixes/network/download.dart';
 import 'package:pixes/utils/translation.dart';
@@ -307,3 +308,162 @@ class _IllustWidgetState extends State<IllustWidget> {
     );
   }
 }
+
+class IllustHistoryWidget extends StatelessWidget {
+  const IllustHistoryWidget(this.illust, {super.key});
+
+  final IllustHistory illust;
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(builder: (context, constrains) {
+      final width = constrains.maxWidth;
+      final height = illust.height * width / illust.width;
+      return SizedBox(
+          width: width,
+          height: height,
+          child: Stack(
+            children: [
+              Positioned.fill(
+                  child: Container(
+                width: width,
+                height: height,
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 8.0, vertical: 8.0),
+                child: Card(
+                  padding: EdgeInsets.zero,
+                  margin: EdgeInsets.zero,
+                  child: GestureDetector(
+                    onTap: () {
+                      context.to(() => IllustPageWithId(illust.id.toString()));
+                    },
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(4.0),
+                      child: AnimatedImage(
+                        image: CachedImageProvider(
+                            illust.imgPath),
+                        fit: BoxFit.cover,
+                        width: width - 16.0,
+                        height: height - 16.0,
+                      ),
+                    ),
+                  ),
+                ),
+              )),
+              if (illust.imageCount > 1)
+                Positioned(
+                  top: 12,
+                  left: 12,
+                  child: Container(
+                      width: 28,
+                      height: 20,
+                      decoration: BoxDecoration(
+                        color: FluentTheme.of(context)
+                            .micaBackgroundColor
+                            .withOpacity(0.72),
+                        borderRadius: BorderRadius.circular(4),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
+                      ),
+                      child: Center(
+                        child: Text(
+                          "${illust.imageCount}P",
+                          style: const TextStyle(fontSize: 12),
+                        ),
+                      )),
+                ),
+              if (illust.isAi)
+                Positioned(
+                  bottom: 12,
+                  left: 12,
+                  child: Container(
+                      width: 28,
+                      height: 20,
+                      decoration: BoxDecoration(
+                        color: ColorScheme.of(context)
+                            .errorContainer
+                            .withOpacity(0.8),
+                        borderRadius: BorderRadius.circular(4),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
+                      ),
+                      child: const Center(
+                        child: Text(
+                          "AI",
+                          style: TextStyle(fontSize: 12),
+                        ),
+                      )),
+                ),
+              if (illust.isGif)
+                Positioned(
+                  bottom: 12,
+                  left: 12,
+                  child: Container(
+                      width: 28,
+                      height: 20,
+                      decoration: BoxDecoration(
+                        color: ColorScheme.of(context)
+                            .primaryContainer
+                            .withOpacity(0.8),
+                        borderRadius: BorderRadius.circular(4),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
+                      ),
+                      child: const Center(
+                        child: Text(
+                          "GIF",
+                          style: TextStyle(fontSize: 12),
+                        ),
+                      )),
+                ),
+              if (illust.isR18)
+                Positioned(
+                  bottom: 12,
+                  right: 12,
+                  child: Container(
+                      width: 28,
+                      height: 20,
+                      decoration: BoxDecoration(
+                        color: ColorScheme.of(context).errorContainer,
+                        borderRadius: BorderRadius.circular(4),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
+                      ),
+                      child: const Center(
+                        child: Text(
+                          "R18",
+                          style: TextStyle(fontSize: 12),
+                        ),
+                      )),
+                ),
+              if (illust.isR18G)
+                Positioned(
+                  bottom: 12,
+                  right: 12,
+                  child: Container(
+                      width: 28,
+                      height: 20,
+                      decoration: BoxDecoration(
+                        color: ColorScheme.of(context).errorContainer,
+                        borderRadius: BorderRadius.circular(4),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
+                      ),
+                      child: const Center(
+                        child: Text(
+                          "R18G",
+                          style: TextStyle(fontSize: 12),
+                        ),
+                      )),
+                ),
+            ],
+          ),
+        );
+    });
+  }
+}

lib/components/keyboard.dart

@@ -40,12 +40,11 @@ class KeyEventListenerState extends State<KeyEventListener> {
       focusNode: focusNode,
       autofocus: true,
       onKeyEvent: (node, event) {
-        if (event is! KeyUpEvent) return KeyEventResult.ignored;
+        if (event is! KeyUpEvent) return KeyEventResult.handled;
         if (event.logicalKey == LogicalKeyboardKey.escape) {
           if (App.rootNavigatorKey.currentState?.canPop() ?? false) {
             App.rootNavigatorKey.currentState?.pop();
-          }
-          if (App.mainNavigatorKey?.currentState?.canPop() ?? false) {
+          } else if (App.mainNavigatorKey?.currentState?.canPop() ?? false) {
             App.mainNavigatorKey?.currentState?.pop();
           }
           return KeyEventResult.handled;

lib/foundation/app.dart

@@ -12,7 +12,7 @@ export "state_controller.dart";
 export "navigation.dart";
 
 class _App {
-  final version = "1.0.6";
+  final version = "1.0.7";
 
   bool get isAndroid => Platform.isAndroid;
   bool get isIOS => Platform.isIOS;

lib/foundation/history.dart

@@ -0,0 +1,102 @@
+import 'package:pixes/foundation/app.dart';
+import 'package:sqlite3/sqlite3.dart';
+import 'package:pixes/network/models.dart';
+
+class IllustHistory {
+  final int id;
+  final String imgPath;
+  final DateTime time;
+  final int imageCount;
+  final bool isR18;
+  final bool isR18G;
+  final bool isAi;
+  final bool isGif;
+  final int width;
+  final int height;
+
+  IllustHistory(this.id, this.imgPath, this.time, this.imageCount, this.isR18,
+      this.isR18G, this.isAi, this.isGif, this.width, this.height);
+}
+
+class HistoryManager {
+  static HistoryManager? instance;
+
+  factory HistoryManager() => instance ??= HistoryManager._create();
+
+  HistoryManager._create();
+
+  late Database _db;
+
+  init() {
+    _db = sqlite3.open("${App.dataPath}/history.db");
+    _db.execute('''
+      create table if not exists history (
+        id integer primary key not null,
+        imgPath text not null,
+        time integer not null,
+        imageCount integer not null,
+        isR18 integer not null,
+        isR18g integer not null,
+        isAi integer not null,
+        isGif integer not null,
+        width integer not null,
+        height integer not null
+      )
+    ''');
+  }
+
+  void addHistory(Illust illust) {
+    var time = DateTime.now();
+    _db.execute('''
+      insert or replace into history (id, imgPath, time, imageCount, isR18, isR18g, isAi, isGif, width, height)
+      values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ''', [
+      illust.id,
+      illust.images.first.medium,
+      time.millisecondsSinceEpoch,
+      illust.pageCount,
+      illust.isR18 ? 1 : 0,
+      illust.isR18G ? 1 : 0,
+      illust.isAi ? 1 : 0,
+      illust.isUgoira ? 1 : 0,
+      illust.width,
+      illust.height
+    ]);
+    if(length > 1000) {
+      _db.execute('''
+        delete from history where id in (
+          select id from history order by time asc limit 100
+        )
+      ''');
+    }
+  }
+
+  List<IllustHistory> getHistories(int page) {
+    var rows = _db.select('''
+      select * from history order by time desc
+      limit 20 offset ? 
+    ''', [(page - 1) * 20]);
+    List<IllustHistory> res = [];
+    for (var row in rows) {
+      res.add(IllustHistory(
+          row['id'],
+          row['imgPath'],
+          DateTime.fromMillisecondsSinceEpoch(row['time']),
+          row['imageCount'],
+          row['isR18'] == 1,
+          row['isR18g'] == 1,
+          row['isAi'] == 1,
+          row['isGif'] == 1,
+          row['width'],
+          row['height']));
+    }
+    return res;
+  }
+
+  int get length {
+    var rows = _db.select('''
+      select count(*) from history
+    ''');
+    return rows.first.values.first! as int;
+  }
+}

lib/foundation/log.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/foundation.dart';
 import 'package:pixes/utils/ext.dart';
 
@@ -26,6 +28,9 @@ class Log {
 
   static bool ignoreLimitation = false;
 
+  /// only for debug
+  static const String? logFile = null;
+
   static void printWarning(String text) {
     print('\x1B[33m$text\x1B[0m');
   }
@@ -57,6 +62,9 @@ class Log {
     }
 
     _logs.add(newLog);
+    if(logFile != null) {
+      File(logFile!).writeAsString(newLog.toString(), mode: FileMode.append);
+    }
     if (_logs.length > maxLogNumber) {
       var res = _logs.remove(
           _logs.firstWhereOrNull((element) => element.level == LogLevel.info));

lib/main.dart

@@ -11,6 +11,7 @@ import "package:pixes/components/keyboard.dart";
 import "package:pixes/components/md.dart";
 import "package:pixes/components/message.dart";
 import "package:pixes/foundation/app.dart";
+import "package:pixes/foundation/history.dart";
 import "package:pixes/foundation/log.dart";
 import "package:pixes/network/app_dio.dart";
 import "package:pixes/pages/main_page.dart";
@@ -29,6 +30,7 @@ void main() async {
   await App.init();
   await appdata.readData();
   await Translation.init();
+  HistoryManager().init();
   handleLinks();
   if (App.isDesktop) {
     await flutter_acrylic.Window.initialize();
@@ -41,6 +43,10 @@ void main() async {
         TitleBarStyle.hidden,
         windowButtonVisibility: false,
       );
+      if(App.isLinux) {
+        // https://github.com/leanflutter/window_manager/issues/460
+        return;
+      }
       await windowManager.setMinimumSize(const Size(500, 600));
       var placement = await WindowPlacement.loadFromFile();
       await placement.applyToWindow();
@@ -49,6 +55,7 @@ void main() async {
     });
   }
   Loop.start();
+  Log.info("APP", "Application started");
   runApp(const MyApp());
 }
 

lib/network/network.dart

@@ -573,4 +573,14 @@ class Network {
       return Res.error(res.errorMessage);
     }
   }
+
+  Future<Res<bool>> sendHistory(List<int> ids) async{
+    var res = await apiPost("/v2/user/browsing-history/illust/add",
+        data: {"illust_ids": ids});
+    if (res.success) {
+      return const Res(true);
+    } else {
+      return Res.fromErrorRes(res);
+    }
+  }
 }

lib/pages/history.dart

@@ -2,8 +2,10 @@ import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:pixes/appdata.dart';
 import 'package:pixes/components/loading.dart';
+import 'package:pixes/components/segmented_button.dart';
 import 'package:pixes/components/title_bar.dart';
 import 'package:pixes/foundation/app.dart';
+import 'package:pixes/foundation/history.dart';
 import 'package:pixes/network/network.dart';
 import 'package:pixes/utils/translation.dart';
 
@@ -17,42 +19,109 @@ class HistoryPage extends StatefulWidget {
   State<HistoryPage> createState() => _HistoryPageState();
 }
 
-class _HistoryPageState extends MultiPageLoadingState<HistoryPage, Illust> {
+class _HistoryPageState extends State<HistoryPage> {
+  int page = 0;
+
   @override
-  Widget buildContent(BuildContext context, final List<Illust> data) {
+  Widget build(BuildContext context) {
     return Column(
       children: [
-        TitleBar(title: "History".tl),
+        TitleBar(
+          title: "History".tl,
+          action: SegmentedButton<int>(
+            options: [
+              SegmentedButtonOption(0, "Local".tl,),
+              SegmentedButtonOption(1, "Network".tl,),
+            ],
+            value: page,
+            onPressed: (key) {
+              setState(() {
+                page = key;
+              });
+            },
+          ),
+          ),
         Expanded(
-          child: LayoutBuilder(builder: (context, constrains){
-            return MasonryGridView.builder(
-              padding: const EdgeInsets.symmetric(horizontal: 8)
-                  + EdgeInsets.only(bottom: context.padding.bottom),
-              gridDelegate: const SliverSimpleGridDelegateWithMaxCrossAxisExtent(
-                maxCrossAxisExtent: 240,
-              ),
-              itemCount: data.length,
-              itemBuilder: (context, index) {
-                if(index == data.length - 1){
-                  nextPage();
-                }
-                return IllustWidget(data[index], onTap: () {
-                  context.to(() => IllustGalleryPage(
-                      illusts: data,
-                      initialPage: index,
-                  ));
-                });
-              },
-            );
-          }),
-        )
+          child: page == 0
+              ? const LocalHistoryPage()
+              : const NetworkHistoryPage(),
+        ),
       ],
     );
   }
+}
+
+class LocalHistoryPage extends StatefulWidget {
+  const LocalHistoryPage({super.key});
+
+  @override
+  State<LocalHistoryPage> createState() => _LocalHistoryPageState();
+}
+
+class _LocalHistoryPageState extends State<LocalHistoryPage> {
+  int page = 1;
+
+  var data = <IllustHistory>[];
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(builder: (context, constrains) {
+      return MasonryGridView.builder(
+        padding: const EdgeInsets.symmetric(horizontal: 8) +
+            EdgeInsets.only(bottom: context.padding.bottom),
+        gridDelegate: const SliverSimpleGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: 240,
+        ),
+        itemCount: HistoryManager().length,
+        itemBuilder: (context, index) {
+          if (index == data.length) {
+            data.addAll(HistoryManager().getHistories(page));
+            page++;
+          }
+          return IllustHistoryWidget(data[index]);
+        },
+      );
+    });
+  }
+}
+
+class NetworkHistoryPage extends StatefulWidget {
+  const NetworkHistoryPage({super.key});
+
+  @override
+  State<NetworkHistoryPage> createState() => _NetworkHistoryPageState();
+}
+
+class _NetworkHistoryPageState
+    extends MultiPageLoadingState<NetworkHistoryPage, Illust> {
+  @override
+  Widget buildContent(BuildContext context, final List<Illust> data) {
+    return LayoutBuilder(builder: (context, constrains) {
+      return MasonryGridView.builder(
+        padding: const EdgeInsets.symmetric(horizontal: 8) +
+            EdgeInsets.only(bottom: context.padding.bottom),
+        gridDelegate: const SliverSimpleGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: 240,
+        ),
+        itemCount: data.length,
+        itemBuilder: (context, index) {
+          if (index == data.length - 1) {
+            nextPage();
+          }
+          return IllustWidget(data[index], onTap: () {
+            context.to(() => IllustGalleryPage(
+                  illusts: data,
+                  initialPage: index,
+                ));
+          });
+        },
+      );
+    });
+  }
 
   @override
   Future<Res<List<Illust>>> loadData(page) {
-    if(appdata.account?.user.isPremium != true) {
+    if (appdata.account?.user.isPremium != true) {
       return Future.value(Res.error("Premium Required".tl));
     }
     return Network().getHistory(page);

lib/pages/illust_page.dart

@@ -14,6 +14,7 @@ import 'package:pixes/components/page_route.dart';
 import 'package:pixes/components/title_bar.dart';
 import 'package:pixes/components/user_preview.dart';
 import 'package:pixes/foundation/app.dart';
+import 'package:pixes/foundation/history.dart';
 import 'package:pixes/foundation/image_provider.dart';
 import 'package:pixes/network/download.dart';
 import 'package:pixes/network/network.dart';
@@ -44,6 +45,8 @@ class IllustGalleryPage extends StatefulWidget {
 
   final String? nextUrl;
 
+  static var cachedHistoryIds = <int>{};
+
   @override
   State<IllustGalleryPage> createState() => _IllustGalleryPageState();
 }
@@ -57,6 +60,8 @@ class _IllustGalleryPageState extends State<IllustGalleryPage> {
 
   bool loading = false;
 
+  late int page = widget.initialPage;
+
   @override
   void initState() {
     illusts = List.from(widget.illusts);
@@ -68,6 +73,16 @@ class _IllustGalleryPageState extends State<IllustGalleryPage> {
     super.initState();
   }
 
+  @override
+  void dispose() {
+    if (IllustGalleryPage.cachedHistoryIds.length > 5) {
+      Network().sendHistory(
+          IllustGalleryPage.cachedHistoryIds.toList().reversed.toList());
+      IllustGalleryPage.cachedHistoryIds.clear();
+    }
+    super.dispose();
+  }
+
   void nextPage() {
     var length = illusts.length;
     if (controller.page == length - 1) return;
@@ -88,16 +103,51 @@ class _IllustGalleryPageState extends State<IllustGalleryPage> {
       length++;
     }
 
-    return PageView.builder(
-      controller: controller,
-      itemCount: length,
-      itemBuilder: (context, index) {
-        if (index == illusts.length) {
-          return buildLast();
-        }
-        return IllustPage(illusts[index],
-            nextPage: nextPage, previousPage: previousPage);
-      },
+    return Stack(
+      children: [
+        Positioned.fill(
+          child: PageView.builder(
+            controller: controller,
+            itemCount: length,
+            itemBuilder: (context, index) {
+              if (index == illusts.length) {
+                return buildLast();
+              }
+              return IllustPage(illusts[index],
+                  nextPage: nextPage, previousPage: previousPage);
+            },
+            onPageChanged: (value) => setState(() {
+              page = value;
+            }),
+          ),
+        ),
+        if (page < length - 1 && length > 1 && App.isDesktop)
+          Positioned(
+            right: 0,
+            top: 0,
+            bottom: 32,
+            child: Center(
+                child: IconButton(
+              icon: const Icon(FluentIcons.chevron_right),
+              onPressed: () {
+                nextPage();
+              },
+            )),
+          ),
+        if (page != 0 && length > 1 && App.isDesktop)
+          Positioned(
+            left: 0,
+            top: 0,
+            bottom: 32,
+            child: Center(
+                child: IconButton(
+              icon: const Icon(FluentIcons.chevron_left),
+              onPressed: () {
+                previousPage();
+              },
+            )),
+          ),
+      ],
     );
   }
 
@@ -169,6 +219,10 @@ class _IllustPageState extends State<IllustPage> {
         widget.illust.author.isFollowed = v;
       });
     };
+    HistoryManager().addHistory(widget.illust);
+    if (appdata.account!.user.isPremium) {
+      IllustGalleryPage.cachedHistoryIds.add(widget.illust.id);
+    }
     super.initState();
   }
 
@@ -265,6 +319,14 @@ class _IllustPageState extends State<IllustPage> {
         _bottomBarController.download();
       case 6:
         _bottomBarController.follow();
+      case 7:
+        if (ModalRoute.of(context)?.isCurrent ?? true) {
+          CommentsPage.show(context, widget.illust.id.toString());
+        } else {
+          context.pop();
+        }
+      case 8:
+        openImage(0);
     }
   }
 
@@ -997,7 +1059,7 @@ class _BottomBarState extends State<_BottomBar> with TickerProviderStateMixin {
 
   Widget buildMoreActions() {
     return Wrap(
-      runSpacing: 4,
+      runSpacing: 8,
       spacing: 8,
       children: [
         Button(

lib/pages/image_page.dart

@@ -3,8 +3,10 @@ import 'dart:io';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/services.dart';
+import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:photo_view/photo_view_gallery.dart';
 import 'package:pixes/components/md.dart';
+import 'package:pixes/components/message.dart';
 import 'package:pixes/components/page_route.dart';
 import 'package:pixes/foundation/app.dart';
 import 'package:pixes/foundation/cache_manager.dart';
@@ -89,6 +91,8 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
 
   void showMenu() {
     menuController.showFlyout(
+        barrierColor: Colors.transparent,
+        position: Offset(context.size!.width, 0),
         builder: (context) => MenuFlyout(
               items: [
                 MenuFlyoutItem(
@@ -103,6 +107,23 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
                         saveFile(file, fileName);
                       }
                     }),
+                if (App.isMobile)
+                  MenuFlyoutItem(
+                      text: Text("Save to gallery".tl),
+                      onPressed: () async {
+                        var file = await getFile();
+                        if (file != null) {
+                          var fileName = file.path.split('/').last;
+                          if (!fileName.contains('.')) {
+                            fileName += getExtensionName();
+                          }
+                          await ImageGallerySaver.saveFile(file.path,
+                              name: fileName);
+                          if (mounted) {
+                            showToast(context, message: "Saved".tl);
+                          }
+                        }
+                      }),
                 MenuFlyoutItem(
                     text: Text("Share".tl),
                     onPressed: () async {

lib/pages/login_page.dart

@@ -1,4 +1,5 @@
 import 'package:fluent_ui/fluent_ui.dart';
+import 'package:pixes/components/button.dart';
 import 'package:pixes/foundation/app.dart';
 import 'package:pixes/network/network.dart';
 import 'package:pixes/pages/webview_page.dart';
@@ -24,7 +25,7 @@ class _LoginPageState extends State<LoginPage> {
 
   @override
   Widget build(BuildContext context) {
-    if(isLogging) {
+    if (isLogging) {
       return buildLoading(context);
     } else if (!waitingForAuth) {
       return buildLogin(context);
@@ -56,23 +57,12 @@ class _LoginPageState extends State<LoginPage> {
                       child: Column(
                         mainAxisSize: MainAxisSize.min,
                         children: [
-                          if (checked)
-                            FilledButton(
-                              onPressed: onContinue,
-                              child: Text("Continue".tl),
-                            )
-                          else
-                            Container(
-                              height: 28,
-                              width: 78,
-                              decoration: BoxDecoration(
-                                  color: FluentTheme.of(context)
-                                      .inactiveBackgroundColor,
-                                  borderRadius: BorderRadius.circular(4)),
-                              child: Center(
-                                child: Text("Continue".tl),
-                              ),
-                            ),
+                          FluentButton(
+                            onPressed: onContinue,
+                            enabled: checked,
+                            width: 96,
+                            child: Text("Continue".tl),
+                          ),
                           const SizedBox(
                             height: 16,
                           ),
@@ -186,6 +176,39 @@ class _LoginPageState extends State<LoginPage> {
   }
 
   void onContinue() async {
+    bool? useExternal;
+    if (App.isMobile) {
+      await showDialog(
+        context: context,
+        barrierDismissible: true,
+        builder: (context) => ContentDialog(
+            title: Text("Choose a way to login".tl),
+            content: Text("${"Use Webview: you cannot sign in with Google.".tl}"
+                "\n\n"
+                "${"Use an external browser: You can sign in using Google. However, some browsers may not be compatible with the application".tl}"),
+            actions: [
+              Button(
+                child: Text("Webview".tl),
+                onPressed: () {
+                  useExternal = false;
+                  App.rootNavigatorKey.currentState!.pop();
+                },
+              ),
+              Button(
+                child: Text("External browser".tl),
+                onPressed: () {
+                  useExternal = true;
+                  App.rootNavigatorKey.currentState!.pop();
+                },
+              )
+            ]),
+      );
+    } else {
+      useExternal = true;
+    }
+    if (useExternal == null) {
+      return;
+    }
     var url = await Network().generateWebviewUrl();
     onLink = (uri) {
       if (uri.scheme == "pixiv") {
@@ -198,15 +221,18 @@ class _LoginPageState extends State<LoginPage> {
     setState(() {
       waitingForAuth = true;
     });
-    if(App.isMobile && mounted) {
-      context.to(() => WebviewPage(url, onNavigation: (req) {
-        if(req.url.startsWith("pixiv://")) {
-          App.rootNavigatorKey.currentState!.pop();
-          onLink?.call(Uri.parse(req.url));
-          return false;
-        }
-        return true;
-      },));
+    if (!useExternal! && mounted) {
+      context.to(() => WebviewPage(
+            url,
+            onNavigation: (req) {
+              if (req.url.startsWith("pixiv://")) {
+                App.rootNavigatorKey.currentState!.pop();
+                onLink?.call(Uri.parse(req.url));
+                return false;
+              }
+              return true;
+            },
+          ));
     } else {
       launchUrlString(url);
     }
@@ -219,7 +245,7 @@ class _LoginPageState extends State<LoginPage> {
     });
     var res = await Network().loginWithCode(code);
     if (res.error) {
-      if(mounted) {
+      if (mounted) {
         context.showToast(message: res.errorMessage!);
       }
       setState(() {

lib/pages/settings_page.dart

@@ -88,6 +88,7 @@ class _SettingsPageState extends State<SettingsPage> {
                         child: Text('Continue'.tl),
                         onPressed: () {
                           appdata.account = null;
+                          appdata.writeData();
                           App.rootNavigatorKey.currentState!.pushAndRemoveUntil(
                               AppPageRoute(
                                   builder: (context) => const MainPage()),
@@ -591,6 +592,8 @@ class _ShortcutsSettingsState extends State<ShortcutsSettings> {
     "Add to favorites",
     "Download",
     "Follow the artist",
+    "Show comments",
+    "Show original image"
   ];
 
   @override

lib/utils/app_links.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:app_links/app_links.dart';
+import 'package:fluent_ui/fluent_ui.dart';
 import 'package:pixes/foundation/app.dart';
 import 'package:pixes/foundation/log.dart';
 import 'package:pixes/pages/illust_page.dart';
@@ -8,6 +9,7 @@ import 'package:pixes/pages/novel_page.dart';
 import 'package:pixes/pages/search_page.dart';
 import 'package:pixes/pages/user_info_page.dart';
 import 'package:pixes/utils/ext.dart';
+import 'package:pixes/utils/translation.dart';
 import 'package:win32_registry/win32_registry.dart';
 
 Future<void> _register(String scheme) async {
@@ -31,13 +33,40 @@ Future<void> _register(String scheme) async {
   regKey.createKey(protocolCmdRegKey).createValue(protocolCmdRegValue);
 }
 
+void _registerPixiv() async {
+  try {
+    await _register("pixiv");
+  } catch (e) {
+    // 注册失败会导致登录不可用
+    while (App.mainNavigatorKey == null) {
+      await Future.delayed(const Duration(milliseconds: 100));
+    }
+    Future.delayed(const Duration(seconds: 1), () async {
+      showDialog(
+          context: App.rootNavigatorKey.currentContext!,
+          builder: (context) => ContentDialog(
+                title: Text("Error".tl),
+                content: Text("${"Failed to register URL scheme.".tl}\n$e"),
+                actions: [
+                  FilledButton(
+                      child: Text("Retry".tl),
+                      onPressed: () {
+                        context.pop();
+                        _registerPixiv();
+                      })
+                ],
+              ));
+    });
+  }
+}
+
 bool Function(Uri uri)? onLink;
 
 bool _firstLink = true;
 
 void handleLinks() async {
   if (App.isWindows) {
-    await _register("pixiv");
+    _registerPixiv();
   }
   AppLinks().uriLinkStream.listen((uri) async {
     if (_firstLink) {

linux/flutter/generated_plugin_registrant.cc

@@ -6,14 +6,25 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <dynamic_color/dynamic_color_plugin.h>
+#include <file_selector_linux/file_selector_plugin.h>
+#include <flutter_acrylic/flutter_acrylic_plugin.h>
 #include <gtk/gtk_plugin.h>
 #include <screen_retriever/screen_retriever_plugin.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
-#include <system_theme/system_theme_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 #include <window_manager/window_manager_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
+  dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
+  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
+  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
+  g_autoptr(FlPluginRegistrar) flutter_acrylic_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterAcrylicPlugin");
+  flutter_acrylic_plugin_register_with_registrar(flutter_acrylic_registrar);
   g_autoptr(FlPluginRegistrar) gtk_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
   gtk_plugin_register_with_registrar(gtk_registrar);
@@ -23,9 +34,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
   sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);
-  g_autoptr(FlPluginRegistrar) system_theme_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "SystemThemePlugin");
-  system_theme_plugin_register_with_registrar(system_theme_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -3,10 +3,12 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  dynamic_color
+  file_selector_linux
+  flutter_acrylic
   gtk
   screen_retriever
   sqlite3_flutter_libs
-  system_theme
   url_launcher_linux
   window_manager
 )

linux/my_application.cc

@@ -55,7 +55,7 @@ static void my_application_activate(GApplication* application) {
   }
 
   gtk_window_set_default_size(window, 1280, 720);
-  gtk_widget_realize(GTK_WIDGET(window));
+  gtk_widget_show(GTK_WIDGET(window));
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();
   fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,19 +6,27 @@ import FlutterMacOS
 import Foundation
 
 import app_links
+import device_info_plus
+import dynamic_color
+import file_selector_macos
+import flutter_acrylic
 import path_provider_foundation
 import screen_retriever
+import share_plus
 import sqlite3_flutter_libs
-import system_theme
 import url_launcher_macos
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
+  DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
+  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  FlutterAcrylicPlugin.register(with: registry.registrar(forPlugin: "FlutterAcrylicPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
+  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
-  SystemThemePlugin.register(with: registry.registrar(forPlugin: "SystemThemePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
 }

pubspec.lock

@@ -218,10 +218,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_acrylic
-      sha256: a9a1fdf91ff1fb47858fd82507f57e255a132a5d355056694fdb9fd303633b18
+      sha256: "646200d98e8dd2bd4ab931d4ba4f6b4cb899475d6401414017ba5d71b0fac42b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
+    version: "1.0.0+2"
   flutter_file_dialog:
     dependency: "direct main"
     description:
@@ -285,6 +285,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  image_gallery_saver:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: master
+      resolved-ref: "3f8c4d2cc41002d3ffdb770cab3b62583326ce01"
+      url: "https://github.com/wgh136/image_gallery_saver"
+    source: git
+    version: "2.0.0"
   intl:
     dependency: "direct main"
     description:
@@ -325,14 +334,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
-  macos_window_utils:
-    dependency: transitive
-    description:
-      name: macos_window_utils
-      sha256: "230be594d26f6dee92c5a1544f4242d25138a5bfb9f185b27f14de3949ef0be8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.0"
   matcher:
     dependency: transitive
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.6+106
+version: 1.0.7+107
 
 environment:
   sdk: '>=3.3.4 <4.0.0'
@@ -58,6 +58,10 @@ dependencies:
   webview_flutter: ^4.7.0
   flutter_acrylic: 1.0.0+2
   device_info_plus: ^10.1.0
+  image_gallery_saver:
+    git:
+      url: https://github.com/wgh136/image_gallery_saver
+      ref: master
 dev_dependencies:
   flutter_test:
     sdk: flutter

windows/build.iss

@@ -2,11 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "pixes"
-#define MyAppVersion "1.0.5"
+#define MyAppVersion "{{version}}"
 #define MyAppPublisher "Nyne"
 #define MyAppURL "https://github.com/wgh136/pixes"
 #define MyAppExeName "pixes.exe"
-#define RootPath "C:\Users\wgh19\IdeaProjects\pixes"
+#define RootPath "{{root_path}}"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.

windows/flutter/generated_plugin_registrant.cc

@@ -7,21 +7,30 @@
 #include "generated_plugin_registrant.h"
 
 #include <app_links/app_links_plugin_c_api.h>
+#include <dynamic_color/dynamic_color_plugin_c_api.h>
+#include <file_selector_windows/file_selector_windows.h>
+#include <flutter_acrylic/flutter_acrylic_plugin.h>
 #include <screen_retriever/screen_retriever_plugin.h>
+#include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
-#include <system_theme/system_theme_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 #include <window_manager/window_manager_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   AppLinksPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("AppLinksPluginCApi"));
+  DynamicColorPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
+  FlutterAcrylicPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterAcrylicPlugin"));
   ScreenRetrieverPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
+  SharePlusWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   Sqlite3FlutterLibsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin"));
-  SystemThemePluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("SystemThemePlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
   WindowManagerPluginRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -4,9 +4,12 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   app_links
+  dynamic_color
+  file_selector_windows
+  flutter_acrylic
   screen_retriever
+  share_plus
   sqlite3_flutter_libs
-  system_theme
   url_launcher_windows
   window_manager
 )