diff --git a/ci/version.code.txt b/ci/version.code.txt index 32e7334..89fb16f 100644 --- a/ci/version.code.txt +++ b/ci/version.code.txt @@ -1 +1 @@ -v1.1.3 \ No newline at end of file +v1.1.4 \ No newline at end of file diff --git a/ci/version.info.txt b/ci/version.info.txt index 392b213..5443e66 100644 --- a/ci/version.info.txt +++ b/ci/version.info.txt @@ -1,3 +1,14 @@ +v1.1.4 + +- [x] 修复BUG, 发电后下一页不好用 +- [x] 修复BUG, 夜间登录看不起字 +- [x] 修复BUG ios11,12,13 闪退 +- [x] 升级flutter + +计划中 + +- [x] 下载和导出 + v1.1.3 - [x] 长按下载可以删除 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 89124d5..3e30d65 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -19,7 +19,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - Flutter: 405776dd0763d7e32a8f989d4e271ca1317d080c + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de diff --git a/lib/screens/components/comic_pager.dart b/lib/screens/components/comic_pager.dart index 6654191..ef74573 100644 --- a/lib/screens/components/comic_pager.dart +++ b/lib/screens/components/comic_pager.dart @@ -369,7 +369,7 @@ class _PagerPagerState extends State<_PagerPager> { if (num == 0 || num > _maxPage) { return; } - if (_currentPage > 20) { + if (num > 20 && !isPro) { defaultToast(context, "下一页需要发电鸭"); return; } diff --git a/lib/screens/pro_screen.dart b/lib/screens/pro_screen.dart index d251ba2..fafc65c 100644 --- a/lib/screens/pro_screen.dart +++ b/lib/screens/pro_screen.dart @@ -345,9 +345,9 @@ class _RegisterDialogState extends State<_RegisterDialog> { height: 250, width: MediaQuery.of(context).size.width - 90, margin: const EdgeInsets.all(30), - decoration: const BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(10)), - color: Colors.white, + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(10)), + color: Theme.of(context).scaffoldBackgroundColor, ), child: Material( color: Colors.transparent, diff --git a/pubspec.lock b/pubspec.lock index 4de8aa1..98b1be5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -28,14 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clipboard: dependency: "direct main" description: @@ -49,7 +42,7 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: @@ -91,7 +84,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" fixnum: dependency: transitive description: @@ -143,7 +136,7 @@ packages: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "1.1.1+1" + version: "1.1.4" flutter_test: dependency: "direct dev" description: flutter @@ -181,21 +174,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" modal_bottom_sheet: dependency: "direct main" description: @@ -209,21 +202,21 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" path_drawing: dependency: transitive description: name: path_drawing url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" path_parsing: dependency: transitive description: name: path_parsing url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" pedantic: dependency: transitive description: @@ -312,7 +305,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -333,21 +326,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" typed_data: dependency: transitive description: @@ -403,7 +396,7 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.12" + version: "2.0.13" url_launcher_windows: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8949d65..c28f499 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: wax -description: A new Flutter project. +description: A comic reader. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.1.3+4 +version: 1.1.4+5 environment: sdk: ">=2.16.1 <3.0.0" diff --git a/scripts/bind-ios-arm64.sh b/scripts/bind-ios-arm64.sh index 7f812ac..9406a7e 100644 --- a/scripts/bind-ios-arm64.sh +++ b/scripts/bind-ios-arm64.sh @@ -4,4 +4,4 @@ cd "$( cd "$( dirname "$0" )" && pwd )/.." cd go/mobile -gomobile bind -target=ios -o lib/Mobile.xcframework ./ +gomobile bind -iosversion 11.0 -target=ios -o lib/Mobile.xcframework ./ diff --git a/scripts/build-ipa.sh b/scripts/build-ipa.sh index 516b4c8..00c7a05 100644 --- a/scripts/build-ipa.sh +++ b/scripts/build-ipa.sh @@ -4,7 +4,7 @@ cd "$( cd "$( dirname "$0" )" && pwd )/.." cd go/mobile go get golang.org/x/mobile/cmd/gobind -gomobile bind -target=ios -o lib/Mobile.xcframework ./ +gomobile bind -iosversion 11.0 -target=ios -o lib/Mobile.xcframework ./ cd ../.. flutter build ios --release --no-codesign