From fffeadc86e27b0a37aecd0edff5f3d3396570722 Mon Sep 17 00:00:00 2001 From: niuhuan Date: Sat, 11 Feb 2023 09:26:33 +0800 Subject: [PATCH] :rocket: v1.6.6 --- .github/workflows/Release.yml | 8 +- android/app/build.gradle | 2 +- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 6 +- .../pikapika/MainActivity.kt | 3 +- android/app/src/profile/AndroidManifest.xml | 2 +- ci/version.code.txt | 2 +- ci/version.info.txt | 5 + ios/Runner.xcodeproj/project.pbxproj | 10 +- ios/Runner/Info.plist | 12 +- lib/screens/AccountScreen.dart | 13 - lib/screens/SettingsScreen.dart | 231 ++++++++++++------ lib/screens/SpaceScreen.dart | 38 +-- linux/CMakeLists.txt | 2 +- macos/Runner/Configs/AppInfo.xcconfig | 2 +- pubspec.lock | 117 +++++++-- pubspec.yaml | 4 +- 17 files changed, 291 insertions(+), 168 deletions(-) rename android/app/src/main/kotlin/{niuhuan => opensource}/pikapika/MainActivity.kt (99%) diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 01377aa..242210a 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -64,7 +64,7 @@ jobs: flutter_version: '2.10.3' - target: ios host: macos-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: android-arm32 host: ubuntu-latest flutter_version: '2.10.5' @@ -76,13 +76,13 @@ jobs: flutter_version: '2.10.5' - target: android-arm32 host: ubuntu-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: android-arm64 host: ubuntu-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: android-x86_64 host: ubuntu-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' runs-on: ${{ matrix.config.host }} diff --git a/android/app/build.gradle b/android/app/build.gradle index b71f21f..fab9d69 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,7 +34,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "niuhuan.pikapika" + applicationId "opensource.pikapika" minSdkVersion 19 // flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index f258968..5690237 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="opensource.pikapika"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 6ca8334..35b81a6 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="opensource.pikapika"> @@ -18,11 +18,11 @@ + package="opensource.pikapika"> diff --git a/ci/version.code.txt b/ci/version.code.txt index bf991af..cea0f99 100644 --- a/ci/version.code.txt +++ b/ci/version.code.txt @@ -1 +1 @@ -v1.6.5 \ No newline at end of file +v1.6.6 \ No newline at end of file diff --git a/ci/version.info.txt b/ci/version.info.txt index 42a41f3..18057c5 100644 --- a/ci/version.info.txt +++ b/ci/version.info.txt @@ -1,3 +1,8 @@ +v1.6.6 + +- [x] ♻️修改一些UI +- [x] 🚀修改AppID, 签名 +- [x] 🚀升级flutter v1.6.5 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 00a27c4..c0e8e52 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -203,6 +203,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -239,6 +240,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -369,7 +371,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.1; - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapika; + PRODUCT_BUNDLE_IDENTIFIER = opensource.pikapika; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -503,7 +505,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.1; - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapika; + PRODUCT_BUNDLE_IDENTIFIER = opensource.pikapika; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -529,7 +531,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.1; - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.pikapika; + PRODUCT_BUNDLE_IDENTIFIER = opensource.pikapika; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 970218e..a464704 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -21,7 +21,7 @@ Owner LSItemContentTypes - niuhuan.pkz + opensource.pkz pkz @@ -90,7 +90,7 @@ UTTypeDescription PKZ Archive UTTypeIdentifier - niuhuan.pkz + opensource.pkz UTTypeTagSpecification public.filename-extension @@ -101,12 +101,14 @@ public.mime-type - text/vnd.niuhuan.pkz - text/vnd.niuhuan.pki - text/vnd.niuhuan.zip + text/vnd.opensource.pkz + text/vnd.opensource.pki + text/vnd.opensource.zip + UIApplicationSupportsIndirectInputEvents + diff --git a/lib/screens/AccountScreen.dart b/lib/screens/AccountScreen.dart index 2c8103f..8e847d3 100644 --- a/lib/screens/AccountScreen.dart +++ b/lib/screens/AccountScreen.dart @@ -110,19 +110,6 @@ class _AccountScreenState extends State { }, icon: const Text('关于'), ), - IconButton( - onPressed: () { - if (androidNightModeDisplay) { - Navigator.push( - context, - mixRoute(builder: (context) => const ThemeScreen()), - ); - } else { - chooseLightTheme(context); - } - }, - icon: const Text('主题'), - ), IconButton( onPressed: _toDownloadList, icon: const Icon(Icons.download_rounded), diff --git a/lib/screens/SettingsScreen.dart b/lib/screens/SettingsScreen.dart index 95df81b..62d3348 100644 --- a/lib/screens/SettingsScreen.dart +++ b/lib/screens/SettingsScreen.dart @@ -26,7 +26,6 @@ import 'package:pikapika/basic/config/ShadowCategories.dart'; import 'package:pikapika/basic/config/ShowCommentAtDownload.dart'; import 'package:pikapika/basic/config/Themes.dart'; import 'package:pikapika/basic/config/TimeOffsetHour.dart'; -import 'package:pikapika/basic/config/Version.dart'; import 'package:pikapika/basic/config/VolumeController.dart'; import 'package:pikapika/basic/config/ShadowCategoriesMode.dart'; import 'package:pikapika/screens/components/NetworkSetting.dart'; @@ -40,13 +39,19 @@ import '../basic/config/WillPopNotice.dart'; import 'CleanScreen.dart'; import 'MigrateScreen.dart'; import 'ModifyPasswordScreen.dart'; +import 'ThemeScreen.dart'; -class SettingsScreen extends StatelessWidget { +class SettingsScreen extends StatefulWidget { final bool hiddenAccountInfo; const SettingsScreen({Key? key, this.hiddenAccountInfo = false}) : super(key: key); + @override + State createState() => _SettingsScreenState(); +} + +class _SettingsScreenState extends State { @override Widget build(BuildContext context) { return rightClickPop( @@ -56,77 +61,152 @@ class SettingsScreen extends StatelessWidget { ); } - Widget buildScreen(BuildContext context) => Scaffold( - appBar: AppBar(title: const Text('设置')), - body: ListView( - children: [ - const Divider(), - hiddenAccountInfo - ? Container() - : ListTile( - onTap: () async { - Navigator.push( - context, - mixRoute( - builder: (context) => const ModifyPasswordScreen()), - ); - }, - title: const Text('修改密码'), - ), - const Divider(), - const NetworkSetting(), - const Divider(), - shadowCategoriesModeSetting(), - shadowCategoriesSetting(), - qualitySetting(), - const Divider(), - pagerActionSetting(), - contentFailedReloadActionSetting(), - const Divider(), - readerTypeSetting(), - readerDirectionSetting(), - readerSliderPositionSetting(), - autoFullScreenSetting(), - fullScreenActionSetting(), - volumeControllerSetting(), - keyboardControllerSetting(), - noAnimationSetting(), - iconLoadingSetting(), - categoriesColumnCountSetting(), - const Divider(), - fullScreenUISetting(), - willPopNoticeSetting(), - timeZoneSetting(), - const Divider(), - autoCleanSecSetting(), - ListTile( - onTap: () { - Navigator.push( - context, - mixRoute(builder: (context) => const CleanScreen()), - ); - }, - title: const Text('清除缓存'), - ), - const Divider(), - androidDisplayModeSetting(), - androidSecureFlagSetting(), - authenticationSetting(), - const Divider(), - chooserRootSetting(), - downloadThreadCountSetting(), - downloadAndExportPathSetting(), - showCommentAtDownloadSetting(), - downloadCachePathSetting(), - exportRenameSetting(), - fontSetting(), - usingRightClickPopSetting(), - const Divider(), - migrate(context), - const Divider(), - ], + late var _index = 0; + + Widget buildScreen(BuildContext context) { + final List<_IconAndWidgets> iaws = [ + _IconAndWidgets(Icons.lan, [ + const Padding(padding: EdgeInsets.only(top: 15)), + const Divider(), + const ListTile( + subtitle: Text("网络&账户"), ), - ); + const Divider(), + widget.hiddenAccountInfo + ? Container() + : ListTile( + onTap: () async { + Navigator.push( + context, + mixRoute( + builder: (context) => const ModifyPasswordScreen(), + ), + ); + }, + title: const Text('修改密码'), + ), + const Divider(), + const NetworkSetting(), + const Divider(), + const Padding(padding: EdgeInsets.only(top: 15)), + ]), + _IconAndWidgets(Icons.ad_units, [ + const Padding(padding: EdgeInsets.only(top: 15)), + const Divider(), + const ListTile( + subtitle: Text("系统&界面"), + ), + const Divider(), + ListTile( + onTap: () async { + if (androidNightModeDisplay) { + Navigator.push( + context, + mixRoute(builder: (context) => const ThemeScreen()), + ); + } else { + chooseLightTheme(context); + } + }, + title: const Text('主题'), + ), + fullScreenUISetting(), + noAnimationSetting(), + iconLoadingSetting(), + categoriesColumnCountSetting(), + willPopNoticeSetting(), + pagerActionSetting(), + contentFailedReloadActionSetting(), + timeZoneSetting(), + fontSetting(), + usingRightClickPopSetting(), + const Divider(), + androidDisplayModeSetting(), + androidSecureFlagSetting(), + authenticationSetting(), + const Divider(), + migrate(context), + const Divider(), + const Padding(padding: EdgeInsets.only(top: 15)), + ]), + _IconAndWidgets(Icons.confirmation_num_rounded, [ + const Divider(), + const Padding(padding: EdgeInsets.only(top: 15)), + const Divider(), + const ListTile( + subtitle: Text("内容&阅读器"), + ), + const Divider(), + shadowCategoriesModeSetting(), + shadowCategoriesSetting(), + const Divider(), + qualitySetting(), + readerTypeSetting(), + readerDirectionSetting(), + readerSliderPositionSetting(), + autoFullScreenSetting(), + fullScreenActionSetting(), + volumeControllerSetting(), + keyboardControllerSetting(), + const Divider(), + const Padding(padding: EdgeInsets.only(top: 15)), + ]), + _IconAndWidgets(Icons.download, [ + const Padding(padding: EdgeInsets.only(top: 15)), + const Divider(), + const ListTile( + subtitle: Text("下载&缓存"), + ), + const Divider(), + autoCleanSecSetting(), + ListTile( + onTap: () { + Navigator.push( + context, + mixRoute(builder: (context) => const CleanScreen()), + ); + }, + title: const Text('清除缓存'), + ), + const Divider(), + chooserRootSetting(), + downloadThreadCountSetting(), + downloadAndExportPathSetting(), + showCommentAtDownloadSetting(), + downloadCachePathSetting(), + exportRenameSetting(), + const Divider(), + const Padding(padding: EdgeInsets.only(top: 15)), + ]), + ]; + var i = 0; + return Scaffold( + appBar: AppBar( + title: const Text('设置'), + actions: [ + ...iaws.map( + (e) { + final idx = i; + return Opacity( + child: IconButton( + onPressed: () { + setState(() { + _index = idx; + }); + }, + icon: Icon(e.icon), + ), + opacity: i++ == _index ? 1 : .75, + ); + }, + ) + ], + ), + body: ListView( + children: iaws[_index].widgets, + ), + ); + } Widget migrate(BuildContext context) { if (Platform.isAndroid) { @@ -159,3 +239,10 @@ class SettingsScreen extends StatelessWidget { return Container(); } } + +class _IconAndWidgets { + final IconData icon; + final List widgets; + + _IconAndWidgets(this.icon, this.widgets); +} diff --git a/lib/screens/SpaceScreen.dart b/lib/screens/SpaceScreen.dart index a79029d..a54b5c7 100644 --- a/lib/screens/SpaceScreen.dart +++ b/lib/screens/SpaceScreen.dart @@ -53,7 +53,7 @@ class _SpaceScreenState extends State { IconButton( onPressed: () async { bool result = - await confirmDialog(context, '退出登录', '您确认要退出当前账号吗?'); + await confirmDialog(context, '退出登录', '您确认要退出当前账号吗?'); if (result) { await method.clearToken(); await method.setPassword(""); @@ -105,20 +105,6 @@ class _SpaceScreenState extends State { const Divider(), const UserProfileCard(), const Divider(), - ListTile( - onTap: () async { - if (androidNightModeDisplay) { - Navigator.push( - context, - mixRoute(builder: (context) => const ThemeScreen()), - ); - } else { - chooseLightTheme(context); - } - }, - title: const Text('主题'), - ), - const Divider(), ListTile( onTap: () { Navigator.push( @@ -151,28 +137,6 @@ class _SpaceScreenState extends State { title: const Text('我的下载'), ), const Divider(), - ListTile( - onTap: () { - Navigator.push( - context, - mixRoute(builder: (context) => const ProScreen()), - ); - }, - title: const Text('发电'), - ), - const Divider(), - ListTile( - onTap: () { - Navigator.push( - context, - mixRoute(builder: (context) => const AboutScreen()), - ); - }, - title: Badged( - child: const Text('关于'), - badge: latestVersion() == null ? null : "1", - )), - const Divider(), ], ), ); diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 57b29e4..b18d2d6 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) set(BINARY_NAME "pikapika") -set(APPLICATION_ID "niuhuan.pikapika") +set(APPLICATION_ID "opensource.pikapika") cmake_policy(SET CMP0063 NEW) diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 7518c0d..c8040a2 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = pikapika // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = niuhuan +PRODUCT_BUNDLE_IDENTIFIER = opensource // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2021 com.example. All rights reserved. diff --git a/pubspec.lock b/pubspec.lock index 144028b..0667864 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,6 +5,7 @@ packages: dependency: "direct main" description: name: another_xlider + sha256: "1446d10af1aefd8fe527e62054214967684773c0c2bb3dd2a8d506983a1d2279" url: "https://pub.dartlang.org" source: hosted version: "1.1.2" @@ -12,6 +13,7 @@ packages: dependency: transitive description: name: archive + sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d url: "https://pub.dartlang.org" source: hosted version: "3.3.6" @@ -19,20 +21,23 @@ packages: dependency: transitive description: name: async + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 url: "https://pub.dartlang.org" source: hosted - version: "2.9.0" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c url: "https://pub.dartlang.org" source: hosted version: "1.2.1" @@ -40,6 +45,7 @@ packages: dependency: "direct main" description: name: clipboard + sha256: "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9" url: "https://pub.dartlang.org" source: hosted version: "0.1.3" @@ -47,6 +53,7 @@ packages: dependency: transitive description: name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf url: "https://pub.dartlang.org" source: hosted version: "1.1.1" @@ -54,13 +61,15 @@ packages: dependency: transitive description: name: collection + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.17.0" convert: dependency: transitive description: name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" url: "https://pub.dartlang.org" source: hosted version: "3.1.1" @@ -68,6 +77,7 @@ packages: dependency: "direct main" description: name: crop_image + sha256: "78715179b0d3cd1e9e0a5c4a7846851acf33db346c657674b9abc358e84a511d" url: "https://pub.dartlang.org" source: hosted version: "1.0.3" @@ -75,13 +85,15 @@ packages: dependency: transitive description: name: cross_file + sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" url: "https://pub.dartlang.org" source: hosted - version: "0.3.3+2" + version: "0.3.3+4" crypto: dependency: transitive description: name: crypto + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 url: "https://pub.dartlang.org" source: hosted version: "3.0.2" @@ -89,6 +101,7 @@ packages: dependency: "direct main" description: name: cupertino_icons + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be url: "https://pub.dartlang.org" source: hosted version: "1.0.5" @@ -96,6 +109,7 @@ packages: dependency: "direct main" description: name: event + sha256: eb4814de94cbf6a10da9c4f652bc654087d7066e33566b5036822e6c0b24befb url: "https://pub.dartlang.org" source: hosted version: "2.1.2" @@ -103,6 +117,7 @@ packages: dependency: transitive description: name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" url: "https://pub.dartlang.org" source: hosted version: "1.3.1" @@ -110,6 +125,7 @@ packages: dependency: transitive description: name: ffi + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 url: "https://pub.dartlang.org" source: hosted version: "2.0.1" @@ -117,6 +133,7 @@ packages: dependency: "direct main" description: name: file_picker + sha256: d090ae03df98b0247b82e5928f44d1b959867049d18d73635e2e0bc3f49542b9 url: "https://pub.dartlang.org" source: hosted version: "5.2.5" @@ -124,6 +141,7 @@ packages: dependency: "direct main" description: name: filesystem_picker + sha256: cf790e033b3e0c07b5bc9f71458b39f1f45017641aae508ffdfb86a59baa0c1d url: "https://pub.dartlang.org" source: hosted version: "3.1.0" @@ -136,6 +154,7 @@ packages: dependency: "direct main" description: name: flutter_datetime_picker + sha256: "8e695c63c769350e541951227c2775190ec73ceda774a315b1dc9a99d5facfe5" url: "https://pub.dartlang.org" source: hosted version: "1.5.1" @@ -143,6 +162,7 @@ packages: dependency: "direct dev" description: name: flutter_lints + sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493 url: "https://pub.dartlang.org" source: hosted version: "1.0.4" @@ -155,6 +175,7 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle + sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b" url: "https://pub.dartlang.org" source: hosted version: "2.0.7" @@ -162,6 +183,7 @@ packages: dependency: "direct main" description: name: flutter_search_bar + sha256: "80c00de27e2fbb852550d6f0319135af191e5ba7ab7e61cd5173fd4e29611eb3" url: "https://pub.dartlang.org" source: hosted version: "3.0.0-dev.1" @@ -169,6 +191,7 @@ packages: dependency: "direct main" description: name: flutter_styled_toast + sha256: cc32aed2a49ce77a1ed5844073c6c0f5e381c81fd6d694e0ba3c5dc2a645963d url: "https://pub.dartlang.org" source: hosted version: "2.1.3" @@ -176,6 +199,7 @@ packages: dependency: "direct main" description: name: flutter_svg + sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2" url: "https://pub.dartlang.org" source: hosted version: "1.1.6" @@ -193,6 +217,7 @@ packages: dependency: transitive description: name: http + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" url: "https://pub.dartlang.org" source: hosted version: "0.13.5" @@ -200,6 +225,7 @@ packages: dependency: transitive description: name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" url: "https://pub.dartlang.org" source: hosted version: "4.0.2" @@ -207,6 +233,7 @@ packages: dependency: "direct main" description: name: image + sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6" url: "https://pub.dartlang.org" source: hosted version: "3.3.0" @@ -214,6 +241,7 @@ packages: dependency: "direct main" description: name: image_cropper + sha256: "60542ffd03436e6f80a1d7c9839f75b6a62b0a290cd98624fa29d150fdf672c8" url: "https://pub.dartlang.org" source: hosted version: "1.5.1" @@ -221,6 +249,7 @@ packages: dependency: "direct main" description: name: image_picker + sha256: f98d76672d309c8b7030c323b3394669e122d52b307d2bbd8d06bd70f5b2aabe url: "https://pub.dartlang.org" source: hosted version: "0.8.6+1" @@ -228,13 +257,15 @@ packages: dependency: transitive description: name: image_picker_android + sha256: "385f12ee9c7288575572c7873a332016ec45ebd092e1c2f6bd421b4a9ad21f1d" url: "https://pub.dartlang.org" source: hosted - version: "0.8.5+5" + version: "0.8.5+6" image_picker_for_web: dependency: transitive description: name: image_picker_for_web + sha256: "7d319fb74955ca46d9bf7011497860e3923bb67feebcf068f489311065863899" url: "https://pub.dartlang.org" source: hosted version: "2.1.10" @@ -242,13 +273,15 @@ packages: dependency: transitive description: name: image_picker_ios + sha256: "8ffb14b43713d7c43fb21299cc18181cc5b39bd3ea1cc427a085c6400fe5aa52" url: "https://pub.dartlang.org" source: hosted - version: "0.8.6+6" + version: "0.8.6+7" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface + sha256: "7cef2f28f4f2fef99180f636c3d446b4ccbafd6ba0fad2adc9a80c4040f656b8" url: "https://pub.dartlang.org" source: hosted version: "2.6.2" @@ -256,6 +289,7 @@ packages: dependency: transitive description: name: intl + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" url: "https://pub.dartlang.org" source: hosted version: "0.17.0" @@ -263,6 +297,7 @@ packages: dependency: "direct main" description: name: isolate + sha256: "3554ab10fdeec965d27e0074c913ccb2229887633da080d2b35a6322da14938b" url: "https://pub.dartlang.org" source: hosted version: "2.1.1" @@ -270,13 +305,15 @@ packages: dependency: transitive description: name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.5" lints: dependency: transitive description: name: lints + sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c url: "https://pub.dartlang.org" source: hosted version: "1.0.1" @@ -284,20 +321,23 @@ packages: dependency: transitive description: name: matcher + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" url: "https://pub.dartlang.org" source: hosted - version: "0.12.12" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 url: "https://pub.dartlang.org" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: name: meta + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" url: "https://pub.dartlang.org" source: hosted version: "1.8.0" @@ -305,13 +345,15 @@ packages: dependency: "direct main" description: name: modal_bottom_sheet + sha256: "3bba63c62d35c931bce7f8ae23a47f9a05836d8cb3c11122ada64e0b2f3d718f" url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "3.0.0-pre" multi_select_flutter: dependency: "direct main" description: name: multi_select_flutter + sha256: "503857b415d390d29159df8a9d92d83c6aac17aaf1c307fb7bcfc77d097d20ed" url: "https://pub.dartlang.org" source: hosted version: "4.1.3" @@ -319,6 +361,7 @@ packages: dependency: "direct main" description: name: path + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b url: "https://pub.dartlang.org" source: hosted version: "1.8.2" @@ -326,6 +369,7 @@ packages: dependency: transitive description: name: path_drawing + sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977 url: "https://pub.dartlang.org" source: hosted version: "1.0.1" @@ -333,6 +377,7 @@ packages: dependency: transitive description: name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf url: "https://pub.dartlang.org" source: hosted version: "1.0.1" @@ -340,6 +385,7 @@ packages: dependency: "direct main" description: name: permission_handler + sha256: "33c6a1253d1f95fd06fa74b65b7ba907ae9811f9d5c1d3150e51417d04b8d6a8" url: "https://pub.dartlang.org" source: hosted version: "10.2.0" @@ -347,6 +393,7 @@ packages: dependency: transitive description: name: permission_handler_android + sha256: "8028362b40c4a45298f1cbfccd227c8dd6caf0e27088a69f2ba2ab15464159e2" url: "https://pub.dartlang.org" source: hosted version: "10.2.0" @@ -354,6 +401,7 @@ packages: dependency: transitive description: name: permission_handler_apple + sha256: "9c370ef6a18b1c4b2f7f35944d644a56aa23576f23abee654cf73968de93f163" url: "https://pub.dartlang.org" source: hosted version: "9.0.7" @@ -361,6 +409,7 @@ packages: dependency: transitive description: name: permission_handler_platform_interface + sha256: "68abbc472002b5e6dfce47fe9898c6b7d8328d58b5d2524f75e277c07a97eb84" url: "https://pub.dartlang.org" source: hosted version: "3.9.0" @@ -368,6 +417,7 @@ packages: dependency: transitive description: name: permission_handler_windows + sha256: f67cab14b4328574938ecea2db3475dad7af7ead6afab6338772c5f88963e38b url: "https://pub.dartlang.org" source: hosted version: "0.1.2" @@ -375,6 +425,7 @@ packages: dependency: transitive description: name: petitparser + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" url: "https://pub.dartlang.org" source: hosted version: "5.1.0" @@ -382,6 +433,7 @@ packages: dependency: "direct main" description: name: photo_view + sha256: "26cb153080a2673bebccaf72d3283e82f8f41a47fe5f9bc5ba8634d2e8a9fc8e" url: "https://pub.dartlang.org" source: hosted version: "0.13.0" @@ -389,6 +441,7 @@ packages: dependency: transitive description: name: plugin_platform_interface + sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a url: "https://pub.dartlang.org" source: hosted version: "2.1.3" @@ -396,6 +449,7 @@ packages: dependency: transitive description: name: pointycastle + sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346 url: "https://pub.dartlang.org" source: hosted version: "3.6.2" @@ -403,6 +457,7 @@ packages: dependency: "direct main" description: name: scrollable_positioned_list + sha256: "9566352ab9ba05794ee6c8864f154afba5d36c5637d0e3e32c615ba4ceb92772" url: "https://pub.dartlang.org" source: hosted version: "0.2.3" @@ -415,34 +470,39 @@ packages: dependency: transitive description: name: source_span + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dartlang.org" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 url: "https://pub.dartlang.org" source: hosted version: "1.2.1" @@ -450,13 +510,15 @@ packages: dependency: transitive description: name: test_api + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 url: "https://pub.dartlang.org" source: hosted - version: "0.4.12" + version: "0.4.16" typed_data: dependency: transitive description: name: typed_data + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" url: "https://pub.dartlang.org" source: hosted version: "1.3.1" @@ -464,6 +526,7 @@ packages: dependency: "direct main" description: name: uni_links + sha256: "051098acfc9e26a9fde03b487bef5d3d228ca8f67693480c6f33fd4fbb8e2b6e" url: "https://pub.dartlang.org" source: hosted version: "0.5.1" @@ -471,6 +534,7 @@ packages: dependency: transitive description: name: uni_links_platform_interface + sha256: "929cf1a71b59e3b7c2d8a2605a9cf7e0b125b13bc858e55083d88c62722d4507" url: "https://pub.dartlang.org" source: hosted version: "1.0.0" @@ -478,6 +542,7 @@ packages: dependency: transitive description: name: uni_links_web + sha256: "7539db908e25f67de2438e33cc1020b30ab94e66720b5677ba6763b25f6394df" url: "https://pub.dartlang.org" source: hosted version: "0.1.0" @@ -485,6 +550,7 @@ packages: dependency: "direct main" description: name: uri_to_file + sha256: "84afd633b1492fc465c768141e1a29edd519061bf99935b6b4d0d5de8ec7c108" url: "https://pub.dartlang.org" source: hosted version: "0.2.0" @@ -492,13 +558,15 @@ packages: dependency: "direct main" description: name: url_launcher + sha256: e8f2efc804810c0f2f5b485f49e7942179f56eabcfe81dce3387fec4bb55876b url: "https://pub.dartlang.org" source: hosted - version: "6.1.8" + version: "6.1.9" url_launcher_android: dependency: transitive description: name: url_launcher_android + sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1" url: "https://pub.dartlang.org" source: hosted version: "6.0.23" @@ -506,13 +574,15 @@ packages: dependency: transitive description: name: url_launcher_ios + sha256: "0a5af0aefdd8cf820dd739886efb1637f1f24489900204f50984634c07a54815" url: "https://pub.dartlang.org" source: hosted - version: "6.0.18" + version: "6.1.0" url_launcher_linux: dependency: transitive description: name: url_launcher_linux + sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc" url: "https://pub.dartlang.org" source: hosted version: "3.0.2" @@ -520,6 +590,7 @@ packages: dependency: transitive description: name: url_launcher_macos + sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094" url: "https://pub.dartlang.org" source: hosted version: "3.0.2" @@ -527,6 +598,7 @@ packages: dependency: transitive description: name: url_launcher_platform_interface + sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6" url: "https://pub.dartlang.org" source: hosted version: "2.1.1" @@ -534,6 +606,7 @@ packages: dependency: transitive description: name: url_launcher_web + sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0" url: "https://pub.dartlang.org" source: hosted version: "2.0.14" @@ -541,6 +614,7 @@ packages: dependency: transitive description: name: url_launcher_windows + sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615 url: "https://pub.dartlang.org" source: hosted version: "3.0.3" @@ -548,13 +622,15 @@ packages: dependency: transitive description: name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.4" win32: dependency: transitive description: name: win32 + sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 url: "https://pub.dartlang.org" source: hosted version: "3.1.3" @@ -562,9 +638,10 @@ packages: dependency: transitive description: name: xml + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.2.2" sdks: dart: ">=2.18.0 <3.0.0" - flutter: ">=3.0.0" + flutter: ">=3.7.0" diff --git a/pubspec.yaml b/pubspec.yaml index d4f8af9..ff3f953 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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.6.4+10 +version: 1.6.6+13 environment: sdk: ">=2.12.0 <3.0.0" @@ -41,7 +41,7 @@ dependencies: photo_view: ^0.13.0 multi_select_flutter: ^4.0.0 flutter_datetime_picker: ^1.5.1 - modal_bottom_sheet: ^2.0.0 + modal_bottom_sheet: ^3.0.0-pre image_cropper: ^1.5.0 image_picker: ^0.8.6 file_picker: ^5.2.1