Compare commits
84 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
eee1141970 | ||
![]() |
50a69f77b6 | ||
![]() |
790ed54d5b | ||
![]() |
21fe14f88b | ||
![]() |
a03ad12837 | ||
![]() |
426257716f | ||
![]() |
67e01ea69f | ||
![]() |
6cf9ce9c96 | ||
![]() |
593899af8c | ||
![]() |
908c26d764 | ||
![]() |
eef1af3ad1 | ||
![]() |
b97c7cde25 | ||
![]() |
6118fc30f8 | ||
![]() |
4476ad7f90 | ||
![]() |
7c8fabf52c | ||
![]() |
70da478044 | ||
![]() |
b14c2682a7 | ||
![]() |
54b64fb19b | ||
![]() |
d247455c19 | ||
![]() |
759d6959b5 | ||
![]() |
488be5fb1a | ||
![]() |
62b50c466e | ||
![]() |
49da2b772b | ||
![]() |
4dc1ec8784 | ||
![]() |
1fad3694cf | ||
![]() |
39eb5c836e | ||
![]() |
9603706fc6 | ||
![]() |
343e993627 | ||
![]() |
246f96bdbf | ||
![]() |
61c6ed0e1b | ||
![]() |
fd63b02b60 | ||
![]() |
9275024050 | ||
![]() |
5e53c57755 | ||
![]() |
6a95fb37ed | ||
![]() |
20829e1ad5 | ||
![]() |
cb356dbf71 | ||
![]() |
9ad6207bd5 | ||
![]() |
676e7508c7 | ||
![]() |
1652a93772 | ||
![]() |
e6d015a2bc | ||
![]() |
35dd9dee5f | ||
![]() |
b34a8342d2 | ||
![]() |
0ed17edd3e | ||
![]() |
187e5f9a09 | ||
![]() |
9505b78ae4 | ||
![]() |
1d49f1c387 | ||
![]() |
7641cc8f5c | ||
![]() |
de26cba0fa | ||
![]() |
471b319891 | ||
![]() |
1a224114fc | ||
![]() |
5ae73bd7c8 | ||
![]() |
013e509ebf | ||
![]() |
974e2f0cc6 | ||
![]() |
1d649ebde2 | ||
![]() |
dd1ed690e1 | ||
![]() |
f33df47cd6 | ||
![]() |
c51df1efde | ||
![]() |
93ce4eb94b | ||
![]() |
a3868b1969 | ||
![]() |
2a1a668c25 | ||
![]() |
b0d740a174 | ||
![]() |
811b7b4ed8 | ||
![]() |
1fecb8d55d | ||
![]() |
67ebe4e50b | ||
![]() |
a9bddd7def | ||
![]() |
4b8acfc3ff | ||
![]() |
38f57584b6 | ||
![]() |
8ff269c8a8 | ||
![]() |
dde518ab6b | ||
![]() |
bfad0dc176 | ||
![]() |
ed9213b12e | ||
![]() |
6d4a6fad08 | ||
![]() |
6edf93beb5 | ||
![]() |
b6c4b6da5a | ||
![]() |
a8ebebfedd | ||
![]() |
8c57dd30fb | ||
![]() |
6e7e029a0d | ||
![]() |
872a2e13cf | ||
![]() |
2f72437fc1 | ||
![]() |
efd5683529 | ||
![]() |
ae0be5a97d | ||
![]() |
1698928212 | ||
![]() |
945d386d17 | ||
![]() |
2f0b1b9554 |
23
.github/workflows/linux.yml
vendored
Normal file
@@ -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
|
||||
|
15
.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"cSpell.words": [
|
||||
"appdata",
|
||||
"Bungo",
|
||||
"gjzr",
|
||||
"microtask",
|
||||
"mypixiv",
|
||||
"pawoo",
|
||||
"Rorigod",
|
||||
"sleepinglife",
|
||||
"Ugoira",
|
||||
"vocaloidhm",
|
||||
"vsync"
|
||||
]
|
||||
}
|
21
LICENSE
Normal file
@@ -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.
|
51
README.md
@@ -1,5 +1,52 @@
|
||||
# pixes
|
||||
|
||||
Unofficial pixiv app
|
||||
[](https://flutter.dev/)
|
||||
[](https://github.com/wgh136/pixes/blob/master/LICENSE)
|
||||
[](https://github.com/wgh136/pixes)
|
||||
[](https://github.com/wgh136/pixes/stargazers)
|
||||
[](https://t.me/pica_group)
|
||||
|
||||
This project is under development.
|
||||
非官方 Pixiv app, 支持 Windows, Android, iOS, macOS, linux
|
||||
|
||||
主要功能均已实现
|
||||
|
||||
## 下载
|
||||
|
||||
在 [Release](https://github.com/wgh136/pixes/releases) 页面下载
|
||||
|
||||
## 从源代码构建
|
||||
|
||||
### 准备工作
|
||||
|
||||
安装Stable版的Flutter
|
||||
|
||||
### 构建Android
|
||||
|
||||
将你的证书文件(`key.jks`, `key.properties`)放在`android`目录下
|
||||
|
||||
执行`flutter build apk`构建apk
|
||||
|
||||
### 构建iOS
|
||||
|
||||
执行`flutter build ios`构建iOS程序
|
||||
|
||||
### 构建Windows
|
||||
|
||||
执行`python windows/build_windows.py`构建Windows程序
|
||||
|
||||
### 构建macOS
|
||||
|
||||
执行`flutter build macos`构建macOS程序
|
||||
|
||||
### 构建Linux
|
||||
|
||||
执行`python3 debian/build.py`构建deb包
|
||||
|
||||
如果你使用其他发行版, 请注意`.desktop`文件中需要注册 URI Scheme `pixiv`
|
||||
|
||||
## 屏幕截图
|
||||
|
||||
<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">
|
@@ -5,6 +5,7 @@
|
||||
<application
|
||||
android:label="pixes"
|
||||
android:name="${applicationName}"
|
||||
android:enableOnBackInvokedCallback="true"
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
@@ -33,6 +34,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 -->
|
||||
|
162
assets/tr.json
@@ -3,7 +3,7 @@
|
||||
"Search": "搜索",
|
||||
"Downloading": "下载中",
|
||||
"Downloaded": "已下载",
|
||||
"Artwork": "作品",
|
||||
"Artwork": "插画",
|
||||
"Explore": "探索",
|
||||
"Bookmarks": "收藏",
|
||||
"Following": "关注",
|
||||
@@ -64,9 +64,9 @@
|
||||
"Weekly Manga": "每周漫画",
|
||||
"Monthly Manga": "每月漫画",
|
||||
"R18": "R18",
|
||||
"Account": "账户",
|
||||
"Account": "账号",
|
||||
"Logout": "登出",
|
||||
"Account Settings": "账户设置",
|
||||
"Account Settings": "账号设置",
|
||||
"Edit": "编辑",
|
||||
"Download": "下载",
|
||||
"Manage": "管理",
|
||||
@@ -106,7 +106,83 @@
|
||||
"Popular(Female)": "热门(女性向)",
|
||||
"Start Time": "开始时间",
|
||||
"End Time": "结束时间",
|
||||
"Max parallels": "最大并行数"
|
||||
"Max parallels": "最大并行数",
|
||||
"Replace with 'AI' if the work was generated by AI, otherwise replace with blank": "替换为'AI'如果作品是由AI生成的, 否则替换为空白",
|
||||
"Replace with * if the work have tag *, otherwise replace with blank.": "替换为*如果作品包含标签*, 否则替换为空白",
|
||||
"Multiple path separators will be automatically replaced with a single": "多个路径分隔符将被自动替换为单个",
|
||||
"Login": "登录",
|
||||
"You need to complete the login operation in the browser window that will open.": "您需要在打开的浏览器窗口中完成登录操作",
|
||||
"Waiting..." : "等待中...",
|
||||
"Waiting for authentication. Please finished in the browser." : "等待验证. 请在浏览器中完成.",
|
||||
"Back" : "返回",
|
||||
"Logging in" : "登录中",
|
||||
"Browse": "浏览",
|
||||
"Proxy": "代理",
|
||||
"Appearance": "外观",
|
||||
"Language": "语言",
|
||||
"Theme": "主题",
|
||||
"Pause": "暂停",
|
||||
"Resume": "继续",
|
||||
"Paused": "已暂停",
|
||||
"Delete all": "删除全部",
|
||||
"Related": "相关",
|
||||
"Related artworks": "相关作品",
|
||||
"Related users": "相关用户",
|
||||
"Replace with '-p${index}' if the work have more than one images, otherwise replace with blank.": "替换为'-p${index}'如果作品有多张图片, 否则替换为空白",
|
||||
"Recommendation": "推荐",
|
||||
"Novel": "小说",
|
||||
"Novels": "小说",
|
||||
"Reading Settings": "阅读设置",
|
||||
"Font Size": "字体大小",
|
||||
"Line Height": "行高",
|
||||
"Paragraph Spacing": "段间距",
|
||||
"light": "浅色",
|
||||
"dark": "深色",
|
||||
"block": "屏蔽",
|
||||
"Block": "屏蔽",
|
||||
"Block(Account)": "屏蔽(账号)",
|
||||
"Block(Local)": "屏蔽(本地)",
|
||||
"Add": "添加",
|
||||
"Submit": "提交",
|
||||
"Local": "本地",
|
||||
"Both": "同时",
|
||||
"This artwork is blocked": "此作品已被屏蔽",
|
||||
"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": "阅读",
|
||||
"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": "显示原图",
|
||||
"Illustrations": "插画",
|
||||
"New version available": "新版本可用",
|
||||
"A new version of Pixes is available. Do you want to update now?" : "Pixes有新版本可用. 您要立即更新吗?",
|
||||
"Update": "更新",
|
||||
"Check for updates": "检查更新",
|
||||
"Check for updates on startup": "启动时检查更新",
|
||||
"I understand pixes is a free unofficial application.": "我了解Pixes是一个免费的非官方应用程序",
|
||||
"Related Artworks": "相关作品",
|
||||
"Emphasize artworks from following artists": "强调关注画师的作品",
|
||||
"The border of the artworks will be darker": "作品的边框将被加深"
|
||||
},
|
||||
"zh_TW": {
|
||||
"Search": "搜索",
|
||||
@@ -215,6 +291,82 @@
|
||||
"Popular(Female)": "熱門(女性)",
|
||||
"Start Time": "開始時間",
|
||||
"End Time": "結束時間",
|
||||
"Max parallels": "最大並行數"
|
||||
"Max parallels": "最大並行數",
|
||||
"Replace with 'AI' if the work was generated by AI, otherwise replace with blank": "替換為'AI'如果作品是由AI生成的, 否則替換為空白",
|
||||
"Replace with * if the work have tag *, otherwise replace with blank.": "替換為*如果作品包含標籤*, 否則替換為空白",
|
||||
"Multiple path separators will be automatically replaced with a single": "多個路徑分隔符號將自動替換為單一",
|
||||
"Login": "登錄",
|
||||
"You need to complete the login operation in the browser window that will open.": "您需要在打開的瀏覽器窗口中完成登錄操作",
|
||||
"Waiting..." : "等待中...",
|
||||
"Waiting for authentication. Please finished in the browser." : "等待驗證. 請在瀏覽器中完成.",
|
||||
"Back" : "返回",
|
||||
"Logging in" : "登錄中",
|
||||
"Browse": "瀏覽",
|
||||
"Proxy": "代理",
|
||||
"Appearance": "外觀",
|
||||
"Language": "語言",
|
||||
"Theme": "主題",
|
||||
"Pause": "暫停",
|
||||
"Resume": "繼續",
|
||||
"Paused": "已暫停",
|
||||
"Delete all": "刪除全部",
|
||||
"Related": "相關",
|
||||
"Related artworks": "相關作品",
|
||||
"Related users": "相關用戶",
|
||||
"Replace with '-p${index}' if the work have more than one images, otherwise replace with blank.": "替換為'-p${index}'如果作品有多張圖片, 否則替換為空白",
|
||||
"Recommendation": "推薦",
|
||||
"Novel": "小說",
|
||||
"Novels": "小說",
|
||||
"Reading Settings": "閱讀設置",
|
||||
"Font Size": "字體大小",
|
||||
"Line Height": "行高",
|
||||
"Paragraph Spacing": "段間距",
|
||||
"light": "淺色",
|
||||
"dark": "深色",
|
||||
"block": "屏蔽",
|
||||
"Block": "屏蔽",
|
||||
"Block(Account)": "屏蔽(賬戶)",
|
||||
"Block(Local)": "屏蔽(本地)",
|
||||
"Add": "添加",
|
||||
"Submit": "提交",
|
||||
"Local": "本地",
|
||||
"Both": "同時",
|
||||
"This artwork is blocked": "此作品已被屏蔽",
|
||||
"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": "閱讀",
|
||||
"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": "顯示原圖",
|
||||
"Illustrations": "插畫",
|
||||
"New version available": "新版本可用",
|
||||
"A new version of Pixes is available. Do you want to update now?" : "Pixes有新版本可用. 您要立即更新嗎?",
|
||||
"Update": "更新",
|
||||
"Check for updates": "檢查更新",
|
||||
"Check for updates on startup": "啟動時檢查更新",
|
||||
"I understand pixes is a free unofficial application.": "我了解Pixes是一個免費的非官方應用程序",
|
||||
"Related Artworks": "相關作品",
|
||||
"Emphasize artworks from following artists": "強調關注畫師的作品",
|
||||
"The border of the artworks will be darker": "作品的邊框將被加深"
|
||||
}
|
||||
}
|
27
debian/build.py
vendored
Normal file
@@ -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)
|
18
debian/debian.yaml
vendored
Normal file
@@ -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
|
10
debian/gui/pixes.desktop
vendored
Normal file
@@ -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;
|
BIN
debian/gui/pixes.png
vendored
Normal file
After Width: | Height: | Size: 11 KiB |
@@ -17,7 +17,7 @@ import Flutter
|
||||
let proxyConfig = "\(host):\(port)"
|
||||
result(proxyConfig)
|
||||
} else {
|
||||
result("")
|
||||
result("no proxy")
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -16,9 +16,28 @@ class _Appdata {
|
||||
Map<String, dynamic> settings = {
|
||||
"downloadPath": null,
|
||||
"downloadSubPath": r"/${id}-p${index}.${ext}",
|
||||
"tagsWeight": "風景 ロリ 巨乳 女の子",
|
||||
"useTranslatedNameForDownload": true,
|
||||
"maxParallels": 3
|
||||
"maxParallels": 3,
|
||||
"proxy": "",
|
||||
"darkMode": "System",
|
||||
"language": "System",
|
||||
"readingFontSize": 16.0,
|
||||
"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,
|
||||
LogicalKeyboardKey.keyC.keyId,
|
||||
LogicalKeyboardKey.keyG.keyId,
|
||||
],
|
||||
"showOriginalImage": false,
|
||||
"checkUpdate": true,
|
||||
"emphasizeArtworksFromFollowingArtists": true,
|
||||
};
|
||||
|
||||
bool lock = false;
|
||||
@@ -48,14 +67,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];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
100
lib/components/button.dart
Normal file
@@ -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,
|
||||
);
|
||||
}
|
||||
}
|
@@ -1,48 +1,43 @@
|
||||
import 'package:flutter/rendering.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
|
||||
class SliverGridViewWithFixedItemHeight extends StatelessWidget {
|
||||
const SliverGridViewWithFixedItemHeight(
|
||||
{required this.delegate,
|
||||
required this.maxCrossAxisExtent,
|
||||
required this.itemHeight,
|
||||
super.key});
|
||||
this.maxCrossAxisExtent = double.infinity,
|
||||
this.minCrossAxisExtent = 0,
|
||||
required this.itemHeight,
|
||||
super.key});
|
||||
|
||||
final SliverChildDelegate delegate;
|
||||
|
||||
final double maxCrossAxisExtent;
|
||||
|
||||
final double minCrossAxisExtent;
|
||||
|
||||
final double itemHeight;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SliverLayoutBuilder(
|
||||
builder: ((context, constraints) => SliverGrid(
|
||||
delegate: delegate,
|
||||
gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
|
||||
maxCrossAxisExtent: maxCrossAxisExtent,
|
||||
childAspectRatio:
|
||||
calcChildAspectRatio(constraints.crossAxisExtent)),
|
||||
).sliverPadding(EdgeInsets.only(bottom: context.padding.bottom))));
|
||||
}
|
||||
|
||||
double calcChildAspectRatio(double width) {
|
||||
var crossItems = width ~/ maxCrossAxisExtent;
|
||||
if (width % maxCrossAxisExtent != 0) {
|
||||
crossItems += 1;
|
||||
}
|
||||
final itemWidth = width / crossItems;
|
||||
return itemWidth / itemHeight;
|
||||
return SliverGrid(
|
||||
delegate: delegate,
|
||||
gridDelegate: SliverGridDelegateWithFixedHeight(
|
||||
itemHeight: itemHeight,
|
||||
maxCrossAxisExtent: maxCrossAxisExtent,
|
||||
minCrossAxisExtent: minCrossAxisExtent),
|
||||
).sliverPadding(EdgeInsets.only(bottom: context.padding.bottom));
|
||||
}
|
||||
}
|
||||
|
||||
class GridViewWithFixedItemHeight extends StatelessWidget {
|
||||
const GridViewWithFixedItemHeight(
|
||||
{ required this.builder,
|
||||
required this.itemCount,
|
||||
required this.maxCrossAxisExtent,
|
||||
required this.itemHeight,
|
||||
super.key});
|
||||
{required this.builder,
|
||||
required this.itemCount,
|
||||
this.maxCrossAxisExtent = double.infinity,
|
||||
this.minCrossAxisExtent = 0,
|
||||
required this.itemHeight,
|
||||
super.key});
|
||||
|
||||
final Widget Function(BuildContext, int) builder;
|
||||
|
||||
@@ -50,28 +45,80 @@ class GridViewWithFixedItemHeight extends StatelessWidget {
|
||||
|
||||
final double maxCrossAxisExtent;
|
||||
|
||||
final double minCrossAxisExtent;
|
||||
|
||||
final double itemHeight;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return LayoutBuilder(
|
||||
builder: ((context, constraints) => GridView.builder(
|
||||
gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
|
||||
maxCrossAxisExtent: maxCrossAxisExtent,
|
||||
childAspectRatio:
|
||||
calcChildAspectRatio(constraints.maxWidth)),
|
||||
itemBuilder: builder,
|
||||
itemCount: itemCount,
|
||||
padding: EdgeInsets.only(bottom: context.padding.bottom),
|
||||
)));
|
||||
gridDelegate: SliverGridDelegateWithFixedHeight(
|
||||
itemHeight: itemHeight,
|
||||
maxCrossAxisExtent: maxCrossAxisExtent,
|
||||
minCrossAxisExtent: minCrossAxisExtent),
|
||||
itemBuilder: builder,
|
||||
itemCount: itemCount,
|
||||
padding: EdgeInsets.only(bottom: context.padding.bottom),
|
||||
)));
|
||||
}
|
||||
}
|
||||
|
||||
class SliverGridDelegateWithFixedHeight extends SliverGridDelegate {
|
||||
const SliverGridDelegateWithFixedHeight({
|
||||
this.maxCrossAxisExtent = double.infinity,
|
||||
this.minCrossAxisExtent = 0,
|
||||
required this.itemHeight,
|
||||
});
|
||||
|
||||
final double maxCrossAxisExtent;
|
||||
|
||||
final double minCrossAxisExtent;
|
||||
|
||||
final double itemHeight;
|
||||
|
||||
@override
|
||||
SliverGridLayout getLayout(SliverConstraints constraints) {
|
||||
var crossItemsCount = calcCrossItemsCount(constraints.crossAxisExtent);
|
||||
return SliverGridRegularTileLayout(
|
||||
crossAxisCount: crossItemsCount,
|
||||
mainAxisStride: itemHeight,
|
||||
childMainAxisExtent: itemHeight,
|
||||
crossAxisStride: constraints.crossAxisExtent / crossItemsCount,
|
||||
childCrossAxisExtent: constraints.crossAxisExtent / crossItemsCount,
|
||||
reverseCrossAxis: false);
|
||||
}
|
||||
|
||||
double calcChildAspectRatio(double width) {
|
||||
var crossItems = width ~/ maxCrossAxisExtent;
|
||||
if (width % maxCrossAxisExtent != 0) {
|
||||
crossItems += 1;
|
||||
int calcCrossItemsCount(double width) {
|
||||
int count = 20;
|
||||
var itemWidth = width / 20;
|
||||
|
||||
if(minCrossAxisExtent == 0) {
|
||||
count = 1;
|
||||
itemWidth = width;
|
||||
while(itemWidth > maxCrossAxisExtent) {
|
||||
count++;
|
||||
itemWidth = width / count;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
final itemWidth = width / crossItems;
|
||||
return itemWidth / itemHeight;
|
||||
|
||||
while (
|
||||
!(itemWidth > minCrossAxisExtent && itemWidth < maxCrossAxisExtent)) {
|
||||
count--;
|
||||
itemWidth = width / count;
|
||||
if (count == 1) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRelayout(covariant SliverGridDelegate oldDelegate) {
|
||||
return oldDelegate is! SliverGridDelegateWithFixedHeight ||
|
||||
oldDelegate.maxCrossAxisExtent != maxCrossAxisExtent ||
|
||||
oldDelegate.minCrossAxisExtent != minCrossAxisExtent ||
|
||||
oldDelegate.itemHeight != itemHeight;
|
||||
}
|
||||
}
|
||||
|
@@ -1,19 +1,28 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/appdata.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/pages/related_page.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../network/network.dart';
|
||||
import '../pages/illust_page.dart';
|
||||
import 'md.dart';
|
||||
|
||||
typedef UpdateFavoriteFunc = void Function(bool v);
|
||||
|
||||
class IllustWidget extends StatefulWidget {
|
||||
const IllustWidget(this.illust, {super.key});
|
||||
const IllustWidget(this.illust, {this.onTap, super.key});
|
||||
|
||||
final Illust illust;
|
||||
|
||||
final void Function()? onTap;
|
||||
|
||||
static Map<String, UpdateFavoriteFunc> favoriteCallbacks = {};
|
||||
|
||||
@override
|
||||
State<IllustWidget> createState() => _IllustWidgetState();
|
||||
}
|
||||
@@ -24,6 +33,22 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
final contextController = FlyoutController();
|
||||
final contextAttachKey = GlobalKey();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
IllustWidget.favoriteCallbacks[widget.illust.id.toString()] = (v) {
|
||||
setState(() {
|
||||
widget.illust.isBookmarked = v;
|
||||
});
|
||||
};
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
IllustWidget.favoriteCallbacks.remove(widget.illust.id.toString());
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return LayoutBuilder(builder: (context, constrains) {
|
||||
@@ -37,34 +62,160 @@ 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),
|
||||
child: Card(
|
||||
padding:
|
||||
const EdgeInsets.symmetric(horizontal: 8.0, vertical: 8.0),
|
||||
child: Container(
|
||||
padding: EdgeInsets.zero,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(4.0),
|
||||
border: () {
|
||||
var emphasis = widget.illust.author.isFollowed &&
|
||||
appdata.settings[
|
||||
'emphasizeArtworksFromFollowingArtists'];
|
||||
var color = emphasis
|
||||
? ColorScheme.of(context).primary
|
||||
: ColorScheme.of(context)
|
||||
.outlineVariant
|
||||
.withOpacity(0.64);
|
||||
var width = emphasis ? 1.6 : 1.0;
|
||||
return Border.all(color: color, width: width);
|
||||
}()),
|
||||
margin: EdgeInsets.zero,
|
||||
child: GestureDetector(
|
||||
onTap: (){
|
||||
context.to(() => IllustPage(widget.illust, favoriteCallback: (v) {
|
||||
setState(() {
|
||||
widget.illust.isBookmarked = v;
|
||||
});
|
||||
},));
|
||||
},
|
||||
onTap: widget.onTap ??
|
||||
() {
|
||||
context.to(() => IllustPage(widget.illust));
|
||||
},
|
||||
onSecondaryTapUp: showMenu,
|
||||
onLongPress: 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)
|
||||
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(
|
||||
"${widget.illust.images.length}P",
|
||||
style: const TextStyle(fontSize: 12),
|
||||
),
|
||||
)),
|
||||
),
|
||||
if (widget.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 (widget.illust.isUgoira)
|
||||
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 (widget.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 (widget.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),
|
||||
),
|
||||
)),
|
||||
),
|
||||
Positioned(
|
||||
top: 16,
|
||||
right: 16,
|
||||
@@ -77,13 +228,13 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
});
|
||||
}
|
||||
|
||||
void showMenu(TapUpDetails details) {
|
||||
void showMenu([TapUpDetails? details]) {
|
||||
// This calculates the position of the flyout according to the parent navigator
|
||||
final targetContext = contextAttachKey.currentContext;
|
||||
if (targetContext == null) return;
|
||||
final box = targetContext.findRenderObject() as RenderBox;
|
||||
final position = box.localToGlobal(
|
||||
details.localPosition,
|
||||
Offset? position = box.localToGlobal(
|
||||
details?.localPosition ?? box.size.center(Offset.zero),
|
||||
ancestor: Navigator.of(context).context.findRenderObject(),
|
||||
);
|
||||
|
||||
@@ -93,35 +244,44 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
builder: (context) {
|
||||
return MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(text: Text("View".tl), onPressed: (){
|
||||
context.to(() => IllustPage(widget.illust, favoriteCallback: (v) {
|
||||
setState(() {
|
||||
widget.illust.isBookmarked = v;
|
||||
});
|
||||
},));
|
||||
}),
|
||||
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);
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: Text("Related Artworks".tl),
|
||||
onPressed: () {
|
||||
context.to(
|
||||
() => RelatedIllustsPage(widget.illust.id.toString()));
|
||||
}),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
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 {
|
||||
@@ -134,16 +294,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 {
|
||||
@@ -169,3 +331,161 @@ 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),
|
||||
),
|
||||
)),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
60
lib/components/keyboard.dart
Normal file
@@ -0,0 +1,60 @@
|
||||
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.handled;
|
||||
if (event.logicalKey == LogicalKeyboardKey.escape) {
|
||||
if (App.rootNavigatorKey.currentState?.canPop() ?? false) {
|
||||
App.rootNavigatorKey.currentState?.pop();
|
||||
} else 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,
|
||||
);
|
||||
}
|
||||
}
|
@@ -13,6 +13,34 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object> extends
|
||||
|
||||
Widget buildContent(BuildContext context, S data);
|
||||
|
||||
Widget? buildFrame(BuildContext context, Widget child) => null;
|
||||
|
||||
Widget buildLoading() {
|
||||
return const Center(
|
||||
child: ProgressRing(),
|
||||
);
|
||||
}
|
||||
|
||||
void retry() {
|
||||
setState(() {
|
||||
isLoading = true;
|
||||
error = null;
|
||||
});
|
||||
loadData().then((value) {
|
||||
if(value.success) {
|
||||
setState(() {
|
||||
isLoading = false;
|
||||
data = value.data;
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
isLoading = false;
|
||||
error = value.errorMessage!;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Widget buildError() {
|
||||
return Center(
|
||||
child: Column(
|
||||
@@ -21,25 +49,7 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object> extends
|
||||
Text(error!),
|
||||
const SizedBox(height: 12),
|
||||
Button(
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
isLoading = true;
|
||||
error = null;
|
||||
});
|
||||
loadData().then((value) {
|
||||
if(value.success) {
|
||||
setState(() {
|
||||
isLoading = false;
|
||||
data = value.data;
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
isLoading = false;
|
||||
error = value.errorMessage!;
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
onPressed: retry,
|
||||
child: const Text("Retry"),
|
||||
)
|
||||
],
|
||||
@@ -69,15 +79,17 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object> extends
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
Widget child;
|
||||
|
||||
if(isLoading){
|
||||
return const Center(
|
||||
child: ProgressRing(),
|
||||
);
|
||||
child = buildLoading();
|
||||
} else if (error != null){
|
||||
return buildError();
|
||||
child = buildError();
|
||||
} else {
|
||||
return buildContent(context, data!);
|
||||
child = buildContent(context, data!);
|
||||
}
|
||||
|
||||
return buildFrame(context, child) ?? child;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,10 +106,14 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
|
||||
|
||||
Future<Res<List<S>>> loadData(int page);
|
||||
|
||||
Widget buildContent(BuildContext context, final List<S> data);
|
||||
Widget? buildFrame(BuildContext context, Widget child) => null;
|
||||
|
||||
Widget buildContent(BuildContext context, List<S> data);
|
||||
|
||||
bool get isLoading => _isLoading || _isFirstLoading;
|
||||
|
||||
bool get isFirstLoading => _isFirstLoading;
|
||||
|
||||
void nextPage() {
|
||||
if(_isLoading) return;
|
||||
_isLoading = true;
|
||||
@@ -181,12 +197,16 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
Widget child;
|
||||
|
||||
if(_isFirstLoading){
|
||||
return buildLoading(context);
|
||||
child = buildLoading(context);
|
||||
} else if (_error != null){
|
||||
return buildError(context, _error!);
|
||||
child = buildError(context, _error!);
|
||||
} else {
|
||||
return buildContent(context, _data!);
|
||||
child = buildContent(context, _data!);
|
||||
}
|
||||
|
||||
return buildFrame(context, child) ?? child;
|
||||
}
|
||||
}
|
||||
|
@@ -1,6 +1,10 @@
|
||||
import 'package:flutter/material.dart' as md;
|
||||
|
||||
typedef MdIcons = md.Icons;
|
||||
typedef MdTheme = md.Theme;
|
||||
typedef MdThemeData = md.ThemeData;
|
||||
typedef MdColorScheme = md.ColorScheme;
|
||||
typedef TextField = md.TextField;
|
||||
|
||||
class ColorScheme {
|
||||
static md.ColorScheme of(md.BuildContext context) {
|
||||
|
@@ -30,7 +30,7 @@ class ToastOverlay extends StatelessWidget {
|
||||
child: Align(
|
||||
alignment: Alignment.bottomCenter,
|
||||
child: PhysicalModel(
|
||||
color: FluentTheme.of(context).cardColor.withOpacity(0),
|
||||
color: ColorScheme.of(context).surface.withOpacity(1),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
elevation: 1,
|
||||
child: Container(
|
||||
|
84
lib/components/novel.dart
Normal file
@@ -0,0 +1,84 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/components/animated_image.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/foundation/image_provider.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/pages/novel_page.dart';
|
||||
|
||||
class NovelWidget extends StatefulWidget {
|
||||
const NovelWidget(this.novel, {super.key});
|
||||
|
||||
final Novel novel;
|
||||
|
||||
@override
|
||||
State<NovelWidget> createState() => _NovelWidgetState();
|
||||
}
|
||||
|
||||
class _NovelWidgetState extends State<NovelWidget> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Card(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
||||
child: GestureDetector(
|
||||
onTap: () {
|
||||
context.to(() => NovelPage(widget.novel));
|
||||
},
|
||||
behavior: HitTestBehavior.opaque,
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 96,
|
||||
height: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context).secondaryContainer,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: AnimatedImage(
|
||||
fit: BoxFit.cover,
|
||||
filterQuality: FilterQuality.medium,
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
image: CachedImageProvider(widget.novel.image),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
widget.novel.title,
|
||||
maxLines: 2,
|
||||
style: const TextStyle(
|
||||
fontSize: 16, fontWeight: FontWeight.bold),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 4,
|
||||
),
|
||||
Expanded(
|
||||
child: Text(
|
||||
widget.novel.caption.trim().replaceAll('<br />', '\n'),
|
||||
maxLines: 3,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 4,
|
||||
),
|
||||
Text(
|
||||
widget.novel.author.name,
|
||||
style: const TextStyle(fontSize: 12),
|
||||
)
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
@@ -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,
|
||||
),
|
||||
|
265
lib/components/ugoira.dart
Normal file
@@ -0,0 +1,265 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'package:archive/archive_io.dart';
|
||||
|
||||
import 'package:crypto/crypto.dart';
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
|
||||
import '../foundation/cache_manager.dart';
|
||||
import '../network/app_dio.dart';
|
||||
import 'dart:ui' as ui;
|
||||
|
||||
class UgoiraWidget extends StatefulWidget {
|
||||
const UgoiraWidget({super.key, required this.id, required this.previewImage,
|
||||
required this.width, required this.height});
|
||||
|
||||
final String id;
|
||||
|
||||
final ImageProvider previewImage;
|
||||
|
||||
final double width;
|
||||
|
||||
final double height;
|
||||
|
||||
@override
|
||||
State<UgoiraWidget> createState() => _UgoiraWidgetState();
|
||||
}
|
||||
|
||||
class _UgoiraWidgetState extends State<UgoiraWidget> {
|
||||
_UgoiraMetadata? _metadata;
|
||||
|
||||
bool _loading = false;
|
||||
|
||||
bool _finished = false;
|
||||
|
||||
bool _error = false;
|
||||
|
||||
int expectedBytes = 1;
|
||||
|
||||
int receivedBytes = 0;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SizedBox(
|
||||
width: widget.width,
|
||||
height: widget.height,
|
||||
child: !_finished
|
||||
? buildPreview()
|
||||
: _UgoiraAnimation(metadata: _metadata!, key: Key(widget.id),),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildPreview() {
|
||||
return Stack(
|
||||
children: [
|
||||
Positioned.fill(
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
child: Image(
|
||||
image: widget.previewImage,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
),
|
||||
),
|
||||
if(_error)
|
||||
const Positioned.fill(
|
||||
child: Center(
|
||||
child: Icon(
|
||||
MdIcons.error_outline,
|
||||
size: 36,
|
||||
),
|
||||
)),
|
||||
if(!_loading)
|
||||
Positioned.fill(
|
||||
child: GestureDetector(
|
||||
onTap: load,
|
||||
child: const Center(
|
||||
child: Icon(
|
||||
MdIcons.play_circle_outline,
|
||||
size: 36,
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
else
|
||||
Center(
|
||||
child: ProgressRing(value: (receivedBytes / expectedBytes) * 100,),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
void load() async {
|
||||
setState(() {
|
||||
_loading = true;
|
||||
});
|
||||
var res0 = await Network().apiGet('/v1/ugoira/metadata?illust_id=${widget.id}');
|
||||
if(res0.error) {
|
||||
setState(() {
|
||||
_error = true;
|
||||
_loading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
var json = res0.data;
|
||||
_metadata = _UgoiraMetadata(
|
||||
url: json["ugoira_metadata"]["zip_urls"]["medium"],
|
||||
frames: (json["ugoira_metadata"]["frames"] as List).map<_UgoiraFrame>((e) => _UgoiraFrame(
|
||||
delay: e["delay"],
|
||||
fileName: e["file"],
|
||||
)).toList(),
|
||||
);
|
||||
try {
|
||||
var key = "ugoira_${widget.id}";
|
||||
var cached = await CacheManager().findCache(key);
|
||||
if(cached != null) {
|
||||
await extract(cached);
|
||||
return;
|
||||
}
|
||||
var dio = AppDio();
|
||||
final time = DateFormat("yyyy-MM-dd'T'HH:mm:ss'+00:00'").format(DateTime.now());
|
||||
final hash = md5.convert(utf8.encode(time + Network.hashSalt)).toString();
|
||||
var res = await dio.get<ResponseBody>(
|
||||
_metadata!.url,
|
||||
options: Options(
|
||||
responseType: ResponseType.stream,
|
||||
validateStatus: (status) => status != null && status < 500,
|
||||
headers: {
|
||||
"referer": "https://app-api.pixiv.net/",
|
||||
"user-agent": "PixivAndroidApp/5.0.234 (Android 14; Pixes)",
|
||||
"x-client-time": time,
|
||||
"x-client-hash": hash,
|
||||
"accept-enconding": "gzip",
|
||||
}
|
||||
)
|
||||
);
|
||||
if(res.statusCode != 200) {
|
||||
throw "Failed to load image: ${res.statusCode}";
|
||||
}
|
||||
expectedBytes = int.parse(res.headers.value("content-length") ?? "1");
|
||||
var cachingFile = await CacheManager().openWrite(key);
|
||||
await for (var chunk in res.data!.stream) {
|
||||
await cachingFile.writeBytes(chunk);
|
||||
setState(() {
|
||||
receivedBytes += chunk.length;
|
||||
if(receivedBytes > expectedBytes) {
|
||||
expectedBytes = receivedBytes + 1;
|
||||
}
|
||||
});
|
||||
}
|
||||
await cachingFile.close();
|
||||
await extract(cachingFile.file.path);
|
||||
}
|
||||
catch(e) {
|
||||
setState(() {
|
||||
_error = true;
|
||||
_loading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> extract(String filePath) async{
|
||||
var zip = ZipDecoder().decodeBytes(await File(filePath).readAsBytes());
|
||||
for(var file in zip) {
|
||||
if(file.isFile) {
|
||||
var frame = _metadata!.frames.firstWhere((element) => element.fileName == file.name);
|
||||
frame.data = await decodeImageFromList(file.content);
|
||||
}
|
||||
}
|
||||
zip.clear();
|
||||
setState(() {
|
||||
_loading = false;
|
||||
_finished = true;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class _UgoiraAnimation extends StatefulWidget {
|
||||
const _UgoiraAnimation({super.key, required this.metadata});
|
||||
|
||||
final _UgoiraMetadata metadata;
|
||||
|
||||
@override
|
||||
State<_UgoiraAnimation> createState() => _UgoiraAnimationState();
|
||||
}
|
||||
|
||||
class _UgoiraAnimationState extends State<_UgoiraAnimation> with SingleTickerProviderStateMixin {
|
||||
late AnimationController _controller;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
final totalDuration = widget.metadata.frames.fold<int>(
|
||||
0, (previousValue, element) => previousValue + element.delay);
|
||||
_controller = AnimationController(
|
||||
vsync: this,
|
||||
duration: Duration(milliseconds: totalDuration),
|
||||
value: 0,
|
||||
lowerBound: 0,
|
||||
upperBound: widget.metadata.frames.length.toDouble(),
|
||||
);
|
||||
_controller.repeat();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_controller.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AnimatedBuilder(
|
||||
animation: _controller,
|
||||
builder: (context, child) {
|
||||
final frame = widget.metadata.frames[_controller.value.toInt()];
|
||||
return CustomPaint(
|
||||
painter: _ImagePainter(frame.data!),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _UgoiraMetadata {
|
||||
final String url;
|
||||
final List<_UgoiraFrame> frames;
|
||||
|
||||
_UgoiraMetadata({required this.url, required this.frames});
|
||||
}
|
||||
|
||||
class _UgoiraFrame {
|
||||
final int delay;
|
||||
final String fileName;
|
||||
ui.Image? data;
|
||||
|
||||
_UgoiraFrame({required this.delay, required this.fileName});
|
||||
}
|
||||
|
||||
class _ImagePainter extends CustomPainter {
|
||||
final ui.Image data;
|
||||
|
||||
_ImagePainter(this.data);
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
// 覆盖整个画布
|
||||
Rect rect = Offset.zero & size;
|
||||
canvas.drawImageRect(
|
||||
data,
|
||||
Rect.fromLTRB(0, 0, data.width.toDouble(), data.height.toDouble()),
|
||||
rect,
|
||||
Paint()..filterQuality = FilterQuality.medium
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(covariant CustomPainter oldDelegate) {
|
||||
return data != (oldDelegate as _ImagePainter).data;
|
||||
}
|
||||
}
|
@@ -1,34 +1,57 @@
|
||||
import 'dart:math';
|
||||
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/components/animated_image.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/foundation/image_provider.dart';
|
||||
import 'package:pixes/pages/illust_page.dart';
|
||||
import 'package:pixes/pages/user_info_page.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../network/network.dart';
|
||||
import 'md.dart';
|
||||
|
||||
typedef UpdateFollowCallback = void Function(bool isFollowed);
|
||||
|
||||
class UserPreviewWidget extends StatefulWidget {
|
||||
const UserPreviewWidget(this.user, {super.key});
|
||||
|
||||
final UserPreview user;
|
||||
|
||||
static Map<String, UpdateFollowCallback> followCallbacks = {};
|
||||
|
||||
@override
|
||||
State<UserPreviewWidget> createState() => _UserPreviewWidgetState();
|
||||
}
|
||||
|
||||
class _UserPreviewWidgetState extends State<UserPreviewWidget> {
|
||||
@override
|
||||
void initState() {
|
||||
UserPreviewWidget.followCallbacks[widget.user.id.toString()] = (v) {
|
||||
setState(() {
|
||||
widget.user.isFollowed = v;
|
||||
});
|
||||
};
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
UserPreviewWidget.followCallbacks.remove(widget.user.id.toString());
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
bool isFollowing = false;
|
||||
|
||||
void follow() async{
|
||||
if(isFollowing) return;
|
||||
void follow() async {
|
||||
if (isFollowing) return;
|
||||
setState(() {
|
||||
isFollowing = true;
|
||||
});
|
||||
var method = widget.user.isFollowed ? "delete" : "add";
|
||||
var res = await Network().follow(widget.user.id.toString(), method);
|
||||
if(res.error) {
|
||||
if(mounted) {
|
||||
if (res.error) {
|
||||
if (mounted) {
|
||||
context.showToast(message: "Network Error");
|
||||
}
|
||||
} else {
|
||||
@@ -37,71 +60,129 @@ class _UserPreviewWidgetState extends State<UserPreviewWidget> {
|
||||
setState(() {
|
||||
isFollowing = false;
|
||||
});
|
||||
UserInfoPage.followCallbacks[widget.user.id.toString()]
|
||||
?.call(widget.user.isFollowed);
|
||||
IllustPage.updateFollow(widget.user.id.toString(), widget.user.isFollowed);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Card(
|
||||
margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
|
||||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 64,
|
||||
height: 64,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
child: ColoredBox(
|
||||
color: ColorScheme.of(context).secondaryContainer,
|
||||
child: AnimatedImage(
|
||||
image: CachedImageProvider(widget.user.avatar),
|
||||
fit: BoxFit.cover,
|
||||
filterQuality: FilterQuality.medium,
|
||||
child: GestureDetector(
|
||||
onTap: () => context.to(() => UserInfoPage(widget.user.id.toString())),
|
||||
behavior: HitTestBehavior.translucent,
|
||||
child: SizedBox.expand(
|
||||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 64,
|
||||
height: 64,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
child: ColoredBox(
|
||||
color: ColorScheme.of(context).secondaryContainer,
|
||||
child: AnimatedImage(
|
||||
image: CachedImageProvider(widget.user.avatar),
|
||||
fit: BoxFit.cover,
|
||||
filterQuality: FilterQuality.medium,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
SizedBox(
|
||||
width: 96,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Spacer(),
|
||||
Text(widget.user.name,
|
||||
maxLines: 1,
|
||||
style: const TextStyle(
|
||||
fontSize: 16, fontWeight: FontWeight.bold)),
|
||||
const SizedBox(
|
||||
height: 12,
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
if (isFollowing)
|
||||
Button(
|
||||
onPressed: follow,
|
||||
child: const SizedBox(
|
||||
width: 42,
|
||||
height: 24,
|
||||
child: Center(
|
||||
child: SizedBox.square(
|
||||
dimension: 18,
|
||||
child: ProgressRing(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
),
|
||||
),
|
||||
))
|
||||
else if (!widget.user.isFollowed)
|
||||
Button(onPressed: follow, child: Text("Follow".tl))
|
||||
else
|
||||
Button(
|
||||
onPressed: follow,
|
||||
child: Text(
|
||||
"Unfollow".tl,
|
||||
style: TextStyle(
|
||||
color: ColorScheme.of(context).error),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const Spacer(),
|
||||
],
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
var count = constraints.maxWidth.toInt() ~/ 96;
|
||||
var images = List.generate(
|
||||
min(count, widget.user.artworks.length),
|
||||
(index) => buildIllust(widget.user.artworks[index]));
|
||||
return Row(
|
||||
children: images,
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
const Icon(
|
||||
FluentIcons.chevron_right,
|
||||
size: 14,
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildIllust(Illust illust) {
|
||||
return SizedBox(
|
||||
width: 96,
|
||||
height: double.infinity,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
child: ColoredBox(
|
||||
color: ColorScheme.of(context).secondaryContainer,
|
||||
child: AnimatedImage(
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
fit: BoxFit.cover,
|
||||
filterQuality: FilterQuality.medium,
|
||||
image: CachedImageProvider(illust.images.first.medium),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12,),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(widget.user.name, maxLines: 1, style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
|
||||
const Spacer(),
|
||||
Row(
|
||||
children: [
|
||||
Button(
|
||||
onPressed: () => context.to(() => UserInfoPage(widget.user.id.toString(), followCallback: (v){
|
||||
setState(() {
|
||||
widget.user.isFollowed = v;
|
||||
});
|
||||
},)),
|
||||
child: Text("View".tl,),
|
||||
),
|
||||
const SizedBox(width: 8,),
|
||||
if(isFollowing)
|
||||
Button(onPressed: follow, child: const SizedBox(
|
||||
width: 42,
|
||||
height: 24,
|
||||
child: Center(
|
||||
child: SizedBox.square(
|
||||
dimension: 18,
|
||||
child: ProgressRing(strokeWidth: 2,),
|
||||
),
|
||||
),
|
||||
))
|
||||
else if (!widget.user.isFollowed)
|
||||
Button(onPressed: follow, child: Text("Follow".tl))
|
||||
else
|
||||
Button(
|
||||
onPressed: follow,
|
||||
child: Text("Unfollow".tl, style: TextStyle(color: ColorScheme.of(context).error),),
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
).paddingVertical(8),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
@@ -1,19 +1,24 @@
|
||||
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';
|
||||
|
||||
import '../appdata.dart';
|
||||
|
||||
export "widget_utils.dart";
|
||||
export "state_controller.dart";
|
||||
export "navigation.dart";
|
||||
|
||||
class _App {
|
||||
final version = "1.0.1";
|
||||
final version = "1.0.8";
|
||||
|
||||
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 =>
|
||||
@@ -21,8 +26,17 @@ class _App {
|
||||
bool get isMobile => Platform.isAndroid || Platform.isIOS;
|
||||
|
||||
Locale get locale {
|
||||
if (appdata.settings["language"] != "System") {
|
||||
return switch (appdata.settings["language"]) {
|
||||
"English" => const Locale("en"),
|
||||
"简体中文" => const Locale("zh", "CN"),
|
||||
"繁體中文" => const Locale("zh", "TW"),
|
||||
_ => const Locale("en"),
|
||||
};
|
||||
}
|
||||
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;
|
||||
@@ -31,12 +45,29 @@ 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>();
|
||||
|
||||
GlobalKey<NavigatorState>? mainNavigatorKey;
|
||||
}
|
||||
|
||||
// ignore: non_constant_identifier_names
|
||||
|
102
lib/foundation/history.dart
Normal file
@@ -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;
|
||||
}
|
||||
}
|
@@ -45,10 +45,10 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
|
||||
}
|
||||
|
||||
Future<ui.Codec> _loadBufferAsync(
|
||||
T key,
|
||||
StreamController<ImageChunkEvent> chunkEvents,
|
||||
ImageDecoderCallback decode,
|
||||
) async {
|
||||
T key,
|
||||
StreamController<ImageChunkEvent> chunkEvents,
|
||||
ImageDecoderCallback decode,
|
||||
) async {
|
||||
try {
|
||||
int retryTime = 1;
|
||||
|
||||
@@ -83,11 +83,11 @@ abstract class BaseImageProvider<T extends BaseImageProvider<T>>
|
||||
}
|
||||
}
|
||||
|
||||
if(stop) {
|
||||
if (stop) {
|
||||
throw Exception("Image loading is stopped");
|
||||
}
|
||||
|
||||
if(data!.isEmpty) {
|
||||
if (data!.isEmpty) {
|
||||
throw Exception("Empty image data");
|
||||
}
|
||||
|
||||
@@ -147,13 +147,13 @@ class CachedImageProvider extends BaseImageProvider<CachedImageProvider> {
|
||||
String get key => url;
|
||||
|
||||
@override
|
||||
Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async{
|
||||
Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
|
||||
chunkEvents.add(const ImageChunkEvent(
|
||||
cumulativeBytesLoaded: 0,
|
||||
expectedTotalBytes: 1,
|
||||
));
|
||||
var cached = await CacheManager().findCache(key);
|
||||
if(cached != null) {
|
||||
if (cached != null) {
|
||||
chunkEvents.add(const ImageChunkEvent(
|
||||
cumulativeBytesLoaded: 1,
|
||||
expectedTotalBytes: 1,
|
||||
@@ -161,30 +161,28 @@ class CachedImageProvider extends BaseImageProvider<CachedImageProvider> {
|
||||
return await File(cached).readAsBytes();
|
||||
}
|
||||
var dio = AppDio();
|
||||
final time = DateFormat("yyyy-MM-dd'T'HH:mm:ss'+00:00'").format(DateTime.now());
|
||||
final time =
|
||||
DateFormat("yyyy-MM-dd'T'HH:mm:ss'+00:00'").format(DateTime.now());
|
||||
final hash = md5.convert(utf8.encode(time + Network.hashSalt)).toString();
|
||||
var res = await dio.get<ResponseBody>(
|
||||
url,
|
||||
options: Options(
|
||||
responseType: ResponseType.stream,
|
||||
validateStatus: (status) => status != null && status < 500,
|
||||
headers: {
|
||||
"referer": "https://app-api.pixiv.net/",
|
||||
"user-agent": "PixivAndroidApp/5.0.234 (Android 14; Pixes)",
|
||||
"x-client-time": time,
|
||||
"x-client-hash": hash,
|
||||
"accept-enconding": "gzip",
|
||||
}
|
||||
)
|
||||
);
|
||||
if(res.statusCode != 200) {
|
||||
var res = await dio.get<ResponseBody>(url,
|
||||
options: Options(
|
||||
responseType: ResponseType.stream,
|
||||
validateStatus: (status) => status != null && status < 500,
|
||||
headers: {
|
||||
"referer": "https://app-api.pixiv.net/",
|
||||
"user-agent": "PixivAndroidApp/5.0.234 (Android 14; Pixes)",
|
||||
"x-client-time": time,
|
||||
"x-client-hash": hash,
|
||||
"accept-enconding": "gzip",
|
||||
}));
|
||||
if (res.statusCode != 200) {
|
||||
throw BadRequestException("Failed to load image: ${res.statusCode}");
|
||||
}
|
||||
var data = <int>[];
|
||||
var cachingFile = await CacheManager().openWrite(key);
|
||||
await for (var chunk in res.data!.stream) {
|
||||
var length = res.data!.contentLength+1;
|
||||
if(length < data.length) {
|
||||
var length = res.data!.contentLength + 1;
|
||||
if (length < data.length) {
|
||||
length = data.length + 1;
|
||||
}
|
||||
data.addAll(chunk);
|
||||
@@ -203,3 +201,71 @@ class CachedImageProvider extends BaseImageProvider<CachedImageProvider> {
|
||||
return SynchronousFuture<CachedImageProvider>(this);
|
||||
}
|
||||
}
|
||||
|
||||
class CachedNovelImageProvider
|
||||
extends BaseImageProvider<CachedNovelImageProvider> {
|
||||
final String novelId;
|
||||
final String imageId;
|
||||
|
||||
CachedNovelImageProvider(this.novelId, this.imageId);
|
||||
|
||||
@override
|
||||
String get key => "$novelId/$imageId";
|
||||
|
||||
@override
|
||||
Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
|
||||
chunkEvents.add(const ImageChunkEvent(
|
||||
cumulativeBytesLoaded: 0,
|
||||
expectedTotalBytes: 1,
|
||||
));
|
||||
var cached = await CacheManager().findCache(key);
|
||||
if (cached != null) {
|
||||
chunkEvents.add(const ImageChunkEvent(
|
||||
cumulativeBytesLoaded: 1,
|
||||
expectedTotalBytes: 1,
|
||||
));
|
||||
return await File(cached).readAsBytes();
|
||||
}
|
||||
var urlRes = await Network().getNovelImage(novelId, imageId);
|
||||
var url = urlRes.data;
|
||||
var dio = AppDio();
|
||||
final time =
|
||||
DateFormat("yyyy-MM-dd'T'HH:mm:ss'+00:00'").format(DateTime.now());
|
||||
final hash = md5.convert(utf8.encode(time + Network.hashSalt)).toString();
|
||||
var res = await dio.get<ResponseBody>(url,
|
||||
options: Options(
|
||||
responseType: ResponseType.stream,
|
||||
validateStatus: (status) => status != null && status < 500,
|
||||
headers: {
|
||||
"referer": "https://app-api.pixiv.net/",
|
||||
"user-agent": "PixivAndroidApp/5.0.234 (Android 14; Pixes)",
|
||||
"x-client-time": time,
|
||||
"x-client-hash": hash,
|
||||
"accept-enconding": "gzip",
|
||||
}));
|
||||
if (res.statusCode != 200) {
|
||||
throw BadRequestException("Failed to load image: ${res.statusCode}");
|
||||
}
|
||||
var data = <int>[];
|
||||
var cachingFile = await CacheManager().openWrite(key);
|
||||
await for (var chunk in res.data!.stream) {
|
||||
var length = res.data!.contentLength + 1;
|
||||
if (length < data.length) {
|
||||
length = data.length + 1;
|
||||
}
|
||||
data.addAll(chunk);
|
||||
await cachingFile.writeBytes(chunk);
|
||||
chunkEvents.add(ImageChunkEvent(
|
||||
cumulativeBytesLoaded: data.length,
|
||||
expectedTotalBytes: length,
|
||||
));
|
||||
}
|
||||
await cachingFile.close();
|
||||
return Uint8List.fromList(data);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<CachedNovelImageProvider> obtainKey(ImageConfiguration configuration) {
|
||||
return SynchronousFuture<CachedNovelImageProvider>(this);
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
|
@@ -20,4 +20,6 @@ extension Navigation on BuildContext {
|
||||
Size get size => MediaQuery.of(this).size;
|
||||
|
||||
EdgeInsets get padding => MediaQuery.of(this).padding;
|
||||
|
||||
EdgeInsets get viewInsets => MediaQuery.of(this).viewInsets;
|
||||
}
|
||||
|
261
lib/main.dart
@@ -1,44 +1,69 @@
|
||||
import "dart:async";
|
||||
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";
|
||||
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";
|
||||
import "package:pixes/utils/app_links.dart";
|
||||
import "package:pixes/utils/loop.dart";
|
||||
import "package:pixes/utils/translation.dart";
|
||||
import "package:pixes/utils/update.dart";
|
||||
import "package:pixes/utils/window.dart";
|
||||
import "package:window_manager/window_manager.dart";
|
||||
import 'package:system_theme/system_theme.dart';
|
||||
|
||||
void main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
FlutterError.onError = (details) {
|
||||
Log.error("Unhandled", "${details.exception}\n${details.stack}");
|
||||
};
|
||||
setSystemProxy();
|
||||
SystemTheme.fallbackColor = Colors.blue;
|
||||
await SystemTheme.accentColor.load();
|
||||
await App.init();
|
||||
await appdata.readData();
|
||||
await Translation.init();
|
||||
handleLinks();
|
||||
SystemTheme.onChange.listen((event) {
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
void main() {
|
||||
runZonedGuarded(() async {
|
||||
Future.delayed(const Duration(seconds: 3), checkUpdate);
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
FlutterError.onError = (details) {
|
||||
Log.error("Unhandled", "${details.exception}\n${details.stack}");
|
||||
};
|
||||
setSystemProxy();
|
||||
await App.init();
|
||||
await appdata.readData();
|
||||
await Translation.init();
|
||||
HistoryManager().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(
|
||||
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();
|
||||
await windowManager.show();
|
||||
Loop.register(WindowPlacement.loop);
|
||||
});
|
||||
}
|
||||
Loop.start();
|
||||
Log.info("APP", "Application started");
|
||||
runApp(const MyApp());
|
||||
}, (error, stack) {
|
||||
Log.error("Unhandled Exception", "$error\n$stack");
|
||||
});
|
||||
if (App.isDesktop) {
|
||||
await WindowManager.instance.ensureInitialized();
|
||||
windowManager.waitUntilReadyToShow().then((_) async {
|
||||
await windowManager.setTitleBarStyle(
|
||||
TitleBarStyle.hidden,
|
||||
windowButtonVisibility: false,
|
||||
);
|
||||
await windowManager.setMinimumSize(const Size(500, 600));
|
||||
await windowManager.show();
|
||||
await windowManager.setSkipTaskbar(false);
|
||||
});
|
||||
}
|
||||
runApp(const MyApp());
|
||||
}
|
||||
|
||||
class MyApp extends StatelessWidget {
|
||||
@@ -47,60 +72,132 @@ class MyApp extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
return AnnotatedRegion<SystemUiOverlayStyle>(
|
||||
value: const SystemUiOverlayStyle(
|
||||
systemNavigationBarColor: Colors.transparent,
|
||||
statusBarColor: Colors.transparent),
|
||||
child: StateBuilder<SimpleController>(
|
||||
init: SimpleController(),
|
||||
tag: "MyApp",
|
||||
builder: (controller) {
|
||||
return FluentApp(
|
||||
navigatorKey: App.rootNavigatorKey,
|
||||
debugShowCheckedModeBanner: false,
|
||||
title: 'pixes',
|
||||
theme: FluentThemeData(
|
||||
brightness: Brightness.light,
|
||||
fontFamily: App.isWindows ? 'font' : null,
|
||||
accentColor: AccentColor.swatch({
|
||||
'darkest': SystemTheme.accentColor.darkest,
|
||||
'darker': SystemTheme.accentColor.darker,
|
||||
'dark': SystemTheme.accentColor.dark,
|
||||
'normal': SystemTheme.accentColor.accent,
|
||||
'light': SystemTheme.accentColor.light,
|
||||
'lighter': SystemTheme.accentColor.lighter,
|
||||
'lightest': SystemTheme.accentColor.lightest,
|
||||
})),
|
||||
darkTheme: FluentThemeData(
|
||||
brightness: Brightness.dark,
|
||||
fontFamily: App.isWindows ? 'font' : null,
|
||||
accentColor: AccentColor.swatch({
|
||||
'darkest': SystemTheme.accentColor.darkest,
|
||||
'darker': SystemTheme.accentColor.darker,
|
||||
'dark': SystemTheme.accentColor.dark,
|
||||
'normal': SystemTheme.accentColor.accent,
|
||||
'light': SystemTheme.accentColor.light,
|
||||
'lighter': SystemTheme.accentColor.lighter,
|
||||
'lightest': SystemTheme.accentColor.lightest,
|
||||
})),
|
||||
home: const MainPage(),
|
||||
builder: (context, child) {
|
||||
ErrorWidget.builder = (details) {
|
||||
if (details.exception
|
||||
.toString()
|
||||
.contains("RenderFlex overflowed")) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
Log.error("UI", "${details.exception}\n${details.stack}");
|
||||
return Text(details.exception.toString());
|
||||
};
|
||||
if (child == null) {
|
||||
throw "widget is null";
|
||||
}
|
||||
var windowsFont = kDebugMode ? "微软雅黑" : "font";
|
||||
return StateBuilder<SimpleController>(
|
||||
init: SimpleController(),
|
||||
tag: "MyApp",
|
||||
builder: (controller) {
|
||||
Brightness brightness =
|
||||
PlatformDispatcher.instance.platformBrightness;
|
||||
|
||||
return OverlayWidget(child);
|
||||
});
|
||||
}),
|
||||
);
|
||||
if (appdata.settings["theme"] == "Dark") {
|
||||
brightness = Brightness.dark;
|
||||
} else if (appdata.settings["theme"] == "Light") {
|
||||
brightness = Brightness.light;
|
||||
}
|
||||
|
||||
return AnnotatedRegion<SystemUiOverlayStyle>(
|
||||
value: SystemUiOverlayStyle(
|
||||
systemNavigationBarColor: Colors.transparent,
|
||||
statusBarColor: Colors.transparent,
|
||||
statusBarIconBrightness: brightness.opposite,
|
||||
systemNavigationBarIconBrightness: brightness.opposite,
|
||||
),
|
||||
child: DynamicColorBuilder(
|
||||
builder: (light, dark) {
|
||||
final colorScheme =
|
||||
(brightness == Brightness.light ? light : dark) ??
|
||||
md.ColorScheme.fromSeed(
|
||||
seedColor: Colors.blue, brightness: brightness);
|
||||
return FluentApp(
|
||||
navigatorKey: App.rootNavigatorKey,
|
||||
debugShowCheckedModeBanner: false,
|
||||
title: 'pixes',
|
||||
theme: FluentThemeData(
|
||||
brightness: brightness,
|
||||
fontFamily: App.isWindows ? windowsFont : null,
|
||||
accentColor: AccentColor.swatch({
|
||||
'darkest': darken(colorScheme.primary, 30),
|
||||
'darker': darken(colorScheme.primary, 20),
|
||||
'dark': darken(colorScheme.primary, 10),
|
||||
'normal': colorScheme.primary,
|
||||
'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) {
|
||||
if (details.exception
|
||||
.toString()
|
||||
.contains("RenderFlex overflowed")) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
Log.error(
|
||||
"UI", "${details.exception}\n${details.stack}");
|
||||
return Text(details.exception.toString());
|
||||
};
|
||||
if (child == null) {
|
||||
throw "widget is null";
|
||||
}
|
||||
|
||||
Widget widget = MdTheme(
|
||||
data: MdThemeData.from(
|
||||
colorScheme: colorScheme, useMaterial3: true),
|
||||
child: DefaultTextStyle.merge(
|
||||
style: TextStyle(
|
||||
fontFamily: App.isWindows ? 'font' : null,
|
||||
),
|
||||
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);
|
||||
});
|
||||
},
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// from https://stackoverflow.com/a/60191441
|
||||
Color darken(Color c, [int percent = 10]) {
|
||||
assert(1 <= percent && percent <= 100);
|
||||
var f = 1 - percent / 100;
|
||||
return Color.fromARGB(c.alpha, (c.red * f).round(), (c.green * f).round(),
|
||||
(c.blue * f).round());
|
||||
}
|
||||
|
||||
/// from https://stackoverflow.com/a/60191441
|
||||
Color lighten(Color c, [int percent = 10]) {
|
||||
assert(1 <= percent && percent <= 100);
|
||||
var p = percent / 100;
|
||||
return Color.fromARGB(
|
||||
c.alpha,
|
||||
c.red + ((255 - c.red) * p).round(),
|
||||
c.green + ((255 - c.green) * p).round(),
|
||||
c.blue + ((255 - c.blue) * p).round());
|
||||
}
|
||||
|
@@ -3,6 +3,7 @@ import 'dart:io';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:dio/io.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/foundation/log.dart';
|
||||
import 'package:pixes/utils/ext.dart';
|
||||
@@ -124,21 +125,22 @@ class AppDio extends DioForNative {
|
||||
}
|
||||
|
||||
void setSystemProxy() {
|
||||
HttpOverrides.global = _ProxyHttpOverrides()
|
||||
..findProxy(Uri());
|
||||
HttpOverrides.global = _ProxyHttpOverrides()..findProxy(Uri());
|
||||
}
|
||||
|
||||
class _ProxyHttpOverrides extends HttpOverrides {
|
||||
String proxy = "DIRECT";
|
||||
|
||||
String findProxy(Uri uri) {
|
||||
if(!App.isLinux) {
|
||||
var haveUserProxy = appdata.settings["proxy"] != null &&
|
||||
appdata.settings["proxy"].toString().removeAllBlank.isNotEmpty;
|
||||
if (!App.isLinux && !haveUserProxy) {
|
||||
var channel = const MethodChannel("pixes/proxy");
|
||||
channel.invokeMethod("getProxy").then((value) {
|
||||
if(value.toString().toLowerCase() == "no proxy"){
|
||||
if (value.toString().toLowerCase() == "no proxy") {
|
||||
proxy = "DIRECT";
|
||||
} else {
|
||||
if(proxy.contains("https")){
|
||||
if (proxy.contains("https")) {
|
||||
var proxies = value.split(";");
|
||||
for (String proxy in proxies) {
|
||||
proxy = proxy.removeAllBlank;
|
||||
@@ -150,6 +152,20 @@ class _ProxyHttpOverrides extends HttpOverrides {
|
||||
proxy = "PROXY $value";
|
||||
}
|
||||
});
|
||||
} else {
|
||||
if (haveUserProxy) {
|
||||
proxy = "PROXY ${appdata.settings["proxy"]}";
|
||||
}
|
||||
}
|
||||
// check validation
|
||||
if (proxy.startsWith("PROXY")) {
|
||||
var uri = proxy.replaceFirst("PROXY", "").removeAllBlank;
|
||||
if (!uri.startsWith("http")) {
|
||||
uri += "http://";
|
||||
}
|
||||
if (!uri.isURL) {
|
||||
return "DIRECT";
|
||||
}
|
||||
}
|
||||
return proxy;
|
||||
}
|
||||
|
@@ -127,28 +127,37 @@ class DownloadingTask {
|
||||
static String _generateFilePath(Illust illust, int index, String ext) {
|
||||
final String downloadPath = appdata.settings["downloadPath"];
|
||||
String subPathPatten = appdata.settings["downloadSubPath"];
|
||||
final tagsWeight = (appdata.settings["tagsWeight"] as String).split(' ');
|
||||
final originalTags = List<Tag>.from(illust.tags);
|
||||
originalTags.sort((a, b){
|
||||
var aWeight = tagsWeight.indexOf(a.name);
|
||||
if(aWeight == -1) aWeight = tagsWeight.length;
|
||||
var bWeight = tagsWeight.indexOf(b.name);
|
||||
if(bWeight == -1) bWeight = tagsWeight.length;
|
||||
return aWeight - bWeight;
|
||||
});
|
||||
final tags = appdata.settings["useTranslatedNameForDownload"] == false
|
||||
? originalTags.map((e) => e.name).toList()
|
||||
: originalTags.map((e) => e.translatedName ?? e.name).toList();
|
||||
|
||||
subPathPatten = subPathPatten.replaceAll(r"${id}", illust.id.toString());
|
||||
subPathPatten = subPathPatten.replaceAll(r"${title}", illust.title);
|
||||
subPathPatten = subPathPatten.replaceAll(r"${author}", illust.author.name);
|
||||
subPathPatten = subPathPatten.replaceAll(r"${index}", index.toString());
|
||||
subPathPatten = subPathPatten.replaceAll(r"${page}",
|
||||
illust.images.length == 1 ? "" : "-p$index");
|
||||
subPathPatten = subPathPatten.replaceAll(r"${ext}", ext);
|
||||
for(int i=0; i<tags.length; i++) {
|
||||
subPathPatten = subPathPatten.replaceAll("\${tag$i}", tags[i]);
|
||||
subPathPatten = subPathPatten.replaceAll(r"${AI}", illust.isAi ? "AI" : "");
|
||||
List<String> extractTags(String input) {
|
||||
final regex = RegExp(r'\$\{tag\((.*?)\)\}');
|
||||
final matches = regex.allMatches(input);
|
||||
return matches.map((match) => match.group(1)!).toList();
|
||||
}
|
||||
return "$downloadPath$subPathPatten";
|
||||
var tags = extractTags(subPathPatten);
|
||||
for(var tag in tags) {
|
||||
if (illust.tags.where((e) => e.name == tag || e.translatedName == tag).isNotEmpty) {
|
||||
subPathPatten = subPathPatten.replaceAll("\${tag($tag)}", tag);
|
||||
}
|
||||
}
|
||||
return _cleanFilePath("$downloadPath$subPathPatten");
|
||||
}
|
||||
|
||||
static String _cleanFilePath(String filePath) {
|
||||
const invalidChars = ['*', '?', '"', '<', '>', '|'];
|
||||
|
||||
String cleanedPath =
|
||||
filePath.replaceAll(RegExp('[${invalidChars.join(' ')}]'), '');
|
||||
|
||||
cleanedPath = cleanedPath.replaceAll(RegExp(r'[/\\]+'), '/');
|
||||
|
||||
return cleanedPath;
|
||||
}
|
||||
|
||||
void retry() {
|
||||
@@ -156,6 +165,10 @@ class DownloadingTask {
|
||||
_stop = false;
|
||||
_download();
|
||||
}
|
||||
|
||||
void pause() {
|
||||
_stop = true;
|
||||
}
|
||||
}
|
||||
|
||||
class DownloadManager {
|
||||
@@ -269,8 +282,20 @@ class DownloadManager {
|
||||
|
||||
int get maxConcurrentTasks => appdata.settings["maxParallels"];
|
||||
|
||||
bool _paused = false;
|
||||
|
||||
bool get paused => _paused;
|
||||
|
||||
void pause() {
|
||||
_paused = true;
|
||||
for(var task in tasks) {
|
||||
task.pause();
|
||||
}
|
||||
}
|
||||
|
||||
void run() {
|
||||
_loop ??= Timer.periodic(const Duration(seconds: 1), (timer) {
|
||||
if(_paused) return;
|
||||
_bytesPerSecond = _currentBytes;
|
||||
_currentBytes = 0;
|
||||
uiUpdateCallback?.call();
|
||||
@@ -342,4 +367,28 @@ class DownloadManager {
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> checkAndClearInvalidItems() async{
|
||||
var illusts = listAll();
|
||||
var shouldDelete = <DownloadedIllust>[];
|
||||
for(var item in illusts) {
|
||||
var paths = getImagePaths(item.illustId);
|
||||
var validPaths = <String>[];
|
||||
for(var path in paths) {
|
||||
if(await File(path).exists()) {
|
||||
validPaths.add(path);
|
||||
}
|
||||
}
|
||||
if(validPaths.isEmpty) {
|
||||
shouldDelete.add(item);
|
||||
}
|
||||
}
|
||||
for(var item in shouldDelete) {
|
||||
delete(item);
|
||||
}
|
||||
}
|
||||
|
||||
void resume() {
|
||||
_paused = false;
|
||||
}
|
||||
}
|
@@ -121,15 +121,14 @@ class UserDetails {
|
||||
pawooUrl = json['profile']['pawoo_url'];
|
||||
}
|
||||
|
||||
class IllustAuthor {
|
||||
class Author {
|
||||
final int id;
|
||||
final String name;
|
||||
final String account;
|
||||
final String avatar;
|
||||
bool isFollowed;
|
||||
|
||||
IllustAuthor(
|
||||
this.id, this.name, this.account, this.avatar, this.isFollowed);
|
||||
Author(this.id, this.name, this.account, this.avatar, this.isFollowed);
|
||||
}
|
||||
|
||||
class Tag {
|
||||
@@ -142,6 +141,17 @@ class Tag {
|
||||
String toString() {
|
||||
return "$name${translatedName == null ? "" : "($translatedName)"}";
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
if (other is Tag) {
|
||||
return name == other.name;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode => name.hashCode;
|
||||
}
|
||||
|
||||
class IllustImage {
|
||||
@@ -160,9 +170,9 @@ class Illust {
|
||||
final List<IllustImage> images;
|
||||
final String caption;
|
||||
final int restrict;
|
||||
final IllustAuthor author;
|
||||
final Author author;
|
||||
final List<Tag> tags;
|
||||
final String createDate;
|
||||
final DateTime createDate;
|
||||
final int pageCount;
|
||||
final int width;
|
||||
final int height;
|
||||
@@ -170,6 +180,12 @@ class Illust {
|
||||
final int totalBookmarks;
|
||||
bool isBookmarked;
|
||||
final bool isAi;
|
||||
final bool isUgoira;
|
||||
final bool isBlocked;
|
||||
|
||||
bool get isR18 => tags.contains(const Tag("R-18", null));
|
||||
|
||||
bool get isR18G => tags.contains(const Tag("R-18G", null));
|
||||
|
||||
Illust.fromJson(Map<String, dynamic> json)
|
||||
: id = json['id'],
|
||||
@@ -195,7 +211,7 @@ class Illust {
|
||||
}()),
|
||||
caption = json['caption'],
|
||||
restrict = json['restrict'],
|
||||
author = IllustAuthor(
|
||||
author = Author(
|
||||
json['user']['id'],
|
||||
json['user']['name'],
|
||||
json['user']['account'],
|
||||
@@ -204,14 +220,16 @@ class Illust {
|
||||
tags = (json['tags'] as List)
|
||||
.map((e) => Tag(e['name'], e['translated_name']))
|
||||
.toList(),
|
||||
createDate = json['create_date'],
|
||||
createDate = DateTime.parse(json['create_date']),
|
||||
pageCount = json['page_count'],
|
||||
width = json['width'],
|
||||
height = json['height'],
|
||||
totalView = json['total_view'],
|
||||
totalBookmarks = json['total_bookmarks'],
|
||||
isBookmarked = json['is_bookmarked'],
|
||||
isAi = json['is_ai'] != 1;
|
||||
isAi = json['illust_ai_type'] == 2,
|
||||
isUgoira = json['type'] == "ugoira",
|
||||
isBlocked = json['is_muted'] ?? false;
|
||||
}
|
||||
|
||||
class TrendingTag {
|
||||
@@ -233,11 +251,11 @@ enum KeywordMatchType {
|
||||
@override
|
||||
toString() => text;
|
||||
|
||||
String toParam() => switch(this) {
|
||||
KeywordMatchType.tagsPartialMatches => "partial_match_for_tags",
|
||||
KeywordMatchType.tagsExactMatch => "exact_match_for_tags",
|
||||
KeywordMatchType.titleOrDescriptionSearch => "title_and_caption"
|
||||
};
|
||||
String toParam() => switch (this) {
|
||||
KeywordMatchType.tagsPartialMatches => "partial_match_for_tags",
|
||||
KeywordMatchType.tagsExactMatch => "exact_match_for_tags",
|
||||
KeywordMatchType.titleOrDescriptionSearch => "title_and_caption"
|
||||
};
|
||||
}
|
||||
|
||||
enum FavoriteNumber {
|
||||
@@ -256,9 +274,11 @@ enum FavoriteNumber {
|
||||
const FavoriteNumber(this.number);
|
||||
|
||||
@override
|
||||
toString() => this == FavoriteNumber.unlimited ? "Unlimited" : "$number Bookmarks";
|
||||
toString() =>
|
||||
this == FavoriteNumber.unlimited ? "Unlimited" : "$number Bookmarks";
|
||||
|
||||
String toParam() => this == FavoriteNumber.unlimited ? "" : " ${number}users入り";
|
||||
String toParam() =>
|
||||
this == FavoriteNumber.unlimited ? "" : " ${number}users入り";
|
||||
}
|
||||
|
||||
enum SearchSort {
|
||||
@@ -271,37 +291,35 @@ enum SearchSort {
|
||||
bool get isPremium => appdata.account?.user.isPremium == true;
|
||||
|
||||
static List<SearchSort> get availableValues => [
|
||||
SearchSort.newToOld,
|
||||
SearchSort.oldToNew,
|
||||
SearchSort.popular,
|
||||
if(appdata.account?.user.isPremium == true)
|
||||
SearchSort.popularMale,
|
||||
if(appdata.account?.user.isPremium == true)
|
||||
SearchSort.popularFemale
|
||||
];
|
||||
SearchSort.newToOld,
|
||||
SearchSort.oldToNew,
|
||||
SearchSort.popular,
|
||||
if (appdata.account?.user.isPremium == true) SearchSort.popularMale,
|
||||
if (appdata.account?.user.isPremium == true) SearchSort.popularFemale
|
||||
];
|
||||
|
||||
@override
|
||||
toString() {
|
||||
if(this == SearchSort.popular) {
|
||||
if (this == SearchSort.popular) {
|
||||
return isPremium ? "Popular" : "Popular(limited)";
|
||||
} else if(this == SearchSort.newToOld) {
|
||||
} else if (this == SearchSort.newToOld) {
|
||||
return "New to old";
|
||||
} else if(this == SearchSort.oldToNew){
|
||||
} else if (this == SearchSort.oldToNew) {
|
||||
return "Old to new";
|
||||
} else if(this == SearchSort.popularMale){
|
||||
} else if (this == SearchSort.popularMale) {
|
||||
return "Popular(Male)";
|
||||
} else {
|
||||
return "Popular(Female)";
|
||||
}
|
||||
}
|
||||
|
||||
String toParam() => switch(this) {
|
||||
SearchSort.newToOld => "date_desc",
|
||||
SearchSort.oldToNew => "date_asc",
|
||||
SearchSort.popular => "popular_desc",
|
||||
SearchSort.popularMale => "popular_male_desc",
|
||||
SearchSort.popularFemale => "popular_female_desc",
|
||||
};
|
||||
String toParam() => switch (this) {
|
||||
SearchSort.newToOld => "date_desc",
|
||||
SearchSort.oldToNew => "date_asc",
|
||||
SearchSort.popular => "popular_desc",
|
||||
SearchSort.popularMale => "popular_male_desc",
|
||||
SearchSort.popularFemale => "popular_female_desc",
|
||||
};
|
||||
}
|
||||
|
||||
enum AgeLimit {
|
||||
@@ -316,11 +334,11 @@ enum AgeLimit {
|
||||
@override
|
||||
toString() => text;
|
||||
|
||||
String toParam() => switch(this) {
|
||||
AgeLimit.unlimited => "",
|
||||
AgeLimit.allAges => " -R-18",
|
||||
AgeLimit.r18 => "R-18",
|
||||
};
|
||||
String toParam() => switch (this) {
|
||||
AgeLimit.unlimited => "",
|
||||
AgeLimit.allAges => " -R-18",
|
||||
AgeLimit.r18 => "R-18",
|
||||
};
|
||||
}
|
||||
|
||||
class SearchOptions {
|
||||
@@ -352,17 +370,20 @@ class UserPreview {
|
||||
final String avatar;
|
||||
bool isFollowed;
|
||||
final bool isBlocking;
|
||||
final List<Illust> artworks;
|
||||
|
||||
UserPreview(this.id, this.name, this.account, this.avatar, this.isFollowed,
|
||||
this.isBlocking);
|
||||
this.isBlocking, this.artworks);
|
||||
|
||||
UserPreview.fromJson(Map<String, dynamic> json)
|
||||
: id = json['id'],
|
||||
name = json['name'],
|
||||
account = json['account'],
|
||||
avatar = json['profile_image_urls']['medium'],
|
||||
isFollowed = json['is_followed'],
|
||||
isBlocking = json['is_access_blocking_user'] ?? false;
|
||||
: id = json['user']['id'],
|
||||
name = json['user']['name'],
|
||||
account = json['user']['account'],
|
||||
avatar = json['user']['profile_image_urls']['medium'],
|
||||
isFollowed = json['user']['is_followed'],
|
||||
isBlocking = json['user']['is_access_blocking_user'] ?? false,
|
||||
artworks =
|
||||
(json['illusts'] as List).map((e) => Illust.fromJson(e)).toList();
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -385,7 +406,7 @@ class UserPreview {
|
||||
}
|
||||
}
|
||||
*/
|
||||
class Comment{
|
||||
class Comment {
|
||||
final String id;
|
||||
final String comment;
|
||||
final DateTime date;
|
||||
@@ -402,6 +423,129 @@ class Comment{
|
||||
uid = json['user']['id'].toString(),
|
||||
name = json['user']['name'],
|
||||
avatar = json['user']['profile_image_urls']['medium'],
|
||||
hasReplies = json['has_replies'],
|
||||
hasReplies = json['has_replies'] ?? false,
|
||||
stampUrl = json['stamp']?['stamp_url'];
|
||||
}
|
||||
|
||||
/*
|
||||
{
|
||||
"id": 20741342,
|
||||
"title": "中身が一般人のやつがれくん",
|
||||
"caption": "なんか思いついたので書いてみた。<br />よくある芥川成り代わり。<br />3年くらい前の書きかけのやつをサルベージ。<br />じっくりは書いてないので抜け抜け。<br /><br />デイリー1位ありがとうございます✨<br /><br />※※※※※※※※<br />※※※※※※※※<br /><br />以下読了後推奨の蛇足<br /><br />「芥川くん」<br />「なんですかボス」<br />「君は将来的にどんな地位につきたいとかある?」<br />「僕はしがない一構成員ゆえ」<br />「ほら幹部とか隊長とか人事部とかさ。君あれこれオールマイティにできるから希望を聞いておこうと思って」<br />「ございます」<br />「なにかな?」<br />「僕は将来的にポートマフィア直営のいちじく農家になりたいと思います」<br />「なんて?」<br />「さらに、ゆくゆくはいちじく農家兼、いちじくの素晴らしさを世に知らしめるポートマフィア直営いちじくレストランを開きたいと」<br />「なんて???」",
|
||||
"restrict": 0,
|
||||
"x_restrict": 0,
|
||||
"is_original": false,
|
||||
"image_urls": {
|
||||
"square_medium": "https://i.pximg.net/c/128x128/novel-cover-master/img/2023/09/27/16/14/45/ci20741342_db401e9b27afbf96f772d30759e1d104_square1200.jpg",
|
||||
"medium": "https://i.pximg.net/c/176x352/novel-cover-master/img/2023/09/27/16/14/45/ci20741342_db401e9b27afbf96f772d30759e1d104_master1200.jpg",
|
||||
"large": "https://i.pximg.net/c/240x480_80/novel-cover-master/img/2023/09/27/16/14/45/ci20741342_db401e9b27afbf96f772d30759e1d104_master1200.jpg"
|
||||
},
|
||||
"create_date": "2023-09-27T16:14:45+09:00",
|
||||
"tags": [
|
||||
{
|
||||
"name": "文スト夢",
|
||||
"translated_name": "Bungo Stray Dogs original/self-insert",
|
||||
"added_by_uploaded_user": true
|
||||
},
|
||||
{
|
||||
"name": "成り代わり",
|
||||
"translated_name": "取代即有角色",
|
||||
"added_by_uploaded_user": true
|
||||
},
|
||||
],
|
||||
"page_count": 6,
|
||||
"text_length": 12550,
|
||||
"user": {
|
||||
"id": 9275134,
|
||||
"name": "もろろ",
|
||||
"account": "sleepinglife",
|
||||
"profile_image_urls": {
|
||||
"medium": "https://s.pximg.net/common/images/no_profile.png"
|
||||
},
|
||||
"is_followed": false
|
||||
},
|
||||
"series": {
|
||||
"id": 11897059,
|
||||
"title": "文スト夢"
|
||||
},
|
||||
"is_bookmarked": false,
|
||||
"total_bookmarks": 8099,
|
||||
"total_view": 76112,
|
||||
"visible": true,
|
||||
"total_comments": 146,
|
||||
"is_muted": false,
|
||||
"is_mypixiv_only": false,
|
||||
"is_x_restricted": false,
|
||||
"novel_ai_type": 1
|
||||
}
|
||||
*/
|
||||
class Novel {
|
||||
final int id;
|
||||
final String title;
|
||||
final String caption;
|
||||
final bool isOriginal;
|
||||
final String image;
|
||||
final DateTime createDate;
|
||||
final List<Tag> tags;
|
||||
final int pages;
|
||||
final int length;
|
||||
final Author author;
|
||||
final int? seriesId;
|
||||
final String? seriesTitle;
|
||||
bool isBookmarked;
|
||||
final int totalBookmarks;
|
||||
final int totalViews;
|
||||
final int commentsCount;
|
||||
final bool isAi;
|
||||
|
||||
Novel.fromJson(Map<String, dynamic> json)
|
||||
: id = json["id"],
|
||||
title = json["title"],
|
||||
caption = json["caption"],
|
||||
isOriginal = json["is_original"],
|
||||
image = json["image_urls"]["large"] ??
|
||||
json["image_urls"]["medium"] ??
|
||||
json["image_urls"]["square_medium"] ??
|
||||
"",
|
||||
createDate = DateTime.parse(json["create_date"]),
|
||||
tags = (json['tags'] as List)
|
||||
.map((e) => Tag(e['name'], e['translated_name']))
|
||||
.toList(),
|
||||
pages = json["page_count"],
|
||||
length = json["text_length"],
|
||||
author = Author(
|
||||
json['user']['id'],
|
||||
json['user']['name'],
|
||||
json['user']['account'],
|
||||
json['user']['profile_image_urls']['medium'],
|
||||
json['user']['is_followed'] ?? false),
|
||||
seriesId = json["series"]?["id"],
|
||||
seriesTitle = json["series"]?["title"],
|
||||
isBookmarked = json["is_bookmarked"],
|
||||
totalBookmarks = json["total_bookmarks"],
|
||||
totalViews = json["total_view"],
|
||||
commentsCount = json["total_comments"],
|
||||
isAi = json["novel_ai_type"] == 2;
|
||||
}
|
||||
|
||||
class MuteList {
|
||||
List<Tag> tags;
|
||||
|
||||
List<Author> authors;
|
||||
|
||||
int limit;
|
||||
|
||||
MuteList(this.tags, this.authors, this.limit);
|
||||
|
||||
static MuteList? fromJson(Map<String, dynamic> data) {
|
||||
return MuteList(
|
||||
(data['muted_tags'] as List)
|
||||
.map((e) => Tag(e['tag'], e['tag_translation']))
|
||||
.toList(),
|
||||
(data['muted_users'] as List)
|
||||
.map((e) => Author(e['user_id'], e['user_name'], e['user_account'],
|
||||
e['user_profile_image_urls']['medium'], false))
|
||||
.toList(),
|
||||
data['mute_limit_count']);
|
||||
}
|
||||
}
|
||||
|
@@ -14,6 +14,8 @@ import 'models.dart';
|
||||
export 'models.dart';
|
||||
export 'res.dart';
|
||||
|
||||
part 'novel.dart';
|
||||
|
||||
class Network {
|
||||
static const hashSalt =
|
||||
"28c1fdd170a5204386cb1313c7077b34f83e4aaf4aa829ce78c231e05b0bae2c";
|
||||
@@ -108,9 +110,9 @@ class Network {
|
||||
contentType: Headers.formUrlEncodedContentType,
|
||||
validateStatus: (i) => true,
|
||||
headers: headers));
|
||||
if(res.statusCode != 200) {
|
||||
if (res.statusCode != 200) {
|
||||
var data = res.data ?? "";
|
||||
if(data.contains("Invalid refresh token")) {
|
||||
if (data.contains("Invalid refresh token")) {
|
||||
throw "Failed to refresh token. Please log out.";
|
||||
}
|
||||
}
|
||||
@@ -132,8 +134,7 @@ class Network {
|
||||
}
|
||||
final res = await dio.get<Map<String, dynamic>>(path,
|
||||
queryParameters: query,
|
||||
options:
|
||||
Options(headers: headers, validateStatus: (status) => true));
|
||||
options: Options(headers: headers, validateStatus: (status) => true));
|
||||
if (res.statusCode == 200) {
|
||||
return Res(res.data!);
|
||||
} else if (res.statusCode == 400) {
|
||||
@@ -159,6 +160,52 @@ class Network {
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<String>> apiGetPlain(String path,
|
||||
{Map<String, dynamic>? query}) async {
|
||||
try {
|
||||
if (!path.startsWith("http")) {
|
||||
path = "$baseUrl$path";
|
||||
}
|
||||
final res = await dio.get<String>(path,
|
||||
queryParameters: query,
|
||||
options: Options(headers: headers, validateStatus: (status) => true));
|
||||
if (res.statusCode == 200) {
|
||||
return Res(res.data!);
|
||||
} else if (res.statusCode == 400) {
|
||||
if (res.data.toString().contains("Access Token")) {
|
||||
var refresh = await refreshToken();
|
||||
if (refresh.success) {
|
||||
return apiGetPlain(path, query: query);
|
||||
} else {
|
||||
return Res.error(refresh.errorMessage);
|
||||
}
|
||||
} else {
|
||||
return Res.error("Invalid Status Code: ${res.statusCode}");
|
||||
}
|
||||
} else {
|
||||
return Res.error("Invalid Status Code: ${res.statusCode}");
|
||||
}
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
String? encodeFormData(Map<String, dynamic>? data) {
|
||||
if (data == null) return null;
|
||||
StringBuffer buffer = StringBuffer();
|
||||
data.forEach((key, value) {
|
||||
if (value is List) {
|
||||
for (var element in value) {
|
||||
buffer.write("$key[]=$element&");
|
||||
}
|
||||
} else {
|
||||
buffer.write("$key=$value&");
|
||||
}
|
||||
});
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
Future<Res<Map<String, dynamic>>> apiPost(String path,
|
||||
{Map<String, dynamic>? query, Map<String, dynamic>? data}) async {
|
||||
try {
|
||||
@@ -167,7 +214,7 @@ class Network {
|
||||
}
|
||||
final res = await dio.post<Map<String, dynamic>>(path,
|
||||
queryParameters: query,
|
||||
data: data,
|
||||
data: encodeFormData(data),
|
||||
options: Options(
|
||||
headers: headers,
|
||||
validateStatus: (status) => true,
|
||||
@@ -208,13 +255,15 @@ class Network {
|
||||
}
|
||||
}
|
||||
|
||||
static const recommendationUrl =
|
||||
"/v1/illust/recommended?include_privacy_policy=true&filter=for_android&include_ranking_illusts=true";
|
||||
|
||||
Future<Res<List<Illust>>> getRecommendedIllusts() async {
|
||||
var res = await apiGet(
|
||||
"/v1/illust/recommended?include_privacy_policy=true&filter=for_android&include_ranking_illusts=true");
|
||||
var res = await apiGet(recommendationUrl);
|
||||
if (res.success) {
|
||||
return Res((res.data["illusts"] as List)
|
||||
.map((e) => Illust.fromJson(e))
|
||||
.toList());
|
||||
return Res(
|
||||
(res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
|
||||
subData: recommendationUrl);
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
@@ -223,7 +272,20 @@ class Network {
|
||||
Future<Res<List<Illust>>> getBookmarkedIllusts(String restrict,
|
||||
[String? nextUrl]) async {
|
||||
var res = await apiGet(nextUrl ??
|
||||
"/v1/user/bookmarks/illust?user_id=49258688&restrict=$restrict");
|
||||
"/v1/user/bookmarks/illust?user_id=${appdata.account?.user.id}&restrict=$restrict");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
|
||||
subData: res.data["next_url"]);
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<Illust>>> getUserBookmarks(String uid,
|
||||
[String? nextUrl]) async {
|
||||
var res = await apiGet(
|
||||
nextUrl ?? "/v1/user/bookmarks/illust?user_id=$uid&restrict=public");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
|
||||
@@ -298,7 +360,7 @@ class Network {
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<Illust>>> getIllustsWithNextUrl(String nextUrl) async{
|
||||
Future<Res<List<Illust>>> getIllustsWithNextUrl(String nextUrl) async {
|
||||
var res = await apiGet(nextUrl);
|
||||
if (res.success) {
|
||||
return Res(
|
||||
@@ -309,20 +371,25 @@ class Network {
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<UserPreview>>> searchUsers(String keyword, [String? nextUrl]) async{
|
||||
var path = nextUrl ?? "/v1/search/user?filter=for_android&word=${Uri.encodeComponent(keyword)}";
|
||||
Future<Res<List<UserPreview>>> searchUsers(String keyword,
|
||||
[String? nextUrl]) async {
|
||||
var path = nextUrl ??
|
||||
"/v1/search/user?filter=for_android&word=${Uri.encodeComponent(keyword)}";
|
||||
var res = await apiGet(path);
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["user_previews"] as List).map((e) => UserPreview.fromJson(e["user"])).toList(),
|
||||
(res.data["user_previews"] as List)
|
||||
.map((e) => UserPreview.fromJson(e))
|
||||
.toList(),
|
||||
subData: res.data["next_url"]);
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<Illust>>> getUserIllusts(String uid) async {
|
||||
var res = await apiGet("/v1/user/illusts?filter=for_android&user_id=$uid&type=illust");
|
||||
Future<Res<List<Illust>>> getUserIllusts(String uid, String? type) async {
|
||||
var res = await apiGet(
|
||||
"/v1/user/illusts?filter=for_android&user_id=$uid${type != null ? "&type=$type" : ""}");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
|
||||
@@ -332,19 +399,24 @@ class Network {
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<UserPreview>>> getFollowing(String uid, String type, [String? nextUrl]) async {
|
||||
var path = nextUrl ?? "/v1/user/following?filter=for_android&user_id=$uid&restrict=$type";
|
||||
Future<Res<List<UserPreview>>> getFollowing(String uid, String type,
|
||||
[String? nextUrl]) async {
|
||||
var path = nextUrl ??
|
||||
"/v1/user/following?filter=for_android&user_id=$uid&restrict=$type";
|
||||
var res = await apiGet(path);
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["user_previews"] as List).map((e) => UserPreview.fromJson(e["user"])).toList(),
|
||||
(res.data["user_previews"] as List)
|
||||
.map((e) => UserPreview.fromJson(e))
|
||||
.toList(),
|
||||
subData: res.data["next_url"]);
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<Illust>>> getFollowingArtworks(String restrict, [String? nextUrl]) async {
|
||||
Future<Res<List<Illust>>> getFollowingArtworks(String restrict,
|
||||
[String? nextUrl]) async {
|
||||
var res = await apiGet(nextUrl ?? "/v2/illust/follow?restrict=$restrict");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
@@ -359,7 +431,9 @@ class Network {
|
||||
var res = await apiGet("/v1/user/recommended?filter=for_android");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["user_previews"] as List).map((e) => UserPreview.fromJson(e["user"])).toList(),
|
||||
(res.data["user_previews"] as List)
|
||||
.map((e) => UserPreview.fromJson(e))
|
||||
.toList(),
|
||||
subData: res.data["next_url"]);
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
@@ -368,7 +442,8 @@ class Network {
|
||||
|
||||
/// mode: day, week, month, day_male, day_female, week_original, week_rookie, day_manga, week_manga, month_manga, day_r18_manga, day_r18
|
||||
Future<Res<List<Illust>>> getRanking(String mode, [String? nextUrl]) async {
|
||||
var res = await apiGet(nextUrl ?? "/v1/illust/ranking?filter=for_android&mode=$mode");
|
||||
var res = await apiGet(
|
||||
nextUrl ?? "/v1/illust/ranking?filter=for_android&mode=$mode");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
|
||||
@@ -382,7 +457,9 @@ class Network {
|
||||
var res = await apiGet(nextUrl ?? "/v3/illust/comments?illust_id=$id");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["comments"] as List).map((e) => Comment.fromJson(e)).toList(),
|
||||
(res.data["comments"] as List)
|
||||
.map((e) => Comment.fromJson(e))
|
||||
.toList(),
|
||||
subData: res.data["next_url"]);
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
@@ -409,7 +486,8 @@ class Network {
|
||||
}
|
||||
|
||||
Future<Res<List<Illust>>> getRecommendedMangas() async {
|
||||
var res = await apiGet("/v1/manga/recommended?filter=for_android&include_ranking_illusts=true&include_privacy_policy=true");
|
||||
var res = await apiGet(
|
||||
"/v1/manga/recommended?filter=for_android&include_ranking_illusts=true&include_privacy_policy=true");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
|
||||
@@ -421,34 +499,84 @@ class Network {
|
||||
|
||||
Future<Res<List<Illust>>> getHistory(int page) async {
|
||||
String param = "";
|
||||
if(page > 1) {
|
||||
param = "?offset=${30*(page-1)}";
|
||||
if (page > 1) {
|
||||
param = "?offset=${30 * (page - 1)}";
|
||||
}
|
||||
var res = await apiGet("/v1/user/browsing-history/illusts$param");
|
||||
if (res.success) {
|
||||
return Res((res.data["illusts"] as List)
|
||||
.map((e) => Illust.fromJson(e)).toList());
|
||||
.map((e) => Illust.fromJson(e))
|
||||
.toList());
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Future<List<Tag>> getMutedTags() async {
|
||||
Future<Res<MuteList>> getMuteList() async {
|
||||
var res = await apiGet("/v1/mute/list");
|
||||
if (res.success) {
|
||||
return res.data["mute_tags"].map<Tag>((e) =>
|
||||
Tag(e["tag"]["name"], e["tag"]["translated_name"]))
|
||||
.toList();
|
||||
return Res(MuteList.fromJson(res.data));
|
||||
} else {
|
||||
return [];
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<bool>> muteTags(List<String> muteTags, List<String> unmuteTags) async {
|
||||
var res = await apiPost("/v1/mute/edit", data: {
|
||||
"add_tags": muteTags,
|
||||
"delete_tags": unmuteTags
|
||||
});
|
||||
Future<Res<bool>> editMute(List<String> addTags, List<String> addUsers,
|
||||
List<String> deleteTags, List<String> deleteUsers) async {
|
||||
var res = await apiPost("/v1/mute/edit",
|
||||
data: {
|
||||
"add_tags": addTags,
|
||||
"add_user_ids": addUsers,
|
||||
"delete_tags": deleteTags,
|
||||
"delete_user_ids": deleteUsers
|
||||
}..removeWhere((key, value) => value.isEmpty));
|
||||
if (res.success) {
|
||||
return const Res(true);
|
||||
} else {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<UserPreview>>> relatedUsers(String id) async {
|
||||
var res =
|
||||
await apiGet("/v1/user/related?filter=for_android&seed_user_id=$id");
|
||||
if (res.success) {
|
||||
return Res((res.data["user_previews"] as List)
|
||||
.map((e) => UserPreview.fromJson(e))
|
||||
.toList());
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<Illust>>> relatedIllusts(String id) async {
|
||||
var res =
|
||||
await apiGet("/v2/illust/related?filter=for_android&illust_id=$id");
|
||||
if (res.success) {
|
||||
return Res((res.data["illusts"] as List)
|
||||
.map((e) => Illust.fromJson(e))
|
||||
.toList());
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<String>> getNovelImage(String novelId, String imageId) async {
|
||||
var res = await apiGetPlain(
|
||||
"/web/v1/novel/image?novel_id=$novelId&uploaded_image_id=$imageId");
|
||||
if (res.success) {
|
||||
var html = res.data;
|
||||
int start = html.indexOf('<img src="') + 10;
|
||||
int end = html.indexOf('"', start);
|
||||
return Res(html.substring(start, end));
|
||||
} else {
|
||||
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 {
|
||||
|
152
lib/network/novel.dart
Normal file
@@ -0,0 +1,152 @@
|
||||
part of "network.dart";
|
||||
|
||||
extension NovelExt on Network {
|
||||
Future<Res<List<Novel>>> getRecommendNovels() {
|
||||
return getNovelsWithNextUrl("/v1/novel/recommended");
|
||||
}
|
||||
|
||||
Future<Res<List<Novel>>> getNovelsWithNextUrl(String nextUrl) async {
|
||||
var res = await apiGet(nextUrl);
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
return Res(
|
||||
(res.data["novels"] as List).map((e) => Novel.fromJson(e)).toList(),
|
||||
subData: res.data["next_url"]);
|
||||
}
|
||||
|
||||
Future<Res<List<Novel>>> searchNovels(String keyword, SearchOptions options) {
|
||||
var url = "/v1/search/novel?"
|
||||
"include_translated_tag_results=true&"
|
||||
"merge_plain_keyword_results=true&"
|
||||
"word=${Uri.encodeComponent(keyword)}&"
|
||||
"sort=${options.sort.toParam()}&"
|
||||
"search_target=${options.matchType.toParam()}&"
|
||||
"search_ai_type=0";
|
||||
return getNovelsWithNextUrl(url);
|
||||
}
|
||||
|
||||
/// mode: day, day_male, day_female, week_rookie, week, week_ai
|
||||
Future<Res<List<Novel>>> getNovelRanking(String mode, DateTime? date) {
|
||||
var url = "/v1/novel/ranking?mode=$mode";
|
||||
if (date != null) {
|
||||
url += "&date=${date.year}-${date.month}-${date.day}";
|
||||
}
|
||||
return getNovelsWithNextUrl(url);
|
||||
}
|
||||
|
||||
Future<Res<List<Novel>>> getBookmarkedNovels(String uid) {
|
||||
return getNovelsWithNextUrl(
|
||||
"/v1/user/bookmarks/novel?user_id=$uid&restrict=public");
|
||||
}
|
||||
|
||||
Future<Res<bool>> favoriteNovel(String id) async {
|
||||
var res = await apiPost("/v2/novel/bookmark/add", data: {
|
||||
"novel_id": id,
|
||||
"restrict": "public",
|
||||
});
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
return const Res(true);
|
||||
}
|
||||
|
||||
Future<Res<bool>> deleteFavoriteNovel(String id) async {
|
||||
var res = await apiPost("/v1/novel/bookmark/delete", data: {
|
||||
"novel_id": id,
|
||||
});
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
return const Res(true);
|
||||
}
|
||||
|
||||
Future<Res<String>> getNovelContent(String id) async {
|
||||
var res = await apiGetPlain(
|
||||
"/webview/v2/novel?id=$id&font=default&font_size=16.0px&line_height=1.75&color=%23101010&background_color=%23EFEFEF&margin_top=56px&margin_bottom=48px&theme=light&use_block=true&viewer_version=20221031_ai");
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
try {
|
||||
var html = res.data;
|
||||
int start = html.indexOf("novel:");
|
||||
while (html[start] != '{') {
|
||||
start++;
|
||||
}
|
||||
int leftCount = 0;
|
||||
int end = start;
|
||||
for (end = start; end < html.length; end++) {
|
||||
if (html[end] == '{') {
|
||||
leftCount++;
|
||||
} else if (html[end] == '}') {
|
||||
leftCount--;
|
||||
}
|
||||
if (leftCount == 0) {
|
||||
end++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
var json = jsonDecode(html.substring(start, end));
|
||||
return Res(json['text']);
|
||||
} catch (e, s) {
|
||||
Log.error(
|
||||
"Data Convert", "Failed to analyze html novel content: \n$e\n$s");
|
||||
return Res.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<Novel>>> relatedNovels(String id) async {
|
||||
var res = await apiPost("/v1/novel/related", data: {
|
||||
"novel_id": id,
|
||||
});
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
return Res(
|
||||
(res.data["novels"] as List).map((e) => Novel.fromJson(e)).toList());
|
||||
}
|
||||
|
||||
Future<Res<List<Novel>>> getUserNovels(String uid) {
|
||||
return getNovelsWithNextUrl("/v1/user/novels?user_id=$uid");
|
||||
}
|
||||
|
||||
Future<Res<List<Novel>>> getNovelSeries(String id, [String? nextUrl]) async {
|
||||
var res = await apiGet(nextUrl ?? "/v2/novel/series?series_id=$id");
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
return Res(
|
||||
(res.data["novels"] as List).map((e) => Novel.fromJson(e)).toList(),
|
||||
subData: res.data["next_url"]);
|
||||
}
|
||||
|
||||
Future<Res<List<Comment>>> getNovelComments(String id,
|
||||
[String? nextUrl]) async {
|
||||
var res = await apiGet(nextUrl ?? "/v1/novel/comments?novel_id=$id");
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
return Res(
|
||||
(res.data["comments"] as List).map((e) => Comment.fromJson(e)).toList(),
|
||||
subData: res.data["next_url"]);
|
||||
}
|
||||
|
||||
Future<Res<bool>> commentNovel(String id, String content) async {
|
||||
var res = await apiPost("/v1/novel/comment/add", data: {
|
||||
"novel_id": id,
|
||||
"content": content,
|
||||
});
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
return const Res(true);
|
||||
}
|
||||
|
||||
Future<Res<Novel>> getNovelDetail(String id) async {
|
||||
var res = await apiGet("/v2/novel/detail?novel_id=$id");
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
return Res(Novel.fromJson(res.data["novel"]));
|
||||
}
|
||||
}
|
@@ -5,6 +5,7 @@ import 'package:pixes/components/segmented_button.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/pages/illust_page.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../components/illust_widget.dart';
|
||||
@@ -83,7 +84,13 @@ class _OneBookmarkedPageState extends MultiPageLoadingState<_OneBookmarkedPage,
|
||||
if(index == data.length - 1){
|
||||
nextPage();
|
||||
}
|
||||
return IllustWidget(data[index]);
|
||||
return IllustWidget(data[index], onTap: () {
|
||||
context.to(() => IllustGalleryPage(
|
||||
illusts: data,
|
||||
initialPage: index,
|
||||
nextUrl: nextUrl
|
||||
));
|
||||
},);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
210
lib/pages/comments_page.dart
Normal file
@@ -0,0 +1,210 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/components/animated_image.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/page_route.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/foundation/image_provider.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/pages/user_info_page.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../components/md.dart';
|
||||
import '../components/message.dart';
|
||||
|
||||
class CommentsPage extends StatefulWidget {
|
||||
const CommentsPage(this.id, {this.isNovel = false, super.key});
|
||||
|
||||
final String id;
|
||||
|
||||
final bool isNovel;
|
||||
|
||||
static void show(BuildContext context, String id, {bool isNovel = false}) {
|
||||
Navigator.of(context)
|
||||
.push(SideBarRoute(CommentsPage(id, isNovel: isNovel)));
|
||||
}
|
||||
|
||||
@override
|
||||
State<CommentsPage> createState() => _CommentsPageState();
|
||||
}
|
||||
|
||||
class _CommentsPageState extends MultiPageLoadingState<CommentsPage, Comment> {
|
||||
bool isCommenting = false;
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<Comment> data) {
|
||||
return Stack(
|
||||
children: [
|
||||
Positioned.fill(child: buildBody(context, data)),
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: buildBottom(context),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildBody(BuildContext context, List<Comment> data) {
|
||||
return ListView.builder(
|
||||
padding: EdgeInsets.zero,
|
||||
itemCount: data.length + 2,
|
||||
itemBuilder: (context, index) {
|
||||
if (index == 0) {
|
||||
return Text("Comments".tl, style: const TextStyle(fontSize: 20))
|
||||
.paddingVertical(16)
|
||||
.paddingHorizontal(12);
|
||||
} else if (index == data.length + 1) {
|
||||
return const SizedBox(
|
||||
height: 64,
|
||||
);
|
||||
}
|
||||
index--;
|
||||
var date = data[index].date;
|
||||
var dateText = "${date.year}/${date.month}/${date.day}";
|
||||
return Card(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 12),
|
||||
margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 38,
|
||||
width: 38,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(38),
|
||||
child: ColoredBox(
|
||||
color: ColorScheme.of(context).secondaryContainer,
|
||||
child: GestureDetector(
|
||||
onTap: () => context.to(
|
||||
() => UserInfoPage(data[index].id.toString())),
|
||||
child: AnimatedImage(
|
||||
image: CachedImageProvider(data[index].avatar),
|
||||
width: 38,
|
||||
height: 38,
|
||||
fit: BoxFit.cover,
|
||||
filterQuality: FilterQuality.medium,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
data[index].name,
|
||||
style: const TextStyle(fontSize: 14),
|
||||
),
|
||||
Text(
|
||||
dateText,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: ColorScheme.of(context).outline),
|
||||
)
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
if (data[index].comment.isNotEmpty)
|
||||
Text(
|
||||
data[index].comment,
|
||||
style: const TextStyle(fontSize: 16),
|
||||
),
|
||||
if (data[index].stampUrl != null)
|
||||
SizedBox(
|
||||
height: 64,
|
||||
width: 64,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
child: AnimatedImage(
|
||||
image: CachedImageProvider(data[index].stampUrl!),
|
||||
width: 64,
|
||||
height: 64,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
Widget buildBottom(BuildContext context) {
|
||||
return Card(
|
||||
padding: EdgeInsets.zero,
|
||||
backgroundColor:
|
||||
FluentTheme.of(context).micaBackgroundColor.withOpacity(0.96),
|
||||
child: SizedBox(
|
||||
height: 52,
|
||||
child: TextBox(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||
placeholder: "Comment".tl,
|
||||
foregroundDecoration: BoxDecoration(
|
||||
border: Border.all(color: Colors.transparent),
|
||||
),
|
||||
onSubmitted: (s) {
|
||||
showToast(context, message: "Sending".tl);
|
||||
if (isCommenting) return;
|
||||
setState(() {
|
||||
isCommenting = true;
|
||||
});
|
||||
if (widget.isNovel) {
|
||||
Network().commentNovel(widget.id, s).then((value) {
|
||||
if (value.error) {
|
||||
context.showToast(message: "Network Error");
|
||||
setState(() {
|
||||
isCommenting = false;
|
||||
});
|
||||
} else {
|
||||
isCommenting = false;
|
||||
nextUrl = null;
|
||||
reset();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Network().comment(widget.id, s).then((value) {
|
||||
if (value.error) {
|
||||
context.showToast(message: "Network Error");
|
||||
setState(() {
|
||||
isCommenting = false;
|
||||
});
|
||||
} else {
|
||||
isCommenting = false;
|
||||
nextUrl = null;
|
||||
reset();
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
).paddingVertical(8).paddingHorizontal(12),
|
||||
).paddingBottom(context.padding.bottom + context.viewInsets.bottom),
|
||||
);
|
||||
}
|
||||
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Comment>>> loadData(int page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = widget.isNovel
|
||||
? await Network().getNovelComments(widget.id, nextUrl)
|
||||
: await Network().getComments(widget.id, nextUrl);
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
@@ -2,11 +2,11 @@ import 'dart:io';
|
||||
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:photo_view/photo_view_gallery.dart';
|
||||
import 'package:pixes/components/animated_image.dart';
|
||||
import 'package:pixes/components/grid.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:pixes/components/message.dart';
|
||||
import 'package:pixes/components/page_route.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/network/download.dart';
|
||||
@@ -31,7 +31,8 @@ class _DownloadedPageState extends State<DownloadedPage> {
|
||||
|
||||
void loadData() {
|
||||
illusts = DownloadManager().listAll();
|
||||
flyoutControllers = List.generate(illusts.length, (index) => FlyoutController());
|
||||
flyoutControllers =
|
||||
List.generate(illusts.length, (index) => FlyoutController());
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -44,7 +45,18 @@ class _DownloadedPageState extends State<DownloadedPage> {
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(title: "Downloaded".tl),
|
||||
TitleBar(
|
||||
title: "Downloaded".tl,
|
||||
action: Button(
|
||||
child: Text("Delete Invalid Items".tl),
|
||||
onPressed: () async {
|
||||
await DownloadManager().checkAndClearInvalidItems();
|
||||
setState(() {
|
||||
loadData();
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: buildBody(),
|
||||
),
|
||||
@@ -54,133 +66,134 @@ class _DownloadedPageState extends State<DownloadedPage> {
|
||||
|
||||
Widget buildBody() {
|
||||
return GridViewWithFixedItemHeight(
|
||||
itemCount: illusts.length,
|
||||
itemHeight: 152,
|
||||
maxCrossAxisExtent: 742,
|
||||
builder: (context, index) {
|
||||
var image = DownloadManager().getImage(illusts[index].illustId, 0);
|
||||
return Card(
|
||||
margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
|
||||
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 96,
|
||||
height: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
color: ColorScheme.of(context).secondaryContainer
|
||||
),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: image == null ? null : Image(
|
||||
image: FileImage(image),
|
||||
fit: BoxFit.cover,
|
||||
filterQuality: FilterQuality.medium,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
illusts[index].title,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
illusts[index].author,
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
Text(
|
||||
"${illusts[index].imageCount}P",
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Row(
|
||||
children: [
|
||||
const Spacer(),
|
||||
Button(
|
||||
child: Text("View".tl).fixWidth(42),
|
||||
onPressed: () {
|
||||
var images = DownloadManager().getImagePaths(
|
||||
illusts[index].illustId);
|
||||
if(images.isEmpty) {
|
||||
showToast(context, message: "No images found".tl);
|
||||
return;
|
||||
}
|
||||
App.rootNavigatorKey.currentState?.push(
|
||||
AppPageRoute(builder: (context) {
|
||||
return _DownloadedIllustViewPage(images);
|
||||
}));
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
Button(
|
||||
child: Text("Info".tl).fixWidth(42),
|
||||
onPressed: () {
|
||||
context.to(() => IllustPageWithId(
|
||||
illusts[index].illustId.toString()));
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
FlyoutTarget(
|
||||
controller: flyoutControllers[index],
|
||||
child: Button(
|
||||
child: Text("Delete".tl).fixWidth(42),
|
||||
onPressed: () {
|
||||
flyoutControllers[index].showFlyout(
|
||||
navigatorKey: App.rootNavigatorKey.currentState,
|
||||
builder: (context) {
|
||||
return FlyoutContent(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'Are you sure you want to delete?'.tl,
|
||||
style: const TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
const SizedBox(height: 12.0),
|
||||
Button(
|
||||
onPressed: () {
|
||||
Flyout.of(context).close();
|
||||
DownloadManager().delete(illusts[index]);
|
||||
setState(() {
|
||||
illusts.removeAt(index);
|
||||
flyoutControllers.removeAt(index);
|
||||
});
|
||||
},
|
||||
child: Text('Yes'.tl),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
},
|
||||
itemCount: illusts.length,
|
||||
itemHeight: 152,
|
||||
maxCrossAxisExtent: 742,
|
||||
builder: (context, index) {
|
||||
var image = DownloadManager().getImage(illusts[index].illustId, 0);
|
||||
return Card(
|
||||
margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
|
||||
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: () {
|
||||
App.rootNavigatorKey.currentContext?.to(() =>
|
||||
_DownloadedIllustViewPage(DownloadManager()
|
||||
.getImagePaths(illusts[index].illustId)));
|
||||
},
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 96,
|
||||
height: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
color: ColorScheme.of(context).secondaryContainer),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: image == null
|
||||
? null
|
||||
: AnimatedImage(
|
||||
image: FileImage(image),
|
||||
fit: BoxFit.cover,
|
||||
width: 96,
|
||||
height: double.infinity,
|
||||
filterQuality: FilterQuality.medium,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
illusts[index].title,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
illusts[index].author,
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
Text(
|
||||
"${illusts[index].imageCount}P",
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Row(
|
||||
children: [
|
||||
const Spacer(),
|
||||
Button(
|
||||
child: Text("Info".tl).fixWidth(42),
|
||||
onPressed: () {
|
||||
context.to(() => IllustPageWithId(
|
||||
illusts[index].illustId.toString()));
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
FlyoutTarget(
|
||||
controller: flyoutControllers[index],
|
||||
child: Button(
|
||||
child: Text("Delete".tl).fixWidth(42),
|
||||
onPressed: () {
|
||||
flyoutControllers[index].showFlyout(
|
||||
navigatorKey:
|
||||
App.rootNavigatorKey.currentState,
|
||||
builder: (context) {
|
||||
return FlyoutContent(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'Are you sure you want to delete?'
|
||||
.tl,
|
||||
style: const TextStyle(
|
||||
fontWeight:
|
||||
FontWeight.bold),
|
||||
),
|
||||
const SizedBox(height: 12.0),
|
||||
Button(
|
||||
onPressed: () {
|
||||
Flyout.of(context).close();
|
||||
DownloadManager()
|
||||
.delete(illusts[index]);
|
||||
setState(() {
|
||||
illusts.removeAt(index);
|
||||
flyoutControllers
|
||||
.removeAt(index);
|
||||
});
|
||||
},
|
||||
child: Text('Yes'.tl),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
).paddingHorizontal(8);
|
||||
),
|
||||
);
|
||||
}).paddingHorizontal(8);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,10 +203,12 @@ class _DownloadedIllustViewPage extends StatefulWidget {
|
||||
final List<String> imagePaths;
|
||||
|
||||
@override
|
||||
State<_DownloadedIllustViewPage> createState() => _DownloadedIllustViewPageState();
|
||||
State<_DownloadedIllustViewPage> createState() =>
|
||||
_DownloadedIllustViewPageState();
|
||||
}
|
||||
|
||||
class _DownloadedIllustViewPageState extends State<_DownloadedIllustViewPage> with WindowListener{
|
||||
class _DownloadedIllustViewPageState extends State<_DownloadedIllustViewPage>
|
||||
with WindowListener {
|
||||
int windowButtonKey = 0;
|
||||
|
||||
@override
|
||||
@@ -230,51 +245,63 @@ class _DownloadedIllustViewPageState extends State<_DownloadedIllustViewPage> wi
|
||||
|
||||
Future<File?> getFile() async {
|
||||
var file = File(widget.imagePaths[currentPage]);
|
||||
if(file.existsSync()) {
|
||||
if (file.existsSync()) {
|
||||
return file;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
void showMenu() {
|
||||
menuController.showFlyout(builder: (context) => MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(text: Text("Save to".tl), onPressed: () async{
|
||||
var file = await getFile();
|
||||
if(file != null){
|
||||
saveFile(file);
|
||||
}
|
||||
}),
|
||||
MenuFlyoutItem(text: Text("Share".tl), onPressed: () async{
|
||||
var file = await getFile();
|
||||
if(file != null){
|
||||
var ext = file.path.split('.').last;
|
||||
var mediaType = switch(ext){
|
||||
'jpg' => 'image/jpeg',
|
||||
'jpeg' => 'image/jpeg',
|
||||
'png' => 'image/png',
|
||||
'gif' => 'image/gif',
|
||||
'webp' => 'image/webp',
|
||||
_ => 'application/octet-stream'
|
||||
};
|
||||
Share.shareXFiles([XFile(file.path, mimeType: mediaType, name: file.path.split('/').last)]);
|
||||
}
|
||||
}),
|
||||
],
|
||||
));
|
||||
menuController.showFlyout(
|
||||
builder: (context) => MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(
|
||||
text: Text("Save to".tl),
|
||||
onPressed: () async {
|
||||
var file = await getFile();
|
||||
if (file != null) {
|
||||
saveFile(file);
|
||||
}
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: Text("Share".tl),
|
||||
onPressed: () async {
|
||||
var file = await getFile();
|
||||
if (file != null) {
|
||||
var ext = file.path.split('.').last;
|
||||
var mediaType = switch (ext) {
|
||||
'jpg' => 'image/jpeg',
|
||||
'jpeg' => 'image/jpeg',
|
||||
'png' => 'image/png',
|
||||
'gif' => 'image/gif',
|
||||
'webp' => 'image/webp',
|
||||
_ => 'application/octet-stream'
|
||||
};
|
||||
Share.shareXFiles([
|
||||
XFile(file.path,
|
||||
mimeType: mediaType,
|
||||
name: file.path.split('/').last)
|
||||
]);
|
||||
}
|
||||
}),
|
||||
],
|
||||
));
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ScaffoldPage(
|
||||
return Container(
|
||||
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
|
||||
content: Listener(
|
||||
color: FluentTheme.of(context).micaBackgroundColor,
|
||||
child: Listener(
|
||||
onPointerSignal: (event) {
|
||||
if(event is PointerScrollEvent) {
|
||||
if(event.scrollDelta.dy > 0
|
||||
&& controller.page!.toInt() < widget.imagePaths.length - 1) {
|
||||
if (event is PointerScrollEvent &&
|
||||
!HardwareKeyboard.instance.isControlPressed) {
|
||||
if (event.scrollDelta.dy > 0 &&
|
||||
controller.page!.toInt() < widget.imagePaths.length - 1) {
|
||||
controller.jumpToPage(controller.page!.toInt() + 1);
|
||||
} else if(event.scrollDelta.dy < 0 && controller.page!.toInt() > 0){
|
||||
} else if (event.scrollDelta.dy < 0 &&
|
||||
controller.page!.toInt() > 0) {
|
||||
controller.jumpToPage(controller.page!.toInt() - 1);
|
||||
}
|
||||
}
|
||||
@@ -284,11 +311,11 @@ class _DownloadedIllustViewPageState extends State<_DownloadedIllustViewPage> wi
|
||||
var height = constrains.maxHeight;
|
||||
return Stack(
|
||||
children: [
|
||||
Positioned.fill(child: PhotoViewGallery.builder(
|
||||
Positioned.fill(
|
||||
child: PhotoViewGallery.builder(
|
||||
pageController: controller,
|
||||
backgroundDecoration: BoxDecoration(
|
||||
color: FluentTheme.of(context).micaBackgroundColor
|
||||
),
|
||||
backgroundDecoration:
|
||||
const BoxDecoration(color: Colors.transparent),
|
||||
itemCount: widget.imagePaths.length,
|
||||
builder: (context, index) {
|
||||
return PhotoViewGalleryPageOptions(
|
||||
@@ -309,17 +336,22 @@ class _DownloadedIllustViewPageState extends State<_DownloadedIllustViewPage> wi
|
||||
height: 36,
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(width: 6,),
|
||||
const SizedBox(
|
||||
width: 6,
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(FluentIcons.back).paddingAll(2),
|
||||
onPressed: () => context.pop()
|
||||
),
|
||||
onPressed: () => context.pop()),
|
||||
const Expanded(
|
||||
child: DragToMoveArea(child: SizedBox.expand(),),
|
||||
child: DragToMoveArea(
|
||||
child: SizedBox.expand(),
|
||||
),
|
||||
),
|
||||
buildActions(),
|
||||
if(App.isDesktop)
|
||||
WindowButtons(key: ValueKey(windowButtonKey),),
|
||||
if (App.isDesktop)
|
||||
WindowButtons(
|
||||
key: ValueKey(windowButtonKey),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -328,7 +360,10 @@ class _DownloadedIllustViewPageState extends State<_DownloadedIllustViewPage> wi
|
||||
left: 0,
|
||||
top: height / 2 - 9,
|
||||
child: IconButton(
|
||||
icon: const Icon(FluentIcons.chevron_left, size: 18,),
|
||||
icon: const Icon(
|
||||
FluentIcons.chevron_left,
|
||||
size: 18,
|
||||
),
|
||||
onPressed: () {
|
||||
controller.previousPage(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
@@ -371,26 +406,25 @@ class _DownloadedIllustViewPageState extends State<_DownloadedIllustViewPage> wi
|
||||
controller: menuController,
|
||||
child: width > 600
|
||||
? Button(
|
||||
onPressed: showMenu,
|
||||
child: const Row(
|
||||
children: [
|
||||
Icon(
|
||||
MdIcons.menu,
|
||||
size: 18,
|
||||
),
|
||||
SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Text('Actions'),
|
||||
],
|
||||
))
|
||||
onPressed: showMenu,
|
||||
child: const Row(
|
||||
children: [
|
||||
Icon(
|
||||
MdIcons.menu,
|
||||
size: 18,
|
||||
),
|
||||
SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Text('Actions'),
|
||||
],
|
||||
))
|
||||
: IconButton(
|
||||
icon: const Icon(
|
||||
MdIcons.more_horiz,
|
||||
size: 20,
|
||||
),
|
||||
onPressed: showMenu),
|
||||
icon: const Icon(
|
||||
MdIcons.more_horiz,
|
||||
size: 20,
|
||||
),
|
||||
onPressed: showMenu),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -47,7 +47,38 @@ class _DownloadingPageState extends State<DownloadingPage> {
|
||||
Widget buildTop() {
|
||||
int bytesPerSecond = DownloadManager().bytesPerSecond;
|
||||
|
||||
return SliverTitleBar(title: "${"Speed".tl}: ${bytesToText(bytesPerSecond)}/s");
|
||||
bool paused = DownloadManager().paused;
|
||||
|
||||
return SliverTitleBar(
|
||||
title: paused
|
||||
? "Paused".tl
|
||||
:"${"Speed".tl}: ${bytesToText(bytesPerSecond)}/s",
|
||||
action: SplitButton(
|
||||
onInvoked: (){
|
||||
if(!paused) {
|
||||
DownloadManager().pause();
|
||||
setState(() {});
|
||||
} else {
|
||||
DownloadManager().resume();
|
||||
setState(() {});
|
||||
}
|
||||
},
|
||||
flyout: MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(text: Text("Cancel All".tl), onPressed: (){
|
||||
var tasks = List.from(DownloadManager().tasks);
|
||||
DownloadManager().tasks.clear();
|
||||
for(var task in tasks) {
|
||||
task.cancel();
|
||||
}
|
||||
setState(() {});
|
||||
})
|
||||
],
|
||||
),
|
||||
child: Text(paused ? "Resume".tl : "Pause".tl)
|
||||
.toCenter().fixWidth(56).fixHeight(32),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildContent() {
|
||||
|
@@ -2,6 +2,7 @@ import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/utils/block.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../components/batch_download.dart';
|
||||
@@ -9,6 +10,7 @@ import '../components/illust_widget.dart';
|
||||
import '../components/loading.dart';
|
||||
import '../components/segmented_button.dart';
|
||||
import '../network/network.dart';
|
||||
import 'illust_page.dart';
|
||||
|
||||
class FollowingArtworksPage extends StatefulWidget {
|
||||
const FollowingArtworksPage({super.key});
|
||||
@@ -26,7 +28,10 @@ class _FollowingArtworksPageState extends State<FollowingArtworksPage> {
|
||||
children: [
|
||||
buildTab(),
|
||||
Expanded(
|
||||
child: _OneFollowingPage(restrict, key: Key(restrict),),
|
||||
child: _OneFollowingPage(
|
||||
restrict,
|
||||
key: Key(restrict),
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
@@ -37,8 +42,11 @@ class _FollowingArtworksPageState extends State<FollowingArtworksPage> {
|
||||
title: "Following".tl,
|
||||
action: Row(
|
||||
children: [
|
||||
BatchDownloadButton(request: () => Network().getFollowingArtworks(restrict)),
|
||||
const SizedBox(width: 8,),
|
||||
BatchDownloadButton(
|
||||
request: () => Network().getFollowingArtworks(restrict)),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
SegmentedButton(
|
||||
options: [
|
||||
SegmentedButtonOption("all", "All".tl),
|
||||
@@ -46,7 +54,7 @@ class _FollowingArtworksPageState extends State<FollowingArtworksPage> {
|
||||
SegmentedButtonOption("private", "Private".tl),
|
||||
],
|
||||
onPressed: (key) {
|
||||
if(key != restrict) {
|
||||
if (key != restrict) {
|
||||
setState(() {
|
||||
restrict = key;
|
||||
});
|
||||
@@ -69,22 +77,27 @@ class _OneFollowingPage extends StatefulWidget {
|
||||
State<_OneFollowingPage> createState() => _OneFollowingPageState();
|
||||
}
|
||||
|
||||
class _OneFollowingPageState extends MultiPageLoadingState<_OneFollowingPage, Illust> {
|
||||
class _OneFollowingPageState
|
||||
extends MultiPageLoadingState<_OneFollowingPage, Illust> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<Illust> data) {
|
||||
return LayoutBuilder(builder: (context, constrains){
|
||||
Widget buildContent(BuildContext context, List<Illust> data) {
|
||||
checkIllusts(data);
|
||||
return LayoutBuilder(builder: (context, constrains) {
|
||||
return MasonryGridView.builder(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8)
|
||||
+ EdgeInsets.only(bottom: context.padding.bottom),
|
||||
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){
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return IllustWidget(data[index]);
|
||||
return IllustWidget(data[index], onTap: () {
|
||||
context.to(() => IllustGalleryPage(
|
||||
illusts: data, initialPage: index, nextUrl: nextUrl));
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
@@ -93,16 +106,15 @@ class _OneFollowingPageState extends MultiPageLoadingState<_OneFollowingPage, Il
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Illust>>> loadData(page) async{
|
||||
if(nextUrl == "end") {
|
||||
Future<Res<List<Illust>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = await Network().getFollowingArtworks(widget.restrict, nextUrl);
|
||||
if(!res.error) {
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -18,7 +18,8 @@ class FollowingUsersPage extends StatefulWidget {
|
||||
State<FollowingUsersPage> createState() => _FollowingUsersPageState();
|
||||
}
|
||||
|
||||
class _FollowingUsersPageState extends MultiPageLoadingState<FollowingUsersPage, UserPreview> {
|
||||
class _FollowingUsersPageState
|
||||
extends MultiPageLoadingState<FollowingUsersPage, UserPreview> {
|
||||
String type = "public";
|
||||
|
||||
@override
|
||||
@@ -28,11 +29,13 @@ class _FollowingUsersPageState extends MultiPageLoadingState<FollowingUsersPage,
|
||||
SliverToBoxAdapter(
|
||||
child: Row(
|
||||
children: [
|
||||
Text("Following".tl,
|
||||
style: const TextStyle(fontSize: 22, fontWeight: FontWeight.bold),)
|
||||
.paddingVertical(12).paddingLeft(16),
|
||||
Text(
|
||||
"Following".tl,
|
||||
style:
|
||||
const TextStyle(fontSize: 22, fontWeight: FontWeight.bold),
|
||||
).paddingVertical(12).paddingLeft(16),
|
||||
const Spacer(),
|
||||
if(widget.uid == appdata.account?.user.id)
|
||||
if (widget.uid == appdata.account?.user.id)
|
||||
SegmentedButton(
|
||||
value: type,
|
||||
options: [
|
||||
@@ -44,22 +47,21 @@ class _FollowingUsersPageState extends MultiPageLoadingState<FollowingUsersPage,
|
||||
reset();
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 16,)
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
SliverGridViewWithFixedItemHeight(
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
if(index == data.length - 1){
|
||||
nextPage();
|
||||
}
|
||||
return UserPreviewWidget(data[index]);
|
||||
},
|
||||
childCount: data.length
|
||||
),
|
||||
maxCrossAxisExtent: 520,
|
||||
itemHeight: 114,
|
||||
delegate: SliverChildBuilderDelegate((context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return UserPreviewWidget(data[index]);
|
||||
}, childCount: data.length),
|
||||
minCrossAxisExtent: 440,
|
||||
itemHeight: 136,
|
||||
).sliverPaddingHorizontal(8)
|
||||
],
|
||||
);
|
||||
@@ -68,12 +70,12 @@ class _FollowingUsersPageState extends MultiPageLoadingState<FollowingUsersPage,
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<UserPreview>>> loadData(page) async{
|
||||
if(nextUrl == "end") {
|
||||
Future<Res<List<UserPreview>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = await Network().getFollowing(widget.uid, type, nextUrl);
|
||||
if(!res.error) {
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
|
@@ -2,13 +2,15 @@ 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/network/models.dart';
|
||||
import 'package:pixes/foundation/history.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../components/illust_widget.dart';
|
||||
import 'illust_page.dart';
|
||||
|
||||
class HistoryPage extends StatefulWidget {
|
||||
const HistoryPage({super.key});
|
||||
@@ -17,37 +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]);
|
||||
},
|
||||
);
|
||||
}),
|
||||
)
|
||||
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);
|
||||
|
@@ -1,8 +1,12 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:photo_view/photo_view.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';
|
||||
@@ -14,13 +18,15 @@ import 'package:share_plus/share_plus.dart';
|
||||
import 'package:window_manager/window_manager.dart';
|
||||
|
||||
class ImagePage extends StatefulWidget {
|
||||
const ImagePage(this.url, {super.key});
|
||||
const ImagePage(this.urls, {this.initialPage = 0, super.key});
|
||||
|
||||
final String url;
|
||||
final List<String> urls;
|
||||
|
||||
static show(String url) {
|
||||
App.rootNavigatorKey.currentState
|
||||
?.push(AppPageRoute(builder: (context) => ImagePage(url)));
|
||||
final int initialPage;
|
||||
|
||||
static show(List<String> urls, {int initialPage = 0}) {
|
||||
App.rootNavigatorKey.currentState?.push(AppPageRoute(
|
||||
builder: (context) => ImagePage(urls, initialPage: initialPage)));
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -56,117 +62,214 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
|
||||
color: FluentTheme.of(context).micaBackgroundColor,
|
||||
child: Stack(
|
||||
children: [
|
||||
Positioned.fill(
|
||||
child: PhotoView(
|
||||
backgroundDecoration: BoxDecoration(
|
||||
color: FluentTheme.of(context).micaBackgroundColor),
|
||||
filterQuality: FilterQuality.medium,
|
||||
imageProvider: widget.url.startsWith("file://")
|
||||
? FileImage(File(widget.url.replaceFirst("file://", "")))
|
||||
: CachedImageProvider(widget.url) as ImageProvider,
|
||||
)),
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: SizedBox(
|
||||
height: 36,
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(
|
||||
width: 6,
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(FluentIcons.back).paddingAll(2),
|
||||
onPressed: () => context.pop()),
|
||||
const Expanded(
|
||||
child: DragToMoveArea(
|
||||
child: SizedBox.expand(),
|
||||
),
|
||||
),
|
||||
buildActions(),
|
||||
if (App.isDesktop)
|
||||
WindowButtons(
|
||||
key: ValueKey(windowButtonKey),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
late var controller = PageController(initialPage: widget.initialPage);
|
||||
|
||||
late int currentPage = widget.initialPage;
|
||||
|
||||
var menuController = FlyoutController();
|
||||
|
||||
Future<File?> getFile() async{
|
||||
if (widget.url.startsWith("file://")) {
|
||||
return File(widget.url.replaceFirst("file://", ""));
|
||||
Future<File?> getFile() async {
|
||||
var image = widget.urls[currentPage];
|
||||
if (image.startsWith("file://")) {
|
||||
return File(image.replaceFirst("file://", ""));
|
||||
}
|
||||
var res = await CacheManager().findCache(widget.url);
|
||||
if(res == null){
|
||||
return null;
|
||||
var key = image;
|
||||
if (key.startsWith("novel:")) {
|
||||
key = key.split(':').last;
|
||||
}
|
||||
return File(res);
|
||||
var file = await CacheManager().findCache(key);
|
||||
return file == null ? null : File(file);
|
||||
}
|
||||
|
||||
String getExtensionName() {
|
||||
var fileName = widget.url.split('/').last;
|
||||
if(fileName.contains('.')){
|
||||
var fileName = widget.urls[currentPage].split('/').last;
|
||||
if (fileName.contains('.')) {
|
||||
return '.${fileName.split('.').last}';
|
||||
}
|
||||
return '.jpg';
|
||||
}
|
||||
|
||||
void showMenu() {
|
||||
menuController.showFlyout(builder: (context) => MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(text: Text("Save to".tl), onPressed: () async{
|
||||
var file = await getFile();
|
||||
if(file != null){
|
||||
var fileName = file.path.split('/').last;
|
||||
if(!fileName.contains('.')){
|
||||
fileName += getExtensionName();
|
||||
menuController.showFlyout(
|
||||
barrierColor: Colors.transparent,
|
||||
position: App.isMobile ? Offset(context.size!.width, 0) : null,
|
||||
builder: (context) => MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(
|
||||
text: Text("Save to".tl),
|
||||
onPressed: () async {
|
||||
var file = await getFile();
|
||||
if (file != null) {
|
||||
var fileName = widget.urls[currentPage].split('/').last;
|
||||
if (!fileName.contains('.')) {
|
||||
fileName += getExtensionName();
|
||||
}
|
||||
saveFile(file, fileName);
|
||||
}
|
||||
}),
|
||||
if (App.isMobile)
|
||||
MenuFlyoutItem(
|
||||
text: Text("Save to gallery".tl),
|
||||
onPressed: () async {
|
||||
var file = await getFile();
|
||||
if (file != null) {
|
||||
var fileName =
|
||||
widget.urls[currentPage].split('/').last;
|
||||
if (!fileName.contains('.')) {
|
||||
fileName += getExtensionName();
|
||||
}
|
||||
await ImageGallerySaver.saveImage(
|
||||
await file.readAsBytes(),
|
||||
quality: 100,
|
||||
name: fileName);
|
||||
if (mounted) {
|
||||
showToast(context, message: "Saved".tl);
|
||||
}
|
||||
}
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: Text("Share".tl),
|
||||
onPressed: () async {
|
||||
var file = await getFile();
|
||||
if (file != null) {
|
||||
var ext = getExtensionName();
|
||||
var fileName = widget.urls[currentPage].split('/').last;
|
||||
if (!fileName.contains('.')) {
|
||||
fileName += ext;
|
||||
}
|
||||
var mediaType = switch (ext) {
|
||||
'.jpg' => 'image/jpeg',
|
||||
'.jpeg' => 'image/jpeg',
|
||||
'.png' => 'image/png',
|
||||
'.gif' => 'image/gif',
|
||||
'.webp' => 'image/webp',
|
||||
_ => 'application/octet-stream'
|
||||
};
|
||||
Share.shareXFiles([
|
||||
XFile.fromData(await file.readAsBytes(),
|
||||
mimeType: mediaType, name: fileName)
|
||||
]);
|
||||
}
|
||||
}),
|
||||
],
|
||||
));
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
|
||||
color: FluentTheme.of(context).micaBackgroundColor,
|
||||
child: Listener(
|
||||
onPointerSignal: (event) {
|
||||
if (event is PointerScrollEvent &&
|
||||
!HardwareKeyboard.instance.isControlPressed) {
|
||||
if (event.scrollDelta.dy > 0 &&
|
||||
controller.page!.toInt() < widget.urls.length - 1) {
|
||||
controller.jumpToPage(controller.page!.toInt() + 1);
|
||||
} else if (event.scrollDelta.dy < 0 &&
|
||||
controller.page!.toInt() > 0) {
|
||||
controller.jumpToPage(controller.page!.toInt() - 1);
|
||||
}
|
||||
saveFile(file, fileName);
|
||||
}
|
||||
}),
|
||||
MenuFlyoutItem(text: Text("Share".tl), onPressed: () async{
|
||||
var file = await getFile();
|
||||
if(file != null){
|
||||
var fileName = file.path.split('/').last;
|
||||
String ext;
|
||||
if(!fileName.contains('.')){
|
||||
ext = getExtensionName();
|
||||
fileName += getExtensionName();
|
||||
} else {
|
||||
ext = file.path.split('.').last;
|
||||
}
|
||||
var mediaType = switch(ext.replaceFirst('.', "")){
|
||||
'jpg' => 'image/jpeg',
|
||||
'jpeg' => 'image/jpeg',
|
||||
'png' => 'image/png',
|
||||
'gif' => 'image/gif',
|
||||
'webp' => 'image/webp',
|
||||
_ => 'application/octet-stream'
|
||||
};
|
||||
Share.shareXFiles([XFile.fromData(
|
||||
await file.readAsBytes(),
|
||||
mimeType: mediaType,
|
||||
name: fileName)]
|
||||
},
|
||||
child: LayoutBuilder(
|
||||
builder: (context, constrains) {
|
||||
var height = constrains.maxHeight;
|
||||
return Stack(
|
||||
children: [
|
||||
Positioned.fill(
|
||||
child: PhotoViewGallery.builder(
|
||||
pageController: controller,
|
||||
backgroundDecoration:
|
||||
const BoxDecoration(color: Colors.transparent),
|
||||
itemCount: widget.urls.length,
|
||||
builder: (context, index) {
|
||||
var image = widget.urls[index];
|
||||
|
||||
return PhotoViewGalleryPageOptions(
|
||||
filterQuality: FilterQuality.medium,
|
||||
imageProvider: getImageProvider(image),
|
||||
);
|
||||
},
|
||||
onPageChanged: (index) {
|
||||
setState(() {
|
||||
currentPage = index;
|
||||
});
|
||||
},
|
||||
)),
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: SizedBox(
|
||||
height: 36,
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(
|
||||
width: 6,
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(FluentIcons.back).paddingAll(2),
|
||||
onPressed: () => context.pop()),
|
||||
const Expanded(
|
||||
child: DragToMoveArea(
|
||||
child: SizedBox.expand(),
|
||||
),
|
||||
),
|
||||
buildActions(),
|
||||
if (App.isDesktop)
|
||||
WindowButtons(
|
||||
key: ValueKey(windowButtonKey),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
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,
|
||||
child: Text(
|
||||
"${currentPage + 1}/${widget.urls.length}",
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
}),
|
||||
],
|
||||
));
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildActions() {
|
||||
@@ -175,25 +278,35 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
|
||||
controller: menuController,
|
||||
child: width > 600
|
||||
? Button(
|
||||
onPressed: showMenu,
|
||||
child: const Row(
|
||||
children: [
|
||||
Icon(
|
||||
MdIcons.menu,
|
||||
size: 18,
|
||||
),
|
||||
SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Text('Actions'),
|
||||
],
|
||||
))
|
||||
onPressed: showMenu,
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(
|
||||
MdIcons.menu,
|
||||
size: 18,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Text('Actions'.tl),
|
||||
],
|
||||
))
|
||||
: IconButton(
|
||||
icon: const Icon(
|
||||
MdIcons.more_horiz,
|
||||
size: 20,
|
||||
),
|
||||
onPressed: showMenu),
|
||||
icon: const Icon(
|
||||
MdIcons.more_horiz,
|
||||
size: 20,
|
||||
),
|
||||
onPressed: showMenu),
|
||||
);
|
||||
}
|
||||
|
||||
ImageProvider getImageProvider(String url) {
|
||||
if (url.startsWith("file://")) {
|
||||
return FileImage(File(url.replaceFirst("file://", "")));
|
||||
} else if (url.startsWith("novel:")) {
|
||||
var ids = url.split(':').last.split('/');
|
||||
return CachedNovelImageProvider(ids[0], ids[1]);
|
||||
}
|
||||
return CachedImageProvider(url) as ImageProvider;
|
||||
}
|
||||
}
|
||||
|
@@ -1,6 +1,8 @@
|
||||
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';
|
||||
import 'package:pixes/utils/app_links.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
import 'package:url_launcher/url_launcher_string.dart';
|
||||
@@ -23,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);
|
||||
@@ -55,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,
|
||||
),
|
||||
@@ -96,7 +87,9 @@ class _LoginPageState extends State<LoginPage> {
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Text("I have read and agree to the Terms of Use".tl)
|
||||
Expanded(
|
||||
child: Text("I understand pixes is a free unofficial application.".tl),
|
||||
)
|
||||
],
|
||||
)
|
||||
],
|
||||
@@ -185,8 +178,40 @@ 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();
|
||||
launchUrlString(url);
|
||||
onLink = (uri) {
|
||||
if (uri.scheme == "pixiv") {
|
||||
onFinished(uri.queryParameters["code"]!);
|
||||
@@ -198,6 +223,21 @@ class _LoginPageState extends State<LoginPage> {
|
||||
setState(() {
|
||||
waitingForAuth = 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);
|
||||
}
|
||||
}
|
||||
|
||||
void onFinished(String code) async {
|
||||
@@ -207,7 +247,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(() {
|
||||
|
@@ -2,21 +2,26 @@ import "dart:async";
|
||||
|
||||
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:pixes/appdata.dart";
|
||||
import "package:pixes/components/md.dart";
|
||||
import "package:pixes/foundation/app.dart";
|
||||
import "package:pixes/foundation/image_provider.dart";
|
||||
import "package:pixes/network/network.dart";
|
||||
import "package:pixes/pages/bookmarks.dart";
|
||||
import "package:pixes/pages/downloaded_page.dart";
|
||||
import "package:pixes/pages/following_artworks.dart";
|
||||
import "package:pixes/pages/history.dart";
|
||||
import "package:pixes/pages/novel_bookmarks_page.dart";
|
||||
import "package:pixes/pages/novel_ranking_page.dart";
|
||||
import "package:pixes/pages/novel_recommendation_page.dart";
|
||||
import "package:pixes/pages/ranking.dart";
|
||||
import "package:pixes/pages/recommendation_page.dart";
|
||||
import "package:pixes/pages/login_page.dart";
|
||||
import "package:pixes/pages/search_page.dart";
|
||||
import "package:pixes/pages/settings_page.dart";
|
||||
import "package:pixes/pages/user_info_page.dart";
|
||||
import "package:pixes/utils/loop.dart";
|
||||
import "package:pixes/utils/mouse_listener.dart";
|
||||
import "package:pixes/utils/translation.dart";
|
||||
import "package:window_manager/window_manager.dart";
|
||||
@@ -27,6 +32,32 @@ import "downloading_page.dart";
|
||||
|
||||
double get _appBarHeight => App.isDesktop ? 36.0 : 48.0;
|
||||
|
||||
class TitleBarAction {
|
||||
final IconData icon;
|
||||
final String title;
|
||||
final void Function() onPressed;
|
||||
|
||||
TitleBarAction(this.icon, this.title, this.onPressed);
|
||||
}
|
||||
|
||||
class TitleBarController extends StateController {
|
||||
TitleBarController();
|
||||
|
||||
final List<TitleBarAction> actions = [
|
||||
if (kDebugMode) TitleBarAction(MdIcons.bug_report, "Debug", debug)
|
||||
];
|
||||
|
||||
void addAction(TitleBarAction action) {
|
||||
actions.add(action);
|
||||
update();
|
||||
}
|
||||
|
||||
void removeAction(TitleBarAction action) {
|
||||
actions.remove(action);
|
||||
update();
|
||||
}
|
||||
}
|
||||
|
||||
class MainPage extends StatefulWidget {
|
||||
const MainPage({super.key});
|
||||
|
||||
@@ -34,23 +65,42 @@ class MainPage extends StatefulWidget {
|
||||
State<MainPage> createState() => _MainPageState();
|
||||
}
|
||||
|
||||
class _MainPageState extends State<MainPage> with WindowListener {
|
||||
class _MainPageState extends State<MainPage>
|
||||
with WindowListener
|
||||
implements PopEntry {
|
||||
final navigatorKey = GlobalKey<NavigatorState>();
|
||||
|
||||
int index = 4;
|
||||
|
||||
int windowButtonKey = 0;
|
||||
|
||||
ModalRoute<dynamic>? _route;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
StateController.put<TitleBarController>(TitleBarController());
|
||||
windowManager.addListener(this);
|
||||
listenMouseSideButtonToBack(navigatorKey);
|
||||
App.mainNavigatorKey = navigatorKey;
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
final ModalRoute<dynamic>? nextRoute = ModalRoute.of(context);
|
||||
if (nextRoute != _route) {
|
||||
_route?.unregisterPopEntry(this);
|
||||
_route = nextRoute;
|
||||
_route?.registerPopEntry(this);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
StateController.remove<TitleBarController>();
|
||||
windowManager.removeListener(this);
|
||||
ModalRoute.of(context)!.unregisterPopEntry(this);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -78,91 +128,114 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
content: LoginPage(() => setState(() {})),
|
||||
);
|
||||
}
|
||||
return md.Theme(
|
||||
data: md.ThemeData.from(
|
||||
useMaterial3: true,
|
||||
colorScheme: md.ColorScheme.fromSeed(
|
||||
seedColor: FluentTheme.of(context).accentColor.withOpacity(1),
|
||||
brightness: FluentTheme.of(context).brightness,
|
||||
)),
|
||||
child: DefaultSelectionStyle.merge(
|
||||
selectionColor: FluentTheme.of(context).selectionColor.withOpacity(0.4),
|
||||
child: NavigationView(
|
||||
appBar: buildAppBar(context, navigatorKey),
|
||||
pane: NavigationPane(
|
||||
selected: index,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
index = value;
|
||||
});
|
||||
navigate(value);
|
||||
},
|
||||
items: [
|
||||
UserPane(),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.search, size: 20,),
|
||||
title: Text('Search'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.downloading, size: 20,),
|
||||
title: Text('Downloading'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.download, size: 20,),
|
||||
title: Text('Downloaded'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItemSeparator(),
|
||||
PaneItemHeader(header: Text("Artwork".tl).paddingBottom(4).paddingLeft(8)),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.explore_outlined, size: 20,),
|
||||
title: Text('Explore'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.bookmark_outline, size: 20),
|
||||
title: Text('Bookmarks'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.interests_outlined, size: 20),
|
||||
title: Text('Following'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.history, size: 20),
|
||||
title: Text('History'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.leaderboard_outlined, size: 20),
|
||||
title: Text('Ranking'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
footerItems: [
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.settings_outlined, size: 20),
|
||||
title: Text('Settings'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
return DefaultSelectionStyle.merge(
|
||||
selectionColor: FluentTheme.of(context).selectionColor.withOpacity(0.4),
|
||||
child: NavigationView(
|
||||
appBar: buildAppBar(context, navigatorKey),
|
||||
pane: NavigationPane(
|
||||
selected: index,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
index = value;
|
||||
});
|
||||
navigate(value);
|
||||
},
|
||||
items: [
|
||||
UserPane(),
|
||||
PaneItem(
|
||||
icon: const Icon(
|
||||
MdIcons.search,
|
||||
size: 20,
|
||||
),
|
||||
title: Text('Search'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
paneBodyBuilder: (pane, child) => NavigatorPopHandler(
|
||||
key: const Key("navigator"),
|
||||
onPop: () => navigatorKey.currentState?.pop(),
|
||||
child: MediaQuery.removePadding(
|
||||
context: context,
|
||||
removeTop: true,
|
||||
child: Navigator(
|
||||
key: navigatorKey,
|
||||
onGenerateRoute: (settings) => AppPageRoute(
|
||||
builder: (context) => const RecommendationPage()),
|
||||
),
|
||||
))),
|
||||
));
|
||||
PaneItem(
|
||||
icon: const Icon(
|
||||
MdIcons.downloading,
|
||||
size: 20,
|
||||
),
|
||||
title: Text('Downloading'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(
|
||||
MdIcons.download,
|
||||
size: 20,
|
||||
),
|
||||
title: Text('Downloaded'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItemSeparator(),
|
||||
PaneItemHeader(
|
||||
header: Text('${"Illustrations".tl}/${"Manga".tl}')
|
||||
.paddingBottom(4)
|
||||
.paddingLeft(8)),
|
||||
PaneItem(
|
||||
icon: const Icon(
|
||||
MdIcons.explore_outlined,
|
||||
size: 20,
|
||||
),
|
||||
title: Text('Explore'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.bookmark_outline, size: 20),
|
||||
title: Text('Bookmarks'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.interests_outlined, size: 20),
|
||||
title: Text('Following'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.history, size: 20),
|
||||
title: Text('History'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.leaderboard_outlined, size: 20),
|
||||
title: Text('Ranking'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItemSeparator(),
|
||||
PaneItemHeader(
|
||||
header: Text("Novel".tl).paddingBottom(4).paddingLeft(8)),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.featured_play_list_outlined, size: 20),
|
||||
title: Text('Recommendation'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon:
|
||||
const Icon(MdIcons.collections_bookmark_outlined, size: 20),
|
||||
title: Text('Bookmarks'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.leaderboard_outlined, size: 20),
|
||||
title: Text('Ranking'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItemSeparator(),
|
||||
PaneItem(
|
||||
icon: const Icon(MdIcons.settings_outlined, size: 20),
|
||||
title: Text('Settings'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
),
|
||||
paneBodyBuilder: (pane, child) => MediaQuery.removePadding(
|
||||
context: context,
|
||||
removeTop: true,
|
||||
child: Navigator(
|
||||
key: navigatorKey,
|
||||
onGenerateRoute: (settings) => AppPageRoute(
|
||||
builder: (context) => const RecommendationPage()),
|
||||
),
|
||||
)),
|
||||
);
|
||||
}
|
||||
|
||||
static final pageBuilders = <Widget Function()>[
|
||||
@@ -175,6 +248,9 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
() => const FollowingArtworksPage(),
|
||||
() => const HistoryPage(),
|
||||
() => const RankingPage(),
|
||||
() => const NovelRecommendationPage(),
|
||||
() => const NovelBookmarksPage(),
|
||||
() => const NovelRankingPage(),
|
||||
() => const SettingsPage(),
|
||||
];
|
||||
|
||||
@@ -193,41 +269,85 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
automaticallyImplyLeading: false,
|
||||
height: _appBarHeight,
|
||||
title: () {
|
||||
if (!App.isDesktop) {
|
||||
return const Align(
|
||||
alignment: AlignmentDirectional.centerStart,
|
||||
child: Text("pixes"),
|
||||
);
|
||||
}
|
||||
return const DragToMoveArea(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(bottom: 4),
|
||||
child: Align(
|
||||
alignment: AlignmentDirectional.centerStart,
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
"Pixes",
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
Spacer(),
|
||||
if(kDebugMode)
|
||||
Padding(
|
||||
padding: EdgeInsets.only(right: 138),
|
||||
child: Button(onPressed: debug, child: Text("Debug")),
|
||||
)
|
||||
],
|
||||
return StateBuilder<TitleBarController>(
|
||||
builder: (controller) {
|
||||
Widget content = Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4),
|
||||
child: Align(
|
||||
alignment: AlignmentDirectional.centerStart,
|
||||
child: Row(
|
||||
children: [
|
||||
if (!App.isDesktop)
|
||||
const Text(
|
||||
"Pixes",
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
if (!App.isDesktop) const Spacer(),
|
||||
if (App.isDesktop)
|
||||
const Expanded(
|
||||
child: SizedBox(
|
||||
height: double.infinity,
|
||||
child: DragToMoveArea(
|
||||
child: Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
"Pixes",
|
||||
style: TextStyle(fontSize: 13),
|
||||
),
|
||||
)),
|
||||
),
|
||||
),
|
||||
for (var action in controller.actions)
|
||||
Button(
|
||||
onPressed: action.onPressed,
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
action.icon,
|
||||
size: 18,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(action.title),
|
||||
],
|
||||
),
|
||||
).paddingTop(4).paddingLeft(4),
|
||||
if (App.isDesktop) const SizedBox(width: 128),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
return content;
|
||||
},
|
||||
);
|
||||
}(),
|
||||
leading: _BackButton(navigatorKey),
|
||||
actions: App.isDesktop ? WindowButtons(
|
||||
key: ValueKey(windowButtonKey),
|
||||
) : null,
|
||||
actions: App.isDesktop
|
||||
? WindowButtons(
|
||||
key: ValueKey(windowButtonKey),
|
||||
)
|
||||
: null,
|
||||
);
|
||||
}
|
||||
|
||||
final popValue = ValueNotifier(false);
|
||||
|
||||
@override
|
||||
ValueListenable<bool> get canPopNotifier => popValue;
|
||||
|
||||
@override
|
||||
PopInvokedCallback? get onPopInvoked => onPop;
|
||||
|
||||
void onPop(bool value) {
|
||||
print("ok");
|
||||
if (App.rootNavigatorKey.currentState?.canPop() ?? false) {
|
||||
App.rootNavigatorKey.currentState?.pop();
|
||||
} else if (App.mainNavigatorKey?.currentState?.canPop() ?? false) {
|
||||
App.mainNavigatorKey?.currentState?.pop();
|
||||
} else {
|
||||
SystemNavigator.pop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class _BackButton extends StatefulWidget {
|
||||
@@ -249,28 +369,22 @@ class _BackButtonState extends State<_BackButton> {
|
||||
@override
|
||||
void initState() {
|
||||
enabled = navigatorKey.currentState?.canPop() == true;
|
||||
loop();
|
||||
Loop.register(loop);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
void loop() {
|
||||
timer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
|
||||
if(!mounted) {
|
||||
timer.cancel();
|
||||
} else {
|
||||
bool enabled = navigatorKey.currentState?.canPop() == true;
|
||||
if(enabled != this.enabled) {
|
||||
setState(() {
|
||||
this.enabled = enabled;
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
bool enabled = navigatorKey.currentState?.canPop() == true;
|
||||
if (enabled != this.enabled) {
|
||||
setState(() {
|
||||
this.enabled = enabled;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
timer?.cancel();
|
||||
Loop.remove(loop);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -300,18 +414,19 @@ class _BackButtonState extends State<_BackButton> {
|
||||
title: const Text("Back"),
|
||||
body: const SizedBox.shrink(),
|
||||
enabled: enabled,
|
||||
).build(
|
||||
context,
|
||||
false,
|
||||
onPressed,
|
||||
displayMode: PaneDisplayMode.compact,
|
||||
).paddingTop(2),
|
||||
)
|
||||
.build(
|
||||
context,
|
||||
false,
|
||||
onPressed,
|
||||
displayMode: PaneDisplayMode.compact,
|
||||
)
|
||||
.paddingTop(2),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class WindowButtons extends StatelessWidget {
|
||||
const WindowButtons({super.key});
|
||||
|
||||
@@ -465,7 +580,8 @@ class UserPane extends PaneItem {
|
||||
child: Image(
|
||||
height: 48,
|
||||
width: 48,
|
||||
image: NetworkImage(appdata.account!.user.profile),
|
||||
image:
|
||||
CachedImageProvider(appdata.account!.user.profile),
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
),
|
||||
@@ -488,7 +604,9 @@ class UserPane extends PaneItem {
|
||||
fontSize: 16, fontWeight: FontWeight.w500),
|
||||
),
|
||||
Text(
|
||||
kDebugMode ? "<hide due to debug>" : appdata.account!.user.email,
|
||||
kDebugMode
|
||||
? "<hide due to debug>"
|
||||
: appdata.account!.user.email,
|
||||
style: const TextStyle(fontSize: 12),
|
||||
)
|
||||
],
|
||||
|
53
lib/pages/novel_bookmarks_page.dart
Normal file
@@ -0,0 +1,53 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/components/grid.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/novel.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/widget_utils.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
class NovelBookmarksPage extends StatefulWidget {
|
||||
const NovelBookmarksPage({super.key});
|
||||
|
||||
@override
|
||||
State<NovelBookmarksPage> createState() => _NovelBookmarksPageState();
|
||||
}
|
||||
|
||||
class _NovelBookmarksPageState
|
||||
extends MultiPageLoadingState<NovelBookmarksPage, Novel> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<Novel> data) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(title: "Bookmarks".tl),
|
||||
Expanded(
|
||||
child: GridViewWithFixedItemHeight(
|
||||
itemCount: data.length,
|
||||
itemHeight: 164,
|
||||
minCrossAxisExtent: 400,
|
||||
builder: (context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return NovelWidget(data[index]);
|
||||
},
|
||||
).paddingHorizontal(8),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Novel>>> loadData(int page) async {
|
||||
if (nextUrl == "end") return Res.error("No more data");
|
||||
var res = nextUrl == null
|
||||
? await Network().getBookmarkedNovels(appdata.account!.user.id)
|
||||
: await Network().getNovelsWithNextUrl(nextUrl!);
|
||||
nextUrl = res.subData ?? "end";
|
||||
return res;
|
||||
}
|
||||
}
|
681
lib/pages/novel_page.dart
Normal file
@@ -0,0 +1,681 @@
|
||||
import 'dart:collection';
|
||||
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:pixes/components/animated_image.dart';
|
||||
import 'package:pixes/components/grid.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:pixes/components/novel.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/foundation/image_provider.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/pages/comments_page.dart';
|
||||
import 'package:pixes/pages/novel_reading_page.dart';
|
||||
import 'package:pixes/pages/search_page.dart';
|
||||
import 'package:pixes/pages/user_info_page.dart';
|
||||
import 'package:pixes/utils/app_links.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
import 'package:url_launcher/url_launcher_string.dart';
|
||||
|
||||
const kFluentButtonPadding = 28.0;
|
||||
|
||||
class NovelPage extends StatefulWidget {
|
||||
const NovelPage(this.novel, {super.key});
|
||||
|
||||
final Novel novel;
|
||||
|
||||
@override
|
||||
State<NovelPage> createState() => _NovelPageState();
|
||||
}
|
||||
|
||||
class _NovelPageState extends State<NovelPage> {
|
||||
final scrollController = ScrollController();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scrollbar(
|
||||
controller: scrollController,
|
||||
child: ScrollConfiguration(
|
||||
behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false),
|
||||
child: CustomScrollView(
|
||||
controller: scrollController,
|
||||
slivers: [
|
||||
SliverToBoxAdapter(
|
||||
child: buildTop(),
|
||||
),
|
||||
SliverToBoxAdapter(
|
||||
child: buildActions(),
|
||||
),
|
||||
SliverToBoxAdapter(
|
||||
child: buildDescription(),
|
||||
),
|
||||
if (widget.novel.seriesId != null)
|
||||
NovelSeriesWidget(
|
||||
widget.novel.seriesId!, widget.novel.seriesTitle!),
|
||||
SliverPadding(
|
||||
padding: EdgeInsets.only(
|
||||
top: 16 + MediaQuery.of(context).padding.bottom)),
|
||||
],
|
||||
),
|
||||
).padding(const EdgeInsets.symmetric(horizontal: 16)));
|
||||
}
|
||||
|
||||
Widget buildTop() {
|
||||
return Card(
|
||||
child: SizedBox(
|
||||
height: 128,
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 96,
|
||||
height: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context).secondaryContainer,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: AnimatedImage(
|
||||
fit: BoxFit.cover,
|
||||
filterQuality: FilterQuality.medium,
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
image: CachedImageProvider(widget.novel.image)),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
Text(widget.novel.title,
|
||||
maxLines: 3,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
)),
|
||||
const SizedBox(height: 4),
|
||||
const Spacer(),
|
||||
if (widget.novel.seriesId != null)
|
||||
Text(
|
||||
overflow: TextOverflow.ellipsis,
|
||||
"${"Series".tl}: ${widget.novel.seriesTitle!}",
|
||||
style: TextStyle(
|
||||
color: ColorScheme.of(context).primary,
|
||||
fontSize: 12,
|
||||
),
|
||||
).paddingVertical(4)
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
)).paddingTop(12);
|
||||
}
|
||||
|
||||
Widget buildStats() {
|
||||
return Container(
|
||||
height: 74,
|
||||
constraints: const BoxConstraints(maxWidth: 560),
|
||||
padding: const EdgeInsets.only(bottom: 10),
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(
|
||||
width: 2,
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
height: 68,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
width: 0.6),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
child: Row(
|
||||
children: [
|
||||
Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(
|
||||
FluentIcons.view,
|
||||
size: 20,
|
||||
),
|
||||
Text(
|
||||
"Views".tl,
|
||||
style: const TextStyle(fontSize: 12),
|
||||
)
|
||||
],
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
Text(
|
||||
widget.novel.totalViews.toString(),
|
||||
style: TextStyle(
|
||||
color: ColorScheme.of(context).primary,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: 18),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
height: 68,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant, width: 0.6),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
child: Row(
|
||||
children: [
|
||||
Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(
|
||||
FluentIcons.six_point_star,
|
||||
size: 20,
|
||||
),
|
||||
Text(
|
||||
"Favorites".tl,
|
||||
style: const TextStyle(fontSize: 12),
|
||||
)
|
||||
],
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
Text(
|
||||
widget.novel.totalBookmarks.toString(),
|
||||
style: TextStyle(
|
||||
color: ColorScheme.of(context).primary,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: 18),
|
||||
)
|
||||
],
|
||||
),
|
||||
)),
|
||||
const SizedBox(
|
||||
width: 2,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildAuthor() {
|
||||
return ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 560),
|
||||
child: Card(
|
||||
margin: const EdgeInsets.only(left: 2, right: 2, bottom: 12),
|
||||
borderColor: ColorScheme.of(context).outlineVariant.withOpacity(0.52),
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: () {
|
||||
context.to(() => UserInfoPage(widget.novel.author.id.toString()));
|
||||
},
|
||||
child: SizedBox(
|
||||
height: 38,
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 36,
|
||||
height: 36,
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context).secondaryContainer,
|
||||
borderRadius: BorderRadius.circular(36),
|
||||
),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: AnimatedImage(
|
||||
fit: BoxFit.cover,
|
||||
width: 36,
|
||||
height: 36,
|
||||
filterQuality: FilterQuality.medium,
|
||||
image: CachedImageProvider(widget.novel.author.avatar),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(widget.novel.author.name,
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.bold,
|
||||
)),
|
||||
Text(
|
||||
widget.novel.createDate.toString().substring(0, 10),
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: ColorScheme.of(context).outline,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const Spacer(),
|
||||
const Icon(MdIcons.chevron_right)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
bool isAddingFavorite = false;
|
||||
|
||||
Widget buildActions() {
|
||||
void favorite() async {
|
||||
if (isAddingFavorite) return;
|
||||
setState(() {
|
||||
isAddingFavorite = true;
|
||||
});
|
||||
var res = widget.novel.isBookmarked
|
||||
? await Network().deleteFavoriteNovel(widget.novel.id.toString())
|
||||
: await Network().favoriteNovel(widget.novel.id.toString());
|
||||
if (res.error) {
|
||||
if (mounted) {
|
||||
context.showToast(message: res.errorMessage ?? "Network Error");
|
||||
}
|
||||
} else {
|
||||
widget.novel.isBookmarked = !widget.novel.isBookmarked;
|
||||
}
|
||||
setState(() {
|
||||
isAddingFavorite = false;
|
||||
});
|
||||
}
|
||||
|
||||
return LayoutBuilder(builder: (context, constraints) {
|
||||
final width = constraints.maxWidth;
|
||||
return Card(
|
||||
margin: const EdgeInsets.only(top: 12),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (width < 560) buildAuthor().toAlign(Alignment.centerLeft),
|
||||
if (width < 560) buildStats().toAlign(Alignment.centerLeft),
|
||||
if (width >= 560)
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 1132),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(child: buildAuthor()),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: buildStats()),
|
||||
],
|
||||
),
|
||||
).toAlign(Alignment.centerLeft),
|
||||
LayoutBuilder(
|
||||
builder: (context, constrains) {
|
||||
var width = constrains.maxWidth;
|
||||
bool shouldFillSpace = width < 500;
|
||||
return Row(
|
||||
children: [
|
||||
FilledButton(
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(MdIcons.menu_book_outlined, size: 18),
|
||||
const SizedBox(width: 12),
|
||||
Text("Read".tl),
|
||||
const Spacer(),
|
||||
const Icon(MdIcons.chevron_right, size: 18)
|
||||
.paddingTop(2),
|
||||
],
|
||||
)
|
||||
.fixWidth(shouldFillSpace
|
||||
? width / 2 - 4 - kFluentButtonPadding
|
||||
: 220)
|
||||
.fixHeight(32),
|
||||
onPressed: () {
|
||||
context.to(() => NovelReadingPage(widget.novel));
|
||||
}),
|
||||
const SizedBox(width: 16),
|
||||
Button(
|
||||
onPressed: favorite,
|
||||
child: Row(
|
||||
mainAxisAlignment: constrains.maxWidth > 420
|
||||
? MainAxisAlignment.start
|
||||
: MainAxisAlignment.center,
|
||||
children: [
|
||||
if (isAddingFavorite)
|
||||
const SizedBox(
|
||||
width: 18,
|
||||
height: 18,
|
||||
child: ProgressRing(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
)
|
||||
else if (widget.novel.isBookmarked)
|
||||
Icon(
|
||||
MdIcons.favorite,
|
||||
size: 18,
|
||||
color: ColorScheme.of(context).error,
|
||||
)
|
||||
else
|
||||
const Icon(MdIcons.favorite_outline, size: 18),
|
||||
if (constrains.maxWidth > 420)
|
||||
const SizedBox(width: 12),
|
||||
if (constrains.maxWidth > 420) Text("Favorite".tl)
|
||||
],
|
||||
)
|
||||
.fixWidth(shouldFillSpace
|
||||
? width / 4 - 4 - kFluentButtonPadding
|
||||
: 64)
|
||||
.fixHeight(32),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Button(
|
||||
child: Row(
|
||||
mainAxisAlignment: constrains.maxWidth > 420
|
||||
? MainAxisAlignment.start
|
||||
: MainAxisAlignment.center,
|
||||
children: [
|
||||
const Icon(MdIcons.comment, size: 18),
|
||||
if (constrains.maxWidth > 420)
|
||||
const SizedBox(width: 12),
|
||||
if (constrains.maxWidth > 420) Text("Comments".tl)
|
||||
],
|
||||
)
|
||||
.fixWidth(shouldFillSpace
|
||||
? width / 4 - 4 - kFluentButtonPadding
|
||||
: 64)
|
||||
.fixHeight(32),
|
||||
onPressed: () {
|
||||
CommentsPage.show(context, widget.novel.id.toString(),
|
||||
isNovel: true);
|
||||
}),
|
||||
],
|
||||
);
|
||||
},
|
||||
).paddingHorizontal(2),
|
||||
SelectableText(
|
||||
"ID: ${widget.novel.id}",
|
||||
style: TextStyle(
|
||||
fontSize: 13, color: ColorScheme.of(context).outline),
|
||||
).paddingTop(8).paddingLeft(2),
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
Widget buildDescription() {
|
||||
return Card(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"Description".tl,
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
SelectableText.rich(
|
||||
TextSpan(children: buildDescriptionText().toList())),
|
||||
const SizedBox(height: 12),
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
child: Wrap(
|
||||
crossAxisAlignment: WrapCrossAlignment.start,
|
||||
children: [
|
||||
for (final tag in widget.novel.tags)
|
||||
MouseRegion(
|
||||
cursor: SystemMouseCursors.click,
|
||||
child: GestureDetector(
|
||||
onTap: () {
|
||||
context.to(() => SearchNovelResultPage(tag.name));
|
||||
},
|
||||
child: Container(
|
||||
margin: const EdgeInsets.only(right: 8, bottom: 6),
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10, vertical: 6),
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context).primaryContainer,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
child: Text(
|
||||
tag.name,
|
||||
style: const TextStyle(fontSize: 12),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Button(
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(MdIcons.bookmark_outline, size: 18),
|
||||
const SizedBox(width: 12),
|
||||
Text("Related".tl)
|
||||
],
|
||||
).fixWidth(64).fixHeight(32),
|
||||
onPressed: () {
|
||||
context
|
||||
.to(() => _RelatedNovelsPage(widget.novel.id.toString()));
|
||||
}),
|
||||
],
|
||||
),
|
||||
).paddingTop(12);
|
||||
}
|
||||
|
||||
Iterable<TextSpan> buildDescriptionText() sync* {
|
||||
var text = widget.novel.caption;
|
||||
text = text.replaceAll("<br />", "\n");
|
||||
text = text.replaceAll('\n\n', '\n');
|
||||
var labels = Queue<String>();
|
||||
var buffer = StringBuffer();
|
||||
var style = const TextStyle();
|
||||
String? link;
|
||||
Map<String, String> attributes = {};
|
||||
for (int i = 0; i < text.length; i++) {
|
||||
if (text[i] == '<' && text[i + 1] != '/') {
|
||||
var label =
|
||||
text.substring(i + 1, text.indexOf('>', i)).split(' ').first;
|
||||
labels.addLast(label);
|
||||
for (var part
|
||||
in text.substring(i + 1, text.indexOf('>', i)).split(' ')) {
|
||||
var kv = part.split('=');
|
||||
if (kv.length >= 2) {
|
||||
attributes[kv[0]] =
|
||||
kv.join('=').substring(kv[0].length + 2).replaceAll('"', '');
|
||||
}
|
||||
}
|
||||
i = text.indexOf('>', i);
|
||||
} else if (text[i] == '<' && text[i + 1] == '/') {
|
||||
var label = text.substring(i + 2, text.indexOf('>', i));
|
||||
if (label == labels.last) {
|
||||
switch (label) {
|
||||
case "strong":
|
||||
style = style.copyWith(fontWeight: FontWeight.bold);
|
||||
case "a":
|
||||
style = style.copyWith(color: ColorScheme.of(context).primary);
|
||||
link = attributes["href"];
|
||||
}
|
||||
labels.removeLast();
|
||||
}
|
||||
i = text.indexOf('>', i);
|
||||
} else {
|
||||
buffer.write(text[i]);
|
||||
}
|
||||
|
||||
if (i + 1 >= text.length ||
|
||||
(labels.isEmpty &&
|
||||
(text[i + 1] == '<' || (i != 0 && text[i - 1] == '>')))) {
|
||||
var content = buffer.toString();
|
||||
var url = link;
|
||||
yield TextSpan(
|
||||
text: content,
|
||||
style: style,
|
||||
recognizer: url != null
|
||||
? (TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
if (!handleLink(Uri.parse(url))) {
|
||||
launchUrlString(url);
|
||||
}
|
||||
})
|
||||
: null);
|
||||
buffer.clear();
|
||||
link = null;
|
||||
attributes.clear();
|
||||
style = const TextStyle();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class NovelSeriesWidget extends StatefulWidget {
|
||||
const NovelSeriesWidget(this.seriesId, this.title, {super.key});
|
||||
|
||||
final int seriesId;
|
||||
|
||||
final String title;
|
||||
|
||||
@override
|
||||
State<NovelSeriesWidget> createState() => _NovelSeriesWidgetState();
|
||||
}
|
||||
|
||||
class _NovelSeriesWidgetState
|
||||
extends MultiPageLoadingState<NovelSeriesWidget, Novel> {
|
||||
@override
|
||||
Widget? buildFrame(BuildContext context, Widget child) {
|
||||
return DecoratedSliver(
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context).cardColor,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant.withOpacity(0.6),
|
||||
width: 0.5,
|
||||
)),
|
||||
sliver: SliverMainAxisGroup(slivers: [
|
||||
SliverToBoxAdapter(
|
||||
child: Text(widget.title.trim(),
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
)).paddingTop(16).paddingLeft(12).paddingRight(12),
|
||||
),
|
||||
const SliverPadding(padding: EdgeInsets.only(top: 8)),
|
||||
child
|
||||
]),
|
||||
).sliverPadding(const EdgeInsets.only(top: 16));
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildLoading(BuildContext context) {
|
||||
return SliverToBoxAdapter(
|
||||
child: const Center(
|
||||
child: ProgressRing(),
|
||||
).fixHeight(124),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildError(BuildContext context, String error) {
|
||||
return SliverToBoxAdapter(
|
||||
child: Center(
|
||||
child: Text(error),
|
||||
).fixHeight(124),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<Novel> data) {
|
||||
return SliverGridViewWithFixedItemHeight(
|
||||
itemHeight: 164,
|
||||
minCrossAxisExtent: 400,
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return NovelWidget(data[index]);
|
||||
},
|
||||
childCount: data.length,
|
||||
),
|
||||
).sliverPadding(const EdgeInsets.symmetric(horizontal: 8));
|
||||
}
|
||||
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Novel>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res =
|
||||
await Network().getNovelSeries(widget.seriesId.toString(), nextUrl);
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
class NovelPageWithId extends StatefulWidget {
|
||||
const NovelPageWithId(this.id, {super.key});
|
||||
|
||||
final String id;
|
||||
|
||||
@override
|
||||
State<NovelPageWithId> createState() => _NovelPageWithIdState();
|
||||
}
|
||||
|
||||
class _NovelPageWithIdState extends LoadingState<NovelPageWithId, Novel> {
|
||||
@override
|
||||
Future<Res<Novel>> loadData() async {
|
||||
return Network().getNovelDetail(widget.id);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, Novel data) {
|
||||
return NovelPage(data);
|
||||
}
|
||||
}
|
||||
|
||||
class _RelatedNovelsPage extends StatefulWidget {
|
||||
const _RelatedNovelsPage(this.id, {super.key});
|
||||
|
||||
final String id;
|
||||
|
||||
@override
|
||||
State<_RelatedNovelsPage> createState() => __RelatedNovelsPageState();
|
||||
}
|
||||
|
||||
class __RelatedNovelsPageState
|
||||
extends LoadingState<_RelatedNovelsPage, List<Novel>> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<Novel> data) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(title: "Related Novels".tl),
|
||||
Expanded(
|
||||
child: GridViewWithFixedItemHeight(
|
||||
itemHeight: 164,
|
||||
itemCount: data.length,
|
||||
minCrossAxisExtent: 400,
|
||||
builder: (context, index) {
|
||||
return NovelWidget(data[index]);
|
||||
},
|
||||
)),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Res<List<Novel>>> loadData() async {
|
||||
return Network().relatedNovels(widget.id);
|
||||
}
|
||||
}
|
102
lib/pages/novel_ranking_page.dart
Normal file
@@ -0,0 +1,102 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/novel.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../components/grid.dart';
|
||||
|
||||
class NovelRankingPage extends StatefulWidget {
|
||||
const NovelRankingPage({super.key});
|
||||
|
||||
@override
|
||||
State<NovelRankingPage> createState() => _NovelRankingPageState();
|
||||
}
|
||||
|
||||
class _NovelRankingPageState extends State<NovelRankingPage> {
|
||||
String type = "day";
|
||||
|
||||
/// mode: day, day_male, day_female, week_rookie, week, week_ai
|
||||
static const types = {
|
||||
"day": "Daily",
|
||||
"week": "Weekly",
|
||||
"day_male": "For male",
|
||||
"day_female": "For female",
|
||||
"week_rookie": "Rookies",
|
||||
};
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ScaffoldPage(
|
||||
padding: EdgeInsets.zero,
|
||||
content: Column(
|
||||
children: [
|
||||
buildHeader(),
|
||||
Expanded(
|
||||
child: _OneRankingPage(type, key: Key(type),),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildHeader() {
|
||||
return TitleBar(
|
||||
title: "Ranking".tl,
|
||||
action: DropDownButton(
|
||||
title: Text(types[type]!.tl),
|
||||
items: types.entries.map((e) => MenuFlyoutItem(
|
||||
text: Text(e.value.tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
type = e.key;
|
||||
});
|
||||
},
|
||||
)).toList(),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _OneRankingPage extends StatefulWidget {
|
||||
const _OneRankingPage(this.type, {super.key});
|
||||
|
||||
final String type;
|
||||
|
||||
@override
|
||||
State<_OneRankingPage> createState() => _OneRankingPageState();
|
||||
}
|
||||
|
||||
class _OneRankingPageState extends MultiPageLoadingState<_OneRankingPage, Novel> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<Novel> data) {
|
||||
return GridViewWithFixedItemHeight(
|
||||
itemCount: data.length,
|
||||
itemHeight: 164,
|
||||
minCrossAxisExtent: 400,
|
||||
builder: (context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return NovelWidget(data[index]);
|
||||
},
|
||||
).paddingHorizontal(8);
|
||||
}
|
||||
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Novel>>> loadData(page) async{
|
||||
if(nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = await Network().getNovelRanking(widget.type, null);
|
||||
if(!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
264
lib/pages/novel_reading_page.dart
Normal file
@@ -0,0 +1,264 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/components/animated_image.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:pixes/components/page_route.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/foundation/image_provider.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/pages/image_page.dart';
|
||||
import 'package:pixes/pages/main_page.dart';
|
||||
import 'package:pixes/utils/ext.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
class NovelReadingPage extends StatefulWidget {
|
||||
const NovelReadingPage(this.novel, {super.key});
|
||||
|
||||
final Novel novel;
|
||||
|
||||
@override
|
||||
State<NovelReadingPage> createState() => _NovelReadingPageState();
|
||||
}
|
||||
|
||||
class _NovelReadingPageState extends LoadingState<NovelReadingPage, String> {
|
||||
TitleBarAction? action;
|
||||
|
||||
bool isShowingSettings = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
action = TitleBarAction(MdIcons.tune, "Settings".tl, () {
|
||||
if (!isShowingSettings) {
|
||||
_NovelReadingSettings.show(context, () {
|
||||
setState(() {});
|
||||
}).then((value) {
|
||||
isShowingSettings = false;
|
||||
});
|
||||
isShowingSettings = true;
|
||||
} else {
|
||||
Navigator.of(context).pop();
|
||||
}
|
||||
});
|
||||
Future.delayed(const Duration(milliseconds: 200), () {
|
||||
StateController.find<TitleBarController>().addAction(action!);
|
||||
});
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
Future.delayed(const Duration(milliseconds: 200), () {
|
||||
StateController.find<TitleBarController>().removeAction(action!);
|
||||
});
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, String data) {
|
||||
var content = buildList(context).toList();
|
||||
return ScaffoldPage(
|
||||
padding: EdgeInsets.zero,
|
||||
content: SelectionArea(
|
||||
child: DefaultTextStyle.merge(
|
||||
style: const TextStyle(fontSize: 16.0, height: 1.6),
|
||||
child: ListView.builder(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
itemBuilder: (context, index) {
|
||||
return content[index];
|
||||
},
|
||||
itemCount: content.length,
|
||||
),
|
||||
)),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Res<String>> loadData() {
|
||||
return Network().getNovelContent(widget.novel.id.toString());
|
||||
}
|
||||
|
||||
Iterable<Widget> buildList(BuildContext context) sync* {
|
||||
double fontSizeAdd = appdata.settings["readingFontSize"] - 16.0;
|
||||
double fontHeight = appdata.settings["readingLineHeight"];
|
||||
|
||||
yield Text(widget.novel.title,
|
||||
style: TextStyle(
|
||||
fontSize: 24.0 + fontSizeAdd, fontWeight: FontWeight.bold));
|
||||
yield const SizedBox(height: 12.0);
|
||||
yield const Divider(
|
||||
style: DividerThemeData(horizontalMargin: EdgeInsets.all(0)),
|
||||
);
|
||||
yield const SizedBox(height: 12.0);
|
||||
|
||||
var novelContent = data!.split('\n');
|
||||
for (var content in novelContent) {
|
||||
if (content.isEmpty) continue;
|
||||
if (content.startsWith('[uploadedimage:')) {
|
||||
var imageId = content.nums;
|
||||
yield GestureDetector(
|
||||
onTap: () {
|
||||
ImagePage.show(["novel:${widget.novel.id.toString()}/$imageId"]);
|
||||
},
|
||||
child: SizedBox(
|
||||
height: 300,
|
||||
width: double.infinity,
|
||||
child: AnimatedImage(
|
||||
image:
|
||||
CachedNovelImageProvider(widget.novel.id.toString(), imageId),
|
||||
filterQuality: FilterQuality.medium,
|
||||
fit: BoxFit.contain,
|
||||
height: 300,
|
||||
width: double.infinity,
|
||||
),
|
||||
),
|
||||
);
|
||||
} else if (content.startsWith('[chapter:')) {
|
||||
var title = content.replaceLast(']', '').split(':')[1];
|
||||
yield Text(title,
|
||||
style: TextStyle(
|
||||
fontSize: 20.0 + fontSizeAdd,
|
||||
fontWeight: FontWeight.bold,
|
||||
height: fontHeight))
|
||||
.paddingBottom(8);
|
||||
} else {
|
||||
yield Text(content,
|
||||
style:
|
||||
TextStyle(fontSize: 16.0 + fontSizeAdd, height: fontHeight))
|
||||
.paddingBottom(appdata.settings["readingParagraphSpacing"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class _NovelReadingSettings extends StatefulWidget {
|
||||
const _NovelReadingSettings(this.callback);
|
||||
|
||||
final void Function() callback;
|
||||
|
||||
static Future show(BuildContext context, void Function() callback) {
|
||||
return Navigator.of(context)
|
||||
.push(SideBarRoute(_NovelReadingSettings(callback)));
|
||||
}
|
||||
|
||||
@override
|
||||
State<_NovelReadingSettings> createState() => __NovelReadingSettingsState();
|
||||
}
|
||||
|
||||
class __NovelReadingSettingsState extends State<_NovelReadingSettings> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SingleChildScrollView(
|
||||
child: Column(
|
||||
children: [
|
||||
TitleBar(title: "Reading Settings".tl),
|
||||
const SizedBox(height: 8),
|
||||
Card(
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
title: Text("Font Size".tl),
|
||||
subtitle: Slider(
|
||||
value: appdata.settings["readingFontSize"],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
appdata.settings["readingFontSize"] = value;
|
||||
});
|
||||
appdata.writeSettings();
|
||||
widget.callback();
|
||||
},
|
||||
min: 12.0,
|
||||
max: 24.0,
|
||||
divisions: 12,
|
||||
label: appdata.settings["readingFontSize"].toString(),
|
||||
),
|
||||
trailing: Text(appdata.settings["readingFontSize"].toString()),
|
||||
),
|
||||
).paddingHorizontal(8).paddingBottom(8),
|
||||
Card(
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
title: Text("Line Height".tl),
|
||||
subtitle: Slider(
|
||||
value: appdata.settings["readingLineHeight"],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
appdata.settings["readingLineHeight"] = value;
|
||||
});
|
||||
appdata.writeSettings();
|
||||
widget.callback();
|
||||
},
|
||||
min: 1.0,
|
||||
max: 2.0,
|
||||
divisions: 10,
|
||||
label: appdata.settings["readingLineHeight"].toString(),
|
||||
),
|
||||
trailing: Text(appdata.settings["readingLineHeight"].toString()),
|
||||
),
|
||||
).paddingHorizontal(8).paddingBottom(8),
|
||||
Card(
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
title: Text("Paragraph Spacing".tl),
|
||||
subtitle: Slider(
|
||||
value: appdata.settings["readingParagraphSpacing"],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
appdata.settings["readingParagraphSpacing"] = value;
|
||||
});
|
||||
appdata.writeSettings();
|
||||
widget.callback();
|
||||
},
|
||||
min: 0.0,
|
||||
max: 16.0,
|
||||
divisions: 8,
|
||||
label: appdata.settings["readingParagraphSpacing"].toString(),
|
||||
),
|
||||
trailing:
|
||||
Text(appdata.settings["readingParagraphSpacing"].toString()),
|
||||
),
|
||||
).paddingHorizontal(8).paddingBottom(8),
|
||||
// 深色模式
|
||||
Card(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 8),
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
title: Text("Theme".tl),
|
||||
trailing: DropDownButton(
|
||||
title: Text(appdata.settings["theme"] ?? "System".tl),
|
||||
items: [
|
||||
MenuFlyoutItem(
|
||||
text: Text("System".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["theme"] = "System";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: Text("light".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["theme"] = "Light";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: Text("dark".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["theme"] = "Dark";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
]),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
46
lib/pages/novel_recommendation_page.dart
Normal file
@@ -0,0 +1,46 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/components/grid.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/novel.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
class NovelRecommendationPage extends StatefulWidget {
|
||||
const NovelRecommendationPage({super.key});
|
||||
|
||||
@override
|
||||
State<NovelRecommendationPage> createState() =>
|
||||
_NovelRecommendationPageState();
|
||||
}
|
||||
|
||||
class _NovelRecommendationPageState
|
||||
extends MultiPageLoadingState<NovelRecommendationPage, Novel> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<Novel> data) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(title: "Recommendation".tl),
|
||||
Expanded(
|
||||
child: GridViewWithFixedItemHeight(
|
||||
itemCount: data.length,
|
||||
itemHeight: 164,
|
||||
minCrossAxisExtent: 400,
|
||||
builder: (context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return NovelWidget(data[index]);
|
||||
},
|
||||
).paddingHorizontal(8),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Res<List<Novel>>> loadData(int page) {
|
||||
return Network().getRecommendNovels();
|
||||
}
|
||||
}
|
@@ -1,6 +1,7 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/utils/block.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../components/batch_download.dart';
|
||||
@@ -8,6 +9,7 @@ import '../components/illust_widget.dart';
|
||||
import '../components/loading.dart';
|
||||
import '../components/title_bar.dart';
|
||||
import '../network/network.dart';
|
||||
import 'illust_page.dart';
|
||||
|
||||
class RankingPage extends StatefulWidget {
|
||||
const RankingPage({super.key});
|
||||
@@ -85,6 +87,7 @@ class _OneRankingPage extends StatefulWidget {
|
||||
class _OneRankingPageState extends MultiPageLoadingState<_OneRankingPage, Illust> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<Illust> data) {
|
||||
checkIllusts(data);
|
||||
return LayoutBuilder(builder: (context, constrains){
|
||||
return MasonryGridView.builder(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8)
|
||||
@@ -97,7 +100,13 @@ class _OneRankingPageState extends MultiPageLoadingState<_OneRankingPage, Illust
|
||||
if(index == data.length - 1){
|
||||
nextPage();
|
||||
}
|
||||
return IllustWidget(data[index]);
|
||||
return IllustWidget(data[index], onTap: () {
|
||||
context.to(() => IllustGalleryPage(
|
||||
illusts: data,
|
||||
initialPage: index,
|
||||
nextUrl: nextUrl
|
||||
));
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
|
@@ -5,6 +5,8 @@ import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/pages/illust_page.dart';
|
||||
import 'package:pixes/utils/block.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
import '../components/grid.dart';
|
||||
@@ -28,8 +30,11 @@ class _RecommendationPageState extends State<RecommendationPage> {
|
||||
buildTab(),
|
||||
Expanded(
|
||||
child: type != 2
|
||||
? _RecommendationArtworksPage(type, key: Key(type.toString()),)
|
||||
: const _RecommendationUsersPage(),
|
||||
? _RecommendationArtworksPage(
|
||||
type,
|
||||
key: Key(type.toString()),
|
||||
)
|
||||
: const _RecommendationUsersPage(),
|
||||
)
|
||||
],
|
||||
);
|
||||
@@ -40,12 +45,12 @@ class _RecommendationPageState extends State<RecommendationPage> {
|
||||
title: "Explore".tl,
|
||||
action: SegmentedButton<int>(
|
||||
options: [
|
||||
SegmentedButtonOption(0, "Artworks".tl),
|
||||
SegmentedButtonOption(0, "Illustrations".tl),
|
||||
SegmentedButtonOption(1, "Mangas".tl),
|
||||
SegmentedButtonOption(2, "Users".tl),
|
||||
],
|
||||
onPressed: (key) {
|
||||
if(key != type) {
|
||||
if (key != type) {
|
||||
setState(() {
|
||||
type = key;
|
||||
});
|
||||
@@ -57,32 +62,43 @@ class _RecommendationPageState extends State<RecommendationPage> {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class _RecommendationArtworksPage extends StatefulWidget {
|
||||
const _RecommendationArtworksPage(this.type, {super.key});
|
||||
|
||||
final int type;
|
||||
|
||||
@override
|
||||
State<_RecommendationArtworksPage> createState() => _RecommendationArtworksPageState();
|
||||
State<_RecommendationArtworksPage> createState() =>
|
||||
_RecommendationArtworksPageState();
|
||||
}
|
||||
|
||||
class _RecommendationArtworksPageState extends MultiPageLoadingState<_RecommendationArtworksPage, Illust> {
|
||||
class _RecommendationArtworksPageState
|
||||
extends MultiPageLoadingState<_RecommendationArtworksPage, Illust> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<Illust> data) {
|
||||
return LayoutBuilder(builder: (context, constrains){
|
||||
checkIllusts(data);
|
||||
return LayoutBuilder(builder: (context, constrains) {
|
||||
return MasonryGridView.builder(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8)
|
||||
+ EdgeInsets.only(bottom: context.padding.bottom),
|
||||
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){
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return IllustWidget(data[index]);
|
||||
return IllustWidget(
|
||||
data[index],
|
||||
onTap: () {
|
||||
context.to(() => IllustGalleryPage(
|
||||
illusts: data,
|
||||
initialPage: index,
|
||||
nextUrl: Network.recommendationUrl,
|
||||
));
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
@@ -100,33 +116,32 @@ class _RecommendationUsersPage extends StatefulWidget {
|
||||
const _RecommendationUsersPage();
|
||||
|
||||
@override
|
||||
State<_RecommendationUsersPage> createState() => _RecommendationUsersPageState();
|
||||
State<_RecommendationUsersPage> createState() =>
|
||||
_RecommendationUsersPageState();
|
||||
}
|
||||
|
||||
class _RecommendationUsersPageState extends MultiPageLoadingState<_RecommendationUsersPage, UserPreview> {
|
||||
class _RecommendationUsersPageState
|
||||
extends MultiPageLoadingState<_RecommendationUsersPage, UserPreview> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<UserPreview> data) {
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverGridViewWithFixedItemHeight(
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
if(index == data.length - 1){
|
||||
nextPage();
|
||||
}
|
||||
return UserPreviewWidget(data[index]);
|
||||
},
|
||||
childCount: data.length
|
||||
),
|
||||
maxCrossAxisExtent: 520,
|
||||
itemHeight: 114,
|
||||
delegate: SliverChildBuilderDelegate((context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return UserPreviewWidget(data[index]);
|
||||
}, childCount: data.length),
|
||||
minCrossAxisExtent: 440,
|
||||
itemHeight: 136,
|
||||
).sliverPaddingHorizontal(8)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Res<List<UserPreview>>> loadData(page) async{
|
||||
Future<Res<List<UserPreview>>> loadData(page) async {
|
||||
var res = await Network().getRecommendationUsers();
|
||||
return res;
|
||||
}
|
||||
|
69
lib/pages/related_page.dart
Normal file
@@ -0,0 +1,69 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
|
||||
import 'package:pixes/components/illust_widget.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
class RelatedIllustsPage extends StatefulWidget {
|
||||
const RelatedIllustsPage(this.id, {super.key});
|
||||
|
||||
final String id;
|
||||
|
||||
@override
|
||||
State<RelatedIllustsPage> createState() => _RelatedIllustsPageState();
|
||||
}
|
||||
|
||||
class _RelatedIllustsPageState
|
||||
extends MultiPageLoadingState<RelatedIllustsPage, Illust> {
|
||||
@override
|
||||
Widget? buildFrame(BuildContext context, Widget child) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(title: "Related artworks".tl),
|
||||
Expanded(
|
||||
child: child,
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@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]);
|
||||
},
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Illust>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = nextUrl == null
|
||||
? await Network().relatedIllusts(widget.id)
|
||||
: await Network().getIllustsWithNextUrl(nextUrl!);
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
@@ -2,13 +2,17 @@ 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/message.dart';
|
||||
import 'package:pixes/components/novel.dart';
|
||||
import 'package:pixes/components/page_route.dart';
|
||||
import 'package:pixes/components/user_preview.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
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';
|
||||
@@ -29,6 +33,8 @@ class _SearchPageState extends State<SearchPage> {
|
||||
|
||||
int searchType = 0;
|
||||
|
||||
final focusNode = FocusNode();
|
||||
|
||||
static const searchTypes = [
|
||||
"Search artwork",
|
||||
"Search novel",
|
||||
@@ -39,11 +45,17 @@ class _SearchPageState extends State<SearchPage> {
|
||||
];
|
||||
|
||||
void search() {
|
||||
switch(searchType) {
|
||||
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));
|
||||
case 1:
|
||||
showToast(context, message: "Not implemented");
|
||||
context.to(() => SearchNovelResultPage(text));
|
||||
case 2:
|
||||
context.to(() => SearchUserResultPage(text));
|
||||
case 3:
|
||||
@@ -51,7 +63,7 @@ class _SearchPageState extends State<SearchPage> {
|
||||
case 4:
|
||||
context.to(() => UserInfoPage(text));
|
||||
case 5:
|
||||
showToast(context, message: "Not implemented");
|
||||
context.to(() => NovelPageWithId(text));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +74,9 @@ class _SearchPageState extends State<SearchPage> {
|
||||
content: Column(
|
||||
children: [
|
||||
buildSearchBar(),
|
||||
const SizedBox(height: 8,),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
const Expanded(
|
||||
child: _TrendingTagsView(),
|
||||
)
|
||||
@@ -88,7 +102,11 @@ class _SearchPageState extends State<SearchPage> {
|
||||
children: [
|
||||
Expanded(
|
||||
child: TextBox(
|
||||
placeholder: searchTypes[searchType].tl,
|
||||
focusNode: focusNode,
|
||||
autofocus: false,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
placeholder:
|
||||
'${searchTypes[searchType].tl} / ${"Open link".tl}',
|
||||
onChanged: (s) => text = s,
|
||||
onSubmitted: (s) => search(),
|
||||
foregroundDecoration: BoxDecoration(
|
||||
@@ -123,14 +141,15 @@ class _SearchPageState extends State<SearchPage> {
|
||||
),
|
||||
onPressed: () {
|
||||
optionController.showFlyout(
|
||||
navigatorKey: App.rootNavigatorKey.currentState,
|
||||
placementMode: FlyoutPlacementMode.bottomCenter,
|
||||
builder: buildSearchOption,
|
||||
);
|
||||
placementMode: FlyoutPlacementMode.bottomCenter,
|
||||
builder: buildSearchOption,
|
||||
barrierColor: Colors.transparent);
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4,),
|
||||
const SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
Button(
|
||||
child: const SizedBox(
|
||||
height: 42,
|
||||
@@ -139,7 +158,9 @@ class _SearchPageState extends State<SearchPage> {
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.of(context).push(SideBarRoute(const SearchSettings()));
|
||||
Navigator.of(context).push(SideBarRoute(SearchSettings(
|
||||
isNovel: searchType == 1,
|
||||
)));
|
||||
},
|
||||
)
|
||||
],
|
||||
@@ -169,12 +190,13 @@ class _TrendingTagsView extends StatefulWidget {
|
||||
State<_TrendingTagsView> createState() => _TrendingTagsViewState();
|
||||
}
|
||||
|
||||
class _TrendingTagsViewState extends LoadingState<_TrendingTagsView, List<TrendingTag>> {
|
||||
class _TrendingTagsViewState
|
||||
extends LoadingState<_TrendingTagsView, List<TrendingTag>> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<TrendingTag> data) {
|
||||
return MasonryGridView.builder(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8.0)
|
||||
+ EdgeInsets.only(bottom: context.padding.bottom),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8.0) +
|
||||
EdgeInsets.only(bottom: context.padding.bottom),
|
||||
gridDelegate: const SliverSimpleGridDelegateWithMaxCrossAxisExtent(
|
||||
maxCrossAxisExtent: 240,
|
||||
),
|
||||
@@ -189,7 +211,7 @@ class _TrendingTagsViewState extends LoadingState<_TrendingTagsView, List<Trendi
|
||||
final illust = tag.illust;
|
||||
|
||||
var text = tag.tag.name;
|
||||
if(tag.tag.translatedName != null) {
|
||||
if (tag.tag.translatedName != null) {
|
||||
text += "/${tag.tag.translatedName}";
|
||||
}
|
||||
|
||||
@@ -206,18 +228,19 @@ class _TrendingTagsViewState extends LoadingState<_TrendingTagsView, List<Trendi
|
||||
child: MouseRegion(
|
||||
cursor: SystemMouseCursors.click,
|
||||
child: GestureDetector(
|
||||
onTap: (){
|
||||
onTap: () {
|
||||
context.to(() => SearchResultPage(tag.tag.name));
|
||||
},
|
||||
child: Stack(
|
||||
children: [
|
||||
Positioned.fill(child: ClipRRect(
|
||||
Positioned.fill(
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4.0),
|
||||
child: AnimatedImage(
|
||||
image: CachedImageProvider(illust.images.first.medium),
|
||||
fit: BoxFit.cover,
|
||||
width: width-16.0,
|
||||
height: height-16.0,
|
||||
width: width - 16.0,
|
||||
height: height - 16.0,
|
||||
),
|
||||
)),
|
||||
Positioned(
|
||||
@@ -226,10 +249,14 @@ class _TrendingTagsViewState extends LoadingState<_TrendingTagsView, List<Trendi
|
||||
right: 0,
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context).micaBackgroundColor.withOpacity(0.84),
|
||||
borderRadius: BorderRadius.circular(4)
|
||||
),
|
||||
child: Text(text).paddingHorizontal(4).paddingVertical(6).paddingBottom(2),
|
||||
color: FluentTheme.of(context)
|
||||
.micaBackgroundColor
|
||||
.withOpacity(0.84),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
child: Text(text)
|
||||
.paddingHorizontal(4)
|
||||
.paddingVertical(6)
|
||||
.paddingBottom(2),
|
||||
),
|
||||
)
|
||||
],
|
||||
@@ -248,10 +275,12 @@ class _TrendingTagsViewState extends LoadingState<_TrendingTagsView, List<Trendi
|
||||
}
|
||||
|
||||
class SearchSettings extends StatefulWidget {
|
||||
const SearchSettings({this.onChanged, super.key});
|
||||
const SearchSettings({this.onChanged, this.isNovel = false, super.key});
|
||||
|
||||
final void Function()? onChanged;
|
||||
|
||||
final bool isNovel;
|
||||
|
||||
@override
|
||||
State<SearchSettings> createState() => _SearchSettingsState();
|
||||
}
|
||||
@@ -264,113 +293,139 @@ class _SearchSettingsState extends State<SearchSettings> {
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 12),
|
||||
child: Text("Search Settings".tl, style: const TextStyle(fontSize: 18),),
|
||||
child: Text(
|
||||
"Search Settings".tl,
|
||||
style: const TextStyle(fontSize: 18),
|
||||
),
|
||||
).toAlign(Alignment.centerLeft),
|
||||
buildItem(title: "Match".tl, child: DropDownButton(
|
||||
title: Text(appdata.searchOptions.matchType.toString().tl),
|
||||
items: KeywordMatchType.values.map((e) =>
|
||||
MenuFlyoutItem(
|
||||
text: Text(e.toString().tl),
|
||||
onPressed: () {
|
||||
if(appdata.searchOptions.matchType != e) {
|
||||
setState(() => appdata.searchOptions.matchType = e);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
}
|
||||
)
|
||||
).toList(),
|
||||
)),
|
||||
buildItem(title: "Favorite number".tl, child: DropDownButton(
|
||||
title: Text(appdata.searchOptions.favoriteNumber.toString().tl),
|
||||
items: FavoriteNumber.values.map((e) =>
|
||||
MenuFlyoutItem(
|
||||
text: Text(e.toString().tl),
|
||||
onPressed: () {
|
||||
if(appdata.searchOptions.favoriteNumber != e) {
|
||||
setState(() => appdata.searchOptions.favoriteNumber = e);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
}
|
||||
)
|
||||
).toList(),
|
||||
)),
|
||||
buildItem(title: "Sort".tl, child: DropDownButton(
|
||||
title: Text(appdata.searchOptions.sort.toString().tl),
|
||||
items: SearchSort.values.map((e) =>
|
||||
MenuFlyoutItem(
|
||||
text: Text(e.toString().tl),
|
||||
onPressed: () {
|
||||
if(appdata.searchOptions.sort != e) {
|
||||
setState(() => appdata.searchOptions.sort = e);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
}
|
||||
)
|
||||
).toList(),
|
||||
)),
|
||||
Card(
|
||||
padding: EdgeInsets.zero,
|
||||
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
child: Column(
|
||||
children: [
|
||||
Text("Start Time".tl, style: const TextStyle(fontSize: 16),)
|
||||
.paddingVertical(8)
|
||||
.toAlign(Alignment.centerLeft)
|
||||
.paddingLeft(16),
|
||||
DatePicker(
|
||||
selected: appdata.searchOptions.startTime,
|
||||
onChanged: (t) {
|
||||
if(appdata.searchOptions.startTime != t) {
|
||||
setState(() => appdata.searchOptions.startTime = t);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 8,)
|
||||
],
|
||||
),
|
||||
)),
|
||||
Card(
|
||||
padding: EdgeInsets.zero,
|
||||
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
child: Column(
|
||||
children: [
|
||||
Text("End Time".tl, style: const TextStyle(fontSize: 16),)
|
||||
.paddingVertical(8)
|
||||
.toAlign(Alignment.centerLeft)
|
||||
.paddingLeft(16),
|
||||
DatePicker(
|
||||
selected: appdata.searchOptions.endTime,
|
||||
onChanged: (t) {
|
||||
if(appdata.searchOptions.endTime != t) {
|
||||
setState(() => appdata.searchOptions.endTime = t);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 8,)
|
||||
],
|
||||
),
|
||||
buildItem(
|
||||
title: "Match".tl,
|
||||
child: DropDownButton(
|
||||
title: Text(appdata.searchOptions.matchType.toString().tl),
|
||||
items: KeywordMatchType.values
|
||||
.map((e) => MenuFlyoutItem(
|
||||
text: Text(e.toString().tl),
|
||||
onPressed: () {
|
||||
if (appdata.searchOptions.matchType != e) {
|
||||
setState(() => appdata.searchOptions.matchType = e);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
}))
|
||||
.toList(),
|
||||
)),
|
||||
buildItem(title: "Age limit".tl, child: DropDownButton(
|
||||
title: Text(appdata.searchOptions.ageLimit.toString().tl),
|
||||
items: AgeLimit.values.map((e) =>
|
||||
MenuFlyoutItem(
|
||||
text: Text(e.toString().tl),
|
||||
onPressed: () {
|
||||
if(appdata.searchOptions.ageLimit != e) {
|
||||
setState(() => appdata.searchOptions.ageLimit = e);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
}
|
||||
)
|
||||
).toList(),
|
||||
)),
|
||||
SizedBox(height: context.padding.bottom,)
|
||||
if (!widget.isNovel)
|
||||
buildItem(
|
||||
title: "Favorite number".tl,
|
||||
child: DropDownButton(
|
||||
title:
|
||||
Text(appdata.searchOptions.favoriteNumber.toString().tl),
|
||||
items: FavoriteNumber.values
|
||||
.map((e) => MenuFlyoutItem(
|
||||
text: Text(e.toString().tl),
|
||||
onPressed: () {
|
||||
if (appdata.searchOptions.favoriteNumber != e) {
|
||||
setState(() =>
|
||||
appdata.searchOptions.favoriteNumber = e);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
}))
|
||||
.toList(),
|
||||
)),
|
||||
buildItem(
|
||||
title: "Sort".tl,
|
||||
child: DropDownButton(
|
||||
title: Text(appdata.searchOptions.sort.toString().tl),
|
||||
items: SearchSort.values
|
||||
.map((e) => MenuFlyoutItem(
|
||||
text: Text(e.toString().tl),
|
||||
onPressed: () {
|
||||
if (appdata.searchOptions.sort != e) {
|
||||
setState(() => appdata.searchOptions.sort = e);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
}))
|
||||
.toList(),
|
||||
)),
|
||||
if (!widget.isNovel)
|
||||
Card(
|
||||
padding: EdgeInsets.zero,
|
||||
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
child: Column(
|
||||
children: [
|
||||
Text(
|
||||
"Start Time".tl,
|
||||
style: const TextStyle(fontSize: 16),
|
||||
)
|
||||
.paddingVertical(8)
|
||||
.toAlign(Alignment.centerLeft)
|
||||
.paddingLeft(16),
|
||||
DatePicker(
|
||||
selected: appdata.searchOptions.startTime,
|
||||
onChanged: (t) {
|
||||
if (appdata.searchOptions.startTime != t) {
|
||||
setState(() => appdata.searchOptions.startTime = t);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
},
|
||||
),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
)
|
||||
],
|
||||
),
|
||||
)),
|
||||
if (!widget.isNovel)
|
||||
Card(
|
||||
padding: EdgeInsets.zero,
|
||||
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
child: Column(
|
||||
children: [
|
||||
Text(
|
||||
"End Time".tl,
|
||||
style: const TextStyle(fontSize: 16),
|
||||
)
|
||||
.paddingVertical(8)
|
||||
.toAlign(Alignment.centerLeft)
|
||||
.paddingLeft(16),
|
||||
DatePicker(
|
||||
selected: appdata.searchOptions.endTime,
|
||||
onChanged: (t) {
|
||||
if (appdata.searchOptions.endTime != t) {
|
||||
setState(() => appdata.searchOptions.endTime = t);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
},
|
||||
),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
)
|
||||
],
|
||||
),
|
||||
)),
|
||||
if (!widget.isNovel)
|
||||
buildItem(
|
||||
title: "Age limit".tl,
|
||||
child: DropDownButton(
|
||||
title: Text(appdata.searchOptions.ageLimit.toString().tl),
|
||||
items: AgeLimit.values
|
||||
.map((e) => MenuFlyoutItem(
|
||||
text: Text(e.toString().tl),
|
||||
onPressed: () {
|
||||
if (appdata.searchOptions.ageLimit != e) {
|
||||
setState(
|
||||
() => appdata.searchOptions.ageLimit = e);
|
||||
widget.onChanged?.call();
|
||||
}
|
||||
}))
|
||||
.toList(),
|
||||
)),
|
||||
SizedBox(
|
||||
height: context.padding.bottom,
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -388,7 +443,6 @@ class _SearchSettingsState extends State<SearchSettings> {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class SearchResultPage extends StatefulWidget {
|
||||
const SearchResultPage(this.keyword, {super.key});
|
||||
|
||||
@@ -398,7 +452,8 @@ class SearchResultPage extends StatefulWidget {
|
||||
State<SearchResultPage> createState() => _SearchResultPageState();
|
||||
}
|
||||
|
||||
class _SearchResultPageState extends MultiPageLoadingState<SearchResultPage, Illust> {
|
||||
class _SearchResultPageState
|
||||
extends MultiPageLoadingState<SearchResultPage, Illust> {
|
||||
late String keyword = widget.keyword;
|
||||
|
||||
late String oldKeyword = widget.keyword;
|
||||
@@ -406,7 +461,7 @@ class _SearchResultPageState extends MultiPageLoadingState<SearchResultPage, Ill
|
||||
late final controller = TextEditingController(text: widget.keyword);
|
||||
|
||||
void search() {
|
||||
if(keyword != oldKeyword) {
|
||||
if (keyword != oldKeyword) {
|
||||
oldKeyword = keyword;
|
||||
reset();
|
||||
}
|
||||
@@ -414,6 +469,7 @@ class _SearchResultPageState extends MultiPageLoadingState<SearchResultPage, Ill
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<Illust> data) {
|
||||
checkIllusts(data);
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
buildSearchBar(),
|
||||
@@ -423,15 +479,23 @@ class _SearchResultPageState extends MultiPageLoadingState<SearchResultPage, Ill
|
||||
),
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
if(index == data.length - 1){
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return IllustWidget(data[index]);
|
||||
return IllustWidget(
|
||||
data[index],
|
||||
onTap: () {
|
||||
context.to(() => IllustGalleryPage(
|
||||
illusts: data, initialPage: index, nextUrl: nextUrl));
|
||||
},
|
||||
);
|
||||
},
|
||||
childCount: data.length,
|
||||
),
|
||||
).sliverPaddingHorizontal(8),
|
||||
SliverPadding(padding: EdgeInsets.only(bottom: context.padding.bottom),)
|
||||
SliverPadding(
|
||||
padding: EdgeInsets.only(bottom: context.padding.bottom),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -475,7 +539,9 @@ class _SearchResultPageState extends MultiPageLoadingState<SearchResultPage, Ill
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4,),
|
||||
const SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
Button(
|
||||
child: const SizedBox(
|
||||
height: 42,
|
||||
@@ -483,12 +549,13 @@ class _SearchResultPageState extends MultiPageLoadingState<SearchResultPage, Ill
|
||||
child: Icon(FluentIcons.settings),
|
||||
),
|
||||
),
|
||||
onPressed: () async{
|
||||
onPressed: () async {
|
||||
bool isChanged = false;
|
||||
await Navigator.of(context).push(
|
||||
SideBarRoute(SearchSettings(
|
||||
onChanged: () => isChanged = true,)));
|
||||
if(isChanged) {
|
||||
await Navigator.of(context)
|
||||
.push(SideBarRoute(SearchSettings(
|
||||
onChanged: () => isChanged = true,
|
||||
)));
|
||||
if (isChanged) {
|
||||
reset();
|
||||
}
|
||||
},
|
||||
@@ -507,14 +574,14 @@ class _SearchResultPageState extends MultiPageLoadingState<SearchResultPage, Ill
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Illust>>> loadData(page) async{
|
||||
if(nextUrl == "end") {
|
||||
Future<Res<List<Illust>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = nextUrl == null
|
||||
? await Network().search(keyword, appdata.searchOptions)
|
||||
: await Network().getIllustsWithNextUrl(nextUrl!);
|
||||
if(!res.error) {
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
@@ -531,30 +598,31 @@ class SearchUserResultPage extends StatefulWidget {
|
||||
State<SearchUserResultPage> createState() => _SearchUserResultPageState();
|
||||
}
|
||||
|
||||
class _SearchUserResultPageState extends MultiPageLoadingState<SearchUserResultPage, UserPreview> {
|
||||
class _SearchUserResultPageState
|
||||
extends MultiPageLoadingState<SearchUserResultPage, UserPreview> {
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<UserPreview> data) {
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverToBoxAdapter(
|
||||
child: Text("${"Search".tl}: ${widget.keyword}",
|
||||
style: const TextStyle(fontSize: 22, fontWeight: FontWeight.bold),)
|
||||
.paddingVertical(12).paddingHorizontal(16),
|
||||
child: Text(
|
||||
"${"Search".tl}: ${widget.keyword}",
|
||||
style: const TextStyle(fontSize: 22, fontWeight: FontWeight.bold),
|
||||
).paddingVertical(12).paddingHorizontal(16),
|
||||
),
|
||||
SliverGridViewWithFixedItemHeight(
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
if(index == data.length - 1){
|
||||
nextPage();
|
||||
}
|
||||
return UserPreviewWidget(data[index]);
|
||||
},
|
||||
childCount: data.length
|
||||
),
|
||||
maxCrossAxisExtent: 520,
|
||||
itemHeight: 114,
|
||||
delegate: SliverChildBuilderDelegate((context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return UserPreviewWidget(data[index]);
|
||||
}, childCount: data.length),
|
||||
minCrossAxisExtent: 440,
|
||||
itemHeight: 136,
|
||||
).sliverPaddingHorizontal(8),
|
||||
SliverPadding(padding: EdgeInsets.only(bottom: context.padding.bottom),)
|
||||
SliverPadding(
|
||||
padding: EdgeInsets.only(bottom: context.padding.bottom),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -562,12 +630,12 @@ class _SearchUserResultPageState extends MultiPageLoadingState<SearchUserResultP
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<UserPreview>>> loadData(page) async{
|
||||
if(nextUrl == "end") {
|
||||
Future<Res<List<UserPreview>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = await Network().searchUsers(widget.keyword, nextUrl);
|
||||
if(!res.error) {
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
@@ -575,3 +643,141 @@ class _SearchUserResultPageState extends MultiPageLoadingState<SearchUserResultP
|
||||
}
|
||||
}
|
||||
|
||||
class SearchNovelResultPage extends StatefulWidget {
|
||||
const SearchNovelResultPage(this.keyword, {super.key});
|
||||
|
||||
final String keyword;
|
||||
|
||||
@override
|
||||
State<SearchNovelResultPage> createState() => _SearchNovelResultPageState();
|
||||
}
|
||||
|
||||
class _SearchNovelResultPageState
|
||||
extends MultiPageLoadingState<SearchNovelResultPage, Novel> {
|
||||
late String keyword = widget.keyword;
|
||||
|
||||
late String oldKeyword = widget.keyword;
|
||||
|
||||
late final controller = TextEditingController(text: widget.keyword);
|
||||
|
||||
void search() {
|
||||
if (keyword != oldKeyword) {
|
||||
oldKeyword = keyword;
|
||||
reset();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<Novel> data) {
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
buildSearchBar(),
|
||||
SliverGridViewWithFixedItemHeight(
|
||||
itemHeight: 164,
|
||||
minCrossAxisExtent: 400,
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return NovelWidget(data[index]);
|
||||
},
|
||||
childCount: data.length,
|
||||
),
|
||||
).sliverPaddingHorizontal(8),
|
||||
SliverPadding(
|
||||
padding: EdgeInsets.only(bottom: context.padding.bottom),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildSearchBar() {
|
||||
return SliverToBoxAdapter(
|
||||
child: Center(
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 560),
|
||||
child: SizedBox(
|
||||
height: 42,
|
||||
width: double.infinity,
|
||||
child: LayoutBuilder(
|
||||
builder: (context, constrains) {
|
||||
return SizedBox(
|
||||
height: 42,
|
||||
width: constrains.maxWidth,
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: TextBox(
|
||||
controller: controller,
|
||||
placeholder: "Search artworks".tl,
|
||||
onChanged: (s) => keyword = s,
|
||||
onSubmitted: (s) => search(),
|
||||
foregroundDecoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context)
|
||||
.outlineVariant
|
||||
.withOpacity(0.6)),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
suffix: MouseRegion(
|
||||
cursor: SystemMouseCursors.click,
|
||||
child: GestureDetector(
|
||||
onTap: search,
|
||||
child: const Icon(
|
||||
FluentIcons.search,
|
||||
size: 16,
|
||||
).paddingHorizontal(12),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
Button(
|
||||
child: const SizedBox(
|
||||
height: 42,
|
||||
child: Center(
|
||||
child: Icon(FluentIcons.settings),
|
||||
),
|
||||
),
|
||||
onPressed: () async {
|
||||
bool isChanged = false;
|
||||
await Navigator.of(context)
|
||||
.push(SideBarRoute(SearchSettings(
|
||||
onChanged: () => isChanged = true,
|
||||
isNovel: true,
|
||||
)));
|
||||
if (isChanged) {
|
||||
reset();
|
||||
}
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
).paddingHorizontal(16),
|
||||
),
|
||||
),
|
||||
).sliverPadding(const EdgeInsets.only(top: 12));
|
||||
}
|
||||
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Novel>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = nextUrl == null
|
||||
? await Network().searchNovels(keyword, appdata.searchOptions)
|
||||
: await Network().getNovelsWithNextUrl(nextUrl!);
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
@@ -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';
|
||||
@@ -31,8 +33,12 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||
SliverTitleBar(title: "Settings".tl),
|
||||
buildHeader("Account".tl),
|
||||
buildAccount(),
|
||||
buildHeader("Browse".tl),
|
||||
buildBrowse(),
|
||||
buildHeader("Download".tl),
|
||||
buildDownload(),
|
||||
buildHeader("Appearance".tl),
|
||||
buildAppearance(),
|
||||
buildHeader("About".tl),
|
||||
buildAbout(),
|
||||
SliverPadding(
|
||||
@@ -82,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()),
|
||||
@@ -123,10 +130,20 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||
child: Text("Manage".tl).fixWidth(64),
|
||||
onPressed: () {
|
||||
if (Platform.isIOS) {
|
||||
showToast(context, message: "Unsupport platform".tl);
|
||||
showToast(context, message: "Unsupported platform".tl);
|
||||
return;
|
||||
}
|
||||
context.to(() => const _SetDownloadPathPage());
|
||||
context.to(() => _SetSingleFieldPage(
|
||||
"Download Path".tl,
|
||||
"downloadPath",
|
||||
check: (text) {
|
||||
if (!Directory(text).havePermission()) {
|
||||
return "No permission".tl;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
},
|
||||
));
|
||||
}),
|
||||
),
|
||||
buildItem(
|
||||
@@ -165,49 +182,223 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||
child: Column(
|
||||
children: [
|
||||
buildItem(title: "Version", subtitle: App.version),
|
||||
buildItem(
|
||||
title: "Check for updates on startup".tl,
|
||||
action: ToggleSwitch(
|
||||
checked: appdata.settings["checkUpdate"],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
appdata.settings["checkUpdate"] = value;
|
||||
});
|
||||
appdata.writeData();
|
||||
})),
|
||||
buildItem(
|
||||
title: "Github",
|
||||
action: IconButton(
|
||||
icon: const Icon(MdIcons.open_in_new, size: 18,),
|
||||
icon: const Icon(
|
||||
MdIcons.open_in_new,
|
||||
size: 18,
|
||||
),
|
||||
onPressed: () =>
|
||||
launchUrlString("https://github.com/wgh136/pixes"),
|
||||
)),
|
||||
buildItem(
|
||||
title: "Telegram",
|
||||
action: IconButton(
|
||||
icon: const Icon(MdIcons.open_in_new, size: 18,),
|
||||
onPressed: () =>
|
||||
launchUrlString("https://t.me/pica_group"),
|
||||
icon: const Icon(
|
||||
MdIcons.open_in_new,
|
||||
size: 18,
|
||||
),
|
||||
onPressed: () => launchUrlString("https://t.me/pica_group"),
|
||||
)),
|
||||
buildItem(
|
||||
title: "Logs",
|
||||
action: IconButton(
|
||||
icon: const Icon(MdIcons.open_in_new, size: 18,),
|
||||
onPressed: () => context.to(() => const LogsPage())
|
||||
icon: const Icon(
|
||||
MdIcons.open_in_new,
|
||||
size: 18,
|
||||
),
|
||||
onPressed: () => context.to(() => const LogsPage()))),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildBrowse() {
|
||||
return SliverToBoxAdapter(
|
||||
child: Column(
|
||||
children: [
|
||||
buildItem(
|
||||
title: "Proxy".tl,
|
||||
action: Button(
|
||||
child: Text("Edit".tl).fixWidth(64),
|
||||
onPressed: () {
|
||||
context.to(() => _SetSingleFieldPage(
|
||||
"Http ${"Proxy".tl}",
|
||||
"proxy",
|
||||
));
|
||||
},
|
||||
)),
|
||||
buildItem(
|
||||
title: "Block(Account)".tl,
|
||||
action: Button(
|
||||
child: Text("Edit".tl).fixWidth(64),
|
||||
onPressed: () {
|
||||
launchUrlString("https://www.pixiv.net/setting_mute.php");
|
||||
},
|
||||
)),
|
||||
buildItem(
|
||||
title: "Block(Local)".tl,
|
||||
action: Button(
|
||||
child: Text("Edit".tl).fixWidth(64),
|
||||
onPressed: () {
|
||||
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();
|
||||
})),
|
||||
buildItem(
|
||||
title: "Emphasize artworks from following artists".tl,
|
||||
subtitle: "The border of the artworks will be darker".tl,
|
||||
action: ToggleSwitch(
|
||||
checked:
|
||||
appdata.settings['emphasizeArtworksFromFollowingArtists'],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
appdata.settings[
|
||||
'emphasizeArtworksFromFollowingArtists'] = value;
|
||||
});
|
||||
appdata.writeData();
|
||||
})),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildAppearance() {
|
||||
return SliverToBoxAdapter(
|
||||
child: Column(
|
||||
children: [
|
||||
buildItem(
|
||||
title: "Theme".tl,
|
||||
action: DropDownButton(
|
||||
title: Text(appdata.settings["theme"] ?? "System".tl),
|
||||
items: [
|
||||
MenuFlyoutItem(
|
||||
text: Text("System".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["theme"] = "System";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: Text("light".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["theme"] = "Light";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: Text("dark".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["theme"] = "Dark";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
])),
|
||||
buildItem(
|
||||
title: "Language".tl,
|
||||
action: DropDownButton(
|
||||
title: Text(appdata.settings["language"] ?? "System"),
|
||||
items: [
|
||||
MenuFlyoutItem(
|
||||
text: const Text("System"),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["language"] = "System";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: const Text("English"),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["language"] = "English";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: const Text("简体中文"),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["language"] = "简体中文";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: const Text("繁體中文"),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings["language"] = "繁體中文";
|
||||
});
|
||||
appdata.writeData();
|
||||
StateController.findOrNull(tag: "MyApp")?.update();
|
||||
}),
|
||||
])),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SetDownloadPathPage extends StatefulWidget {
|
||||
const _SetDownloadPathPage();
|
||||
class _SetSingleFieldPage extends StatefulWidget {
|
||||
const _SetSingleFieldPage(this.title, this.field, {this.check});
|
||||
|
||||
final String title;
|
||||
|
||||
final String field;
|
||||
|
||||
final String? Function(String)? check;
|
||||
|
||||
@override
|
||||
State<_SetDownloadPathPage> createState() => __SetDownloadPathPageState();
|
||||
State<_SetSingleFieldPage> createState() => _SetSingleFieldPageState();
|
||||
}
|
||||
|
||||
class __SetDownloadPathPageState extends State<_SetDownloadPathPage> {
|
||||
final controller =
|
||||
TextEditingController(text: appdata.settings["downloadPath"]);
|
||||
class _SetSingleFieldPageState extends State<_SetSingleFieldPage> {
|
||||
late final controller =
|
||||
TextEditingController(text: appdata.settings[widget.field]);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
TitleBar(title: "Download Path".tl),
|
||||
TitleBar(title: widget.title),
|
||||
TextBox(
|
||||
controller: controller,
|
||||
).paddingHorizontal(16),
|
||||
@@ -218,12 +409,13 @@ class __SetDownloadPathPageState extends State<_SetDownloadPathPage> {
|
||||
child: Text("Confirm".tl),
|
||||
onPressed: () {
|
||||
var text = controller.text;
|
||||
if (Directory(text).havePermission()) {
|
||||
appdata.settings["downloadPath"] = text;
|
||||
var checkRes = widget.check?.call(text);
|
||||
if (checkRes == null) {
|
||||
appdata.settings[widget.field] = text;
|
||||
appdata.writeData();
|
||||
context.pop();
|
||||
} else {
|
||||
showToast(context, message: "No Permission".tl);
|
||||
showToast(context, message: checkRes);
|
||||
}
|
||||
},
|
||||
).toAlign(Alignment.centerRight).paddingRight(16),
|
||||
@@ -243,8 +435,6 @@ class _SetDownloadSubPathPage extends StatefulWidget {
|
||||
class __SetDownloadSubPathPageState extends State<_SetDownloadSubPathPage> {
|
||||
final controller =
|
||||
TextEditingController(text: appdata.settings["downloadSubPath"]);
|
||||
final controller2 =
|
||||
TextEditingController(text: appdata.settings["tagsWeight"]);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -258,26 +448,6 @@ class __SetDownloadSubPathPageState extends State<_SetDownloadSubPathPage> {
|
||||
TextBox(
|
||||
controller: controller,
|
||||
).paddingHorizontal(16),
|
||||
Text("Weights of the tags".tl)
|
||||
.padding(const EdgeInsets.symmetric(vertical: 8, horizontal: 16)),
|
||||
TextBox(
|
||||
controller: controller2,
|
||||
).paddingHorizontal(16),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
ListTile(
|
||||
title: Text("Use translated tag name".tl),
|
||||
trailing: ToggleSwitch(
|
||||
checked: appdata.settings["useTranslatedNameForDownload"],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
appdata.settings["useTranslatedNameForDownload"] = value;
|
||||
});
|
||||
appdata.writeSettings();
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
@@ -287,7 +457,6 @@ class __SetDownloadSubPathPageState extends State<_SetDownloadSubPathPage> {
|
||||
var text = controller.text;
|
||||
if (check(text)) {
|
||||
appdata.settings["downloadSubPath"] = text;
|
||||
appdata.settings["tagsWeight"] = controller2.text;
|
||||
appdata.writeData();
|
||||
context.pop();
|
||||
} else {
|
||||
@@ -320,16 +489,176 @@ ${"Some keywords will be replaced by the following rule:".tl}
|
||||
\${author} -> ${"Name of the author".tl}
|
||||
\${id} -> ${"Artwork ID".tl}
|
||||
\${index} -> ${"Index of the image in the artwork".tl}
|
||||
\${page} -> ${"Replace with '-p\${index}' if the work have more than one images, otherwise replace with blank.".tl}
|
||||
\${ext} -> ${"File extension".tl}
|
||||
\${AI} -> ${"Replace with 'AI' if the work was generated by AI, otherwise replace with blank".tl}
|
||||
\${tag(*)} -> ${"Replace with * if the work have tag *, otherwise replace with blank.".tl}
|
||||
|
||||
${"Tags: Tags will be sorted by the \"Weights of tags\" setting and replaced by the following rule:".tl}
|
||||
${"The final text will be affected by the \"Use translated tag name\" setting.".tl}
|
||||
\${tag0} -> ${"The first tag of the artwork".tl}
|
||||
\${tag1} -> ${"The second tag of the artwork".tl}
|
||||
...
|
||||
|
||||
${"Weights of the tags".tl}:
|
||||
${"Filled with tags. The tags should be separated by a space. The tag in front has higher weight.".tl}
|
||||
${"It is required to use the original name instead of the translated name.".tl}
|
||||
${"Multiple path separators will be automatically replaced with a single".tl}
|
||||
""";
|
||||
}
|
||||
|
||||
class _BlockTagsPage extends StatefulWidget {
|
||||
const _BlockTagsPage();
|
||||
|
||||
@override
|
||||
State<_BlockTagsPage> createState() => __BlockTagsPageState();
|
||||
}
|
||||
|
||||
class __BlockTagsPageState extends State<_BlockTagsPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(
|
||||
title: "Block".tl,
|
||||
action: FilledButton(
|
||||
child: Text("Add".tl),
|
||||
onPressed: () {
|
||||
var controller = TextEditingController();
|
||||
|
||||
void finish(BuildContext context) {
|
||||
var text = controller.text;
|
||||
if (text.isNotEmpty &&
|
||||
!(appdata.settings["blockTags"] as List).contains(text)) {
|
||||
setState(() {
|
||||
appdata.settings["blockTags"].add(text);
|
||||
});
|
||||
appdata.writeSettings();
|
||||
}
|
||||
context.pop();
|
||||
}
|
||||
|
||||
showDialog(
|
||||
context: context,
|
||||
barrierDismissible: true,
|
||||
builder: (context) {
|
||||
return ContentDialog(
|
||||
title: Text("Add".tl),
|
||||
content: SizedBox(
|
||||
width: 300,
|
||||
height: 32,
|
||||
child: TextBox(
|
||||
controller: controller,
|
||||
onSubmitted: (v) => finish(context),
|
||||
),
|
||||
),
|
||||
actions: [
|
||||
FilledButton(
|
||||
child: Text("Submit".tl),
|
||||
onPressed: () {
|
||||
finish(context);
|
||||
})
|
||||
],
|
||||
);
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: ListView.builder(
|
||||
itemCount: appdata.settings["blockTags"].length,
|
||||
itemBuilder: (context, index) {
|
||||
return Card(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
title: Text(appdata.settings["blockTags"][index]),
|
||||
trailing: Button(
|
||||
child: Text("Delete".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
(appdata.settings["blockTags"] as List).removeAt(index);
|
||||
});
|
||||
appdata.writeSettings();
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
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",
|
||||
"Show comments",
|
||||
"Show original image"
|
||||
];
|
||||
|
||||
@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());
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@@ -3,44 +3,76 @@ import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
|
||||
import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/components/batch_download.dart';
|
||||
import 'package:pixes/components/grid.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:pixes/components/novel.dart';
|
||||
import 'package:pixes/components/segmented_button.dart';
|
||||
import 'package:pixes/components/user_preview.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/foundation/image_provider.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/pages/following_users_page.dart';
|
||||
import 'package:pixes/utils/block.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
import 'package:url_launcher/url_launcher_string.dart';
|
||||
|
||||
import '../components/illust_widget.dart';
|
||||
import 'illust_page.dart';
|
||||
|
||||
class UserInfoPage extends StatefulWidget {
|
||||
const UserInfoPage(this.id, {this.followCallback, super.key});
|
||||
const UserInfoPage(this.id, {super.key});
|
||||
|
||||
final String id;
|
||||
|
||||
final void Function(bool)? followCallback;
|
||||
static Map<String, UpdateFollowCallback> followCallbacks = {};
|
||||
|
||||
@override
|
||||
State<UserInfoPage> createState() => _UserInfoPageState();
|
||||
}
|
||||
|
||||
class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
@override
|
||||
void initState() {
|
||||
UserInfoPage.followCallbacks[widget.id] = (v) {
|
||||
if (data == null) return;
|
||||
setState(() {
|
||||
data!.isFollowed = v;
|
||||
});
|
||||
};
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
UserInfoPage.followCallbacks.remove(widget.id);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
int page = 0;
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, UserDetails data) {
|
||||
return ScaffoldPage(
|
||||
content: CustomScrollView(
|
||||
slivers: [
|
||||
buildUser(),
|
||||
buildInformation(),
|
||||
SliverToBoxAdapter(
|
||||
child: buildHeader(
|
||||
"Artworks",
|
||||
action: BatchDownloadButton(
|
||||
request: () => Network().getUserIllusts(widget.id))
|
||||
),),
|
||||
_UserArtworks(data.id.toString(), key: ValueKey(data.id),),
|
||||
SliverPadding(padding: EdgeInsets.only(bottom: context.padding.bottom)),
|
||||
child: buildHeader("Related users".tl),
|
||||
),
|
||||
_RelatedUsers(widget.id),
|
||||
buildInformation(),
|
||||
buildArtworkHeader(),
|
||||
if (page == 4)
|
||||
_UserNovels(widget.id)
|
||||
else
|
||||
_UserArtworks(
|
||||
data.id.toString(),
|
||||
page,
|
||||
key: ValueKey(data.id + page),
|
||||
),
|
||||
SliverPadding(
|
||||
padding: EdgeInsets.only(bottom: context.padding.bottom)),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -48,23 +80,24 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
|
||||
bool isFollowing = false;
|
||||
|
||||
void follow() async{
|
||||
if(isFollowing) return;
|
||||
void follow() async {
|
||||
if (isFollowing) return;
|
||||
String type = "";
|
||||
if(!data!.isFollowed) {
|
||||
if (!data!.isFollowed) {
|
||||
await flyoutController.showFlyout(
|
||||
navigatorKey: App.rootNavigatorKey.currentState,
|
||||
builder: (context) =>
|
||||
MenuFlyout(
|
||||
builder: (context) => MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(text: Text("Public".tl),
|
||||
MenuFlyoutItem(
|
||||
text: Text("Public".tl),
|
||||
onPressed: () => type = "public"),
|
||||
MenuFlyoutItem(text: Text("Private".tl),
|
||||
MenuFlyoutItem(
|
||||
text: Text("Private".tl),
|
||||
onPressed: () => type = "private"),
|
||||
],
|
||||
));
|
||||
}
|
||||
if(type.isEmpty && !data!.isFollowed) {
|
||||
if (type.isEmpty && !data!.isFollowed) {
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
@@ -72,13 +105,15 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
});
|
||||
var method = data!.isFollowed ? "delete" : "add";
|
||||
var res = await Network().follow(data!.id.toString(), method, type);
|
||||
if(res.error) {
|
||||
if(mounted) {
|
||||
if (res.error) {
|
||||
if (mounted) {
|
||||
context.showToast(message: "Network Error");
|
||||
}
|
||||
} else {
|
||||
data!.isFollowed = !data!.isFollowed;
|
||||
widget.followCallback?.call(data!.isFollowed);
|
||||
UserPreviewWidget.followCallbacks[data!.id.toString()]
|
||||
?.call(data!.isFollowed);
|
||||
IllustPage.updateFollow(data!.id.toString(), data!.isFollowed);
|
||||
}
|
||||
setState(() {
|
||||
isFollowing = false;
|
||||
@@ -96,7 +131,8 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
height: 64,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
border: Border.all(color: ColorScheme.of(context).outlineVariant, width: 0.6)),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant, width: 0.6)),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
child: Image(
|
||||
@@ -105,47 +141,60 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
height: 64,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
),),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(data!.name, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
|
||||
Text(data!.name,
|
||||
style:
|
||||
const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
|
||||
const SizedBox(height: 4),
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
children: [
|
||||
TextSpan(text: 'Follows: '.tl),
|
||||
TextSpan(
|
||||
text: '${data!.totalFollowUsers}',
|
||||
recognizer: TapGestureRecognizer()
|
||||
..onTap = (() => context.to(() => FollowingUsersPage(widget.id))),
|
||||
style: TextStyle(fontWeight: FontWeight.bold, color: FluentTheme.of(context).accentColor)
|
||||
),
|
||||
text: '${data!.totalFollowUsers}',
|
||||
recognizer: TapGestureRecognizer()
|
||||
..onTap = (() =>
|
||||
context.to(() => FollowingUsersPage(widget.id))),
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: FluentTheme.of(context).accentColor)),
|
||||
],
|
||||
),
|
||||
style: const TextStyle(fontSize: 14),
|
||||
),
|
||||
if(widget.id != appdata.account?.user.id)
|
||||
const SizedBox(height: 8,),
|
||||
if(widget.id != appdata.account?.user.id)
|
||||
if(isFollowing)
|
||||
Button(onPressed: follow, child: const SizedBox(
|
||||
width: 42,
|
||||
height: 24,
|
||||
child: Center(
|
||||
child: SizedBox.square(
|
||||
dimension: 18,
|
||||
child: ProgressRing(strokeWidth: 2,),
|
||||
),
|
||||
),
|
||||
))
|
||||
if (widget.id != appdata.account?.user.id)
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
if (widget.id != appdata.account?.user.id)
|
||||
if (isFollowing)
|
||||
Button(
|
||||
onPressed: follow,
|
||||
child: const SizedBox(
|
||||
width: 42,
|
||||
height: 24,
|
||||
child: Center(
|
||||
child: SizedBox.square(
|
||||
dimension: 18,
|
||||
child: ProgressRing(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
),
|
||||
),
|
||||
))
|
||||
else if (!data!.isFollowed)
|
||||
FlyoutTarget(
|
||||
controller: flyoutController,
|
||||
child: Button(onPressed: follow, child: Text("Follow".tl))
|
||||
)
|
||||
controller: flyoutController,
|
||||
child: Button(onPressed: follow, child: Text("Follow".tl)))
|
||||
else
|
||||
Button(
|
||||
onPressed: follow,
|
||||
child: Text("Unfollow".tl, style: TextStyle(color: ColorScheme.of(context).error),),
|
||||
child: Text(
|
||||
"Unfollow".tl,
|
||||
style: TextStyle(color: ColorScheme.of(context).error),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -154,33 +203,91 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
|
||||
Widget buildHeader(String title, {Widget? action}) {
|
||||
return SizedBox(
|
||||
width: double.infinity,
|
||||
height: 38,
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
title,
|
||||
style: const TextStyle(fontWeight: FontWeight.w600),
|
||||
).toAlign(Alignment.centerLeft),
|
||||
const Spacer(),
|
||||
if(action != null)
|
||||
action.toAlign(Alignment.centerRight)
|
||||
],
|
||||
).paddingHorizontal(16)).paddingTop(8);
|
||||
width: double.infinity,
|
||||
height: 38,
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
title,
|
||||
style: const TextStyle(fontWeight: FontWeight.w600),
|
||||
).toAlign(Alignment.centerLeft),
|
||||
const Spacer(),
|
||||
if (action != null) action.toAlign(Alignment.centerRight)
|
||||
],
|
||||
).paddingHorizontal(16))
|
||||
.paddingTop(8);
|
||||
}
|
||||
|
||||
Widget buildArtworkHeader() {
|
||||
return SliverToBoxAdapter(
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
height: 38,
|
||||
child: Row(
|
||||
children: [
|
||||
SegmentedButton<int>(
|
||||
options: [
|
||||
SegmentedButtonOption(0, "Artworks".tl),
|
||||
SegmentedButtonOption(1, "Illustrations".tl),
|
||||
SegmentedButtonOption(2, "Mangas".tl),
|
||||
SegmentedButtonOption(3, "Bookmarks".tl),
|
||||
SegmentedButtonOption(4, "Novels".tl),
|
||||
],
|
||||
value: page,
|
||||
onPressed: (value) {
|
||||
setState(() {
|
||||
page = value;
|
||||
});
|
||||
},
|
||||
),
|
||||
const Spacer(),
|
||||
if (page != 4)
|
||||
BatchDownloadButton(
|
||||
request: () {
|
||||
switch (page) {
|
||||
case 0:
|
||||
return Network()
|
||||
.getUserIllusts(data!.id.toString(), null);
|
||||
case 1:
|
||||
return Network()
|
||||
.getUserIllusts(data!.id.toString(), "illust");
|
||||
case 2:
|
||||
return Network()
|
||||
.getUserIllusts(data!.id.toString(), "manga");
|
||||
case 3:
|
||||
return Network()
|
||||
.getUserBookmarks(data!.id.toString());
|
||||
}
|
||||
throw "Invalid page";
|
||||
},
|
||||
),
|
||||
],
|
||||
).paddingHorizontal(16))
|
||||
.paddingTop(12),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildInformation() {
|
||||
Widget buildItem({IconData? icon, required String title, required String? content, Widget? trailing}) {
|
||||
if(content == null || content.isEmpty) {
|
||||
Widget buildItem(
|
||||
{IconData? icon,
|
||||
required String title,
|
||||
required String? content,
|
||||
Widget? trailing}) {
|
||||
if (content == null || content.isEmpty) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
return Card(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
leading: icon == null ? null : Icon(icon, size: 20,),
|
||||
title: Text(title),
|
||||
subtitle: SelectableText(content),
|
||||
title: Row(
|
||||
children: [
|
||||
Icon(icon, size: 20),
|
||||
const SizedBox(width: 8),
|
||||
Text(title)
|
||||
],
|
||||
),
|
||||
subtitle: SelectableText(content).paddingLeft(icon == null ? 0 : 28),
|
||||
trailing: trailing,
|
||||
),
|
||||
);
|
||||
@@ -190,30 +297,46 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
child: Column(
|
||||
children: [
|
||||
buildHeader("Information".tl),
|
||||
buildItem(icon: MdIcons.comment_outlined, title: "Introduction".tl, content: data!.comment),
|
||||
buildItem(icon: MdIcons.cake_outlined, title: "Birthday".tl, content: data!.birth),
|
||||
buildItem(icon: MdIcons.location_city_outlined, title: "Region", content: data!.region),
|
||||
buildItem(icon: MdIcons.work_outline, title: "Job".tl, content: data!.job),
|
||||
buildItem(icon: MdIcons.person_2_outlined, title: "Gender".tl, content: data!.gender),
|
||||
buildItem(
|
||||
icon: MdIcons.comment_outlined,
|
||||
title: "Introduction".tl,
|
||||
content: data!.comment),
|
||||
buildItem(
|
||||
icon: MdIcons.cake_outlined,
|
||||
title: "Birthday".tl,
|
||||
content: data!.birth),
|
||||
buildItem(
|
||||
icon: MdIcons.location_city_outlined,
|
||||
title: "Region",
|
||||
content: data!.region),
|
||||
buildItem(
|
||||
icon: MdIcons.work_outline, title: "Job".tl, content: data!.job),
|
||||
buildItem(
|
||||
icon: MdIcons.person_2_outlined,
|
||||
title: "Gender".tl,
|
||||
content: data!.gender),
|
||||
buildHeader("Social Network".tl),
|
||||
buildItem(title: "Webpage",
|
||||
buildItem(
|
||||
title: "Webpage",
|
||||
content: data!.webpage,
|
||||
trailing: IconButton(
|
||||
icon: const Icon(MdIcons.open_in_new, size: 18),
|
||||
onPressed: () => launchUrlString(data!.twitterUrl!)
|
||||
)),
|
||||
buildItem(title: "Twitter",
|
||||
onPressed: () => launchUrlString(data!.twitterUrl!))),
|
||||
buildItem(
|
||||
title: "Twitter",
|
||||
content: data!.twitterUrl,
|
||||
trailing: IconButton(
|
||||
icon: const Icon(MdIcons.open_in_new, size: 18),
|
||||
onPressed: () => launchUrlString(data!.twitterUrl!)
|
||||
)),
|
||||
buildItem(title: "pawoo",
|
||||
onPressed: () => launchUrlString(data!.twitterUrl!))),
|
||||
buildItem(
|
||||
title: "pawoo",
|
||||
content: data!.pawooUrl,
|
||||
trailing: IconButton(
|
||||
icon: const Icon(MdIcons.open_in_new, size: 18,),
|
||||
onPressed: () => launchUrlString(data!.pawooUrl!)
|
||||
)),
|
||||
icon: const Icon(
|
||||
MdIcons.open_in_new,
|
||||
size: 18,
|
||||
),
|
||||
onPressed: () => launchUrlString(data!.pawooUrl!))),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -226,10 +349,12 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
}
|
||||
|
||||
class _UserArtworks extends StatefulWidget {
|
||||
const _UserArtworks(this.uid, {super.key});
|
||||
const _UserArtworks(this.uid, this.type, {super.key});
|
||||
|
||||
final String uid;
|
||||
|
||||
final int type;
|
||||
|
||||
@override
|
||||
State<_UserArtworks> createState() => _UserArtworksState();
|
||||
}
|
||||
@@ -254,7 +379,9 @@ class _UserArtworksState extends MultiPageLoadingState<_UserArtworks, Illust> {
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(FluentIcons.info),
|
||||
const SizedBox(width: 4,),
|
||||
const SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
Text(error)
|
||||
],
|
||||
),
|
||||
@@ -264,17 +391,21 @@ class _UserArtworksState extends MultiPageLoadingState<_UserArtworks, Illust> {
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, final List<Illust> data) {
|
||||
Widget buildContent(BuildContext context, List<Illust> data) {
|
||||
checkIllusts(data);
|
||||
return SliverMasonryGrid(
|
||||
gridDelegate: const SliverSimpleGridDelegateWithMaxCrossAxisExtent(
|
||||
maxCrossAxisExtent: 240,
|
||||
),
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
if(index == data.length - 1){
|
||||
(context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return IllustWidget(data[index]);
|
||||
return IllustWidget(data[index], onTap: () {
|
||||
context.to(() => IllustGalleryPage(
|
||||
illusts: data, initialPage: index, nextUrl: nextUrl));
|
||||
});
|
||||
},
|
||||
childCount: data.length,
|
||||
),
|
||||
@@ -284,14 +415,17 @@ class _UserArtworksState extends MultiPageLoadingState<_UserArtworks, Illust> {
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Illust>>> loadData(page) async{
|
||||
if(nextUrl == "end") {
|
||||
Future<Res<List<Illust>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = nextUrl == null
|
||||
? await Network().getUserIllusts(widget.uid)
|
||||
? (widget.type != 3
|
||||
? await Network().getUserIllusts(
|
||||
widget.uid, [null, "illust", "manga"][widget.type])
|
||||
: await Network().getUserBookmarks(widget.uid))
|
||||
: await Network().getIllustsWithNextUrl(nextUrl!);
|
||||
if(!res.error) {
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
@@ -299,3 +433,150 @@ class _UserArtworksState extends MultiPageLoadingState<_UserArtworks, Illust> {
|
||||
}
|
||||
}
|
||||
|
||||
class _UserNovels extends StatefulWidget {
|
||||
const _UserNovels(this.uid);
|
||||
|
||||
final String uid;
|
||||
|
||||
@override
|
||||
State<_UserNovels> createState() => _UserNovelsState();
|
||||
}
|
||||
|
||||
class _UserNovelsState extends MultiPageLoadingState<_UserNovels, Novel> {
|
||||
@override
|
||||
Widget buildLoading(BuildContext context) {
|
||||
return const SliverToBoxAdapter(
|
||||
child: SizedBox(
|
||||
child: Center(
|
||||
child: ProgressRing(),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildError(context, error) {
|
||||
return SliverToBoxAdapter(
|
||||
child: SizedBox(
|
||||
child: Center(
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(FluentIcons.info),
|
||||
const SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
Text(error)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<Novel> data) {
|
||||
return SliverGridViewWithFixedItemHeight(
|
||||
itemHeight: 164,
|
||||
minCrossAxisExtent: 400,
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
if (index == data.length - 1) {
|
||||
nextPage();
|
||||
}
|
||||
return NovelWidget(data[index]);
|
||||
},
|
||||
childCount: data.length,
|
||||
),
|
||||
).sliverPaddingHorizontal(8);
|
||||
}
|
||||
|
||||
String? nextUrl;
|
||||
|
||||
@override
|
||||
Future<Res<List<Novel>>> loadData(page) async {
|
||||
if (nextUrl == "end") {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = nextUrl == null
|
||||
? await Network().getUserNovels(widget.uid)
|
||||
: await Network().getNovelsWithNextUrl(nextUrl!);
|
||||
if (!res.error) {
|
||||
nextUrl = res.subData;
|
||||
nextUrl ??= "end";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
class _RelatedUsers extends StatefulWidget {
|
||||
const _RelatedUsers(this.uid);
|
||||
|
||||
final String uid;
|
||||
|
||||
@override
|
||||
State<_RelatedUsers> createState() => _RelatedUsersState();
|
||||
}
|
||||
|
||||
class _RelatedUsersState
|
||||
extends LoadingState<_RelatedUsers, List<UserPreview>> {
|
||||
@override
|
||||
Widget buildFrame(BuildContext context, Widget child) {
|
||||
return SliverToBoxAdapter(
|
||||
child: SizedBox(
|
||||
height: 146,
|
||||
width: double.infinity,
|
||||
child: child,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final ScrollController _controller = ScrollController();
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<UserPreview> data) {
|
||||
Widget content = Scrollbar(
|
||||
controller: _controller,
|
||||
child: ListView.builder(
|
||||
controller: _controller,
|
||||
padding: const EdgeInsets.only(bottom: 8, left: 8),
|
||||
primary: false,
|
||||
scrollDirection: Axis.horizontal,
|
||||
itemCount: data.length,
|
||||
itemBuilder: (context, index) {
|
||||
return UserPreviewWidget(data[index]).fixWidth(342);
|
||||
},
|
||||
));
|
||||
if (App.isDesktop) {
|
||||
content = ScrollbarTheme.merge(
|
||||
data: const ScrollbarThemeData(
|
||||
thickness: 6,
|
||||
hoveringThickness: 6,
|
||||
mainAxisMargin: 4,
|
||||
hoveringPadding: EdgeInsets.zero,
|
||||
padding: EdgeInsets.zero,
|
||||
hoveringMainAxisMargin: 4,
|
||||
crossAxisMargin: 0,
|
||||
hoveringCrossAxisMargin: 0),
|
||||
child: content);
|
||||
} else {
|
||||
content = ScrollbarTheme.merge(
|
||||
data: const ScrollbarThemeData(
|
||||
thickness: 4,
|
||||
hoveringThickness: 4,
|
||||
mainAxisMargin: 4,
|
||||
hoveringPadding: EdgeInsets.zero,
|
||||
padding: EdgeInsets.zero,
|
||||
hoveringMainAxisMargin: 4,
|
||||
crossAxisMargin: 0,
|
||||
hoveringCrossAxisMargin: 0),
|
||||
child: content);
|
||||
}
|
||||
return MediaQuery.removePadding(
|
||||
context: context, removeBottom: true, child: content);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Res<List<UserPreview>>> loadData() {
|
||||
return Network().relatedUsers(widget.uid);
|
||||
}
|
||||
}
|
||||
|
81
lib/pages/webview_page.dart
Normal file
@@ -0,0 +1,81 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:url_launcher/url_launcher_string.dart';
|
||||
import 'package:webview_flutter/webview_flutter.dart';
|
||||
|
||||
import '../foundation/app.dart';
|
||||
|
||||
double get _appBarHeight => App.isDesktop ? 36.0 : 48.0;
|
||||
|
||||
class WebviewPage extends StatefulWidget {
|
||||
const WebviewPage(this.url, {this.onNavigation, super.key});
|
||||
|
||||
final String url;
|
||||
|
||||
final bool Function(NavigationRequest req)? onNavigation;
|
||||
|
||||
@override
|
||||
State<WebviewPage> createState() => _WebviewPageState();
|
||||
}
|
||||
|
||||
class _WebviewPageState extends State<WebviewPage> {
|
||||
WebViewController? controller;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
}
|
||||
|
||||
NavigationDecision handleNavigation(NavigationRequest req) {
|
||||
if (widget.onNavigation != null) {
|
||||
return widget.onNavigation!(req)
|
||||
? NavigationDecision.navigate
|
||||
: NavigationDecision.prevent;
|
||||
}
|
||||
return NavigationDecision.navigate;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
controller ??= WebViewController()
|
||||
..setJavaScriptMode(JavaScriptMode.unrestricted)
|
||||
..setBackgroundColor(FluentTheme.of(context).brightness == Brightness.light
|
||||
? Colors.white
|
||||
: Colors.black)
|
||||
..setNavigationDelegate(
|
||||
NavigationDelegate(
|
||||
onProgress: (int progress) {
|
||||
// Update loading bar.
|
||||
},
|
||||
onPageStarted: (String url) {},
|
||||
onPageFinished: (String url) {},
|
||||
onWebResourceError: (WebResourceError error) {},
|
||||
onNavigationRequest: handleNavigation,
|
||||
),
|
||||
)
|
||||
..loadRequest(Uri.parse(widget.url));
|
||||
return Column(
|
||||
children: [
|
||||
SizedBox(
|
||||
height: _appBarHeight,
|
||||
child: Row(
|
||||
children: [
|
||||
const Text("Webview"),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
icon: const Icon(MdIcons.open_in_new, size: 20,),
|
||||
onPressed: () {
|
||||
launchUrlString(widget.url);
|
||||
context.pop();
|
||||
},
|
||||
),
|
||||
],
|
||||
).paddingHorizontal(16),
|
||||
).paddingTop(MediaQuery.of(context).padding.top),
|
||||
Expanded(
|
||||
child: WebViewWidget(controller: controller!,),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
@@ -1,8 +1,15 @@
|
||||
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';
|
||||
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 {
|
||||
@@ -26,16 +33,107 @@ 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) {
|
||||
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;
|
||||
}
|
||||
handleLink(uri);
|
||||
});
|
||||
}
|
||||
|
||||
bool handleLink(Uri uri) {
|
||||
if (uri.scheme == "pixiv") {
|
||||
var path = uri.toString().split("/").sublist(2);
|
||||
if (path.isEmpty) {
|
||||
return false;
|
||||
}
|
||||
switch (path[0]) {
|
||||
case "users":
|
||||
if (path.length == 2) {
|
||||
App.mainNavigatorKey?.currentContext?.to(() => UserInfoPage(path[1]));
|
||||
return true;
|
||||
}
|
||||
case "novels":
|
||||
if (path.length == 2) {
|
||||
App.mainNavigatorKey?.currentContext
|
||||
?.to(() => NovelPageWithId(path[1]));
|
||||
return true;
|
||||
}
|
||||
case "illusts":
|
||||
if (path.length == 2) {
|
||||
App.mainNavigatorKey?.currentContext
|
||||
?.to(() => IllustPageWithId(path[1]));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
23
lib/utils/block.dart
Normal file
@@ -0,0 +1,23 @@
|
||||
import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/network/models.dart';
|
||||
|
||||
List<Illust> checkIllusts(List<Illust> illusts) {
|
||||
illusts.removeWhere((illust) {
|
||||
if (illust.isBlocked) {
|
||||
return true;
|
||||
}
|
||||
if (appdata.settings["blockTags"] == null) {
|
||||
return false;
|
||||
}
|
||||
if (appdata.settings["blockTags"].contains("user:${illust.author.name}")) {
|
||||
return true;
|
||||
}
|
||||
for (var tag in illust.tags) {
|
||||
if ((appdata.settings["blockTags"] as List).contains(tag.name)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
});
|
||||
return illusts;
|
||||
}
|
@@ -29,6 +29,9 @@ extension FSExt on FileSystemEntity {
|
||||
extension DirectoryExt on Directory {
|
||||
bool havePermission() {
|
||||
if(!existsSync()) return false;
|
||||
if(App.isMacOS) {
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
listSync();
|
||||
return true;
|
||||
|
21
lib/utils/loop.dart
Normal file
@@ -0,0 +1,21 @@
|
||||
import 'dart:async';
|
||||
|
||||
class Loop {
|
||||
static final List<void Function()> _callbacks = [];
|
||||
|
||||
static void start() {
|
||||
Timer.periodic(const Duration(milliseconds: 100), (timer) {
|
||||
for(var func in _callbacks) {
|
||||
func.call();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
static void register(void Function() func) {
|
||||
_callbacks.add(func);
|
||||
}
|
||||
|
||||
static void remove(void Function() func) {
|
||||
_callbacks.remove(func);
|
||||
}
|
||||
}
|
63
lib/utils/update.dart
Normal file
@@ -0,0 +1,63 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/network/app_dio.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
import 'package:url_launcher/url_launcher_string.dart';
|
||||
|
||||
Future<String> getLatestVersion() async {
|
||||
var dio = AppDio();
|
||||
var res = await dio
|
||||
.get("https://api.github.com/repos/wgh136/pixes/releases/latest");
|
||||
return (res.data["tag_name"] as String).replaceFirst("v", "");
|
||||
}
|
||||
|
||||
/// Compare two versions.
|
||||
/// Return `true` if `a` is greater than `b`.
|
||||
bool compareVersion(String a, String b) {
|
||||
var aList = a.split(".").map(int.parse).toList();
|
||||
var bList = b.split(".").map(int.parse).toList();
|
||||
for (var i = 0; i < aList.length; i++) {
|
||||
if (aList[i] > bList[i]) {
|
||||
return true;
|
||||
} else if (aList[i] < bList[i]) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
Future<void> checkUpdate() async {
|
||||
if (appdata.account == null) return;
|
||||
try {
|
||||
var latestVersion = await getLatestVersion();
|
||||
if (compareVersion(latestVersion, App.version)) {
|
||||
showDialog(
|
||||
context: App.rootNavigatorKey.currentContext!,
|
||||
builder: (context) => ContentDialog(
|
||||
title: Text("New version available".tl),
|
||||
content: Text(
|
||||
"A new version of Pixes is available. Do you want to update now?"
|
||||
.tl,
|
||||
),
|
||||
actions: [
|
||||
Button(
|
||||
child: Text("Cancel".tl),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
),
|
||||
FilledButton(
|
||||
child: Text("Update".tl),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
launchUrlString(
|
||||
"https://github.com/wgh136/pixes/releases/latest");
|
||||
})
|
||||
],
|
||||
));
|
||||
}
|
||||
} catch (e) {
|
||||
// ignore
|
||||
}
|
||||
}
|
75
lib/utils/window.dart
Normal file
@@ -0,0 +1,75 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:ui';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:window_manager/window_manager.dart';
|
||||
|
||||
class WindowPlacement {
|
||||
final Rect rect;
|
||||
|
||||
final bool isMaximized;
|
||||
|
||||
const WindowPlacement(this.rect, this.isMaximized);
|
||||
|
||||
Future<void> applyToWindow() async {
|
||||
await windowManager.setBounds(rect);
|
||||
|
||||
if(!validate(rect)){
|
||||
await windowManager.center();
|
||||
}
|
||||
|
||||
if (isMaximized) {
|
||||
await windowManager.maximize();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> writeToFile() async {
|
||||
var file = File("${App.dataPath}/window_placement");
|
||||
await file.writeAsString(jsonEncode({
|
||||
'width': rect.width,
|
||||
'height': rect.height,
|
||||
'x': rect.topLeft.dx,
|
||||
'y': rect.topLeft.dy,
|
||||
'isMaximized': isMaximized
|
||||
}));
|
||||
}
|
||||
|
||||
static Future<WindowPlacement> loadFromFile() async {
|
||||
var file = File("${App.dataPath}/window_placement");
|
||||
if (!file.existsSync()) {
|
||||
return defaultPlacement;
|
||||
}
|
||||
var json = jsonDecode(await file.readAsString());
|
||||
var rect =
|
||||
Rect.fromLTWH(json['x'], json['y'], json['width'], json['height']);
|
||||
return WindowPlacement(rect, json['isMaximized']);
|
||||
}
|
||||
|
||||
static Future<WindowPlacement> get current async {
|
||||
var rect = await windowManager.getBounds();
|
||||
var isMaximized = await windowManager.isMaximized();
|
||||
return WindowPlacement(rect, isMaximized);
|
||||
}
|
||||
|
||||
static const defaultPlacement =
|
||||
WindowPlacement(Rect.fromLTWH(10, 10, 900, 600), false);
|
||||
|
||||
static WindowPlacement cache = defaultPlacement;
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
@@ -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);
|
||||
|
@@ -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
|
||||
)
|
||||
|
@@ -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);
|
||||
|
@@ -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"))
|
||||
}
|
||||
|
46
macos/Podfile
Normal file
@@ -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
|
@@ -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;
|
||||
|
@@ -3,7 +3,7 @@
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<false/>
|
||||
<key>com.apple.security.files.user-selected.read-write</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
|
97
pubspec.lock
@@ -9,6 +9,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.0.1"
|
||||
archive:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: archive
|
||||
sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.5.1"
|
||||
async:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -65,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:
|
||||
@@ -73,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:
|
||||
@@ -182,6 +214,14 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_acrylic:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_acrylic
|
||||
sha256: "646200d98e8dd2bd4ab931d4ba4f6b4cb899475d6401414017ba5d71b0fac42b"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.0+2"
|
||||
flutter_file_dialog:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -245,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:
|
||||
@@ -507,22 +556,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:
|
||||
@@ -643,6 +676,38 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.5.1"
|
||||
webview_flutter:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: webview_flutter
|
||||
sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.7.0"
|
||||
webview_flutter_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: webview_flutter_android
|
||||
sha256: dad3313c9ead95517bb1cae5e1c9d20ba83729d5a59e5e83c0a2d66203f27f91
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.16.1"
|
||||
webview_flutter_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: webview_flutter_platform_interface
|
||||
sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.10.0"
|
||||
webview_flutter_wkwebview:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: webview_flutter_wkwebview
|
||||
sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.13.1"
|
||||
win32:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
12
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.1+2
|
||||
version: 1.0.8+108
|
||||
|
||||
environment:
|
||||
sdk: '>=3.3.4 <4.0.0'
|
||||
@@ -36,7 +36,7 @@ dependencies:
|
||||
# Use with the CupertinoIcons class for iOS style icons.
|
||||
window_manager: ^0.3.8
|
||||
fluent_ui: ^4.8.7
|
||||
system_theme: ^2.3.1
|
||||
dynamic_color: ^1.7.0
|
||||
dio: ^5.4.3
|
||||
crypto:
|
||||
intl:
|
||||
@@ -54,6 +54,14 @@ dependencies:
|
||||
share_plus: ^9.0.0
|
||||
file_selector: ^1.0.1
|
||||
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
|
||||
image_gallery_saver:
|
||||
git:
|
||||
url: https://github.com/wgh136/image_gallery_saver
|
||||
ref: master
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
|
BIN
screenshots/1.png
Normal file
After Width: | Height: | Size: 520 KiB |
BIN
screenshots/2.png
Normal file
After Width: | Height: | Size: 169 KiB |
BIN
screenshots/3.png
Normal file
After Width: | Height: | Size: 492 KiB |
BIN
screenshots/4.png
Normal file
After Width: | Height: | Size: 637 KiB |
64
windows/build.iss
Normal file
@@ -0,0 +1,64 @@
|
||||
; Script generated by the Inno Setup Script Wizard.
|
||||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||
|
||||
#define MyAppName "pixes"
|
||||
#define MyAppVersion "{{version}}"
|
||||
#define MyAppPublisher "Nyne"
|
||||
#define MyAppURL "https://github.com/wgh136/pixes"
|
||||
#define MyAppExeName "pixes.exe"
|
||||
#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.
|
||||
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
|
||||
AppId={{88521115-48B7-4AF3-BF49-2BC6AF90B8D3}
|
||||
AppName={#MyAppName}
|
||||
AppVersion={#MyAppVersion}
|
||||
;AppVerName={#MyAppName} {#MyAppVersion}
|
||||
AppPublisher={#MyAppPublisher}
|
||||
AppPublisherURL={#MyAppURL}
|
||||
AppSupportURL={#MyAppURL}
|
||||
AppUpdatesURL={#MyAppURL}
|
||||
DefaultDirName={autopf}\{#MyAppName}
|
||||
DisableProgramGroupPage=yes
|
||||
; Uncomment the following line to run in non administrative install mode (install for current user only.)
|
||||
;PrivilegesRequired=lowest
|
||||
PrivilegesRequiredOverridesAllowed=dialog
|
||||
OutputDir=C:\Users\wgh19\IdeaProjects\pixes\build\windows
|
||||
OutputBaseFilename=pixes-windows-installer
|
||||
SetupIconFile={#RootPath}\windows\runner\resources\app_icon.ico
|
||||
Compression=lzma
|
||||
SolidCompression=yes
|
||||
WizardStyle=modern
|
||||
ArchitecturesInstallIn64BitMode=x64 arm64
|
||||
ArchitecturesAllowed=x64 arm64
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
|
||||
|
||||
[Tasks]
|
||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||
|
||||
[Files]
|
||||
Source: "{#RootPath}\build\windows\x64\runner\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#RootPath}\build\windows\x64\runner\Release\app_links_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#RootPath}\build\windows\x64\runner\Release\dynamic_color_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#RootPath}\build\windows\x64\runner\Release\file_selector_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#RootPath}\build\windows\x64\runner\Release\flutter_windows.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#RootPath}\build\windows\x64\runner\Release\screen_retriever_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#RootPath}\build\windows\x64\runner\Release\share_plus_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "{#RootPath}\build\windows\x64\runner\Release\sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
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
|
||||
|
||||
[Icons]
|
||||
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
|
||||
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
|
||||
|
||||
[Run]
|
||||
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
|
@@ -1,6 +1,8 @@
|
||||
import subprocess
|
||||
import os
|
||||
|
||||
os.chdir(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
fontUse = '''
|
||||
fonts:
|
||||
- family: font
|
||||
@@ -26,4 +28,19 @@ if os.path.exists("build/app-windows.zip"):
|
||||
subprocess.run(["tar", "-a", "-c", "-f", "build/windows/x64/app-windows.zip", "-C", "build/windows/x64/runner/Release", "."]
|
||||
, shell=True)
|
||||
|
||||
subprocess.run(["iscc", "build/windows/build.iss"], shell=True)
|
||||
version = str.split(str.split(content, 'version: ')[1], '+')[0]
|
||||
issContent = ""
|
||||
file = open('windows/build.iss', 'r')
|
||||
issContent = file.read()
|
||||
newContent = issContent
|
||||
newContent = newContent.replace("{{version}}", version)
|
||||
newContent = newContent.replace("{{root_path}}", os.getcwd())
|
||||
file.close()
|
||||
file = open('windows/build.iss', 'w')
|
||||
file.write(newContent)
|
||||
file.close()
|
||||
|
||||
subprocess.run(["iscc", "windows/build.iss"], shell=True)
|
||||
|
||||
with open('windows/build.iss', 'w') as file:
|
||||
file.write(issContent)
|
@@ -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(
|
||||
|
@@ -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
|
||||
)
|
||||
|
BIN
windows/runner/RCa14464
Normal file
BIN
windows/runner/Runner.aps
Normal file
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 121 KiB |