fix display error

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 nyne
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

android/app/src/main/AndroidManifest.xml

@@ -33,6 +33,15 @@
                 <!-- Accepts URIs that begin with "example://gizmos” -->
                 <data android:scheme="pixiv"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="www.pixiv.net" android:pathPrefix="/users"/>
+                <data android:scheme="https" android:host="www.pixiv.net" android:pathPrefix="/novel"/>
+                <data android:scheme="https" android:host="www.pixiv.net" android:pathPrefix="/tags"/>
+                <data android:scheme="https" android:host="www.pixiv.net" android:pathPrefix="/artworks"/>
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

assets/tr.json

@@ -3,14 +3,14 @@
         "Search": "搜索",
         "Downloading": "下载中",
         "Downloaded": "已下载",
-        "Artwork": "作品",
+        "Artwork": "插画",
         "Explore": "探索",
         "Bookmarks": "收藏",
         "Following": "关注",
         "History": "历史",
         "Ranking": "排行",
         "Settings": "设置",
-        "Artworks": "作品",
+        "Artworks": "插画",
         "Mangas": "漫画",
         "Users": "用户",
         "Search artwork": "搜索作品",
@@ -148,7 +148,21 @@
         "Local": "本地",
         "Both": "同时",
         "This artwork is blocked": "此作品已被屏蔽",
-        "Delete Invalid Items": "删除无效项目"
+        "Delete Invalid Items": "删除无效项目",
+        "Private Favorite": "私人收藏",
+        "Shortcuts": "快捷键",
+        "Page down": "向下翻页",
+        "Page up": "向上翻页",
+        "Next work": "下一作品",
+        "Previous work": "上一作品",
+        "Add to favorites": "添加收藏",
+        "Follow the artist": "关注画师",
+        "Manga": "漫画",
+        "Actions": "操作",
+        "Current quantity": "当前数量",
+        "Display the original image on the details page": "在详情页显示原图",
+        "Open link": "打开链接",
+        "Read": "阅读"
     },
     "zh_TW": {
         "Search": "搜索",
@@ -299,6 +313,20 @@
         "Local": "本地",
         "Both": "同時",
         "This artwork is blocked": "此作品已被屏蔽",
-        "Delete Invalid Items": "刪除無效項目"
+        "Delete Invalid Items": "刪除無效項目",
+        "Private Favorite": "私人收藏",
+        "Shortcuts": "快捷鍵",
+        "Page down": "向下翻頁",
+        "Page up": "向上翻頁",
+        "Next work": "下一作品",
+        "Previous work": "上一作品",
+        "Add to favorites": "添加收藏",
+        "Follow the artist": "關注畫師",
+        "Manga": "漫畫",
+        "Actions": "操作",
+        "Current quantity": "當前數量",
+        "Display the original image on the details page": "在詳情頁顯示原圖",
+        "Open link": "打開鏈接",
+        "Read": "閱讀"
     }
 }

lib/appdata.dart

@@ -24,6 +24,16 @@ class _Appdata {
     "readingLineHeight": 1.5,
     "readingParagraphSpacing": 8.0,
     "blockTags": [],
+    "shortcuts": <int>[
+      LogicalKeyboardKey.arrowDown.keyId,
+      LogicalKeyboardKey.arrowUp.keyId,
+      LogicalKeyboardKey.arrowRight.keyId,
+      LogicalKeyboardKey.arrowLeft.keyId,
+      LogicalKeyboardKey.enter.keyId,
+      LogicalKeyboardKey.keyD.keyId,
+      LogicalKeyboardKey.keyF.keyId,
+    ],
+    "showOriginalImage": false,
   };
 
   bool lock = false;

lib/components/batch_download.dart

@@ -15,7 +15,10 @@ class BatchDownloadButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Button(
-      child: const Icon(MdIcons.download, size: 20,),
+      child: const Icon(
+        MdIcons.download,
+        size: 20,
+      ),
       onPressed: () {
         showDialog(
             context: context,
@@ -40,6 +43,8 @@ class _DownloadDialog extends StatefulWidget {
 class _DownloadDialogState extends State<_DownloadDialog> {
   int maxCount = 30;
 
+  int currentCount = 0;
+
   bool loading = false;
 
   bool cancel = false;
@@ -53,15 +58,18 @@ class _DownloadDialogState extends State<_DownloadDialog> {
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text('${"Maximum number of downloads".tl}:'),
-            const SizedBox(height: 16,),
+            if (!loading) Text('${"Maximum number of downloads".tl}:'),
+            if (loading) Text("${"Current quantity".tl}: $currentCount"),
+            const SizedBox(
+              height: 16,
+            ),
             SizedBox(
               height: 42,
               width: 196,
               child: NumberBox(
                 value: maxCount,
                 onChanged: (value) {
-                  if(!loading) {
+                  if (!loading) {
                     setState(() => maxCount = value ?? maxCount);
                   }
                 },
@@ -71,35 +79,39 @@ class _DownloadDialogState extends State<_DownloadDialog> {
                 largeChange: 30,
                 clearButton: false,
               ),
-            )
+            ),
           ],
         ).paddingVertical(8),
       ),
       actions: [
-        Button(child: Text("Cancel".tl), onPressed: () {
-          cancel = true;
-          context.pop();
-        }),
-        if(!loading)
+        Button(
+            child: Text("Cancel".tl),
+            onPressed: () {
+              cancel = true;
+              context.pop();
+            }),
+        if (!loading)
           FilledButton(onPressed: load, child: Text("Continue".tl))
         else
-          FilledButton(onPressed: (){}, child: const SizedBox(
-            height: 20,
-            width: 64,
-            child: Center(
-              child: SizedBox.square(
-                dimension: 18,
-                child: ProgressRing(
-                  strokeWidth: 1.6,
+          FilledButton(
+              onPressed: () {},
+              child: const SizedBox(
+                height: 20,
+                width: 64,
+                child: Center(
+                  child: SizedBox.square(
+                    dimension: 18,
+                    child: ProgressRing(
+                      strokeWidth: 1.6,
+                    ),
+                  ),
                 ),
-              ),
-            ),
-          ))
+              ))
       ],
     );
   }
 
-  void load() async{
+  void load() async {
     setState(() {
       loading = true;
     });
@@ -109,17 +121,17 @@ class _DownloadDialogState extends State<_DownloadDialog> {
     List<Illust> all = [];
     String? nextUrl;
     int retryCount = 0;
-    while(nextUrl != "end" && all.length < maxCount) {
-      if(nextUrl != null) {
+    while (nextUrl != "end" && all.length < maxCount) {
+      if (nextUrl != null) {
         request = Network().getIllustsWithNextUrl(nextUrl);
       }
       var res = await request;
-      if(cancel || !mounted) {
+      if (cancel || !mounted) {
         return;
       }
-      if(res.error) {
+      if (res.error) {
         retryCount++;
-        if(retryCount > 3) {
+        if (retryCount > 3) {
           setState(() {
             loading = false;
           });
@@ -130,15 +142,17 @@ class _DownloadDialogState extends State<_DownloadDialog> {
         continue;
       }
       all.addAll(res.data);
+      setState(() {
+        currentCount = all.length;
+      });
       nextUrl = res.subData ?? "end";
     }
     int i = 0;
-    for(var illust in all) {
-      if(i > maxCount)  return;
+    for (var illust in all) {
+      if (i > maxCount) break;
       DownloadManager().addDownloadingTask(illust);
       i++;
     }
     context.pop();
   }
 }
-

lib/components/illust_widget.dart

@@ -59,48 +59,58 @@ class _IllustWidgetState extends State<IllustWidget> {
           height: height,
           child: Stack(
             children: [
-              Positioned.fill(child: Container(
+              Positioned.fill(
+                  child: Container(
                 width: width,
                 height: height,
-                padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 8.0),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 8.0, vertical: 8.0),
                 child: Card(
                   padding: EdgeInsets.zero,
                   margin: EdgeInsets.zero,
                   child: GestureDetector(
-                    onTap: widget.onTap ?? (){
-                      context.to(() => IllustPage(widget.illust));
-                    },
+                    onTap: widget.onTap ??
+                        () {
+                          context.to(() => IllustPage(widget.illust));
+                        },
                     onSecondaryTapUp: showMenu,
                     child: ClipRRect(
                       borderRadius: BorderRadius.circular(4.0),
                       child: AnimatedImage(
-                        image: CachedImageProvider(widget.illust.images.first.medium),
+                        image: CachedImageProvider(
+                            widget.illust.images.first.medium),
                         fit: BoxFit.cover,
-                        width: width-16.0,
-                        height: height-16.0,
+                        width: width - 16.0,
+                        height: height - 16.0,
                       ),
                     ),
                   ),
                 ),
               )),
-              if(widget.illust.images.length > 1)
+              if (widget.illust.images.length > 1)
                 Positioned(
                   top: 12,
                   left: 12,
                   child: Container(
-                    width: 28,
-                    height: 20,
-                    decoration: BoxDecoration(
-                      color: FluentTheme.of(context).cardColor,
-                      borderRadius: BorderRadius.circular(4),
-                      border: Border.all(color: ColorScheme.of(context).outlineVariant, width: 0.6),
-                    ),
-                    child: Center(
-                      child: Text("${widget.illust.images.length}P",
-                        style: const TextStyle(fontSize: 12),),
-                    )),
+                      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(
+                          "${widget.illust.images.length}P",
+                          style: const TextStyle(fontSize: 12),
+                        ),
+                      )),
                 ),
-              if(widget.illust.isAi)
+              if (widget.illust.isAi)
                 Positioned(
                   bottom: 12,
                   left: 12,
@@ -108,16 +118,22 @@ class _IllustWidgetState extends State<IllustWidget> {
                       width: 28,
                       height: 20,
                       decoration: BoxDecoration(
-                        color: ColorScheme.of(context).errorContainer.withOpacity(0.8),
+                        color: ColorScheme.of(context)
+                            .errorContainer
+                            .withOpacity(0.8),
                         borderRadius: BorderRadius.circular(4),
-                        border: Border.all(color: ColorScheme.of(context).outlineVariant, width: 0.6),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
                       ),
                       child: const Center(
-                        child: Text("AI",
-                          style: TextStyle(fontSize: 12),),
+                        child: Text(
+                          "AI",
+                          style: TextStyle(fontSize: 12),
+                        ),
                       )),
                 ),
-              if(widget.illust.isUgoira)
+              if (widget.illust.isUgoira)
                 Positioned(
                   bottom: 12,
                   left: 12,
@@ -125,16 +141,22 @@ class _IllustWidgetState extends State<IllustWidget> {
                       width: 28,
                       height: 20,
                       decoration: BoxDecoration(
-                        color: ColorScheme.of(context).primaryContainer.withOpacity(0.8),
+                        color: ColorScheme.of(context)
+                            .primaryContainer
+                            .withOpacity(0.8),
                         borderRadius: BorderRadius.circular(4),
-                        border: Border.all(color: ColorScheme.of(context).outlineVariant, width: 0.6),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
                       ),
                       child: const Center(
-                        child: Text("GIF",
-                          style: TextStyle(fontSize: 12),),
+                        child: Text(
+                          "GIF",
+                          style: TextStyle(fontSize: 12),
+                        ),
                       )),
                 ),
-              if(widget.illust.isR18)
+              if (widget.illust.isR18)
                 Positioned(
                   bottom: 12,
                   right: 12,
@@ -144,14 +166,18 @@ class _IllustWidgetState extends State<IllustWidget> {
                       decoration: BoxDecoration(
                         color: ColorScheme.of(context).errorContainer,
                         borderRadius: BorderRadius.circular(4),
-                        border: Border.all(color: ColorScheme.of(context).outlineVariant, width: 0.6),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
                       ),
                       child: const Center(
-                        child: Text("R18",
-                          style: TextStyle(fontSize: 12),),
+                        child: Text(
+                          "R18",
+                          style: TextStyle(fontSize: 12),
+                        ),
                       )),
                 ),
-              if(widget.illust.isR18G)
+              if (widget.illust.isR18G)
                 Positioned(
                   bottom: 12,
                   right: 12,
@@ -161,11 +187,15 @@ class _IllustWidgetState extends State<IllustWidget> {
                       decoration: BoxDecoration(
                         color: ColorScheme.of(context).errorContainer,
                         borderRadius: BorderRadius.circular(4),
-                        border: Border.all(color: ColorScheme.of(context).outlineVariant, width: 0.6),
+                        border: Border.all(
+                            color: ColorScheme.of(context).outlineVariant,
+                            width: 0.6),
                       ),
                       child: const Center(
-                        child: Text("R18G",
-                          style: TextStyle(fontSize: 12),),
+                        child: Text(
+                          "R18G",
+                          style: TextStyle(fontSize: 12),
+                        ),
                       )),
                 ),
               Positioned(
@@ -196,31 +226,38 @@ class _IllustWidgetState extends State<IllustWidget> {
       builder: (context) {
         return MenuFlyout(
           items: [
-            MenuFlyoutItem(text: Text("View".tl), onPressed: (){
-              context.to(() => IllustPage(widget.illust));
-            }),
-            MenuFlyoutItem(text: Text("Private Favorite".tl), onPressed: (){
-              favorite("private");
-            }),
-            MenuFlyoutItem(text: Text("Download".tl), onPressed: (){
-              context.showToast(message: "Added");
-              DownloadManager().addDownloadingTask(widget.illust);
-            }),
+            MenuFlyoutItem(
+                text: Text("View".tl),
+                onPressed: () {
+                  context.to(() => IllustPage(widget.illust));
+                }),
+            MenuFlyoutItem(
+                text: Text("Private Favorite".tl),
+                onPressed: () {
+                  favorite("private");
+                }),
+            MenuFlyoutItem(
+                text: Text("Download".tl),
+                onPressed: () {
+                  context.showToast(message: "Added");
+                  DownloadManager().addDownloadingTask(widget.illust);
+                }),
           ],
         );
       },
     );
   }
 
-  void favorite([String type = "public"]) async{
-    if(isBookmarking) return;
+  void favorite([String type = "public"]) async {
+    if (isBookmarking) return;
     setState(() {
       isBookmarking = true;
     });
     var method = widget.illust.isBookmarked ? "delete" : "add";
-    var res = await Network().addBookmark(widget.illust.id.toString(), method, type);
-    if(res.error) {
-      if(mounted) {
+    var res =
+        await Network().addBookmark(widget.illust.id.toString(), method, type);
+    if (res.error) {
+      if (mounted) {
         context.showToast(message: "Network Error");
       }
     } else {
@@ -233,16 +270,18 @@ class _IllustWidgetState extends State<IllustWidget> {
 
   Widget buildButton() {
     Widget child;
-    if(isBookmarking) {
+    if (isBookmarking) {
       child = const SizedBox(
         width: 14,
         height: 14,
-        child: ProgressRing(strokeWidth: 1.6,),
+        child: ProgressRing(
+          strokeWidth: 1.6,
+        ),
       );
-    } else if(widget.illust.isBookmarked) {
+    } else if (widget.illust.isBookmarked) {
       child = Icon(
         MdIcons.favorite,
-        color: ColorScheme.of(context).error,
+        color: Colors.red,
         size: 22,
       );
     } else {

lib/components/keyboard.dart

@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:pixes/foundation/app.dart';
+
+typedef KeyEventHandler = void Function(LogicalKeyboardKey key);
+
+class KeyEventListener extends StatefulWidget {
+  const KeyEventListener({required this.child, super.key});
+
+  final Widget child;
+
+  static KeyEventListenerState? of(BuildContext context) {
+    return context.findAncestorStateOfType<KeyEventListenerState>();
+  }
+
+  @override
+  State<KeyEventListener> createState() => KeyEventListenerState();
+}
+
+class KeyEventListenerState extends State<KeyEventListener> {
+  final focusNode = FocusNode();
+
+  final List<KeyEventHandler> _handlers = [];
+
+  void addHandler(KeyEventHandler handler) {
+    _handlers.add(handler);
+  }
+
+  void removeHandler(KeyEventHandler handler) {
+    _handlers.remove(handler);
+  }
+
+  void removeAll() {
+    _handlers.clear();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Focus(
+      focusNode: focusNode,
+      autofocus: true,
+      onKeyEvent: (node, event) {
+        if (event is! KeyUpEvent) return KeyEventResult.ignored;
+        if (event.logicalKey == LogicalKeyboardKey.escape) {
+          if (App.rootNavigatorKey.currentState?.canPop() ?? false) {
+            App.rootNavigatorKey.currentState?.pop();
+          }
+          if (App.mainNavigatorKey?.currentState?.canPop() ?? false) {
+            App.mainNavigatorKey?.currentState?.pop();
+          }
+          return KeyEventResult.handled;
+        }
+        for (var handler in _handlers) {
+          handler(event.logicalKey);
+        }
+        return KeyEventResult.handled;
+      },
+      child: widget.child,
+    );
+  }
+}

lib/components/page_route.dart

@@ -328,11 +328,15 @@ class SideBarRoute<T> extends PopupRoute<T> {
             bottom: 0,
             child: Container(
               decoration: BoxDecoration(
-                color: FluentTheme.of(context).micaBackgroundColor.withOpacity(0.98),
-                borderRadius: const BorderRadius.only(topLeft: Radius.circular(4), bottomLeft: Radius.circular(4))
-              ),
-              constraints: BoxConstraints(maxWidth: min(_kSideBarWidth,
-                  MediaQuery.of(context).size.width)),
+                  color: FluentTheme.of(context)
+                      .micaBackgroundColor
+                      .withOpacity(0.98),
+                  borderRadius: const BorderRadius.only(
+                      topLeft: Radius.circular(4),
+                      bottomLeft: Radius.circular(4))),
+              constraints: BoxConstraints(
+                  maxWidth:
+                      min(_kSideBarWidth, MediaQuery.of(context).size.width)),
               width: double.infinity,
               child: child,
             ),

lib/foundation/app.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'dart:ui';
 
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:path_provider/path_provider.dart';
 
@@ -11,11 +12,13 @@ export "state_controller.dart";
 export "navigation.dart";
 
 class _App {
-  final version = "1.0.5";
+  final version = "1.0.6";
 
   bool get isAndroid => Platform.isAndroid;
   bool get isIOS => Platform.isIOS;
   bool get isWindows => Platform.isWindows;
+  int? _windowsVersion;
+  int get windowsVersion => _windowsVersion!;
   bool get isLinux => Platform.isLinux;
   bool get isMacOS => Platform.isMacOS;
   bool get isDesktop =>
@@ -23,8 +26,8 @@ class _App {
   bool get isMobile => Platform.isAndroid || Platform.isIOS;
 
   Locale get locale {
-    if(appdata.settings["language"] != "System"){
-      return switch(appdata.settings["language"]){
+    if (appdata.settings["language"] != "System") {
+      return switch (appdata.settings["language"]) {
         "English" => const Locale("en"),
         "简体中文" => const Locale("zh", "CN"),
         "繁體中文" => const Locale("zh", "TW"),
@@ -32,7 +35,8 @@ class _App {
       };
     }
     Locale deviceLocale = PlatformDispatcher.instance.locale;
-    if (deviceLocale.languageCode == "zh" && deviceLocale.scriptCode == "Hant") {
+    if (deviceLocale.languageCode == "zh" &&
+        deviceLocale.scriptCode == "Hant") {
       deviceLocale = const Locale("zh", "TW");
     }
     return deviceLocale;
@@ -41,9 +45,24 @@ class _App {
   late String dataPath;
   late String cachePath;
 
-  init() async{
+  init() async {
     cachePath = (await getApplicationCacheDirectory()).path;
     dataPath = (await getApplicationSupportDirectory()).path;
+    if (App.isWindows) {
+      final deviceInfoPlugin = DeviceInfoPlugin();
+      final deviceInfo = await deviceInfoPlugin.windowsInfo;
+      if (deviceInfo.majorVersion <= 6) {
+        if (deviceInfo.minorVersion < 2) {
+          _windowsVersion = 7;
+        } else {
+          _windowsVersion = 8;
+        }
+      } else if (deviceInfo.buildNumber < 22000) {
+        _windowsVersion = 10;
+      } else {
+        _windowsVersion = 11;
+      }
+    }
   }
 
   final rootNavigatorKey = GlobalKey<NavigatorState>();

lib/main.dart

@@ -2,9 +2,12 @@ import "dart:ui";
 
 import "package:dynamic_color/dynamic_color.dart";
 import "package:fluent_ui/fluent_ui.dart";
+import "package:flutter/foundation.dart";
 import "package:flutter/material.dart" as md;
 import "package:flutter/services.dart";
+import "package:flutter_acrylic/flutter_acrylic.dart" as flutter_acrylic;
 import "package:pixes/appdata.dart";
+import "package:pixes/components/keyboard.dart";
 import "package:pixes/components/md.dart";
 import "package:pixes/components/message.dart";
 import "package:pixes/foundation/app.dart";
@@ -28,6 +31,10 @@ void main() async {
   await Translation.init();
   handleLinks();
   if (App.isDesktop) {
+    await flutter_acrylic.Window.initialize();
+    if (App.isWindows) {
+      await flutter_acrylic.Window.hideWindowControls();
+    }
     await WindowManager.instance.ensureInitialized();
     windowManager.waitUntilReadyToShow().then((_) async {
       await windowManager.setTitleBarStyle(
@@ -51,6 +58,7 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    var windowsFont = kDebugMode ? "微软雅黑" : "font";
     return StateBuilder<SimpleController>(
         init: SimpleController(),
         tag: "MyApp",
@@ -83,7 +91,7 @@ class MyApp extends StatelessWidget {
                     title: 'pixes',
                     theme: FluentThemeData(
                         brightness: brightness,
-                        fontFamily: App.isWindows ? 'font' : null,
+                        fontFamily: App.isWindows ? windowsFont : null,
                         accentColor: AccentColor.swatch({
                           'darkest': darken(colorScheme.primary, 30),
                           'darker': darken(colorScheme.primary, 20),
@@ -92,7 +100,11 @@ class MyApp extends StatelessWidget {
                           'light': lighten(colorScheme.primary, 10),
                           'lighter': lighten(colorScheme.primary, 20),
                           'lightest': lighten(colorScheme.primary, 30)
-                        })),
+                        }),
+                        focusTheme: const FocusThemeData(
+                          primaryBorder: BorderSide.none,
+                          secondaryBorder: BorderSide.none,
+                        )),
                     home: const MainPage(),
                     builder: (context, child) {
                       ErrorWidget.builder = (details) {
@@ -109,7 +121,7 @@ class MyApp extends StatelessWidget {
                         throw "widget is null";
                       }
 
-                      return MdTheme(
+                      Widget widget = MdTheme(
                         data: MdThemeData.from(
                             colorScheme: colorScheme, useMaterial3: true),
                         child: DefaultTextStyle.merge(
@@ -119,6 +131,36 @@ class MyApp extends StatelessWidget {
                           child: OverlayWidget(child),
                         ),
                       );
+
+                      if (App.isWindows) {
+                        if (App.windowsVersion == 11) {
+                          flutter_acrylic.Window.setEffect(
+                              effect: flutter_acrylic.WindowEffect.mica,
+                              dark: FluentTheme.of(context).brightness ==
+                                  Brightness.dark);
+                          widget = NavigationPaneTheme(
+                            data: const NavigationPaneThemeData(
+                              backgroundColor: Colors.transparent,
+                            ),
+                            child: widget,
+                          );
+                        } else if (App.windowsVersion == 10) {
+                          flutter_acrylic.Window.setEffect(
+                              effect: flutter_acrylic.WindowEffect.acrylic,
+                              dark: FluentTheme.of(context).brightness ==
+                                  Brightness.dark);
+                          widget = NavigationPaneTheme(
+                            data: NavigationPaneThemeData(
+                              backgroundColor: FluentTheme.of(context)
+                                  .micaBackgroundColor
+                                  .withOpacity(0.72),
+                            ),
+                            child: widget,
+                          );
+                        }
+                      }
+
+                      return KeyEventListener(child: widget);
                     });
               },
             ),

lib/pages/illust_page.dart

@@ -7,6 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:pixes/appdata.dart';
 import 'package:pixes/components/animated_image.dart';
+import 'package:pixes/components/keyboard.dart';
 import 'package:pixes/components/loading.dart';
 import 'package:pixes/components/message.dart';
 import 'package:pixes/components/page_route.dart';
@@ -154,8 +155,15 @@ class IllustPage extends StatefulWidget {
 class _IllustPageState extends State<IllustPage> {
   String get id => "${widget.illust.author.id}#${widget.illust.id}";
 
+  final _bottomBarController = _BottomBarController();
+
+  KeyEventListenerState? keyboardListener;
+
   @override
   void initState() {
+    keyboardListener = KeyEventListener.of(context);
+    keyboardListener?.removeAll();
+    keyboardListener?.addHandler(handleKey);
     IllustPage.followCallbacks[id] = (v) {
       setState(() {
         widget.illust.author.isFollowed = v;
@@ -166,6 +174,7 @@ class _IllustPageState extends State<IllustPage> {
 
   @override
   void dispose() {
+    keyboardListener?.removeHandler(handleKey);
     IllustPage.followCallbacks.remove(id);
     super.dispose();
   }
@@ -173,7 +182,7 @@ class _IllustPageState extends State<IllustPage> {
   @override
   Widget build(BuildContext context) {
     var isBlocked = checkIllusts([widget.illust]).isEmpty;
-    return buildKeyboardListener(ColoredBox(
+    return ColoredBox(
       color: FluentTheme.of(context).micaBackgroundColor,
       child: SizedBox.expand(
         child: ColoredBox(
@@ -195,6 +204,7 @@ class _IllustPageState extends State<IllustPage> {
                     constrains.maxHeight,
                     constrains.maxWidth,
                     updateCallback: () => setState(() {}),
+                    controller: _bottomBarController,
                   ),
                 if (isBlocked)
                   const Positioned.fill(
@@ -209,36 +219,53 @@ class _IllustPageState extends State<IllustPage> {
           }),
         ),
       ),
-    ));
+    );
   }
 
   final scrollController = ScrollController();
 
-  Widget buildKeyboardListener(Widget child) {
-    return KeyboardListener(
-      focusNode: FocusNode(),
-      autofocus: true,
-      onKeyEvent: (event) {
-        if (event is! KeyUpEvent) return;
-        const kShortcutScrollOffset = 200;
-        if (event.logicalKey == LogicalKeyboardKey.arrowDown) {
+  void handleKey(LogicalKeyboardKey key) {
+    const kShortcutScrollOffset = 200;
+
+    var shortcuts = appdata.settings["shortcuts"] as List;
+
+    switch (shortcuts.indexOf(key.keyId)) {
+      case 0:
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent) {
+          _bottomBarController.openOrClose();
+        } else {
           scrollController.animateTo(
-              scrollController.offset + kShortcutScrollOffset,
-              duration: const Duration(milliseconds: 200),
-              curve: Curves.easeOut);
-        } else if (event.logicalKey == LogicalKeyboardKey.arrowUp) {
-          scrollController.animateTo(
-              scrollController.offset - kShortcutScrollOffset,
-              duration: const Duration(milliseconds: 200),
-              curve: Curves.easeOut);
-        } else if (event.logicalKey == LogicalKeyboardKey.arrowRight) {
-          widget.nextPage?.call();
-        } else if (event.logicalKey == LogicalKeyboardKey.arrowLeft) {
-          widget.previousPage?.call();
+            scrollController.offset + kShortcutScrollOffset,
+            duration: const Duration(milliseconds: 200),
+            curve: Curves.easeOut,
+          );
         }
-      },
-      child: child,
-    );
+        break;
+      case 1:
+        if (_bottomBarController.isOpen()) {
+          _bottomBarController.openOrClose();
+          break;
+        }
+        scrollController.animateTo(
+          scrollController.offset - kShortcutScrollOffset,
+          duration: const Duration(milliseconds: 200),
+          curve: Curves.easeOut,
+        );
+        break;
+      case 2:
+        widget.nextPage?.call();
+        break;
+      case 3:
+        widget.previousPage?.call();
+        break;
+      case 4:
+        _bottomBarController.favorite();
+      case 5:
+        _bottomBarController.download();
+      case 6:
+        _bottomBarController.follow();
+    }
   }
 
   Widget buildBody(double width, double height) {
@@ -291,6 +318,10 @@ class _IllustPageState extends State<IllustPage> {
     }
     Widget image;
 
+    var imageUrl = appdata.settings["showOriginalImage"]
+        ? widget.illust.images[index].original
+        : widget.illust.images[index].large;
+
     if (!widget.illust.isUgoira) {
       image = SizedBox(
         width: imageWidth,
@@ -300,8 +331,7 @@ class _IllustPageState extends State<IllustPage> {
           child: Image(
               key: ValueKey(index),
               image: downloadFile == null
-                  ? CachedImageProvider(widget.illust.images[index].large)
-                      as ImageProvider
+                  ? CachedImageProvider(imageUrl) as ImageProvider
                   : FileImage(downloadFile) as ImageProvider,
               width: imageWidth,
               fit: BoxFit.cover,
@@ -344,8 +374,31 @@ class _IllustPageState extends State<IllustPage> {
   }
 }
 
+class _BottomBarController {
+  VoidCallback? _openOrClose;
+
+  VoidCallback get openOrClose => _openOrClose!;
+
+  bool Function()? _isOpen;
+
+  bool isOpen() => _isOpen!();
+
+  VoidCallback? _favorite;
+
+  VoidCallback get favorite => _favorite!;
+
+  VoidCallback? _download;
+
+  VoidCallback get download => _download!;
+
+  VoidCallback? _follow;
+
+  VoidCallback get follow => _follow!;
+}
+
 class _BottomBar extends StatefulWidget {
-  const _BottomBar(this.illust, this.height, this.width, {this.updateCallback});
+  const _BottomBar(this.illust, this.height, this.width,
+      {this.updateCallback, this.controller});
 
   final void Function()? updateCallback;
 
@@ -355,6 +408,8 @@ class _BottomBar extends StatefulWidget {
 
   final double width;
 
+  final _BottomBarController? controller;
+
   @override
   State<_BottomBar> createState() => _BottomBarState();
 }
@@ -391,9 +446,32 @@ class _BottomBarState extends State<_BottomBar> with TickerProviderStateMixin {
       ..onCancel = _handlePointerCancel;
     animationController = AnimationController(
         vsync: this, duration: const Duration(milliseconds: 180), value: 1);
+    if (widget.controller != null) {
+      widget.controller!._openOrClose = () {
+        if (animationController.value == 0) {
+          animationController.animateTo(1);
+        } else if (animationController.value == 1) {
+          animationController.animateTo(0);
+        }
+      };
+      widget.controller!._isOpen = () => animationController.value == 0;
+      widget.controller!._favorite = favorite;
+      widget.controller!._download = () {
+        DownloadManager().addDownloadingTask(widget.illust);
+        setState(() {});
+      };
+      widget.controller!._follow = follow;
+    }
     super.initState();
   }
 
+  @override
+  void dispose() {
+    animationController.dispose();
+    _recognizer.dispose();
+    super.dispose();
+  }
+
   void _handlePointerDown(DragStartDetails details) {}
   void _handlePointerMove(DragUpdateDetails details) {
     var offset = details.primaryDelta ?? 0;
@@ -541,31 +619,31 @@ class _BottomBarState extends State<_BottomBar> with TickerProviderStateMixin {
 
   bool isFollowing = false;
 
-  Widget buildAuthor() {
-    void follow() async {
-      if (isFollowing) return;
-      setState(() {
-        isFollowing = true;
-      });
-      var method = widget.illust.author.isFollowed ? "delete" : "add";
-      var res =
-          await Network().follow(widget.illust.author.id.toString(), method);
-      if (res.error) {
-        if (mounted) {
-          context.showToast(message: "Network Error");
-        }
-      } else {
-        widget.illust.author.isFollowed = !widget.illust.author.isFollowed;
+  void follow() async {
+    if (isFollowing) return;
+    setState(() {
+      isFollowing = true;
+    });
+    var method = widget.illust.author.isFollowed ? "delete" : "add";
+    var res =
+        await Network().follow(widget.illust.author.id.toString(), method);
+    if (res.error) {
+      if (mounted) {
+        context.showToast(message: "Network Error");
       }
-      setState(() {
-        isFollowing = false;
-      });
-      UserInfoPage.followCallbacks[widget.illust.author.id.toString()]
-          ?.call(widget.illust.author.isFollowed);
-      UserPreviewWidget.followCallbacks[widget.illust.author.id.toString()]
-          ?.call(widget.illust.author.isFollowed);
+    } else {
+      widget.illust.author.isFollowed = !widget.illust.author.isFollowed;
     }
+    setState(() {
+      isFollowing = false;
+    });
+    UserInfoPage.followCallbacks[widget.illust.author.id.toString()]
+        ?.call(widget.illust.author.isFollowed);
+    UserPreviewWidget.followCallbacks[widget.illust.author.id.toString()]
+        ?.call(widget.illust.author.isFollowed);
+  }
 
+  Widget buildAuthor() {
     final bool showUserName = MediaQuery.of(context).size.width > 640;
 
     return Card(

lib/pages/image_page.dart

@@ -201,35 +201,37 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
                     ),
                   ),
                 ),
-                Positioned(
-                  left: 0,
-                  top: height / 2 - 9,
-                  child: IconButton(
-                    icon: const Icon(
-                      FluentIcons.chevron_left,
-                      size: 18,
-                    ),
-                    onPressed: () {
-                      controller.previousPage(
-                        duration: const Duration(milliseconds: 300),
-                        curve: Curves.easeInOut,
-                      );
-                    },
-                  ).paddingAll(8),
-                ),
-                Positioned(
-                  right: 0,
-                  top: height / 2 - 9,
-                  child: IconButton(
-                    icon: const Icon(FluentIcons.chevron_right, size: 18),
-                    onPressed: () {
-                      controller.nextPage(
-                        duration: const Duration(milliseconds: 300),
-                        curve: Curves.easeInOut,
-                      );
-                    },
-                  ).paddingAll(8),
-                ),
+                if (currentPage != 0)
+                  Positioned(
+                    left: 0,
+                    top: height / 2 - 9,
+                    child: IconButton(
+                      icon: const Icon(
+                        FluentIcons.chevron_left,
+                        size: 18,
+                      ),
+                      onPressed: () {
+                        controller.previousPage(
+                          duration: const Duration(milliseconds: 300),
+                          curve: Curves.easeInOut,
+                        );
+                      },
+                    ).paddingAll(8),
+                  ),
+                if (currentPage != widget.urls.length - 1)
+                  Positioned(
+                    right: 0,
+                    top: height / 2 - 9,
+                    child: IconButton(
+                      icon: const Icon(FluentIcons.chevron_right, size: 18),
+                      onPressed: () {
+                        controller.nextPage(
+                          duration: const Duration(milliseconds: 300),
+                          curve: Curves.easeInOut,
+                        );
+                      },
+                    ).paddingAll(8),
+                  ),
                 Positioned(
                   left: 12,
                   bottom: 8,
@@ -252,16 +254,16 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
       child: width > 600
           ? Button(
               onPressed: showMenu,
-              child: const Row(
+              child: Row(
                 children: [
-                  Icon(
+                  const Icon(
                     MdIcons.menu,
                     size: 18,
                   ),
-                  SizedBox(
+                  const SizedBox(
                     width: 8,
                   ),
-                  Text('Actions'),
+                  Text('Actions'.tl),
                 ],
               ))
           : IconButton(

lib/pages/main_page.dart

@@ -151,7 +151,9 @@ class _MainPageState extends State<MainPage> with WindowListener {
               ),
               PaneItemSeparator(),
               PaneItemHeader(
-                  header: Text("Artwork".tl).paddingBottom(4).paddingLeft(8)),
+                  header: Text('${"Artwork".tl}/${"Manga".tl}')
+                      .paddingBottom(4)
+                      .paddingLeft(8)),
               PaneItem(
                 icon: const Icon(
                   MdIcons.explore_outlined,
@@ -269,11 +271,17 @@ class _MainPageState extends State<MainPage> with WindowListener {
                     if (!App.isDesktop) const Spacer(),
                     if (App.isDesktop)
                       const Expanded(
-                        child: DragToMoveArea(
+                        child: SizedBox(
+                          height: double.infinity,
+                          child: DragToMoveArea(
+                              child: Align(
+                            alignment: Alignment.centerLeft,
                             child: Text(
-                          "Pixes",
-                          style: TextStyle(fontSize: 13),
-                        )),
+                              "Pixes",
+                              style: TextStyle(fontSize: 13),
+                            ),
+                          )),
+                        ),
                       ),
                     for (var action in controller.actions)
                       Button(

lib/pages/novel_reading_page.dart

@@ -29,7 +29,7 @@ class _NovelReadingPageState extends LoadingState<NovelReadingPage, String> {
 
   @override
   void initState() {
-    action = TitleBarAction(MdIcons.tune, "Settings", () {
+    action = TitleBarAction(MdIcons.tune, "Settings".tl, () {
       if (!isShowingSettings) {
         _NovelReadingSettings.show(context, () {
           setState(() {});
@@ -138,7 +138,8 @@ class _NovelReadingSettings extends StatefulWidget {
   final void Function() callback;
 
   static Future show(BuildContext context, void Function() callback) {
-    return Navigator.of(context).push(SideBarRoute(_NovelReadingSettings(callback)));
+    return Navigator.of(context)
+        .push(SideBarRoute(_NovelReadingSettings(callback)));
   }
 
   @override

lib/pages/search_page.dart

@@ -10,7 +10,9 @@ import 'package:pixes/network/network.dart';
 import 'package:pixes/pages/illust_page.dart';
 import 'package:pixes/pages/novel_page.dart';
 import 'package:pixes/pages/user_info_page.dart';
+import 'package:pixes/utils/app_links.dart';
 import 'package:pixes/utils/block.dart';
+import 'package:pixes/utils/ext.dart';
 import 'package:pixes/utils/translation.dart';
 
 import '../components/animated_image.dart';
@@ -41,6 +43,12 @@ class _SearchPageState extends State<SearchPage> {
   ];
 
   void search() {
+    if (text.isURL && handleLink(Uri.parse(text))) {
+      return;
+    } else if ("https://$text".isURL &&
+        handleLink(Uri.parse("https://$text"))) {
+      return;
+    }
     switch (searchType) {
       case 0:
         context.to(() => SearchResultPage(text));
@@ -92,7 +100,8 @@ class _SearchPageState extends State<SearchPage> {
                 children: [
                   Expanded(
                     child: TextBox(
-                      placeholder: searchTypes[searchType].tl,
+                      placeholder:
+                          '${searchTypes[searchType].tl} / ${"Open link".tl}',
                       onChanged: (s) => text = s,
                       onSubmitted: (s) => search(),
                       foregroundDecoration: BoxDecoration(
@@ -127,9 +136,9 @@ class _SearchPageState extends State<SearchPage> {
                       ),
                       onPressed: () {
                         optionController.showFlyout(
-                          placementMode: FlyoutPlacementMode.bottomCenter,
-                          builder: buildSearchOption,
-                        );
+                            placementMode: FlyoutPlacementMode.bottomCenter,
+                            builder: buildSearchOption,
+                            barrierColor: Colors.transparent);
                       },
                     ),
                   ),

lib/pages/settings_page.dart

@@ -1,7 +1,9 @@
 import 'dart:io';
 
 import 'package:fluent_ui/fluent_ui.dart';
+import 'package:flutter/services.dart';
 import 'package:pixes/appdata.dart';
+import 'package:pixes/components/keyboard.dart';
 import 'package:pixes/components/md.dart';
 import 'package:pixes/components/message.dart';
 import 'package:pixes/components/page_route.dart';
@@ -242,6 +244,24 @@ class _SettingsPageState extends State<SettingsPage> {
                   context.to(() => const _BlockTagsPage());
                 },
               )),
+          buildItem(
+              title: "Shortcuts".tl,
+              action: Button(
+                child: Text("Edit".tl).fixWidth(64),
+                onPressed: () {
+                  context.to(() => const ShortcutsSettings());
+                },
+              )),
+          buildItem(
+              title: "Display the original image on the details page".tl,
+              action: ToggleSwitch(
+                  checked: appdata.settings['showOriginalImage'],
+                  onChanged: (value) {
+                    setState(() {
+                      appdata.settings['showOriginalImage'] = value;
+                    });
+                    appdata.writeData();
+                  })),
         ],
       ),
     );
@@ -538,3 +558,81 @@ class __BlockTagsPageState extends State<_BlockTagsPage> {
     );
   }
 }
+
+class ShortcutsSettings extends StatefulWidget {
+  const ShortcutsSettings({super.key});
+
+  @override
+  State<ShortcutsSettings> createState() => _ShortcutsSettingsState();
+}
+
+class _ShortcutsSettingsState extends State<ShortcutsSettings> {
+  int listening = -1;
+
+  KeyEventListenerState? listener;
+
+  @override
+  void initState() {
+    listener = KeyEventListener.of(context);
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    listener?.removeAll();
+    super.dispose();
+  }
+
+  final settings = <String>[
+    "Page down",
+    "Page up",
+    "Next work",
+    "Previous work",
+    "Add to favorites",
+    "Download",
+    "Follow the artist",
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(children: [
+        TitleBar(title: "Shortcuts".tl),
+        ...settings.map((e) => buildItem(e, settings.indexOf(e)))
+      ]),
+    );
+  }
+
+  Widget buildItem(String text, int index) {
+    var keyText = listening == index
+        ? "Waiting..."
+        : LogicalKeyboardKey(appdata.settings['shortcuts'][index]).keyLabel;
+    return Card(
+      padding: EdgeInsets.zero,
+      margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
+      child: ListTile(
+        title: Text(text.tl),
+        trailing: Button(
+          child: Text(keyText),
+          onPressed: () {
+            if (listening != -1) {
+              listener?.removeAll();
+            }
+            setState(() {
+              listening = index;
+            });
+            listener?.addHandler((key) {
+              if (key == LogicalKeyboardKey.escape) return;
+              setState(() {
+                appdata.settings['shortcuts'][index] = key.keyId;
+                listening = -1;
+                appdata.writeData();
+              });
+              Future.microtask(() => listener?.removeAll());
+            });
+          },
+        ),
+      ),
+    );
+  }
+}

lib/pages/user_info_page.dart

@@ -545,7 +545,8 @@ class _RelatedUsersState
               hoveringMainAxisMargin: 4),
           child: content);
     }
-    return content;
+    return MediaQuery.removePadding(
+        context: context, removeBottom: true, child: content);
   }
 
   @override

lib/utils/app_links.dart

@@ -5,7 +5,9 @@ import 'package:pixes/foundation/app.dart';
 import 'package:pixes/foundation/log.dart';
 import 'package:pixes/pages/illust_page.dart';
 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:win32_registry/win32_registry.dart';
 
 Future<void> _register(String scheme) async {
@@ -31,11 +33,17 @@ Future<void> _register(String scheme) async {
 
 bool Function(Uri uri)? onLink;
 
+bool _firstLink = true;
+
 void handleLinks() async {
   if (App.isWindows) {
     await _register("pixiv");
   }
-  AppLinks().uriLinkStream.listen((uri) {
+  AppLinks().uriLinkStream.listen((uri) async {
+    if (_firstLink) {
+      await Future.delayed(const Duration(milliseconds: 200));
+    }
+    _firstLink = false;
     Log.info("App Link", uri.toString());
     if (onLink?.call(uri) == true) {
       return;
@@ -70,6 +78,33 @@ bool handleLink(Uri uri) {
         }
     }
     return false;
+  } else if (uri.scheme == "https") {
+    var path = uri.toString().split("/").sublist(3);
+    switch (path[0]) {
+      case "users":
+        if (path.length >= 2) {
+          App.mainNavigatorKey?.currentContext?.to(() => UserInfoPage(path[1]));
+          return true;
+        }
+      case "novel":
+        if (path.length == 2) {
+          App.mainNavigatorKey?.currentContext
+              ?.to(() => NovelPageWithId(path[1].nums));
+          return true;
+        }
+      case "artworks":
+        if (path.length == 2) {
+          App.mainNavigatorKey?.currentContext
+              ?.to(() => IllustPageWithId(path[1]));
+          return true;
+        }
+      case "tags":
+        if (path.length == 2) {
+          App.mainNavigatorKey?.currentContext
+              ?.to(() => SearchResultPage(path[1]));
+          return true;
+        }
+    }
   }
   return false;
 }

lib/utils/window.dart

@@ -15,6 +15,10 @@ class WindowPlacement {
   Future<void> applyToWindow() async {
     await windowManager.setBounds(rect);
 
+    if(!validate(rect)){
+      await windowManager.center();
+    }
+
     if (isMaximized) {
       await windowManager.maximize();
     }
@@ -55,10 +59,17 @@ class WindowPlacement {
 
   static void loop() async {
     var placement = await WindowPlacement.current;
+    if(!validate(placement.rect)){
+      return;
+    }
     if (placement.rect != cache.rect ||
         placement.isMaximized != cache.isMaximized) {
       cache = placement;
       await placement.writeToFile();
     }
   }
+
+  static bool validate(Rect rect){
+    return rect.topLeft.dx >= 0 && rect.topLeft.dy >= 0;
+  }
 }

macos/Podfile

@@ -0,0 +1,46 @@
+platform :osx, '10.14.6'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+#  target 'RunnerTests' do
+#    inherit! :search_paths
+#  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.14.6'
+    end
+  end
+end

macos/Runner.xcodeproj/project.pbxproj

@@ -461,7 +461,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.14.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -543,7 +543,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.14.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -593,7 +593,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.14.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;

pubspec.lock

@@ -73,6 +73,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
+  device_info_plus:
+    dependency: "direct main"
+    description:
+      name: device_info_plus
+      sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.1.0"
+  device_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: device_info_plus_platform_interface
+      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   dio:
     dependency: "direct main"
     description:
@@ -81,6 +97,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.4.3+1"
+  dynamic_color:
+    dependency: "direct main"
+    description:
+      name: dynamic_color
+      sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.7.0"
   fake_async:
     dependency: transitive
     description:
@@ -190,6 +214,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_acrylic:
+    dependency: "direct main"
+    description:
+      name: flutter_acrylic
+      sha256: a9a1fdf91ff1fb47858fd82507f57e255a132a5d355056694fdb9fd303633b18
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
   flutter_file_dialog:
     dependency: "direct main"
     description:
@@ -293,6 +325,14 @@ 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:
@@ -515,22 +555,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
-  system_theme:
-    dependency: "direct main"
-    description:
-      name: system_theme
-      sha256: "1f208db140a3d1e1eac2034b54920d95699c1534df576ced44b3312c5de3975f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.1"
-  system_theme_web:
-    dependency: transitive
-    description:
-      name: system_theme_web
-      sha256: "7566f5a928f6d28d7a60c97bea8a851d1c6bc9b86a4df2366230a97458489219"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.2"
   term_glyph:
     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.5+105
+version: 1.0.6+106
 
 environment:
   sdk: '>=3.3.4 <4.0.0'
@@ -56,6 +56,8 @@ dependencies:
   flutter_file_dialog: 3.0.1
   archive: ^3.5.1
   webview_flutter: ^4.7.0
+  flutter_acrylic: 1.0.0+2
+  device_info_plus: ^10.1.0
 dev_dependencies:
   flutter_test:
     sdk: flutter

windows/build.iss

@@ -52,6 +52,7 @@ Source: "{#RootPath}\build\windows\x64\runner\Release\sqlite3.dll"; DestDir: "{a
 Source: "{#RootPath}\build\windows\x64\runner\Release\sqlite3_flutter_libs_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\url_launcher_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\window_manager_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#RootPath}\build\windows\x64\runner\Release\flutter_acrylic_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files