mirror of
https://github.com/wgh136/pixes.git
synced 2025-09-27 12:57:24 +00:00
Compare commits
55 Commits
v1.0.7
...
558832d188
Author | SHA1 | Date | |
---|---|---|---|
558832d188 | |||
2be88895ed | |||
1a110e711d | |||
1ad8329797 | |||
1cf4da66ad | |||
5dad6910fc | |||
72eb4a51ea | |||
3d49bebc44 | |||
e86f8b7f51 | |||
![]() |
20130ef89e | ||
![]() |
b76fbf040b | ||
018fb11ca5 | |||
cbc69b4707 | |||
1e53e374e4 | |||
0756ebe4e5 | |||
47ebe9deec | |||
37f84efe05 | |||
6530f2c57d | |||
a3e758831b | |||
3e5ae0a39a | |||
974f739900 | |||
deb866da63 | |||
eea77b297a | |||
264c2b0e20 | |||
513e716608 | |||
8364b56178 | |||
0d0122be3a | |||
4f1fd8530a | |||
82b8eac989 | |||
95815131fe | |||
f8439a3cb2 | |||
f7a6eb1ac9 | |||
a10e8c05d5 | |||
bd15053c2f | |||
![]() |
86c6f13282 | ||
![]() |
b69d2a0950 | ||
![]() |
c897891b2a | ||
![]() |
3c73439588 | ||
![]() |
2d16502154 | ||
![]() |
294498d8a7 | ||
![]() |
20dfbf5125 | ||
![]() |
63aa4ee8b0 | ||
![]() |
c8d4b3db88 | ||
![]() |
b1e7adb1c5 | ||
![]() |
0143a67fa0 | ||
![]() |
eee1141970 | ||
![]() |
50a69f77b6 | ||
![]() |
790ed54d5b | ||
![]() |
21fe14f88b | ||
![]() |
a03ad12837 | ||
![]() |
426257716f | ||
![]() |
67e01ea69f | ||
![]() |
6cf9ce9c96 | ||
![]() |
593899af8c | ||
![]() |
908c26d764 |
6
.github/generate_ipa.sh
vendored
6
.github/generate_ipa.sh
vendored
@@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
mkdir -p build/ios/iphoneos/Payload
|
||||
mv build/ios/iphoneos/Runner.app build/ios/iphoneos/Payload
|
||||
cd build/ios/iphoneos/
|
||||
zip -r app-ios.ipa Payload
|
20
.github/workflows/ios_simulator.yml
vendored
20
.github/workflows/ios_simulator.yml
vendored
@@ -1,20 +0,0 @@
|
||||
name: Build IOS SIMULATOR
|
||||
run-name: Build IOS SIMULATOR
|
||||
on:
|
||||
workflow_dispatch: {}
|
||||
jobs:
|
||||
Build_IOS_SIMULATOR:
|
||||
runs-on: macos-13
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: 'stable'
|
||||
architecture: x64
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app
|
||||
- run: flutter pub get
|
||||
- run: flutter build ios --simulator --no-codesign
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: build_files
|
||||
path: build/ios/iphonesimulator
|
23
.github/workflows/linux.yml
vendored
23
.github/workflows/linux.yml
vendored
@@ -1,23 +0,0 @@
|
||||
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
|
||||
|
196
.github/workflows/main.yml
vendored
196
.github/workflows/main.yml
vendored
@@ -1,40 +1,188 @@
|
||||
name: Build IOS
|
||||
run-name: Build IOS
|
||||
name: Build ALL
|
||||
run-name: Build ALL
|
||||
on:
|
||||
workflow_dispatch: {}
|
||||
release:
|
||||
types: [published]
|
||||
|
||||
jobs:
|
||||
Build_IOS:
|
||||
runs-on: macos-13
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: 'stable'
|
||||
architecture: x64
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app
|
||||
- run: flutter pub get
|
||||
- run: flutter build ios --release --no-codesign
|
||||
- run: bash .github/generate_ipa.sh
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: app-ios.ipa
|
||||
path: build/ios/iphoneos/app-ios.ipa
|
||||
Build_MacOS:
|
||||
runs-on: macos-13
|
||||
runs-on: macos-15
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: 'stable'
|
||||
architecture: x64
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app
|
||||
flutter-version-file: pubspec.yaml
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_16.0.app
|
||||
- run: flutter pub get
|
||||
- run: flutter build macos --release
|
||||
- run: |
|
||||
cd build/macos/Build/Products/Release
|
||||
zip -r macos-build.zip pixes.app
|
||||
chmod +x pixes.app/Contents/MacOS/pixes
|
||||
zip -r macos.zip pixes.app
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: macos-build.zip
|
||||
path: build/macos/Build/Products/Release/macos-build.zip
|
||||
|
||||
name: macos.zip
|
||||
path: build/macos/Build/Products/Release/macos.zip
|
||||
Build_IOS:
|
||||
runs-on: macos-15
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: "stable"
|
||||
flutter-version-file: pubspec.yaml
|
||||
architecture: x64
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_16.0.app
|
||||
- run: flutter pub get
|
||||
- run: flutter build ios --release --no-codesign
|
||||
- run: |
|
||||
mkdir -p /Users/runner/work/pixes/pixes/build/ios/iphoneos/Payload
|
||||
mv /Users/runner/work/pixes/pixes/build/ios/iphoneos/Runner.app /Users/runner/work/pixes/pixes/build/ios/iphoneos/Payload
|
||||
cd /Users/runner/work/pixes/pixes/build/ios/iphoneos/
|
||||
zip -r pixes-ios.ipa Payload
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: app-ios.ipa
|
||||
path: /Users/runner/work/pixes/pixes/build/ios/iphoneos/pixes-ios.ipa
|
||||
Build_Android:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: "stable"
|
||||
flutter-version-file: pubspec.yaml
|
||||
architecture: x64
|
||||
- name: Decode and install certificate
|
||||
env:
|
||||
STORE_FILE: ${{ secrets.ANDROID_KEYSTORE }}
|
||||
PROPERTY_FILE: ${{ secrets.ANDROID_KEY_PROPERTIES }}
|
||||
run: |
|
||||
echo "$STORE_FILE" | base64 --decode > android/keystore.jks
|
||||
echo "$PROPERTY_FILE" > android/key.properties
|
||||
- uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'oracle'
|
||||
java-version: '17'
|
||||
- run: flutter pub get
|
||||
- run: flutter build apk --release
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: apks
|
||||
path: build/app/outputs/apk/release
|
||||
Build_Windows:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: install dependencies
|
||||
run: |
|
||||
choco install yq -y
|
||||
pip install httpx
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: "stable"
|
||||
flutter-version-file: pubspec.yaml
|
||||
architecture: x64
|
||||
- name: build
|
||||
run: |
|
||||
flutter pub get
|
||||
python windows/build.py
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: windows_build
|
||||
path: build/windows/pixes-*
|
||||
Build_Linux:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: 'stable'
|
||||
flutter-version-file: pubspec.yaml
|
||||
architecture: x64
|
||||
- run: |
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y ninja-build libgtk-3-dev webkit2gtk-4.1
|
||||
dart pub global activate flutter_to_debian
|
||||
- run: python3 debian/build.py x64
|
||||
- run: dart run flutter_to_arch
|
||||
- run: |
|
||||
sudo rm -rf build/linux/arch/app.tar.gz
|
||||
sudo rm -rf build/linux/arch/pkg
|
||||
sudo rm -rf build/linux/arch/src
|
||||
sudo rm -rf build/linux/arch/PKGBUILD
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: deb_build
|
||||
path: build/linux/x64/release/debian
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: arch_build
|
||||
path: build/linux/arch/
|
||||
Build_Linux_ARM64:
|
||||
runs-on: ubuntu-22.04-arm
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: 'master'
|
||||
flutter-version-file: pubspec.yaml
|
||||
- run: |
|
||||
flutter pub get
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y ninja-build libgtk-3-dev webkit2gtk-4.1
|
||||
dart pub global activate flutter_to_debian
|
||||
- run: python3 debian/build.py arm64
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: deb_arm64_build
|
||||
path: build/linux/x64/release/debian # This is a bug related to flutter_to_debian, but it's not a big deal.
|
||||
Release:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [Build_MacOS, Build_IOS, Build_Android, Build_Windows, Build_Linux, Build_Linux_ARM64]
|
||||
if: github.event_name == 'release' # 仅在 push 事件时执行
|
||||
steps:
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: macos.zip
|
||||
path: outputs
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: app-ios.ipa
|
||||
path: outputs
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: apks
|
||||
path: outputs
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: windows_build
|
||||
path: outputs
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: deb_build
|
||||
path: outputs
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: arch_build
|
||||
path: outputs
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: deb_arm64_build
|
||||
path: outputs
|
||||
- uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ github.ref_name }}
|
||||
files: |
|
||||
outputs/*.ipa
|
||||
outputs/*.dmg
|
||||
outputs/*.apk
|
||||
outputs/*.zip
|
||||
outputs/*.exe
|
||||
outputs/*.deb
|
||||
outputs/*.zst
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.ACTION_GITHUB_TOKEN }}
|
||||
|
38
README.md
38
README.md
@@ -1,16 +1,42 @@
|
||||
# pixes
|
||||
|
||||
[](https://flutter.dev/)
|
||||
[](https://flutter.dev/)
|
||||
[](https://github.com/wgh136/pixes/blob/master/LICENSE)
|
||||
[](https://github.com/wgh136/PicaComic/pixes)
|
||||
[](https://github.com/wgh136/pixes)
|
||||
[](https://github.com/wgh136/pixes/stargazers)
|
||||
[](https://t.me/pica_group)
|
||||
|
||||
非官方 Pixiv app, 支持 Windows, Android, iOS, macOS
|
||||
Unofficial Pixiv app, support Windows, Android, iOS, macOS, linux
|
||||
|
||||
主要功能均已实现
|
||||
All main features are implemented.
|
||||
|
||||
## 屏幕截图
|
||||
## Download
|
||||
|
||||
Download from [Release](https://github.com/wgh136/pixes/releases)
|
||||
|
||||
## Build from source
|
||||
|
||||
### Install Flutter
|
||||
|
||||
View [Flutter Document](https://flutter.dev/docs/get-started/install)
|
||||
|
||||
### Build Android
|
||||
|
||||
Put your keystore file (`key.jks`, `key.properties`) in `android/`
|
||||
|
||||
Run `flutter build apk`
|
||||
|
||||
### Build iOS/Windows/macOS
|
||||
|
||||
Run `flutter build ios/windows/macos`
|
||||
|
||||
### Build Linux
|
||||
|
||||
Use`python3 debian/build.py {ARCH}` to build deb package. Replace {ARCH} with `x64` or `arm64`.
|
||||
|
||||
For other linux distributions, you can use `flutter build linux` to build.
|
||||
You must register the `pixiv` scheme in the `.desktop` file, otherwise the login will not work.
|
||||
|
||||
## Screenshots
|
||||
|
||||
<img src="screenshots/1.png" style="width: 400px">
|
||||
<img src="screenshots/2.png" style="width: 400px">
|
||||
|
@@ -4,6 +4,8 @@ plugins {
|
||||
id "dev.flutter.flutter-gradle-plugin"
|
||||
}
|
||||
|
||||
ext.abiCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86_64": 3]
|
||||
|
||||
def localProperties = new Properties()
|
||||
def localPropertiesFile = rootProject.file('local.properties')
|
||||
if (localPropertiesFile.exists()) {
|
||||
@@ -33,26 +35,29 @@ android {
|
||||
compileSdk flutter.compileSdkVersion
|
||||
ndkVersion flutter.ndkVersion
|
||||
|
||||
splits{
|
||||
abi {
|
||||
reset()
|
||||
include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
|
||||
enable true
|
||||
universalApk true
|
||||
}
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = '1.8'
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
main.java.srcDirs += 'src/main/kotlin'
|
||||
kotlinOptions{
|
||||
jvmTarget = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||
applicationId "com.github.wgh136.pixes"
|
||||
// You can update the following values to match your application needs.
|
||||
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
targetSdkVersion 34
|
||||
targetSdk = flutter.targetSdkVersion
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
}
|
||||
@@ -74,9 +79,25 @@ android {
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
// TODO: Add your own signing config for the release build.
|
||||
// Signing with the debug keys for now, so `flutter run --release` works.
|
||||
signingConfig signingConfigs.debug
|
||||
ndk {
|
||||
abiFilters "armeabi-v7a", "arm64-v8a", "x86_64"
|
||||
}
|
||||
signingConfig signingConfigs.release
|
||||
applicationVariants.all { variant ->
|
||||
variant.outputs.all { output ->
|
||||
def abi = output.getFilter(com.android.build.OutputFile.ABI)
|
||||
if (abi != null) {
|
||||
outputFileName = "pixes-${variant.versionName}-${abi}.apk"
|
||||
def abiVersionCode = project.ext.abiCodes.get(abi)
|
||||
if (abiVersionCode != null) {
|
||||
versionCodeOverride = variant.versionCode * 10 + abiVersionCode
|
||||
}
|
||||
} else {
|
||||
outputFileName = "pixes-${variant.versionName}.apk"
|
||||
versionCodeOverride = variant.versionCode * 10
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -5,6 +5,7 @@
|
||||
<application
|
||||
android:label="pixes"
|
||||
android:name="${applicationName}"
|
||||
android:enableOnBackInvokedCallback="true"
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
@@ -48,6 +49,7 @@
|
||||
<meta-data
|
||||
android:name="flutterEmbedding"
|
||||
android:value="2" />
|
||||
<meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false"/>
|
||||
</application>
|
||||
<!-- Required to query activities that can process text, see:
|
||||
https://developer.android.com/training/package-visibility?hl=en and
|
||||
|
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
|
@@ -19,8 +19,8 @@ pluginManagement {
|
||||
|
||||
plugins {
|
||||
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
||||
id "com.android.application" version "7.3.0" apply false
|
||||
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
|
||||
id "com.android.application" version "8.9.0" apply false
|
||||
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
|
||||
}
|
||||
|
||||
include ":app"
|
||||
|
Binary file not shown.
@@ -10,7 +10,7 @@
|
||||
"History": "历史",
|
||||
"Ranking": "排行",
|
||||
"Settings": "设置",
|
||||
"Artworks": "插画",
|
||||
"Artworks": "作品",
|
||||
"Mangas": "漫画",
|
||||
"Users": "用户",
|
||||
"Search artwork": "搜索作品",
|
||||
@@ -112,7 +112,6 @@
|
||||
"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.": "您需要在打开的浏览器窗口中完成登录操作",
|
||||
"I have read and agree to the Terms of Use": "我已阅读并同意使用条款",
|
||||
"Waiting..." : "等待中...",
|
||||
"Waiting for authentication. Please finished in the browser." : "等待验证. 请在浏览器中完成.",
|
||||
"Back" : "返回",
|
||||
@@ -173,7 +172,20 @@
|
||||
"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": "显示原图"
|
||||
"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": "作品的边框将被加深",
|
||||
"Initial Page": "初始页面",
|
||||
"Close the pane to apply the settings": "关闭面板以应用设置",
|
||||
"No results found": "未找到结果"
|
||||
},
|
||||
"zh_TW": {
|
||||
"Search": "搜索",
|
||||
@@ -288,7 +300,6 @@
|
||||
"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.": "您需要在打開的瀏覽器窗口中完成登錄操作",
|
||||
"I have read and agree to the Terms of Use": "我已閱讀並同意使用條款",
|
||||
"Waiting..." : "等待中...",
|
||||
"Waiting for authentication. Please finished in the browser." : "等待驗證. 請在瀏覽器中完成.",
|
||||
"Back" : "返回",
|
||||
@@ -349,6 +360,19 @@
|
||||
"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": "顯示原圖"
|
||||
"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": "作品的邊框將被加深",
|
||||
"Initial Page": "初始頁面",
|
||||
"Close the pane to apply the settings": "關閉面板以應用設置",
|
||||
"No results found": "未找到結果"
|
||||
}
|
||||
}
|
12
debian/build.py
vendored
12
debian/build.py
vendored
@@ -1,6 +1,7 @@
|
||||
import subprocess
|
||||
import os
|
||||
import sys
|
||||
|
||||
arch = sys.argv[1]
|
||||
debianContent = ''
|
||||
desktopContent = ''
|
||||
version = ''
|
||||
@@ -13,7 +14,14 @@ 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))
|
||||
content = debianContent.replace('{{Version}}', version)
|
||||
if arch == 'x64':
|
||||
content = content.replace('{{Arch}}', 'x64')
|
||||
content = content.replace('{{Architecture}}', 'amd64')
|
||||
elif arch == 'arm64':
|
||||
content = content.replace('{{Arch}}', 'arm64')
|
||||
content = content.replace('{{Architecture}}', 'arm64')
|
||||
f.write(content)
|
||||
with open('debian/gui/pixes.desktop', 'w') as f:
|
||||
f.write(desktopContent.replace('{{Version}}', version))
|
||||
|
||||
|
6
debian/debian.yaml
vendored
6
debian/debian.yaml
vendored
@@ -1,6 +1,6 @@
|
||||
flutter_app:
|
||||
command: pixes
|
||||
arch: x64
|
||||
arch: {{Arch}}
|
||||
parent: /usr/local/lib
|
||||
nonInteractive: true
|
||||
execFieldCodes: u
|
||||
@@ -8,9 +8,9 @@ flutter_app:
|
||||
control:
|
||||
Package: pixes
|
||||
Version: {{Version}}
|
||||
Architecture: amd64
|
||||
Architecture: {{Architecture}}
|
||||
Priority: optional
|
||||
Depends:
|
||||
Depends: libwebkit2gtk-4.1-0, libgtk-3-0
|
||||
Maintainer: nyne
|
||||
Description: Unofficial pixiv application
|
||||
|
||||
|
2
debian/gui/pixes.desktop
vendored
2
debian/gui/pixes.desktop
vendored
@@ -1,5 +1,4 @@
|
||||
[Desktop Entry]
|
||||
Version={{Version}}
|
||||
Name=Pixes
|
||||
GenericName=Pixes
|
||||
Comment=Unofficial pixiv application
|
||||
@@ -8,3 +7,4 @@ Type=Application
|
||||
Categories=Utility
|
||||
Keywords=Flutter;share;images;
|
||||
MimeType=x-scheme-handler/pixiv;
|
||||
Icon=pixes
|
@@ -36,6 +36,9 @@ class _Appdata {
|
||||
LogicalKeyboardKey.keyG.keyId,
|
||||
],
|
||||
"showOriginalImage": false,
|
||||
"checkUpdate": true,
|
||||
"emphasizeArtworksFromFollowingArtists": true,
|
||||
"initialPage": 4,
|
||||
};
|
||||
|
||||
bool lock = false;
|
||||
|
@@ -1,9 +1,11 @@
|
||||
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';
|
||||
@@ -64,10 +66,28 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
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(
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
padding: EdgeInsets.zero,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(4.0),
|
||||
color: FluentTheme.of(context).cardColor,
|
||||
border: () {
|
||||
var emphasis = widget.illust.author.isFollowed &&
|
||||
appdata.settings[
|
||||
'emphasizeArtworksFromFollowingArtists'];
|
||||
var color = emphasis
|
||||
? ColorScheme.of(context).primary
|
||||
: ColorScheme.of(context)
|
||||
.outlineVariant
|
||||
.toOpacity(0.64);
|
||||
var width = emphasis ? 1.6 : 1.0;
|
||||
return Border.all(color: color, width: width);
|
||||
}(),
|
||||
),
|
||||
margin: EdgeInsets.zero,
|
||||
child: GestureDetector(
|
||||
onTap: widget.onTap ??
|
||||
@@ -75,6 +95,7 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
context.to(() => IllustPage(widget.illust));
|
||||
},
|
||||
onSecondaryTapUp: showMenu,
|
||||
onLongPress: showMenu,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4.0),
|
||||
child: AnimatedImage(
|
||||
@@ -87,7 +108,8 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
),
|
||||
),
|
||||
),
|
||||
)),
|
||||
),
|
||||
),
|
||||
if (widget.illust.images.length > 1)
|
||||
Positioned(
|
||||
top: 12,
|
||||
@@ -98,7 +120,7 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context)
|
||||
.micaBackgroundColor
|
||||
.withOpacity(0.72),
|
||||
.toOpacity(0.72),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
@@ -121,7 +143,7 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context)
|
||||
.errorContainer
|
||||
.withOpacity(0.8),
|
||||
.toOpacity(0.8),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
@@ -144,7 +166,7 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context)
|
||||
.primaryContainer
|
||||
.withOpacity(0.8),
|
||||
.toOpacity(0.8),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
@@ -211,13 +233,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(),
|
||||
);
|
||||
|
||||
@@ -243,6 +265,12 @@ class _IllustWidgetState extends State<IllustWidget> {
|
||||
context.showToast(message: "Added");
|
||||
DownloadManager().addDownloadingTask(widget.illust);
|
||||
}),
|
||||
MenuFlyoutItem(
|
||||
text: Text("Related Artworks".tl),
|
||||
onPressed: () {
|
||||
context.to(
|
||||
() => RelatedIllustsPage(widget.illust.id.toString()));
|
||||
}),
|
||||
],
|
||||
);
|
||||
},
|
||||
@@ -340,8 +368,7 @@ class IllustHistoryWidget extends StatelessWidget {
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4.0),
|
||||
child: AnimatedImage(
|
||||
image: CachedImageProvider(
|
||||
illust.imgPath),
|
||||
image: CachedImageProvider(illust.imgPath),
|
||||
fit: BoxFit.cover,
|
||||
width: width - 16.0,
|
||||
height: height - 16.0,
|
||||
@@ -360,7 +387,7 @@ class IllustHistoryWidget extends StatelessWidget {
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context)
|
||||
.micaBackgroundColor
|
||||
.withOpacity(0.72),
|
||||
.toOpacity(0.72),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
@@ -383,7 +410,7 @@ class IllustHistoryWidget extends StatelessWidget {
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context)
|
||||
.errorContainer
|
||||
.withOpacity(0.8),
|
||||
.toOpacity(0.8),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
@@ -406,7 +433,7 @@ class IllustHistoryWidget extends StatelessWidget {
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context)
|
||||
.primaryContainer
|
||||
.withOpacity(0.8),
|
||||
.toOpacity(0.8),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
|
@@ -40,7 +40,7 @@ class KeyEventListenerState extends State<KeyEventListener> {
|
||||
focusNode: focusNode,
|
||||
autofocus: true,
|
||||
onKeyEvent: (node, event) {
|
||||
if (event is! KeyUpEvent) return KeyEventResult.handled;
|
||||
if (event is! KeyUpEvent) return KeyEventResult.ignored;
|
||||
if (event.logicalKey == LogicalKeyboardKey.escape) {
|
||||
if (App.rootNavigatorKey.currentState?.canPop() ?? false) {
|
||||
App.rootNavigatorKey.currentState?.pop();
|
||||
@@ -52,7 +52,7 @@ class KeyEventListenerState extends State<KeyEventListener> {
|
||||
for (var handler in _handlers) {
|
||||
handler(event.logicalKey);
|
||||
}
|
||||
return KeyEventResult.handled;
|
||||
return KeyEventResult.ignored;
|
||||
},
|
||||
child: widget.child,
|
||||
);
|
||||
|
@@ -132,8 +132,10 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
|
||||
if(message.length > 20) {
|
||||
message = "${message.substring(0, 20)}...";
|
||||
}
|
||||
if (mounted) {
|
||||
context.showToast(message: message);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -150,6 +152,7 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
|
||||
|
||||
void firstLoad() {
|
||||
loadData(_page).then((value) {
|
||||
if (!mounted) return;
|
||||
if(value.success) {
|
||||
_page++;
|
||||
setState(() {
|
||||
|
@@ -4,6 +4,7 @@ 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) {
|
||||
|
@@ -2,6 +2,7 @@ import 'dart:async';
|
||||
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
|
||||
void showToast(BuildContext context, {required String message, IconData? icon}) {
|
||||
var newEntry = OverlayEntry(
|
||||
@@ -30,7 +31,7 @@ class ToastOverlay extends StatelessWidget {
|
||||
child: Align(
|
||||
alignment: Alignment.bottomCenter,
|
||||
child: PhysicalModel(
|
||||
color: ColorScheme.of(context).surface.withOpacity(1),
|
||||
color: ColorScheme.of(context).surface.toOpacity(1),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
elevation: 1,
|
||||
child: Container(
|
||||
|
@@ -20,6 +20,7 @@ class AppPageRoute<T> extends PageRoute<T> with _AppRouteTransitionMixin {
|
||||
super.barrierDismissible = false,
|
||||
this.enableIOSGesture = true,
|
||||
this.preventRebuild = true,
|
||||
this.isRoot = false,
|
||||
}) {
|
||||
assert(opaque);
|
||||
}
|
||||
@@ -44,6 +45,9 @@ class AppPageRoute<T> extends PageRoute<T> with _AppRouteTransitionMixin {
|
||||
@override
|
||||
final bool preventRebuild;
|
||||
|
||||
@override
|
||||
final bool isRoot;
|
||||
|
||||
static void updateBackButton() {
|
||||
Future.delayed(const Duration(milliseconds: 300), () {
|
||||
StateController.findOrNull(tag: "back_button")?.update();
|
||||
@@ -77,6 +81,8 @@ mixin _AppRouteTransitionMixin<T> on PageRoute<T> {
|
||||
|
||||
Widget? _child;
|
||||
|
||||
bool get isRoot;
|
||||
|
||||
@override
|
||||
Widget buildPage(
|
||||
BuildContext context,
|
||||
@@ -115,7 +121,13 @@ mixin _AppRouteTransitionMixin<T> on PageRoute<T> {
|
||||
@override
|
||||
Widget buildTransitions(BuildContext context, Animation<double> animation,
|
||||
Animation<double> secondaryAnimation, Widget child) {
|
||||
return DrillInPageTransition(
|
||||
child = ColoredBox(
|
||||
color: FluentTheme.of(context).micaBackgroundColor,
|
||||
child: child,
|
||||
);
|
||||
|
||||
if (isRoot) {
|
||||
child = EntrancePageTransition(
|
||||
animation: CurvedAnimation(
|
||||
parent: animation,
|
||||
curve: FluentTheme.of(context).animationCurve,
|
||||
@@ -128,6 +140,25 @@ mixin _AppRouteTransitionMixin<T> on PageRoute<T> {
|
||||
child: child)
|
||||
: child,
|
||||
);
|
||||
} else {
|
||||
child = DrillInPageTransition(
|
||||
animation: CurvedAnimation(
|
||||
parent: animation,
|
||||
curve: FluentTheme
|
||||
.of(context)
|
||||
.animationCurve,
|
||||
),
|
||||
child: enableIOSGesture && App.isIOS
|
||||
? IOSBackGestureDetector(
|
||||
gestureWidth: _kBackGestureWidth,
|
||||
enabledCallback: () => _isPopGestureEnabled<T>(this),
|
||||
onStartPopGesture: () => _startPopGesture(this),
|
||||
child: child)
|
||||
: child,
|
||||
);
|
||||
}
|
||||
|
||||
return child;
|
||||
}
|
||||
|
||||
IOSBackGestureController _startPopGesture(PageRoute<T> route) {
|
||||
@@ -330,7 +361,7 @@ class SideBarRoute<T> extends PopupRoute<T> {
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context)
|
||||
.micaBackgroundColor
|
||||
.withOpacity(0.98),
|
||||
.toOpacity(0.98),
|
||||
borderRadius: const BorderRadius.only(
|
||||
topLeft: Radius.circular(4),
|
||||
bottomLeft: Radius.circular(4))),
|
||||
@@ -388,3 +419,32 @@ class SideBarRoute<T> extends PopupRoute<T> {
|
||||
return IOSBackGestureController(route.controller!, route.navigator!);
|
||||
}
|
||||
}
|
||||
|
||||
class EntrancePageTransition extends StatelessWidget {
|
||||
/// Creates an entrance page transition
|
||||
const EntrancePageTransition({
|
||||
super.key,
|
||||
required this.child,
|
||||
required this.animation,
|
||||
});
|
||||
|
||||
/// The widget to be animated
|
||||
final Widget child;
|
||||
|
||||
/// The animation to drive this transition
|
||||
final Animation<double> animation;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SlideTransition(
|
||||
position: Tween<Offset>(
|
||||
begin: const Offset(0, 0.1),
|
||||
end: Offset.zero,
|
||||
).animate(animation),
|
||||
child: FadeTransition(
|
||||
opacity: animation,
|
||||
child: child,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
315
lib/components/search_field.dart
Normal file
315
lib/components/search_field.dart
Normal file
@@ -0,0 +1,315 @@
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
|
||||
class AutoCompleteItem {
|
||||
final String title;
|
||||
final String? subtitle;
|
||||
final VoidCallback onTap;
|
||||
|
||||
const AutoCompleteItem({
|
||||
required this.title,
|
||||
this.subtitle,
|
||||
required this.onTap,
|
||||
});
|
||||
}
|
||||
|
||||
class AutoCompleteData {
|
||||
final List<AutoCompleteItem> items;
|
||||
final bool isLoading;
|
||||
|
||||
const AutoCompleteData({
|
||||
this.items = const <AutoCompleteItem>[],
|
||||
this.isLoading = false,
|
||||
});
|
||||
}
|
||||
|
||||
class SearchField extends StatefulWidget {
|
||||
const SearchField({
|
||||
super.key,
|
||||
this.autoCompleteItems = const <AutoCompleteItem>[],
|
||||
this.isLoadingAutoCompleteItems = false,
|
||||
this.enableAutoComplete = true,
|
||||
this.textEditingController,
|
||||
this.placeholder,
|
||||
this.leading,
|
||||
this.trailing,
|
||||
this.foregroundDecoration,
|
||||
this.onChanged,
|
||||
this.onSubmitted,
|
||||
this.padding,
|
||||
this.focusNode,
|
||||
this.autoCompleteNoResultsText,
|
||||
});
|
||||
|
||||
final List<AutoCompleteItem> autoCompleteItems;
|
||||
|
||||
final bool isLoadingAutoCompleteItems;
|
||||
|
||||
final bool enableAutoComplete;
|
||||
|
||||
final TextEditingController? textEditingController;
|
||||
|
||||
final String? placeholder;
|
||||
|
||||
final Widget? leading;
|
||||
|
||||
final Widget? trailing;
|
||||
|
||||
final WidgetStatePropertyAll<BoxDecoration>? foregroundDecoration;
|
||||
|
||||
final void Function(String)? onChanged;
|
||||
|
||||
final void Function(String)? onSubmitted;
|
||||
|
||||
final EdgeInsets? padding;
|
||||
|
||||
final FocusNode? focusNode;
|
||||
|
||||
final String? autoCompleteNoResultsText;
|
||||
|
||||
@override
|
||||
State<SearchField> createState() => _SearchFieldState();
|
||||
}
|
||||
|
||||
class _SearchFieldState extends State<SearchField> with TickerProviderStateMixin {
|
||||
late final ValueNotifier<AutoCompleteData> autoCompleteItems;
|
||||
|
||||
late final FocusNode focusNode;
|
||||
|
||||
final boxKey = GlobalKey();
|
||||
|
||||
OverlayEntry? _overlayEntry;
|
||||
|
||||
AnimationController? _animationController;
|
||||
Animation<double>? _fadeAnimation;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
autoCompleteItems = ValueNotifier(AutoCompleteData(
|
||||
items: widget.autoCompleteItems,
|
||||
isLoading: widget.isLoadingAutoCompleteItems,
|
||||
));
|
||||
focusNode = widget.focusNode ?? FocusNode();
|
||||
focusNode.addListener(onfocusChange);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_animationController?.dispose();
|
||||
focusNode.removeListener(onfocusChange);
|
||||
if (widget.focusNode == null) {
|
||||
focusNode.dispose();
|
||||
}
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
void didUpdateWidget(covariant SearchField oldWidget) {
|
||||
if (widget.autoCompleteItems != oldWidget.autoCompleteItems ||
|
||||
widget.isLoadingAutoCompleteItems !=
|
||||
oldWidget.isLoadingAutoCompleteItems) {
|
||||
Future.microtask(() {
|
||||
autoCompleteItems.value = AutoCompleteData(
|
||||
items: widget.autoCompleteItems,
|
||||
isLoading: widget.isLoadingAutoCompleteItems,
|
||||
);
|
||||
});
|
||||
}
|
||||
super.didUpdateWidget(oldWidget);
|
||||
}
|
||||
|
||||
void onfocusChange() {
|
||||
if (focusNode.hasFocus && widget.enableAutoComplete) {
|
||||
final box = context.findRenderObject() as RenderBox?;
|
||||
if (box == null) return;
|
||||
final overlay = Overlay.of(context);
|
||||
final position = box.localToGlobal(
|
||||
Offset.zero,
|
||||
ancestor: overlay.context.findRenderObject(),
|
||||
);
|
||||
|
||||
if (_overlayEntry != null) {
|
||||
_removeOverlayWithAnimation();
|
||||
}
|
||||
|
||||
_animationController = AnimationController(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
vsync: this,
|
||||
);
|
||||
|
||||
_fadeAnimation = Tween<double>(
|
||||
begin: 0.0,
|
||||
end: 1.0,
|
||||
).animate(CurvedAnimation(
|
||||
parent: _animationController!,
|
||||
curve: Curves.easeOut,
|
||||
));
|
||||
|
||||
_overlayEntry = OverlayEntry(
|
||||
builder: (context) {
|
||||
return Positioned(
|
||||
left: position.dx,
|
||||
width: box.size.width,
|
||||
top: position.dy + box.size.height,
|
||||
child: _AnimatedOverlayWrapper(
|
||||
animation: _fadeAnimation!,
|
||||
child: _AutoCompleteOverlay(
|
||||
data: autoCompleteItems,
|
||||
noResultsText: widget.autoCompleteNoResultsText,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
overlay.insert(_overlayEntry!);
|
||||
_animationController!.forward();
|
||||
} else {
|
||||
_removeOverlayWithAnimation();
|
||||
}
|
||||
}
|
||||
|
||||
void _removeOverlayWithAnimation() {
|
||||
if (_overlayEntry != null && _animationController != null) {
|
||||
_animationController!.reverse().then((_) {
|
||||
_overlayEntry?.remove();
|
||||
_overlayEntry = null;
|
||||
_animationController?.dispose();
|
||||
_animationController = null;
|
||||
_fadeAnimation = null;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return TextBox(
|
||||
controller: widget.textEditingController,
|
||||
key: boxKey,
|
||||
focusNode: focusNode,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
placeholder: widget.placeholder,
|
||||
onChanged: widget.onChanged,
|
||||
onSubmitted: widget.onSubmitted,
|
||||
foregroundDecoration: widget.foregroundDecoration,
|
||||
prefix: widget.leading,
|
||||
suffix: widget.trailing,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _AutoCompleteOverlay extends StatefulWidget {
|
||||
const _AutoCompleteOverlay({required this.data, this.noResultsText});
|
||||
|
||||
final ValueNotifier<AutoCompleteData> data;
|
||||
|
||||
final String? noResultsText;
|
||||
|
||||
@override
|
||||
State<_AutoCompleteOverlay> createState() => _AutoCompleteOverlayState();
|
||||
}
|
||||
|
||||
class _AutoCompleteOverlayState extends State<_AutoCompleteOverlay> {
|
||||
late final notifier = widget.data;
|
||||
|
||||
var items = <AutoCompleteItem>[];
|
||||
|
||||
var isLoading = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
items = notifier.value.items;
|
||||
isLoading = notifier.value.isLoading;
|
||||
notifier.addListener(onItemsChanged);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
notifier.removeListener(onItemsChanged);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void onItemsChanged() {
|
||||
setState(() {
|
||||
items = notifier.value.items;
|
||||
isLoading = notifier.value.isLoading;
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var items = List<AutoCompleteItem>.from(this.items);
|
||||
|
||||
Widget? content;
|
||||
|
||||
if (isLoading) {
|
||||
content = SizedBox(
|
||||
height: 44,
|
||||
child: Center(
|
||||
child: ProgressRing(
|
||||
activeColor: FluentTheme.of(context).accentColor,
|
||||
strokeWidth: 2,
|
||||
).fixWidth(24).fixHeight(24),
|
||||
),
|
||||
);
|
||||
} else if (items.isEmpty) {
|
||||
content = ListTile(
|
||||
title: Text(widget.noResultsText ?? 'No results found'),
|
||||
onPressed: () {},
|
||||
);
|
||||
} else {
|
||||
if (items.length > 8) {
|
||||
items = items.sublist(0, 8);
|
||||
}
|
||||
content = Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: items.map((item) {
|
||||
return ListTile(
|
||||
title: Text(item.title),
|
||||
subtitle: item.subtitle != null ? Text(item.subtitle!) : null,
|
||||
onPressed: item.onTap,
|
||||
);
|
||||
}).toList(),
|
||||
);
|
||||
}
|
||||
|
||||
return Card(
|
||||
backgroundColor: FluentTheme.of(context).micaBackgroundColor,
|
||||
child: AnimatedSize(
|
||||
alignment: Alignment.topCenter,
|
||||
duration: const Duration(milliseconds: 160),
|
||||
child: content,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _AnimatedOverlayWrapper extends StatelessWidget {
|
||||
const _AnimatedOverlayWrapper({
|
||||
required this.animation,
|
||||
required this.child,
|
||||
});
|
||||
|
||||
final Animation<double> animation;
|
||||
final Widget child;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AnimatedBuilder(
|
||||
animation: animation,
|
||||
builder: (context, child) {
|
||||
return FadeTransition(
|
||||
opacity: animation,
|
||||
child: Transform.scale(
|
||||
scale: 0.9 + (0.1 * animation.value),
|
||||
alignment: Alignment.topCenter,
|
||||
child: child,
|
||||
),
|
||||
);
|
||||
},
|
||||
child: child,
|
||||
);
|
||||
}
|
||||
}
|
@@ -40,7 +40,7 @@ class SegmentedButton<T> extends StatelessWidget {
|
||||
onPressed: () => onPressed(e.key),
|
||||
builder: (context, states) {
|
||||
var textColor = active ? null : ColorScheme.of(context).outline;
|
||||
var backgroundColor = active ? null : ButtonState.resolveWith((states) {
|
||||
var backgroundColor = active ? null : WidgetStateProperty.resolveWith((states) {
|
||||
return ButtonThemeData.buttonColor(context, states);
|
||||
}).resolve(states);
|
||||
|
||||
|
@@ -12,7 +12,7 @@ export "state_controller.dart";
|
||||
export "navigation.dart";
|
||||
|
||||
class _App {
|
||||
final version = "1.0.7";
|
||||
final version = "1.2.0";
|
||||
|
||||
bool get isAndroid => Platform.isAndroid;
|
||||
bool get isIOS => Platform.isIOS;
|
||||
|
@@ -32,11 +32,11 @@ class Log {
|
||||
static const String? logFile = null;
|
||||
|
||||
static void printWarning(String text) {
|
||||
print('\x1B[33m$text\x1B[0m');
|
||||
debugPrint('\x1B[33m$text\x1B[0m');
|
||||
}
|
||||
|
||||
static void printError(String text) {
|
||||
print('\x1B[31m$text\x1B[0m');
|
||||
debugPrint('\x1B[31m$text\x1B[0m');
|
||||
}
|
||||
|
||||
static void addLog(LogLevel level, String title, String content) {
|
||||
@@ -44,15 +44,13 @@ class Log {
|
||||
content = "${content.substring(0, maxLogLength)}...";
|
||||
}
|
||||
|
||||
if (kDebugMode) {
|
||||
switch (level) {
|
||||
case LogLevel.error:
|
||||
printError(content);
|
||||
case LogLevel.warning:
|
||||
printWarning(content);
|
||||
case LogLevel.info:
|
||||
print(content);
|
||||
}
|
||||
debugPrint(content);
|
||||
}
|
||||
|
||||
var newLog = LogItem(level, title, content);
|
||||
|
@@ -65,3 +65,9 @@ extension WidgetExtension on Widget{
|
||||
return SizedBox(height: height, child: this);
|
||||
}
|
||||
}
|
||||
|
||||
extension ColorExt on Color {
|
||||
Color toOpacity(double opacity){
|
||||
return withValues(alpha: opacity);
|
||||
}
|
||||
}
|
@@ -1,3 +1,4 @@
|
||||
import "dart:async";
|
||||
import "dart:ui";
|
||||
|
||||
import "package:dynamic_color/dynamic_color.dart";
|
||||
@@ -18,10 +19,13 @@ 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";
|
||||
|
||||
void main() async {
|
||||
void main() {
|
||||
runZonedGuarded(() async {
|
||||
Future.delayed(const Duration(seconds: 3), checkUpdate);
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
FlutterError.onError = (details) {
|
||||
Log.error("Unhandled", "${details.exception}\n${details.stack}");
|
||||
@@ -43,7 +47,7 @@ void main() async {
|
||||
TitleBarStyle.hidden,
|
||||
windowButtonVisibility: false,
|
||||
);
|
||||
if(App.isLinux) {
|
||||
if (App.isLinux) {
|
||||
// https://github.com/leanflutter/window_manager/issues/460
|
||||
return;
|
||||
}
|
||||
@@ -57,6 +61,9 @@ void main() async {
|
||||
Loop.start();
|
||||
Log.info("APP", "Application started");
|
||||
runApp(const MyApp());
|
||||
}, (error, stack) {
|
||||
Log.error("Unhandled Exception", "$error\n$stack");
|
||||
});
|
||||
}
|
||||
|
||||
class MyApp extends StatelessWidget {
|
||||
@@ -65,7 +72,6 @@ class MyApp extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
var windowsFont = kDebugMode ? "微软雅黑" : "font";
|
||||
return StateBuilder<SimpleController>(
|
||||
init: SimpleController(),
|
||||
tag: "MyApp",
|
||||
@@ -98,7 +104,7 @@ class MyApp extends StatelessWidget {
|
||||
title: 'pixes',
|
||||
theme: FluentThemeData(
|
||||
brightness: brightness,
|
||||
fontFamily: App.isWindows ? windowsFont : null,
|
||||
fontFamily: App.isWindows ? "Microsoft YaHei UI" : null,
|
||||
accentColor: AccentColor.swatch({
|
||||
'darkest': darken(colorScheme.primary, 30),
|
||||
'darker': darken(colorScheme.primary, 20),
|
||||
@@ -128,12 +134,29 @@ class MyApp extends StatelessWidget {
|
||||
throw "widget is null";
|
||||
}
|
||||
|
||||
String? font;
|
||||
List<String>? fallback;
|
||||
if (App.isLinux || App.isWindows) {
|
||||
font = 'Noto Sans CJK';
|
||||
fallback = [
|
||||
'Segoe UI',
|
||||
'Noto Sans SC',
|
||||
'Noto Sans TC',
|
||||
'Noto Sans',
|
||||
'Microsoft YaHei',
|
||||
'PingFang SC',
|
||||
'Arial',
|
||||
'sans-serif'
|
||||
];
|
||||
}
|
||||
|
||||
Widget widget = MdTheme(
|
||||
data: MdThemeData.from(
|
||||
colorScheme: colorScheme, useMaterial3: true),
|
||||
child: DefaultTextStyle.merge(
|
||||
style: TextStyle(
|
||||
fontFamily: App.isWindows ? 'font' : null,
|
||||
fontFamily: font,
|
||||
fontFamilyFallback: fallback,
|
||||
),
|
||||
child: OverlayWidget(child),
|
||||
),
|
||||
@@ -151,7 +174,7 @@ class MyApp extends StatelessWidget {
|
||||
),
|
||||
child: widget,
|
||||
);
|
||||
} else if (App.windowsVersion == 10) {
|
||||
} /* else if (App.windowsVersion == 10) {
|
||||
flutter_acrylic.Window.setEffect(
|
||||
effect: flutter_acrylic.WindowEffect.acrylic,
|
||||
dark: FluentTheme.of(context).brightness ==
|
||||
@@ -164,7 +187,7 @@ class MyApp extends StatelessWidget {
|
||||
),
|
||||
child: widget,
|
||||
);
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
return KeyEventListener(child: widget);
|
||||
@@ -176,21 +199,28 @@ class MyApp extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// from https://stackoverflow.com/a/60191441
|
||||
int _floatToInt8(double x) {
|
||||
return (x * 255.0).round() & 0xff;
|
||||
}
|
||||
|
||||
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());
|
||||
return Color.fromARGB(
|
||||
_floatToInt8(c.a),
|
||||
_floatToInt8(c.r * f),
|
||||
_floatToInt8(c.g * f),
|
||||
_floatToInt8(c.b * f),
|
||||
);
|
||||
}
|
||||
|
||||
/// 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());
|
||||
_floatToInt8(c.a),
|
||||
_floatToInt8(c.r + (1 - c.r) * p),
|
||||
_floatToInt8(c.g + (1 - c.g) * p),
|
||||
_floatToInt8(c.b + (1 - c.b) * p),
|
||||
);
|
||||
}
|
||||
|
@@ -1,3 +1,4 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:dio/dio.dart';
|
||||
@@ -109,12 +110,53 @@ class AppDio extends DioForNative {
|
||||
CancelToken? cancelToken,
|
||||
Options? options,
|
||||
ProgressCallback? onSendProgress,
|
||||
ProgressCallback? onReceiveProgress}) {
|
||||
ProgressCallback? onReceiveProgress}) async{
|
||||
if (!isInitialized) {
|
||||
isInitialized = true;
|
||||
interceptors.add(MyLogInterceptor());
|
||||
}
|
||||
return super.request(path,
|
||||
if(T == Map<String, dynamic>) {
|
||||
var res = await super.request<String>(path,
|
||||
data: data,
|
||||
queryParameters: queryParameters,
|
||||
cancelToken: cancelToken,
|
||||
options: options,
|
||||
onSendProgress: onSendProgress,
|
||||
onReceiveProgress: onReceiveProgress);
|
||||
if(res.data == null) {
|
||||
return Response(
|
||||
data: null,
|
||||
requestOptions: res.requestOptions,
|
||||
statusCode: res.statusCode,
|
||||
statusMessage: res.statusMessage,
|
||||
isRedirect: res.isRedirect,
|
||||
redirects: res.redirects,
|
||||
extra: res.extra,
|
||||
headers: res.headers
|
||||
);
|
||||
}
|
||||
try {
|
||||
var json = jsonDecode(res.data!);
|
||||
return Response(
|
||||
data: json,
|
||||
requestOptions: res.requestOptions,
|
||||
statusCode: res.statusCode,
|
||||
statusMessage: res.statusMessage,
|
||||
isRedirect: res.isRedirect,
|
||||
redirects: res.redirects,
|
||||
extra: res.extra,
|
||||
headers: res.headers
|
||||
);
|
||||
}
|
||||
catch(e) {
|
||||
var data = res.data!;
|
||||
if(data.length > 50) {
|
||||
data = "${data.substring(0, 50)}...";
|
||||
}
|
||||
throw "Failed to decode response: $e\n$data";
|
||||
}
|
||||
}
|
||||
return super.request<T>(path,
|
||||
data: data,
|
||||
queryParameters: queryParameters,
|
||||
cancelToken: cancelToken,
|
||||
|
@@ -324,7 +324,7 @@ class DownloadManager {
|
||||
where illust_id = ?;
|
||||
''', [illust.illustId]);
|
||||
for(var image in images) {
|
||||
File(image["path"] as String).deleteIfExists();
|
||||
File(image["path"] as String).deleteIgnoreError();
|
||||
}
|
||||
_db.execute('''
|
||||
delete from images
|
||||
|
@@ -152,6 +152,10 @@ class Tag {
|
||||
|
||||
@override
|
||||
int get hashCode => name.hashCode;
|
||||
|
||||
static Tag fromJson(Map<String, dynamic> json) {
|
||||
return Tag(json['name'] ?? "", json['translated_name']);
|
||||
}
|
||||
}
|
||||
|
||||
class IllustImage {
|
||||
|
@@ -387,9 +387,9 @@ class Network {
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<Illust>>> getUserIllusts(String uid) async {
|
||||
Future<Res<List<Illust>>> getUserIllusts(String uid, String? type) async {
|
||||
var res = await apiGet(
|
||||
"/v1/user/illusts?filter=for_android&user_id=$uid&type=illust");
|
||||
"/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(),
|
||||
@@ -574,7 +574,7 @@ class Network {
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<bool>> sendHistory(List<int> ids) async{
|
||||
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) {
|
||||
@@ -583,4 +583,13 @@ class Network {
|
||||
return Res.fromErrorRes(res);
|
||||
}
|
||||
}
|
||||
|
||||
Future<Res<List<Tag>>> getAutoCompleteTags(String keyword) async {
|
||||
var res = await apiGet("/v2/search/autocomplete?merge_plain_keyword_results=true&word=${Uri.encodeComponent(keyword)}");
|
||||
if (res.success) {
|
||||
return Res((res.data["tags"] as List).map((e) => Tag.fromJson(e)).toList());
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -35,15 +35,15 @@ extension NovelExt on Network {
|
||||
return getNovelsWithNextUrl(url);
|
||||
}
|
||||
|
||||
Future<Res<List<Novel>>> getBookmarkedNovels(String uid) {
|
||||
Future<Res<List<Novel>>> getBookmarkedNovels(String uid, bool public) {
|
||||
return getNovelsWithNextUrl(
|
||||
"/v1/user/bookmarks/novel?user_id=$uid&restrict=public");
|
||||
"/v1/user/bookmarks/novel?user_id=$uid&restrict=${public ? "public" : "private"}");
|
||||
}
|
||||
|
||||
Future<Res<bool>> favoriteNovel(String id) async {
|
||||
Future<Res<bool>> favoriteNovel(String id, bool public) async {
|
||||
var res = await apiPost("/v2/novel/bookmark/add", data: {
|
||||
"novel_id": id,
|
||||
"restrict": "public",
|
||||
"restrict": public ? "public" : "private",
|
||||
});
|
||||
if (res.error) {
|
||||
return Res.fromErrorRes(res);
|
||||
@@ -149,4 +149,17 @@ extension NovelExt on Network {
|
||||
}
|
||||
return Res(Novel.fromJson(res.data["novel"]));
|
||||
}
|
||||
|
||||
Future<Res<List<Novel>>> getFollowingNovels(String restrict,
|
||||
[String? nextUrl]) async {
|
||||
var res = await apiGet(nextUrl ?? "/v1/novel/follow?restrict=$restrict");
|
||||
if (res.success) {
|
||||
return Res(
|
||||
(res.data["novels"] as List).map((e) => Novel.fromJson(e)).toList(),
|
||||
subData: res.data["next_url"],
|
||||
);
|
||||
} else {
|
||||
return Res.error(res.errorMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
75
lib/network/translator.dart
Normal file
75
lib/network/translator.dart
Normal file
@@ -0,0 +1,75 @@
|
||||
import 'package:pixes/network/app_dio.dart';
|
||||
|
||||
abstract class Translator {
|
||||
static Translator? _instance;
|
||||
|
||||
static Translator get instance {
|
||||
if (_instance == null) {
|
||||
init();
|
||||
}
|
||||
return _instance!;
|
||||
}
|
||||
|
||||
static void init() {
|
||||
_instance = GoogleTranslator();
|
||||
}
|
||||
|
||||
/// Translates the given [text] to the given [to] language.
|
||||
Future<String> translate(String text, String to);
|
||||
}
|
||||
|
||||
class GoogleTranslator implements Translator {
|
||||
final Dio _dio = AppDio();
|
||||
|
||||
String get url => 'https://translate.google.com/translate_a/single';
|
||||
|
||||
Map<String, dynamic> buildBody(String text, String to) {
|
||||
return {
|
||||
'q': text,
|
||||
'client': 'at',
|
||||
'sl': 'auto',
|
||||
'tl': to,
|
||||
'dt': 't',
|
||||
'ie': 'UTF-8',
|
||||
'oe': 'UTF-8',
|
||||
'dj': '1',
|
||||
};
|
||||
}
|
||||
|
||||
Future<String> translatePart(String part, String to) async {
|
||||
final response = await _dio.post(
|
||||
url,
|
||||
data: buildBody(part, to),
|
||||
options: Options(
|
||||
headers: {
|
||||
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
|
||||
},
|
||||
),
|
||||
);
|
||||
var buffer = StringBuffer();
|
||||
for(var e in response.data['sentences']) {
|
||||
buffer.write(e['trans']);
|
||||
}
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<String> translate(String text, String to) async {
|
||||
final lines = text.split('\n');
|
||||
var buffer = StringBuffer();
|
||||
var result = '';
|
||||
for(int i=0; i<lines.length; i++) {
|
||||
final line = lines[i];
|
||||
if (buffer.length + line.length > 5000) {
|
||||
result += await translatePart(buffer.toString(), to);
|
||||
buffer.clear();
|
||||
}
|
||||
buffer.write(line);
|
||||
buffer.write('\n');
|
||||
}
|
||||
if (buffer.isNotEmpty) {
|
||||
result += await translatePart(buffer.toString(), to);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
@@ -143,15 +143,15 @@ class _CommentsPageState extends MultiPageLoadingState<CommentsPage, Comment> {
|
||||
return Card(
|
||||
padding: EdgeInsets.zero,
|
||||
backgroundColor:
|
||||
FluentTheme.of(context).micaBackgroundColor.withOpacity(0.96),
|
||||
FluentTheme.of(context).micaBackgroundColor.toOpacity(0.96),
|
||||
child: SizedBox(
|
||||
height: 52,
|
||||
child: TextBox(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||
placeholder: "Comment".tl,
|
||||
foregroundDecoration: BoxDecoration(
|
||||
foregroundDecoration: WidgetStatePropertyAll(BoxDecoration(
|
||||
border: Border.all(color: Colors.transparent),
|
||||
),
|
||||
)),
|
||||
onSubmitted: (s) {
|
||||
showToast(context, message: "Sending".tl);
|
||||
if (isCommenting) return;
|
||||
@@ -161,10 +161,12 @@ class _CommentsPageState extends MultiPageLoadingState<CommentsPage, Comment> {
|
||||
if (widget.isNovel) {
|
||||
Network().commentNovel(widget.id, s).then((value) {
|
||||
if (value.error) {
|
||||
if (context.mounted) {
|
||||
context.showToast(message: "Network Error");
|
||||
setState(() {
|
||||
isCommenting = false;
|
||||
});
|
||||
}
|
||||
} else {
|
||||
isCommenting = false;
|
||||
nextUrl = null;
|
||||
@@ -174,10 +176,12 @@ class _CommentsPageState extends MultiPageLoadingState<CommentsPage, Comment> {
|
||||
} else {
|
||||
Network().comment(widget.id, s).then((value) {
|
||||
if (value.error) {
|
||||
if(context.mounted) {
|
||||
context.showToast(message: "Network Error");
|
||||
setState(() {
|
||||
isCommenting = false;
|
||||
});
|
||||
}
|
||||
} else {
|
||||
isCommenting = false;
|
||||
nextUrl = null;
|
||||
|
83
lib/pages/following_novels_page.dart
Normal file
83
lib/pages/following_novels_page.dart
Normal file
@@ -0,0 +1,83 @@
|
||||
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/segmented_button.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 FollowingNovelsPage extends StatefulWidget {
|
||||
const FollowingNovelsPage({super.key});
|
||||
|
||||
@override
|
||||
State<FollowingNovelsPage> createState() => _FollowingNovelsPageState();
|
||||
}
|
||||
|
||||
class _FollowingNovelsPageState
|
||||
extends MultiPageLoadingState<FollowingNovelsPage, Novel> {
|
||||
bool public = true;
|
||||
|
||||
@override
|
||||
Widget? buildFrame(BuildContext context, Widget child) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(
|
||||
title: "Following".tl,
|
||||
action: SegmentedButton(
|
||||
options: [
|
||||
SegmentedButtonOption("public", "Public".tl),
|
||||
SegmentedButtonOption("private", "Private".tl),
|
||||
],
|
||||
onPressed: (key) {
|
||||
var newPublic = key == "public";
|
||||
if (newPublic != public) {
|
||||
public = newPublic;
|
||||
nextUrl = null;
|
||||
reset();
|
||||
}
|
||||
},
|
||||
value: public ? "public" : "private",
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: child,
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<Novel> data) {
|
||||
return Column(
|
||||
children: [
|
||||
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().getFollowingNovels(public ? "public" : "private")
|
||||
: await Network().getNovelsWithNextUrl(nextUrl!);
|
||||
nextUrl = res.subData ?? "end";
|
||||
return res;
|
||||
}
|
||||
}
|
@@ -4,7 +4,6 @@ import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart' show Icons;
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
|
||||
import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/components/animated_image.dart';
|
||||
import 'package:pixes/components/keyboard.dart';
|
||||
@@ -20,6 +19,7 @@ import 'package:pixes/network/download.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/pages/comments_page.dart';
|
||||
import 'package:pixes/pages/image_page.dart';
|
||||
import 'package:pixes/pages/related_page.dart';
|
||||
import 'package:pixes/pages/search_page.dart';
|
||||
import 'package:pixes/pages/user_info_page.dart';
|
||||
import 'package:pixes/utils/block.dart';
|
||||
@@ -620,7 +620,7 @@ class _BottomBarState extends State<_BottomBar> with TickerProviderStateMixin {
|
||||
borderRadius:
|
||||
const BorderRadius.vertical(top: Radius.circular(8)),
|
||||
backgroundColor:
|
||||
FluentTheme.of(context).micaBackgroundColor.withOpacity(0.96),
|
||||
FluentTheme.of(context).micaBackgroundColor.toOpacity(0.96),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
@@ -1140,7 +1140,7 @@ class _BottomBarState extends State<_BottomBar> with TickerProviderStateMixin {
|
||||
).fixWidth(96),
|
||||
Button(
|
||||
onPressed: () {
|
||||
context.to(() => _RelatedIllustsPage(widget.illust.id.toString()));
|
||||
context.to(() => RelatedIllustsPage(widget.illust.id.toString()));
|
||||
},
|
||||
child: SizedBox(
|
||||
height: 28,
|
||||
@@ -1219,7 +1219,7 @@ class __BlockingPageState extends State<_BlockingPage> {
|
||||
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
|
||||
borderColor: blockedTags.contains(index)
|
||||
? ColorScheme.of(context).outlineVariant
|
||||
: ColorScheme.of(context).outlineVariant.withOpacity(0.2),
|
||||
: ColorScheme.of(context).outlineVariant.toOpacity(0.2),
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
title: Text(text),
|
||||
@@ -1357,64 +1357,3 @@ class _IllustPageWithIdState extends LoadingState<IllustPageWithId, Illust> {
|
||||
return Network().getIllustByID(widget.id);
|
||||
}
|
||||
}
|
||||
|
||||
class _RelatedIllustsPage extends StatefulWidget {
|
||||
const _RelatedIllustsPage(this.id);
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
@@ -3,7 +3,7 @@ import 'dart:io';
|
||||
import 'package:fluent_ui/fluent_ui.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:image_gallery_saver/image_gallery_saver.dart';
|
||||
import 'package:image_gallery_saver_plus/image_gallery_saver_plus.dart';
|
||||
import 'package:photo_view/photo_view_gallery.dart';
|
||||
import 'package:pixes/components/md.dart';
|
||||
import 'package:pixes/components/message.dart';
|
||||
@@ -92,7 +92,7 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
|
||||
void showMenu() {
|
||||
menuController.showFlyout(
|
||||
barrierColor: Colors.transparent,
|
||||
position: Offset(context.size!.width, 0),
|
||||
position: App.isMobile ? Offset(context.size!.width, 0) : null,
|
||||
builder: (context) => MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(
|
||||
@@ -100,7 +100,7 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
|
||||
onPressed: () async {
|
||||
var file = await getFile();
|
||||
if (file != null) {
|
||||
var fileName = file.path.split('/').last;
|
||||
var fileName = widget.urls[currentPage].split('/').last;
|
||||
if (!fileName.contains('.')) {
|
||||
fileName += getExtensionName();
|
||||
}
|
||||
@@ -113,13 +113,17 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
|
||||
onPressed: () async {
|
||||
var file = await getFile();
|
||||
if (file != null) {
|
||||
var fileName = file.path.split('/').last;
|
||||
var fileName =
|
||||
widget.urls[currentPage].split('/').last;
|
||||
if (!fileName.contains('.')) {
|
||||
fileName += getExtensionName();
|
||||
}
|
||||
await ImageGallerySaver.saveFile(file.path,
|
||||
name: fileName);
|
||||
if (mounted) {
|
||||
await ImageGallerySaverPlus.saveImage(
|
||||
await file.readAsBytes(),
|
||||
quality: 100,
|
||||
name: fileName,
|
||||
);
|
||||
if (context.mounted) {
|
||||
showToast(context, message: "Saved".tl);
|
||||
}
|
||||
}
|
||||
@@ -130,7 +134,7 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
|
||||
var file = await getFile();
|
||||
if (file != null) {
|
||||
var ext = getExtensionName();
|
||||
var fileName = file.path.split('/').last;
|
||||
var fileName = widget.urls[currentPage].split('/').last;
|
||||
if (!fileName.contains('.')) {
|
||||
fileName += ext;
|
||||
}
|
||||
@@ -185,6 +189,7 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
|
||||
var image = widget.urls[index];
|
||||
|
||||
return PhotoViewGalleryPageOptions(
|
||||
filterQuality: FilterQuality.medium,
|
||||
imageProvider: getImageProvider(image),
|
||||
);
|
||||
},
|
||||
|
@@ -87,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),
|
||||
)
|
||||
],
|
||||
)
|
||||
],
|
||||
|
@@ -34,7 +34,7 @@ class _LogsPageState extends State<LogsPage> {
|
||||
children: [
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: ColorScheme.of(context).surfaceVariant,
|
||||
color: ColorScheme.of(context).surfaceContainerHighest,
|
||||
borderRadius: const BorderRadius.all(Radius.circular(16)),
|
||||
),
|
||||
child: Padding(
|
||||
|
@@ -2,6 +2,7 @@ import "dart:async";
|
||||
|
||||
import "package:fluent_ui/fluent_ui.dart";
|
||||
import "package:flutter/foundation.dart";
|
||||
import "package:flutter/services.dart";
|
||||
import "package:pixes/appdata.dart";
|
||||
import "package:pixes/components/md.dart";
|
||||
import "package:pixes/foundation/app.dart";
|
||||
@@ -10,6 +11,7 @@ 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/following_novels_page.dart";
|
||||
import "package:pixes/pages/history.dart";
|
||||
import "package:pixes/pages/novel_bookmarks_page.dart";
|
||||
import "package:pixes/pages/novel_ranking_page.dart";
|
||||
@@ -64,26 +66,43 @@ 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;
|
||||
index = appdata.settings["initialPage"] ?? 4;
|
||||
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();
|
||||
}
|
||||
|
||||
@@ -112,7 +131,7 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
);
|
||||
}
|
||||
return DefaultSelectionStyle.merge(
|
||||
selectionColor: FluentTheme.of(context).selectionColor.withOpacity(0.4),
|
||||
selectionColor: FluentTheme.of(context).selectionColor.toOpacity(0.4),
|
||||
child: NavigationView(
|
||||
appBar: buildAppBar(context, navigatorKey),
|
||||
pane: NavigationPane(
|
||||
@@ -151,7 +170,7 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
),
|
||||
PaneItemSeparator(),
|
||||
PaneItemHeader(
|
||||
header: Text('${"Artwork".tl}/${"Manga".tl}')
|
||||
header: Text('${"Illustrations".tl}/${"Manga".tl}')
|
||||
.paddingBottom(4)
|
||||
.paddingLeft(8)),
|
||||
PaneItem(
|
||||
@@ -191,36 +210,43 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItem(
|
||||
icon:
|
||||
const Icon(MdIcons.collections_bookmark_outlined, size: 20),
|
||||
icon: const Icon(MdIcons.collections_bookmark_outlined, 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.leaderboard_outlined, size: 20),
|
||||
title: Text('Ranking'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
),
|
||||
PaneItemSeparator(),
|
||||
PaneItem(
|
||||
PaneItemAction(
|
||||
icon: const Icon(MdIcons.settings_outlined, size: 20),
|
||||
title: Text('Settings'.tl),
|
||||
body: const SizedBox.shrink(),
|
||||
onTap: () {
|
||||
navigatorKey.currentContext?.to(() => const SettingsPage());
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
paneBodyBuilder: (pane, child) => NavigatorPopHandler(
|
||||
key: const Key("navigator"),
|
||||
onPop: () => navigatorKey.currentState?.pop(),
|
||||
child: MediaQuery.removePadding(
|
||||
paneBodyBuilder: (pane, child) => MediaQuery.removePadding(
|
||||
context: context,
|
||||
removeTop: true,
|
||||
child: Navigator(
|
||||
key: navigatorKey,
|
||||
onGenerateRoute: (settings) => AppPageRoute(
|
||||
builder: (context) => const RecommendationPage()),
|
||||
isRoot: true,
|
||||
builder: (context) => pageBuilders.elementAtOrNull(index)!(),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
))),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -236,8 +262,8 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
() => const RankingPage(),
|
||||
() => const NovelRecommendationPage(),
|
||||
() => const NovelBookmarksPage(),
|
||||
() => const FollowingNovelsPage(),
|
||||
() => const NovelRankingPage(),
|
||||
() => const SettingsPage(),
|
||||
];
|
||||
|
||||
void navigate(int index) {
|
||||
@@ -246,7 +272,12 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
child: Text("Invalid Page: $index"),
|
||||
);
|
||||
navigatorKey.currentState!.pushAndRemoveUntil(
|
||||
AppPageRoute(builder: (context) => page()), (route) => false);
|
||||
AppPageRoute(
|
||||
builder: (context) => page(),
|
||||
isRoot: true,
|
||||
),
|
||||
(route) => false,
|
||||
);
|
||||
}
|
||||
|
||||
NavigationAppBar buildAppBar(
|
||||
@@ -297,7 +328,26 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
],
|
||||
),
|
||||
).paddingTop(4).paddingLeft(4),
|
||||
if (App.isDesktop) const SizedBox(width: 128),
|
||||
if (App.isDesktop)
|
||||
const SizedBox(width: 128)
|
||||
else
|
||||
Tooltip(
|
||||
message: "Search".tl,
|
||||
child: IconButton(
|
||||
icon: const Icon(
|
||||
MdIcons.search,
|
||||
size: 18,
|
||||
),
|
||||
onPressed: () {
|
||||
if (index == 1) {
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
index = 1;
|
||||
});
|
||||
navigate(1);
|
||||
},
|
||||
)),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -315,6 +365,25 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
: null,
|
||||
);
|
||||
}
|
||||
|
||||
final popValue = ValueNotifier(false);
|
||||
|
||||
@override
|
||||
ValueListenable<bool> get canPopNotifier => popValue;
|
||||
|
||||
@override
|
||||
void onPopInvokedWithResult(bool didPop, result) {
|
||||
if (App.rootNavigatorKey.currentState?.canPop() ?? false) {
|
||||
App.rootNavigatorKey.currentState?.pop();
|
||||
} else if (App.mainNavigatorKey?.currentState?.canPop() ?? false) {
|
||||
App.mainNavigatorKey?.currentState?.pop();
|
||||
} else {
|
||||
SystemNavigator.pop();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void onPopInvoked(bool didPop) {}
|
||||
}
|
||||
|
||||
class _BackButton extends StatefulWidget {
|
||||
@@ -365,7 +434,7 @@ class _BackButtonState extends State<_BackButton> {
|
||||
|
||||
return NavigationPaneTheme(
|
||||
data: NavigationPaneTheme.of(context).merge(NavigationPaneThemeData(
|
||||
unselectedIconColor: ButtonState.resolveWith((states) {
|
||||
unselectedIconColor: WidgetStateProperty.resolveWith((states) {
|
||||
if (states.isDisabled) {
|
||||
return ButtonThemeData.buttonColor(context, states);
|
||||
}
|
||||
@@ -618,16 +687,16 @@ class UserPane extends PaneItem {
|
||||
final tileColor = this.tileColor ??
|
||||
theme.tileColor ??
|
||||
kDefaultPaneItemColor(context, mode == PaneDisplayMode.top);
|
||||
final newStates = states.toSet()..remove(ButtonStates.disabled);
|
||||
final newStates = states.toSet()..remove(WidgetState.disabled);
|
||||
if (selected && selectedTileColor != null) {
|
||||
return selectedTileColor!.resolve(newStates);
|
||||
}
|
||||
return tileColor.resolve(
|
||||
selected
|
||||
? {
|
||||
states.isHovering
|
||||
? ButtonStates.pressing
|
||||
: ButtonStates.hovering,
|
||||
states.isHovered
|
||||
? WidgetState.pressed
|
||||
: WidgetState.hovered,
|
||||
}
|
||||
: newStates,
|
||||
);
|
||||
@@ -655,13 +724,16 @@ class UserPane extends PaneItem {
|
||||
/// Close
|
||||
class CloseIcon extends StatelessWidget {
|
||||
final Color color;
|
||||
|
||||
const CloseIcon({super.key, required this.color});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => _AlignedPaint(_ClosePainter(color));
|
||||
}
|
||||
|
||||
class _ClosePainter extends _IconPainter {
|
||||
_ClosePainter(super.color);
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
Paint p = getPaint(color, true);
|
||||
@@ -673,13 +745,16 @@ class _ClosePainter extends _IconPainter {
|
||||
/// Maximize
|
||||
class MaximizeIcon extends StatelessWidget {
|
||||
final Color color;
|
||||
|
||||
const MaximizeIcon({super.key, required this.color});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => _AlignedPaint(_MaximizePainter(color));
|
||||
}
|
||||
|
||||
class _MaximizePainter extends _IconPainter {
|
||||
_MaximizePainter(super.color);
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
Paint p = getPaint(color);
|
||||
@@ -690,16 +765,19 @@ class _MaximizePainter extends _IconPainter {
|
||||
/// Restore
|
||||
class RestoreIcon extends StatelessWidget {
|
||||
final Color color;
|
||||
|
||||
const RestoreIcon({
|
||||
super.key,
|
||||
required this.color,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => _AlignedPaint(_RestorePainter(color));
|
||||
}
|
||||
|
||||
class _RestorePainter extends _IconPainter {
|
||||
_RestorePainter(super.color);
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
Paint p = getPaint(color);
|
||||
@@ -716,13 +794,16 @@ class _RestorePainter extends _IconPainter {
|
||||
/// Minimize
|
||||
class MinimizeIcon extends StatelessWidget {
|
||||
final Color color;
|
||||
|
||||
const MinimizeIcon({super.key, required this.color});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => _AlignedPaint(_MinimizePainter(color));
|
||||
}
|
||||
|
||||
class _MinimizePainter extends _IconPainter {
|
||||
_MinimizePainter(super.color);
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
Paint p = getPaint(color);
|
||||
@@ -734,6 +815,7 @@ class _MinimizePainter extends _IconPainter {
|
||||
/// Helpers
|
||||
abstract class _IconPainter extends CustomPainter {
|
||||
_IconPainter(this.color);
|
||||
|
||||
final Color color;
|
||||
|
||||
@override
|
||||
@@ -742,6 +824,7 @@ abstract class _IconPainter extends CustomPainter {
|
||||
|
||||
class _AlignedPaint extends StatelessWidget {
|
||||
const _AlignedPaint(this.painter);
|
||||
|
||||
final CustomPainter painter;
|
||||
|
||||
@override
|
||||
|
@@ -3,6 +3,7 @@ import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/components/grid.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/novel.dart';
|
||||
import 'package:pixes/components/segmented_button.dart';
|
||||
import 'package:pixes/components/title_bar.dart';
|
||||
import 'package:pixes/foundation/widget_utils.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
@@ -17,11 +18,41 @@ class NovelBookmarksPage extends StatefulWidget {
|
||||
|
||||
class _NovelBookmarksPageState
|
||||
extends MultiPageLoadingState<NovelBookmarksPage, Novel> {
|
||||
bool public = true;
|
||||
|
||||
@override
|
||||
Widget? buildFrame(BuildContext context, Widget child) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(
|
||||
title: "Bookmarks".tl,
|
||||
action: SegmentedButton(
|
||||
options: [
|
||||
SegmentedButtonOption("public", "Public".tl),
|
||||
SegmentedButtonOption("private", "Private".tl),
|
||||
],
|
||||
onPressed: (key) {
|
||||
var newPublic = key == "public";
|
||||
if (newPublic != public) {
|
||||
public = newPublic;
|
||||
nextUrl = null;
|
||||
reset();
|
||||
}
|
||||
},
|
||||
value: public ? "public" : "private",
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: child,
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget buildContent(BuildContext context, List<Novel> data) {
|
||||
return Column(
|
||||
children: [
|
||||
TitleBar(title: "Bookmarks".tl),
|
||||
Expanded(
|
||||
child: GridViewWithFixedItemHeight(
|
||||
itemCount: data.length,
|
||||
@@ -45,7 +76,7 @@ class _NovelBookmarksPageState
|
||||
Future<Res<List<Novel>>> loadData(int page) async {
|
||||
if (nextUrl == "end") return Res.error("No more data");
|
||||
var res = nextUrl == null
|
||||
? await Network().getBookmarkedNovels(appdata.account!.user.id)
|
||||
? await Network().getBookmarkedNovels(appdata.account!.user.id, public)
|
||||
: await Network().getNovelsWithNextUrl(nextUrl!);
|
||||
nextUrl = res.subData ?? "end";
|
||||
return res;
|
||||
|
@@ -121,18 +121,18 @@ class _NovelPageState extends State<NovelPage> {
|
||||
padding: const EdgeInsets.only(bottom: 10),
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(
|
||||
width: 2,
|
||||
),
|
||||
const SizedBox(width: 2),
|
||||
Expanded(
|
||||
child: Container(
|
||||
height: 68,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
width: 0.6),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
width: 0.6,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
||||
child: Row(
|
||||
children: [
|
||||
Column(
|
||||
@@ -148,31 +148,31 @@ class _NovelPageState extends State<NovelPage> {
|
||||
)
|
||||
],
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
widget.novel.totalViews.toString(),
|
||||
style: TextStyle(
|
||||
color: ColorScheme.of(context).primary,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: 18),
|
||||
fontSize: 18,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
Expanded(
|
||||
child: Container(
|
||||
height: 68,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant, width: 0.6),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
color: ColorScheme.of(context).outlineVariant,
|
||||
width: 0.6,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
||||
child: Row(
|
||||
children: [
|
||||
Column(
|
||||
@@ -188,22 +188,19 @@ class _NovelPageState extends State<NovelPage> {
|
||||
)
|
||||
],
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
widget.novel.totalBookmarks.toString(),
|
||||
style: TextStyle(
|
||||
color: ColorScheme.of(context).primary,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: 18),
|
||||
fontSize: 18,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
)),
|
||||
const SizedBox(
|
||||
width: 2,
|
||||
),
|
||||
const SizedBox(width: 2),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -214,7 +211,7 @@ class _NovelPageState extends State<NovelPage> {
|
||||
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),
|
||||
borderColor: ColorScheme.of(context).outlineVariant.toOpacity(0.52),
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: () {
|
||||
@@ -241,15 +238,20 @@ class _NovelPageState extends State<NovelPage> {
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Column(
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(widget.novel.author.name,
|
||||
Text(
|
||||
widget.novel.author.name,
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.bold,
|
||||
)),
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
Text(
|
||||
widget.novel.createDate.toString().substring(0, 10),
|
||||
style: TextStyle(
|
||||
@@ -259,7 +261,7 @@ class _NovelPageState extends State<NovelPage> {
|
||||
),
|
||||
],
|
||||
),
|
||||
const Spacer(),
|
||||
),
|
||||
const Icon(MdIcons.chevron_right)
|
||||
],
|
||||
),
|
||||
@@ -271,15 +273,44 @@ class _NovelPageState extends State<NovelPage> {
|
||||
|
||||
bool isAddingFavorite = false;
|
||||
|
||||
var favoriteFlyout = FlyoutController();
|
||||
|
||||
Widget buildActions() {
|
||||
void favorite() async {
|
||||
if (isAddingFavorite) return;
|
||||
bool? public;
|
||||
if (!widget.novel.isBookmarked) {
|
||||
await favoriteFlyout.showFlyout(
|
||||
navigatorKey: App.rootNavigatorKey.currentState!,
|
||||
builder: (context) {
|
||||
return MenuFlyout(
|
||||
items: [
|
||||
MenuFlyoutItem(
|
||||
text: Text("Public".tl),
|
||||
onPressed: () {
|
||||
public = true;
|
||||
},
|
||||
),
|
||||
MenuFlyoutItem(
|
||||
text: Text("Private".tl),
|
||||
onPressed: () {
|
||||
public = false;
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
if (public == null) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
setState(() {
|
||||
isAddingFavorite = true;
|
||||
});
|
||||
var res = widget.novel.isBookmarked
|
||||
? await Network().deleteFavoriteNovel(widget.novel.id.toString())
|
||||
: await Network().favoriteNovel(widget.novel.id.toString());
|
||||
: await Network().favoriteNovel(widget.novel.id.toString(), public!);
|
||||
if (res.error) {
|
||||
if (mounted) {
|
||||
context.showToast(message: res.errorMessage ?? "Network Error");
|
||||
@@ -337,7 +368,9 @@ class _NovelPageState extends State<NovelPage> {
|
||||
context.to(() => NovelReadingPage(widget.novel));
|
||||
}),
|
||||
const SizedBox(width: 16),
|
||||
Button(
|
||||
FlyoutTarget(
|
||||
controller: favoriteFlyout,
|
||||
child: Button(
|
||||
onPressed: favorite,
|
||||
child: Row(
|
||||
mainAxisAlignment: constrains.maxWidth > 420
|
||||
@@ -370,6 +403,7 @@ class _NovelPageState extends State<NovelPage> {
|
||||
: 64)
|
||||
.fixHeight(32),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Button(
|
||||
child: Row(
|
||||
@@ -555,7 +589,7 @@ class _NovelSeriesWidgetState
|
||||
color: FluentTheme.of(context).cardColor,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context).outlineVariant.withOpacity(0.6),
|
||||
color: ColorScheme.of(context).outlineVariant.toOpacity(0.6),
|
||||
width: 0.5,
|
||||
)),
|
||||
sliver: SliverMainAxisGroup(slivers: [
|
||||
@@ -646,7 +680,7 @@ class _NovelPageWithIdState extends LoadingState<NovelPageWithId, Novel> {
|
||||
}
|
||||
|
||||
class _RelatedNovelsPage extends StatefulWidget {
|
||||
const _RelatedNovelsPage(this.id, {super.key});
|
||||
const _RelatedNovelsPage(this.id);
|
||||
|
||||
final String id;
|
||||
|
||||
|
@@ -7,7 +7,9 @@ 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/foundation/log.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
import 'package:pixes/network/translator.dart';
|
||||
import 'package:pixes/pages/image_page.dart';
|
||||
import 'package:pixes/pages/main_page.dart';
|
||||
import 'package:pixes/utils/ext.dart';
|
||||
@@ -27,15 +29,36 @@ class _NovelReadingPageState extends LoadingState<NovelReadingPage, String> {
|
||||
|
||||
bool isShowingSettings = false;
|
||||
|
||||
String? translatedContent;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
action = TitleBarAction(MdIcons.tune, "Settings".tl, () {
|
||||
if (!isShowingSettings) {
|
||||
_NovelReadingSettings.show(context, () {
|
||||
_NovelReadingSettings.show(
|
||||
context,
|
||||
() {
|
||||
setState(() {});
|
||||
}).then((value) {
|
||||
isShowingSettings = false;
|
||||
},
|
||||
TranslationController(
|
||||
content: data!,
|
||||
isTranslated: translatedContent != null,
|
||||
onTranslated: (s) {
|
||||
setState(() {
|
||||
translatedContent = s;
|
||||
});
|
||||
},
|
||||
revert: () {
|
||||
setState(() {
|
||||
translatedContent = null;
|
||||
});
|
||||
},
|
||||
),
|
||||
).then(
|
||||
(value) {
|
||||
isShowingSettings = false;
|
||||
},
|
||||
);
|
||||
isShowingSettings = true;
|
||||
} else {
|
||||
Navigator.of(context).pop();
|
||||
@@ -92,7 +115,7 @@ class _NovelReadingPageState extends LoadingState<NovelReadingPage, String> {
|
||||
);
|
||||
yield const SizedBox(height: 12.0);
|
||||
|
||||
var novelContent = data!.split('\n');
|
||||
var novelContent = (translatedContent ?? data!).split('\n');
|
||||
for (var content in novelContent) {
|
||||
if (content.isEmpty) continue;
|
||||
if (content.startsWith('[uploadedimage:')) {
|
||||
@@ -132,14 +155,38 @@ class _NovelReadingPageState extends LoadingState<NovelReadingPage, String> {
|
||||
}
|
||||
}
|
||||
|
||||
class TranslationController {
|
||||
final String content;
|
||||
|
||||
final bool isTranslated;
|
||||
|
||||
final void Function(String translated) onTranslated;
|
||||
|
||||
final void Function() revert;
|
||||
|
||||
const TranslationController({
|
||||
required this.content,
|
||||
required this.isTranslated,
|
||||
required this.onTranslated,
|
||||
required this.revert,
|
||||
});
|
||||
}
|
||||
|
||||
class _NovelReadingSettings extends StatefulWidget {
|
||||
const _NovelReadingSettings(this.callback);
|
||||
const _NovelReadingSettings(this.callback, this.controller);
|
||||
|
||||
final void Function() callback;
|
||||
|
||||
static Future show(BuildContext context, void Function() callback) {
|
||||
return Navigator.of(context)
|
||||
.push(SideBarRoute(_NovelReadingSettings(callback)));
|
||||
final TranslationController controller;
|
||||
|
||||
static Future show(
|
||||
BuildContext context,
|
||||
void Function() callback,
|
||||
TranslationController controller,
|
||||
) {
|
||||
return Navigator.of(context).push(
|
||||
SideBarRoute(_NovelReadingSettings(callback, controller)),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -256,9 +303,64 @@ class __NovelReadingSettingsState extends State<_NovelReadingSettings> {
|
||||
}),
|
||||
]),
|
||||
),
|
||||
).paddingBottom(8),
|
||||
Card(
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
title: Text("Translate Novel".tl),
|
||||
trailing: widget.controller.isTranslated
|
||||
? Button(
|
||||
onPressed: () {
|
||||
widget.controller.revert();
|
||||
context.pop();
|
||||
},
|
||||
child: Text("Revert".tl),
|
||||
)
|
||||
: Button(
|
||||
onPressed: translate,
|
||||
child: isTranslating
|
||||
? const SizedBox(
|
||||
width: 42,
|
||||
height: 18,
|
||||
child: Center(
|
||||
child: SizedBox.square(
|
||||
dimension: 18,
|
||||
child: ProgressRing(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
: Text("Translate".tl),
|
||||
),
|
||||
),
|
||||
).paddingHorizontal(8).paddingBottom(8),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
bool isTranslating = false;
|
||||
|
||||
void translate() async {
|
||||
setState(() {
|
||||
isTranslating = true;
|
||||
});
|
||||
try {
|
||||
var translated = await Translator.instance
|
||||
.translate(widget.controller.content, "zh-CN");
|
||||
widget.controller.onTranslated(translated);
|
||||
if (mounted) {
|
||||
context.pop();
|
||||
}
|
||||
} catch (e) {
|
||||
setState(() {
|
||||
isTranslating = false;
|
||||
});
|
||||
if (mounted) {
|
||||
context.showToast(message: "Failed to translate".tl);
|
||||
}
|
||||
Log.error("Translate", e.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -45,7 +45,7 @@ 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),
|
||||
],
|
||||
|
69
lib/pages/related_page.dart
Normal file
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;
|
||||
}
|
||||
}
|
@@ -4,6 +4,7 @@ import 'package:pixes/appdata.dart';
|
||||
import 'package:pixes/components/loading.dart';
|
||||
import 'package:pixes/components/novel.dart';
|
||||
import 'package:pixes/components/page_route.dart';
|
||||
import 'package:pixes/components/search_field.dart';
|
||||
import 'package:pixes/components/user_preview.dart';
|
||||
import 'package:pixes/foundation/app.dart';
|
||||
import 'package:pixes/network/network.dart';
|
||||
@@ -12,6 +13,7 @@ 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/debounce.dart';
|
||||
import 'package:pixes/utils/ext.dart';
|
||||
import 'package:pixes/utils/translation.dart';
|
||||
|
||||
@@ -21,6 +23,15 @@ import '../components/illust_widget.dart';
|
||||
import '../components/md.dart';
|
||||
import '../foundation/image_provider.dart';
|
||||
|
||||
const searchTypes = [
|
||||
"Search artwork",
|
||||
"Search novel",
|
||||
"Search user",
|
||||
"Artwork ID",
|
||||
"Artist ID",
|
||||
"Novel ID"
|
||||
];
|
||||
|
||||
class SearchPage extends StatefulWidget {
|
||||
const SearchPage({super.key});
|
||||
|
||||
@@ -29,20 +40,9 @@ class SearchPage extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _SearchPageState extends State<SearchPage> {
|
||||
String text = "";
|
||||
|
||||
int searchType = 0;
|
||||
|
||||
static const searchTypes = [
|
||||
"Search artwork",
|
||||
"Search novel",
|
||||
"Search user",
|
||||
"Artwork ID",
|
||||
"Artist ID",
|
||||
"Novel ID"
|
||||
];
|
||||
|
||||
void search() {
|
||||
void search(String text) {
|
||||
if (text.isURL && handleLink(Uri.parse(text))) {
|
||||
return;
|
||||
} else if ("https://$text".isURL &&
|
||||
@@ -71,9 +71,19 @@ class _SearchPageState extends State<SearchPage> {
|
||||
padding: const EdgeInsets.only(top: 8),
|
||||
content: Column(
|
||||
children: [
|
||||
buildSearchBar(),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
_SearchBar(
|
||||
searchType: searchType,
|
||||
onTypeChanged: (type) {
|
||||
setState(() {
|
||||
searchType = type;
|
||||
});
|
||||
},
|
||||
onSearch: (text) {
|
||||
if (text.isEmpty) {
|
||||
return;
|
||||
}
|
||||
search(text);
|
||||
},
|
||||
),
|
||||
const Expanded(
|
||||
child: _TrendingTagsView(),
|
||||
@@ -82,100 +92,6 @@ class _SearchPageState extends State<SearchPage> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final optionController = FlyoutController();
|
||||
|
||||
Widget buildSearchBar() {
|
||||
return 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(
|
||||
placeholder:
|
||||
'${searchTypes[searchType].tl} / ${"Open link".tl}',
|
||||
onChanged: (s) => text = 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,
|
||||
),
|
||||
FlyoutTarget(
|
||||
controller: optionController,
|
||||
child: Button(
|
||||
child: const SizedBox(
|
||||
height: 42,
|
||||
child: Center(
|
||||
child: Icon(FluentIcons.chevron_down),
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
optionController.showFlyout(
|
||||
placementMode: FlyoutPlacementMode.bottomCenter,
|
||||
builder: buildSearchOption,
|
||||
barrierColor: Colors.transparent);
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
Button(
|
||||
child: const SizedBox(
|
||||
height: 42,
|
||||
child: Center(
|
||||
child: Icon(FluentIcons.settings),
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.of(context).push(SideBarRoute(SearchSettings(
|
||||
isNovel: searchType == 1,
|
||||
)));
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
).paddingHorizontal(16),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildSearchOption(BuildContext context) {
|
||||
return MenuFlyout(
|
||||
items: List.generate(
|
||||
searchTypes.length,
|
||||
(index) => MenuFlyoutItem(
|
||||
text: Text(searchTypes[index].tl),
|
||||
onPressed: () => setState(() => searchType = index))),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _TrendingTagsView extends StatefulWidget {
|
||||
@@ -246,7 +162,7 @@ class _TrendingTagsViewState
|
||||
decoration: BoxDecoration(
|
||||
color: FluentTheme.of(context)
|
||||
.micaBackgroundColor
|
||||
.withOpacity(0.84),
|
||||
.toOpacity(0.84),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
child: Text(text)
|
||||
.paddingHorizontal(4)
|
||||
@@ -418,6 +334,19 @@ class _SearchSettingsState extends State<SearchSettings> {
|
||||
}))
|
||||
.toList(),
|
||||
)),
|
||||
const SizedBox(height: 4),
|
||||
Center(
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(FluentIcons.info, size: 16),
|
||||
const SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
Text("Close the pane to apply the settings".tl)
|
||||
],
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: context.padding.bottom,
|
||||
)
|
||||
@@ -455,6 +384,12 @@ class _SearchResultPageState
|
||||
|
||||
late final controller = TextEditingController(text: widget.keyword);
|
||||
|
||||
@override
|
||||
void reset() {
|
||||
nextUrl = null;
|
||||
super.reset();
|
||||
}
|
||||
|
||||
void search() {
|
||||
if (keyword != oldKeyword) {
|
||||
oldKeyword = keyword;
|
||||
@@ -516,12 +451,16 @@ class _SearchResultPageState
|
||||
placeholder: "Search artworks".tl,
|
||||
onChanged: (s) => keyword = s,
|
||||
onSubmitted: (s) => search(),
|
||||
foregroundDecoration: BoxDecoration(
|
||||
foregroundDecoration: WidgetStatePropertyAll(
|
||||
BoxDecoration(
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context)
|
||||
.outlineVariant
|
||||
.withOpacity(0.6)),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
.toOpacity(0.6),
|
||||
),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
),
|
||||
suffix: MouseRegion(
|
||||
cursor: SystemMouseCursors.click,
|
||||
child: GestureDetector(
|
||||
@@ -708,12 +647,14 @@ class _SearchNovelResultPageState
|
||||
placeholder: "Search artworks".tl,
|
||||
onChanged: (s) => keyword = s,
|
||||
onSubmitted: (s) => search(),
|
||||
foregroundDecoration: BoxDecoration(
|
||||
foregroundDecoration: WidgetStatePropertyAll(
|
||||
BoxDecoration(
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context)
|
||||
.outlineVariant
|
||||
.withOpacity(0.6)),
|
||||
.toOpacity(0.6)),
|
||||
borderRadius: BorderRadius.circular(4)),
|
||||
),
|
||||
suffix: MouseRegion(
|
||||
cursor: SystemMouseCursors.click,
|
||||
child: GestureDetector(
|
||||
@@ -776,3 +717,184 @@ class _SearchNovelResultPageState
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
class _SearchBar extends StatefulWidget {
|
||||
const _SearchBar({
|
||||
required this.searchType,
|
||||
required this.onTypeChanged,
|
||||
required this.onSearch,
|
||||
});
|
||||
|
||||
final int searchType;
|
||||
|
||||
final void Function(int) onTypeChanged;
|
||||
|
||||
final void Function(String) onSearch;
|
||||
|
||||
@override
|
||||
State<_SearchBar> createState() => _SearchBarState();
|
||||
}
|
||||
|
||||
class _SearchBarState extends State<_SearchBar> {
|
||||
final optionController = FlyoutController();
|
||||
|
||||
final textController = TextEditingController();
|
||||
|
||||
var autoCompleteItems = <AutoCompleteItem>[];
|
||||
|
||||
var debouncer = Debounce(delay: const Duration(milliseconds: 300));
|
||||
|
||||
var autoCompleteKey = 0;
|
||||
|
||||
var isLoadingAutoCompleteItems = false;
|
||||
|
||||
Widget buildSearchOption(BuildContext context) {
|
||||
return MenuFlyout(
|
||||
items: List.generate(
|
||||
searchTypes.length,
|
||||
(index) => MenuFlyoutItem(
|
||||
text: Text(searchTypes[index].tl),
|
||||
onPressed: () => widget.onTypeChanged(index),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void onTextChanged(String text) {
|
||||
if (widget.searchType == 3 ||
|
||||
widget.searchType == 4 ||
|
||||
widget.searchType == 5) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (text.isEmpty) {
|
||||
setState(() {
|
||||
autoCompleteItems = [];
|
||||
isLoadingAutoCompleteItems = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
isLoadingAutoCompleteItems = true;
|
||||
});
|
||||
debouncer.call(() async {
|
||||
var key = ++autoCompleteKey;
|
||||
|
||||
var res = await Network().getAutoCompleteTags(text);
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
var items = res.data.map((e) {
|
||||
return AutoCompleteItem(
|
||||
title: e.name,
|
||||
subtitle: e.translatedName,
|
||||
onTap: () {
|
||||
textController.text = e.name;
|
||||
widget.onSearch(e.name);
|
||||
},
|
||||
);
|
||||
}).toList();
|
||||
|
||||
if (key != autoCompleteKey) {
|
||||
return; // ignore old request
|
||||
}
|
||||
|
||||
setState(() {
|
||||
autoCompleteItems = items;
|
||||
isLoadingAutoCompleteItems = false;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return 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: SearchField(
|
||||
enableAutoComplete: widget.searchType != 3 &&
|
||||
widget.searchType != 4 &&
|
||||
widget.searchType != 5,
|
||||
textEditingController: textController,
|
||||
autoCompleteNoResultsText: "No results found".tl,
|
||||
isLoadingAutoCompleteItems: isLoadingAutoCompleteItems,
|
||||
autoCompleteItems: autoCompleteItems,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
placeholder:
|
||||
'${searchTypes[widget.searchType].tl} / ${"Open link".tl}',
|
||||
onChanged: onTextChanged,
|
||||
onSubmitted: widget.onSearch,
|
||||
foregroundDecoration: WidgetStatePropertyAll(
|
||||
BoxDecoration(
|
||||
border: Border.all(
|
||||
color: ColorScheme.of(context)
|
||||
.outlineVariant
|
||||
.toOpacity(0.6),
|
||||
),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
),
|
||||
trailing: MouseRegion(
|
||||
cursor: SystemMouseCursors.click,
|
||||
child: GestureDetector(
|
||||
onTap: () => widget.onSearch(textController.text),
|
||||
child: const Icon(
|
||||
FluentIcons.search,
|
||||
size: 16,
|
||||
).paddingHorizontal(12),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
FlyoutTarget(
|
||||
controller: optionController,
|
||||
child: Button(
|
||||
child: const SizedBox(
|
||||
height: 42,
|
||||
child: Center(
|
||||
child: Icon(FluentIcons.chevron_down),
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
optionController.showFlyout(
|
||||
placementMode: FlyoutPlacementMode.bottomCenter,
|
||||
builder: buildSearchOption,
|
||||
barrierColor: Colors.transparent,
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Button(
|
||||
child: const SizedBox(
|
||||
height: 42,
|
||||
child: Center(
|
||||
child: Icon(FluentIcons.settings),
|
||||
),
|
||||
),
|
||||
onPressed: () {
|
||||
Navigator.of(context).push(SideBarRoute(SearchSettings(
|
||||
isNovel: widget.searchType == 1,
|
||||
)));
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
).paddingHorizontal(16),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@@ -182,6 +182,16 @@ 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(
|
||||
@@ -199,7 +209,7 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||
MdIcons.open_in_new,
|
||||
size: 18,
|
||||
),
|
||||
onPressed: () => launchUrlString("https://t.me/pica_group"),
|
||||
onPressed: () => launchUrlString("https://t.me/venera_dev"),
|
||||
)),
|
||||
buildItem(
|
||||
title: "Logs",
|
||||
@@ -218,6 +228,14 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||
return SliverToBoxAdapter(
|
||||
child: Column(
|
||||
children: [
|
||||
buildItem(
|
||||
title: "Initial Page".tl,
|
||||
action: Button(
|
||||
child: Text("Edit".tl).fixWidth(64),
|
||||
onPressed: () {
|
||||
context.to(() => const _SetInitialPageWidget());
|
||||
},
|
||||
)),
|
||||
buildItem(
|
||||
title: "Proxy".tl,
|
||||
action: Button(
|
||||
@@ -263,6 +281,19 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||
});
|
||||
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();
|
||||
})),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -639,3 +670,69 @@ class _ShortcutsSettingsState extends State<ShortcutsSettings> {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SetInitialPageWidget extends StatefulWidget {
|
||||
const _SetInitialPageWidget();
|
||||
|
||||
@override
|
||||
State<_SetInitialPageWidget> createState() => _SetInitialPageWidgetState();
|
||||
}
|
||||
|
||||
class _SetInitialPageWidgetState extends State<_SetInitialPageWidget> {
|
||||
int index = appdata.settings["initialPage"] ?? 4;
|
||||
|
||||
static const pageNames = [
|
||||
"Search",
|
||||
"Downloading",
|
||||
"Downloaded",
|
||||
"Explore",
|
||||
"Bookmarks",
|
||||
"Following",
|
||||
"History",
|
||||
"Ranking",
|
||||
"Recommendation",
|
||||
"Bookmarks",
|
||||
"Following",
|
||||
"Ranking",
|
||||
];
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ScaffoldPage(
|
||||
header: TitleBar(title: "Initial Page".tl),
|
||||
content: ListView.builder(
|
||||
itemCount: pageNames.length + 2,
|
||||
itemBuilder: (context, index) {
|
||||
if (index == 3) {
|
||||
return Text('${"Illustrations".tl}/${"Manga".tl}').paddingHorizontal(16).paddingVertical(8);
|
||||
} else if (index > 3) {
|
||||
index--;
|
||||
}
|
||||
if (index == 8) {
|
||||
return Text("Novel".tl).paddingHorizontal(16).paddingVertical(8);
|
||||
} else if (index > 8) {
|
||||
index--;
|
||||
}
|
||||
|
||||
return Card(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
title: Text(pageNames[index].tl),
|
||||
trailing: RadioButton(
|
||||
checked: this.index - 1 == index,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
this.index = index + 1;
|
||||
appdata.settings["initialPage"] = index + 1;
|
||||
appdata.writeData();
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@@ -63,7 +63,7 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
_RelatedUsers(widget.id),
|
||||
buildInformation(),
|
||||
buildArtworkHeader(),
|
||||
if (page == 2)
|
||||
if (page == 4)
|
||||
_UserNovels(widget.id)
|
||||
else
|
||||
_UserArtworks(
|
||||
@@ -228,8 +228,10 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
SegmentedButton<int>(
|
||||
options: [
|
||||
SegmentedButtonOption(0, "Artworks".tl),
|
||||
SegmentedButtonOption(1, "Bookmarks".tl),
|
||||
SegmentedButtonOption(2, "Novels".tl),
|
||||
SegmentedButtonOption(1, "Illustrations".tl),
|
||||
SegmentedButtonOption(2, "Mangas".tl),
|
||||
SegmentedButtonOption(3, "Bookmarks".tl),
|
||||
SegmentedButtonOption(4, "Novels".tl),
|
||||
],
|
||||
value: page,
|
||||
onPressed: (value) {
|
||||
@@ -239,15 +241,24 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
},
|
||||
),
|
||||
const Spacer(),
|
||||
if (page != 2)
|
||||
if (page != 4)
|
||||
BatchDownloadButton(
|
||||
request: () {
|
||||
if (page == 0) {
|
||||
return Network().getUserIllusts(data!.id.toString());
|
||||
} else {
|
||||
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";
|
||||
},
|
||||
),
|
||||
],
|
||||
@@ -269,14 +280,14 @@ class _UserInfoPageState extends LoadingState<UserInfoPage, UserDetails> {
|
||||
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
|
||||
padding: EdgeInsets.zero,
|
||||
child: ListTile(
|
||||
leading: icon == null
|
||||
? null
|
||||
: Icon(
|
||||
icon,
|
||||
size: 20,
|
||||
title: Row(
|
||||
children: [
|
||||
Icon(icon, size: 20),
|
||||
const SizedBox(width: 8),
|
||||
Text(title)
|
||||
],
|
||||
),
|
||||
title: Text(title),
|
||||
subtitle: SelectableText(content),
|
||||
subtitle: SelectableText(content).paddingLeft(icon == null ? 0 : 28),
|
||||
trailing: trailing,
|
||||
),
|
||||
);
|
||||
@@ -409,8 +420,9 @@ class _UserArtworksState extends MultiPageLoadingState<_UserArtworks, Illust> {
|
||||
return Res.error("No more data");
|
||||
}
|
||||
var res = nextUrl == null
|
||||
? (widget.type == 0
|
||||
? 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) {
|
||||
@@ -422,7 +434,7 @@ class _UserArtworksState extends MultiPageLoadingState<_UserArtworks, Illust> {
|
||||
}
|
||||
|
||||
class _UserNovels extends StatefulWidget {
|
||||
const _UserNovels(this.uid, {super.key});
|
||||
const _UserNovels(this.uid);
|
||||
|
||||
final String uid;
|
||||
|
||||
@@ -534,7 +546,7 @@ class _RelatedUsersState
|
||||
return UserPreviewWidget(data[index]).fixWidth(342);
|
||||
},
|
||||
));
|
||||
if (MediaQuery.of(context).size.width > 500) {
|
||||
if (App.isDesktop) {
|
||||
content = ScrollbarTheme.merge(
|
||||
data: const ScrollbarThemeData(
|
||||
thickness: 6,
|
||||
@@ -542,7 +554,21 @@ class _RelatedUsersState
|
||||
mainAxisMargin: 4,
|
||||
hoveringPadding: EdgeInsets.zero,
|
||||
padding: EdgeInsets.zero,
|
||||
hoveringMainAxisMargin: 4),
|
||||
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(
|
||||
|
@@ -16,15 +16,13 @@ Future<void> _register(String scheme) async {
|
||||
String appPath = Platform.resolvedExecutable;
|
||||
|
||||
String protocolRegKey = 'Software\\Classes\\$scheme';
|
||||
RegistryValue protocolRegValue = const RegistryValue(
|
||||
RegistryValue protocolRegValue = const RegistryValue.string(
|
||||
'URL Protocol',
|
||||
RegistryValueType.string,
|
||||
'',
|
||||
);
|
||||
String protocolCmdRegKey = 'shell\\open\\command';
|
||||
RegistryValue protocolCmdRegValue = RegistryValue(
|
||||
RegistryValue protocolCmdRegValue = RegistryValue.string(
|
||||
'',
|
||||
RegistryValueType.string,
|
||||
'"$appPath" "%1"',
|
||||
);
|
||||
|
||||
|
28
lib/utils/debounce.dart
Normal file
28
lib/utils/debounce.dart
Normal file
@@ -0,0 +1,28 @@
|
||||
import 'dart:async';
|
||||
import 'dart:ui';
|
||||
|
||||
class Debounce {
|
||||
final Duration delay;
|
||||
VoidCallback? _action;
|
||||
Timer? _timer;
|
||||
|
||||
Debounce({required this.delay});
|
||||
|
||||
void call(VoidCallback action) {
|
||||
_action = action;
|
||||
_timer?.cancel();
|
||||
_timer = Timer(delay, _execute);
|
||||
}
|
||||
|
||||
void _execute() {
|
||||
if (_action != null) {
|
||||
_action!();
|
||||
_action = null;
|
||||
}
|
||||
}
|
||||
|
||||
void cancel() {
|
||||
_timer?.cancel();
|
||||
_action = null;
|
||||
}
|
||||
}
|
@@ -12,6 +12,14 @@ extension FSExt on FileSystemEntity {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> deleteIgnoreError() async {
|
||||
try {
|
||||
await delete();
|
||||
} catch (e) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
int get size {
|
||||
if (this is File) {
|
||||
return (this as File).lengthSync();
|
||||
|
69
lib/utils/update.dart
Normal file
69
lib/utils/update.dart
Normal file
@@ -0,0 +1,69 @@
|
||||
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://raw.githubusercontent.com/wgh136/pixes/refs/heads/master/pubspec.yaml");
|
||||
var lines = (res.data as String).split("\n");
|
||||
for (var line in lines) {
|
||||
if (line.startsWith("version:")) {
|
||||
return line.split(":")[1].split('+')[0].trim();
|
||||
}
|
||||
}
|
||||
throw "Failed to get latest version";
|
||||
}
|
||||
|
||||
/// 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
|
||||
}
|
||||
}
|
@@ -10,7 +10,7 @@
|
||||
#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 <screen_retriever_linux/screen_retriever_linux_plugin.h>
|
||||
#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
|
||||
#include <url_launcher_linux/url_launcher_plugin.h>
|
||||
#include <window_manager/window_manager_plugin.h>
|
||||
@@ -28,9 +28,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
|
||||
g_autoptr(FlPluginRegistrar) gtk_registrar =
|
||||
fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
|
||||
gtk_plugin_register_with_registrar(gtk_registrar);
|
||||
g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
|
||||
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
|
||||
screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
|
||||
g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
|
||||
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
|
||||
screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
|
||||
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);
|
||||
|
@@ -7,7 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
|
||||
file_selector_linux
|
||||
flutter_acrylic
|
||||
gtk
|
||||
screen_retriever
|
||||
screen_retriever_linux
|
||||
sqlite3_flutter_libs
|
||||
url_launcher_linux
|
||||
window_manager
|
||||
|
@@ -11,10 +11,11 @@ import dynamic_color
|
||||
import file_selector_macos
|
||||
import flutter_acrylic
|
||||
import path_provider_foundation
|
||||
import screen_retriever
|
||||
import screen_retriever_macos
|
||||
import share_plus
|
||||
import sqlite3_flutter_libs
|
||||
import url_launcher_macos
|
||||
import webview_flutter_wkwebview
|
||||
import window_manager
|
||||
|
||||
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
||||
@@ -24,9 +25,10 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
||||
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"))
|
||||
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
|
||||
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
|
||||
Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
|
||||
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
|
||||
WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
|
||||
WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
|
||||
}
|
||||
|
@@ -3,10 +3,14 @@
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<false/>
|
||||
<key>com.apple.security.cs.allow-jit</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.server</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.user-selected.read-write</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
|
415
pubspec.lock
415
pubspec.lock
@@ -5,98 +5,130 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: app_links
|
||||
sha256: "1c2b9e9c56d80d17610bcbd111b37187875c5d0ded8654caa1bda14ea753d001"
|
||||
sha256: "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.0.1"
|
||||
version: "6.4.0"
|
||||
app_links_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: app_links_linux
|
||||
sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.3"
|
||||
app_links_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: app_links_platform_interface
|
||||
sha256: "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.2"
|
||||
app_links_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: app_links_web
|
||||
sha256: af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.4"
|
||||
archive:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: archive
|
||||
sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
|
||||
sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.5.1"
|
||||
version: "4.0.7"
|
||||
async:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: async
|
||||
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
|
||||
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.11.0"
|
||||
version: "2.13.0"
|
||||
boolean_selector:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: boolean_selector
|
||||
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
|
||||
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
version: "2.1.2"
|
||||
characters:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: characters
|
||||
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
|
||||
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.0"
|
||||
version: "1.4.0"
|
||||
clock:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: clock
|
||||
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
|
||||
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
version: "1.1.2"
|
||||
collection:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: collection
|
||||
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
|
||||
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.18.0"
|
||||
version: "1.19.1"
|
||||
cross_file:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cross_file
|
||||
sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
|
||||
sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.3.4+1"
|
||||
version: "0.3.4+2"
|
||||
crypto:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: crypto
|
||||
sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
|
||||
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.3"
|
||||
version: "3.0.6"
|
||||
device_info_plus:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: device_info_plus
|
||||
sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91
|
||||
sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "10.1.0"
|
||||
version: "11.5.0"
|
||||
device_info_plus_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: device_info_plus_platform_interface
|
||||
sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
|
||||
sha256: e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "7.0.0"
|
||||
version: "7.0.3"
|
||||
dio:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: dio
|
||||
sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5"
|
||||
sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.4.3+1"
|
||||
version: "5.8.0+1"
|
||||
dio_web_adapter:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: dio_web_adapter
|
||||
sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
dynamic_color:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -109,26 +141,26 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: fake_async
|
||||
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
|
||||
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.1"
|
||||
version: "1.3.3"
|
||||
ffi:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: ffi
|
||||
sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
|
||||
sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.2"
|
||||
version: "2.1.4"
|
||||
file:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file
|
||||
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
|
||||
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "7.0.0"
|
||||
version: "7.0.1"
|
||||
file_selector:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -141,34 +173,34 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_android
|
||||
sha256: "57265ec9591e8fd8508f613544cde6f7d045731f6b09644057e49a4c9c672b7c"
|
||||
sha256: "6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.5.1+1"
|
||||
version: "0.5.1+14"
|
||||
file_selector_ios:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_ios
|
||||
sha256: "7160121e434910ec23717bde3a0c514ca039e8c97b791ff35d1786da38abcb4a"
|
||||
sha256: "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.5.2"
|
||||
version: "0.5.3+1"
|
||||
file_selector_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_linux
|
||||
sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
|
||||
sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.2+1"
|
||||
version: "0.9.3+2"
|
||||
file_selector_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_macos
|
||||
sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385
|
||||
sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.4"
|
||||
version: "0.9.4+3"
|
||||
file_selector_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -181,34 +213,34 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_web
|
||||
sha256: "619e431b224711a3869e30dbd7d516f5f5a4f04b265013a50912f39e1abc88c8"
|
||||
sha256: c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.4+1"
|
||||
version: "0.9.4+2"
|
||||
file_selector_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_windows
|
||||
sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0
|
||||
sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.3+1"
|
||||
version: "0.9.3+4"
|
||||
fixnum:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: fixnum
|
||||
sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
|
||||
sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.0"
|
||||
version: "1.1.1"
|
||||
fluent_ui:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: fluent_ui
|
||||
sha256: a8c76cb501303d108cb9bd33e516da7cfd078031ff427d68eab6069bf4492a2c
|
||||
sha256: "8645eabacb46bfc9632fadc6e106756cdc6f2a4efb5a4fed4410bd3131306fe8"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.8.7"
|
||||
version: "4.12.0"
|
||||
flutter:
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
@@ -226,10 +258,10 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_file_dialog
|
||||
sha256: "5a1507833473b38839056d63c5125750a6d12e904f78131324fa4632504de513"
|
||||
sha256: "9344b8f07be6a1b6f9854b723fb0cf84a8094ba94761af1d213589d3cb087488"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
version: "3.0.2"
|
||||
flutter_lints:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@@ -256,6 +288,14 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_to_arch:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: flutter_to_arch
|
||||
sha256: b68b2757a89a517ae2141cbc672acdd1f69721dd686cacad03876b6f436ff040
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.1"
|
||||
flutter_web_plugins:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
@@ -273,51 +313,66 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http
|
||||
sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
|
||||
sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
version: "1.4.0"
|
||||
http_parser:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http_parser
|
||||
sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
|
||||
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.2"
|
||||
image_gallery_saver:
|
||||
version: "4.1.2"
|
||||
image_gallery_saver_plus:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: "."
|
||||
ref: master
|
||||
resolved-ref: "3f8c4d2cc41002d3ffdb770cab3b62583326ce01"
|
||||
url: "https://github.com/wgh136/image_gallery_saver"
|
||||
source: git
|
||||
version: "2.0.0"
|
||||
name: image_gallery_saver_plus
|
||||
sha256: "199b9e24f8d85e98f11e3d35571ab68ae50626ad40e2bb85c84383f69a6950ad"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.1"
|
||||
intl:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: intl
|
||||
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
|
||||
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.19.0"
|
||||
version: "0.20.2"
|
||||
io:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: io
|
||||
sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.5"
|
||||
json_annotation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: json_annotation
|
||||
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.9.0"
|
||||
leak_tracker:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker
|
||||
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
|
||||
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "10.0.4"
|
||||
version: "10.0.9"
|
||||
leak_tracker_flutter_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_flutter_testing
|
||||
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
|
||||
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.3"
|
||||
version: "3.0.9"
|
||||
leak_tracker_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -338,74 +393,74 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: matcher
|
||||
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
|
||||
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.12.16+1"
|
||||
version: "0.12.17"
|
||||
material_color_utilities:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: material_color_utilities
|
||||
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
|
||||
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.8.0"
|
||||
version: "0.11.1"
|
||||
math_expressions:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: math_expressions
|
||||
sha256: db0b72d867491c4e53a1c773e2708d5d6e94bbe06be07080fc9f896766b9cd3d
|
||||
sha256: "218dc65bed4726562bb31c53d8daa3cc824664b26fb72d77bc592757edf74ba0"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.5.0"
|
||||
version: "2.7.0"
|
||||
meta:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: meta
|
||||
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
|
||||
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.12.0"
|
||||
version: "1.16.0"
|
||||
mime:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: mime
|
||||
sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
|
||||
sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.5"
|
||||
version: "2.0.0"
|
||||
path:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path
|
||||
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
|
||||
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.9.0"
|
||||
version: "1.9.1"
|
||||
path_provider:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: path_provider
|
||||
sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
|
||||
sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.3"
|
||||
version: "2.1.5"
|
||||
path_provider_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_android
|
||||
sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
|
||||
sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.2.4"
|
||||
version: "2.2.17"
|
||||
path_provider_foundation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_foundation
|
||||
sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
|
||||
sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.0"
|
||||
version: "2.4.1"
|
||||
path_provider_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -426,16 +481,24 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_windows
|
||||
sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
|
||||
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.2.1"
|
||||
version: "2.3.0"
|
||||
petitparser:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: petitparser
|
||||
sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.1.0"
|
||||
photo_view:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "97de36fa8c500c18037f675c122785b193559e09"
|
||||
resolved-ref: a1255d1b5945aad4b7323303ec2ecdf0c90ffc4c
|
||||
url: "https://github.com/wgh136/photo_view"
|
||||
source: git
|
||||
version: "0.14.0"
|
||||
@@ -443,10 +506,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: platform
|
||||
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
|
||||
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.4"
|
||||
version: "3.1.6"
|
||||
plugin_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -455,6 +518,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.8"
|
||||
posix:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: posix
|
||||
sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.0.3"
|
||||
recase:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -467,10 +538,42 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_retriever
|
||||
sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90"
|
||||
sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.1.9"
|
||||
version: "0.2.0"
|
||||
screen_retriever_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_retriever_linux
|
||||
sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.2.0"
|
||||
screen_retriever_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_retriever_macos
|
||||
sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.2.0"
|
||||
screen_retriever_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_retriever_platform_interface
|
||||
sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.2.0"
|
||||
screen_retriever_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_retriever_windows
|
||||
sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.2.0"
|
||||
scroll_pos:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -483,31 +586,31 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: share_plus
|
||||
sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544
|
||||
sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "9.0.0"
|
||||
version: "10.1.4"
|
||||
share_plus_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: share_plus_platform_interface
|
||||
sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4"
|
||||
sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.0"
|
||||
version: "5.0.2"
|
||||
sky_engine:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.99"
|
||||
version: "0.0.0"
|
||||
source_span:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: source_span
|
||||
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
|
||||
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.10.0"
|
||||
version: "1.10.1"
|
||||
sprintf:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -520,106 +623,106 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: sqlite3
|
||||
sha256: b384f598b813b347c5a7e5ffad82cbaff1bec3d1561af267041e66f6f0899295
|
||||
sha256: c0503c69b44d5714e6abbf4c1f51a3c3cc42b75ce785f44404765e4635481d38
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.3"
|
||||
version: "2.7.6"
|
||||
sqlite3_flutter_libs:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: sqlite3_flutter_libs
|
||||
sha256: fb2a106a2ea6042fe57de2c47074cc31539a941819c91e105b864744605da3f5
|
||||
sha256: e07232b998755fe795655c56d1f5426e0190c9c435e1752d39e7b1cd33699c71
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.5.21"
|
||||
version: "0.5.34"
|
||||
stack_trace:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stack_trace
|
||||
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
|
||||
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.11.1"
|
||||
version: "1.12.1"
|
||||
stream_channel:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stream_channel
|
||||
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
|
||||
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.2"
|
||||
version: "2.1.4"
|
||||
string_scanner:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: string_scanner
|
||||
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
|
||||
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.0"
|
||||
version: "1.4.1"
|
||||
term_glyph:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: term_glyph
|
||||
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
|
||||
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
version: "1.2.2"
|
||||
test_api:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
|
||||
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.7.0"
|
||||
version: "0.7.4"
|
||||
typed_data:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: typed_data
|
||||
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
|
||||
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.2"
|
||||
version: "1.4.0"
|
||||
url_launcher:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: url_launcher
|
||||
sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
|
||||
sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.2.6"
|
||||
version: "6.3.1"
|
||||
url_launcher_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_android
|
||||
sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
|
||||
sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.3.1"
|
||||
version: "6.3.16"
|
||||
url_launcher_ios:
|
||||
dependency: transitive
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: url_launcher_ios
|
||||
sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
|
||||
sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.3.0"
|
||||
version: "6.3.3"
|
||||
url_launcher_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_linux
|
||||
sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
|
||||
sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.1"
|
||||
version: "3.2.1"
|
||||
url_launcher_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_macos
|
||||
sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
|
||||
sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.2.0"
|
||||
version: "3.2.2"
|
||||
url_launcher_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -632,26 +735,26 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_web
|
||||
sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
|
||||
sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.3.1"
|
||||
version: "2.4.1"
|
||||
url_launcher_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: url_launcher_windows
|
||||
sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
|
||||
sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.1"
|
||||
version: "3.1.4"
|
||||
uuid:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: uuid
|
||||
sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
|
||||
sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.4.0"
|
||||
version: "4.5.1"
|
||||
vector_math:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -664,82 +767,90 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vm_service
|
||||
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
|
||||
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "14.2.1"
|
||||
version: "15.0.0"
|
||||
web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: web
|
||||
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
|
||||
sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.5.1"
|
||||
version: "1.1.1"
|
||||
webview_flutter:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: webview_flutter
|
||||
sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
|
||||
sha256: c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.7.0"
|
||||
version: "4.13.0"
|
||||
webview_flutter_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: webview_flutter_android
|
||||
sha256: dad3313c9ead95517bb1cae5e1c9d20ba83729d5a59e5e83c0a2d66203f27f91
|
||||
sha256: f6e6afef6e234801da77170f7a1847ded8450778caf2fe13979d140484be3678
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.16.1"
|
||||
version: "4.7.0"
|
||||
webview_flutter_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: webview_flutter_platform_interface
|
||||
sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
|
||||
sha256: f0dc2dc3a2b1e3a6abdd6801b9355ebfeb3b8f6cde6b9dc7c9235909c4a1f147
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.10.0"
|
||||
version: "2.13.1"
|
||||
webview_flutter_wkwebview:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: webview_flutter_wkwebview
|
||||
sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
|
||||
sha256: a3d461fe3467014e05f3ac4962e5fdde2a4bf44c561cb53e9ae5c586600fdbc3
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.13.1"
|
||||
version: "3.22.0"
|
||||
win32:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: win32
|
||||
sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
|
||||
sha256: "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.5.0"
|
||||
version: "5.14.0"
|
||||
win32_registry:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: win32_registry
|
||||
sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb"
|
||||
sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.3"
|
||||
version: "2.1.0"
|
||||
window_manager:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: window_manager
|
||||
sha256: b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494
|
||||
sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.3.8"
|
||||
version: "0.4.3"
|
||||
xdg_directories:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: xdg_directories
|
||||
sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
|
||||
sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.4"
|
||||
version: "1.1.0"
|
||||
yaml:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: yaml
|
||||
sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.3"
|
||||
sdks:
|
||||
dart: ">=3.3.4 <4.0.0"
|
||||
flutter: ">=3.19.0"
|
||||
dart: ">=3.8.0 <4.0.0"
|
||||
flutter: ">=3.32.5"
|
||||
|
47
pubspec.yaml
47
pubspec.yaml
@@ -16,10 +16,11 @@ 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.7+107
|
||||
version: 1.2.0+120
|
||||
|
||||
environment:
|
||||
sdk: '>=3.3.4 <4.0.0'
|
||||
flutter: 3.32.5
|
||||
|
||||
# Dependencies specify other packages that your package needs in order to work.
|
||||
# To automatically upgrade your package dependencies to the latest versions
|
||||
@@ -34,34 +35,32 @@ dependencies:
|
||||
|
||||
# The following adds the Cupertino Icons font to your application.
|
||||
# Use with the CupertinoIcons class for iOS style icons.
|
||||
window_manager: ^0.3.8
|
||||
fluent_ui: ^4.8.7
|
||||
window_manager: ^0.4.3
|
||||
fluent_ui: ^4.12.0
|
||||
dynamic_color: ^1.7.0
|
||||
dio: ^5.4.3
|
||||
crypto:
|
||||
dio: ^5.8.0
|
||||
crypto: ^3.0.6
|
||||
intl:
|
||||
path_provider:
|
||||
url_launcher: ^6.1.8
|
||||
app_links: ^6.0.1
|
||||
win32_registry: ^1.1.3
|
||||
path_provider: ^2.1.5
|
||||
url_launcher: ^6.3.1
|
||||
url_launcher_ios: ^6.3.2
|
||||
app_links: ^6.4.0
|
||||
win32_registry: ^2.1.0
|
||||
flutter_staggered_grid_view: ^0.7.0
|
||||
sqlite3: ^2.4.3
|
||||
sqlite3: ^2.7.6
|
||||
sqlite3_flutter_libs: any
|
||||
photo_view:
|
||||
git:
|
||||
url: https://github.com/wgh136/photo_view
|
||||
ref: main
|
||||
share_plus: ^9.0.0
|
||||
share_plus: ^10.1.3
|
||||
file_selector: ^1.0.1
|
||||
flutter_file_dialog: 3.0.1
|
||||
archive: ^3.5.1
|
||||
webview_flutter: ^4.7.0
|
||||
flutter_file_dialog: ^3.0.2
|
||||
archive: ^4.0.7
|
||||
webview_flutter: ^4.13.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
|
||||
device_info_plus: ^11.5.0
|
||||
image_gallery_saver_plus: ^4.0.1
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
@@ -72,10 +71,20 @@ dev_dependencies:
|
||||
# package. See that file for information about deactivating specific lint
|
||||
# rules and activating additional ones.
|
||||
flutter_lints: ^3.0.0
|
||||
flutter_to_arch: ^1.0.1
|
||||
|
||||
# For information on the generic Dart part of this file, see the
|
||||
# following page: https://dart.dev/tools/pub/pubspec
|
||||
|
||||
flutter_to_arch:
|
||||
name: Pixes
|
||||
icon: debian/gui/pixes.png
|
||||
categories: Utility
|
||||
keywords: Flutter;pixiv;images;
|
||||
url: https://github.com/wgh136/pixes
|
||||
depends:
|
||||
- gtk3
|
||||
|
||||
# The following section is specific to Flutter packages.
|
||||
flutter:
|
||||
|
||||
|
@@ -24,8 +24,8 @@ 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
|
||||
OutputDir={#RootPath}\build\windows
|
||||
OutputBaseFilename=pixes-{#MyAppVersion}-windows-installer
|
||||
SetupIconFile={#RootPath}\windows\runner\resources\app_icon.ico
|
||||
Compression=lzma
|
||||
SolidCompression=yes
|
||||
@@ -35,7 +35,7 @@ ArchitecturesAllowed=x64 arm64
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
|
||||
Name: "chinesesimplified"; MessagesFile: "{#RootPath}\windows\ChineseSimplified.isl"
|
||||
|
||||
[Tasks]
|
||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||
@@ -46,7 +46,7 @@ Source: "{#RootPath}\build\windows\x64\runner\Release\app_links_plugin.dll"; Des
|
||||
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\screen_retriever_windows_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
|
||||
|
@@ -1,34 +1,18 @@
|
||||
import subprocess
|
||||
import os
|
||||
|
||||
os.chdir(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
fontUse = '''
|
||||
fonts:
|
||||
- family: font
|
||||
fonts:
|
||||
- asset: assets/SourceHanSansSC-Regular.otf
|
||||
'''
|
||||
import httpx
|
||||
|
||||
file = open('pubspec.yaml', 'r')
|
||||
content = file.read()
|
||||
file.close()
|
||||
file = open('pubspec.yaml', 'a')
|
||||
file.write(fontUse)
|
||||
file.close()
|
||||
|
||||
subprocess.run(["flutter", "build", "windows"], shell=True)
|
||||
|
||||
file = open('pubspec.yaml', 'w')
|
||||
file.write(content)
|
||||
version = str.split(str.split(content, 'version: ')[1], '+')[0]
|
||||
|
||||
if os.path.exists("build/app-windows.zip"):
|
||||
os.remove("build/app-windows.zip")
|
||||
|
||||
subprocess.run(["tar", "-a", "-c", "-f", "build/windows/x64/app-windows.zip", "-C", "build/windows/x64/runner/Release", "."]
|
||||
subprocess.run(["tar", "-a", "-c", "-f", f"build/windows/pixes-{version}-windows.zip", "-C", "build/windows/x64/runner/Release", "*"]
|
||||
, shell=True)
|
||||
|
||||
version = str.split(str.split(content, 'version: ')[1], '+')[0]
|
||||
issContent = ""
|
||||
file = open('windows/build.iss', 'r')
|
||||
issContent = file.read()
|
||||
@@ -40,6 +24,13 @@ file = open('windows/build.iss', 'w')
|
||||
file.write(newContent)
|
||||
file.close()
|
||||
|
||||
if not os.path.exists("windows/ChineseSimplified.isl"):
|
||||
# download ChineseSimplified.isl
|
||||
url = "https://raw.githubusercontent.com/kira-96/Inno-Setup-Chinese-Simplified-Translation/refs/heads/main/ChineseSimplified.isl"
|
||||
response = httpx.get(url)
|
||||
with open('windows/ChineseSimplified.isl', 'wb') as file:
|
||||
file.write(response.content)
|
||||
|
||||
subprocess.run(["iscc", "windows/build.iss"], shell=True)
|
||||
|
||||
with open('windows/build.iss', 'w') as file:
|
@@ -10,7 +10,7 @@
|
||||
#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 <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
|
||||
#include <share_plus/share_plus_windows_plugin_c_api.h>
|
||||
#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
|
||||
#include <url_launcher_windows/url_launcher_windows.h>
|
||||
@@ -25,8 +25,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
|
||||
registry->GetRegistrarForPlugin("FileSelectorWindows"));
|
||||
FlutterAcrylicPluginRegisterWithRegistrar(
|
||||
registry->GetRegistrarForPlugin("FlutterAcrylicPlugin"));
|
||||
ScreenRetrieverPluginRegisterWithRegistrar(
|
||||
registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
|
||||
ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
|
||||
registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
|
||||
SharePlusWindowsPluginCApiRegisterWithRegistrar(
|
||||
registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
|
||||
Sqlite3FlutterLibsPluginRegisterWithRegistrar(
|
||||
|
@@ -7,7 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
|
||||
dynamic_color
|
||||
file_selector_windows
|
||||
flutter_acrylic
|
||||
screen_retriever
|
||||
screen_retriever_windows
|
||||
share_plus
|
||||
sqlite3_flutter_libs
|
||||
url_launcher_windows
|
||||
|
Reference in New Issue
Block a user