From ebc8c529ed673cf5fb46473b4ff44dd6ed298d16 Mon Sep 17 00:00:00 2001 From: perol_notsf Date: Wed, 1 Jul 2020 21:27:04 +0800 Subject: [PATCH] ios 1.1.0 --- .flutter-plugins-dependencies | 2 +- ios/Podfile.lock | 6 +++ ios/Runner.xcodeproj/project.pbxproj | 12 ++--- lib/page/about/about_page.dart | 5 +- lib/page/hello/hello_page.dart | 48 ++++++++++++++----- lib/page/hello/ranking/ranking_page.dart | 3 +- .../hello/recom/recom_spotlight_page.dart | 3 +- .../hello/setting/setting_quality_page.dart | 4 ++ pubspec.yaml | 2 +- 9 files changed, 60 insertions(+), 25 deletions(-) diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 9ff2099d9..c82949af3 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+2\\\\","dependencies":[]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.10\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.4.11\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+1\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+1\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"android":[{"name":"device_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\device_info-0.4.2+4\\\\","dependencies":[]},{"name":"flutter_displaymode","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_displaymode-0.1.0\\\\","dependencies":[]},{"name":"flutter_inapp_purchase","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_inapp_purchase-2.2.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.6.7+2\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.10\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1\\\\","dependencies":[]},{"name":"save_in_gallery","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\save_in_gallery-0.1.3\\\\","dependencies":[]},{"name":"screen","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\screen-0.0.5\\\\","dependencies":[]},{"name":"share","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"uni_links","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.4.11\\\\","dependencies":[]},{"name":"video_player","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player-0.10.11+1\\\\","dependencies":[]},{"name":"wakelock","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\wakelock-0.1.4+1\\\\","dependencies":[]},{"name":"webview_flutter","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\webview_flutter-0.3.22+1\\\\","dependencies":[]}],"macos":[{"name":"package_info","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.1\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-0.0.1+7\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-0.0.1+1\\\\","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.1+6\\\\","dependencies":[]},{"name":"video_player_web","path":"C:\\\\Users\\\\Perol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_player_web-0.1.3+1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info","dependencies":[]},{"name":"flutter_displaymode","dependencies":[]},{"name":"flutter_inapp_purchase","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"save_in_gallery","dependencies":[]},{"name":"screen","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-07-01 19:09:11.296464","version":"1.17.4"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+4/","dependencies":[]},{"name":"flutter_inapp_purchase","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_inapp_purchase-2.2.0/","dependencies":[]},{"name":"image_picker","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.6.7+2/","dependencies":[]},{"name":"package_info","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.10/","dependencies":[]},{"name":"permission_handler","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler-5.0.1/","dependencies":[]},{"name":"save_in_gallery","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/save_in_gallery-0.1.3/","dependencies":[]},{"name":"screen","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/screen-0.0.5/","dependencies":[]},{"name":"share","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/share-0.6.4+3/","dependencies":[]},{"name":"shared_preferences","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.7+3/","dependencies":[]},{"name":"sqflite","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1/","dependencies":[]},{"name":"uni_links","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.4.11/","dependencies":[]},{"name":"video_player","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.10.11+1/","dependencies":[]},{"name":"wakelock","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/wakelock-0.1.4+1/","dependencies":[]},{"name":"webview_flutter","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.22+1/","dependencies":[]}],"android":[{"name":"device_info","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+4/","dependencies":[]},{"name":"flutter_displaymode","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_displaymode-0.1.0/","dependencies":[]},{"name":"flutter_inapp_purchase","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_inapp_purchase-2.2.0/","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_plugin_android_lifecycle-1.0.8/","dependencies":[]},{"name":"image_picker","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.6.7+2/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.10/","dependencies":[]},{"name":"permission_handler","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler-5.0.1/","dependencies":[]},{"name":"save_in_gallery","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/save_in_gallery-0.1.3/","dependencies":[]},{"name":"screen","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/screen-0.0.5/","dependencies":[]},{"name":"share","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/share-0.6.4+3/","dependencies":[]},{"name":"shared_preferences","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.7+3/","dependencies":[]},{"name":"sqflite","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1/","dependencies":[]},{"name":"uni_links","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.4.11/","dependencies":[]},{"name":"video_player","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.10.11+1/","dependencies":[]},{"name":"wakelock","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/wakelock-0.1.4+1/","dependencies":[]},{"name":"webview_flutter","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.22+1/","dependencies":[]}],"macos":[{"name":"package_info","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.1/","dependencies":[]},{"name":"path_provider_macos","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1/","dependencies":[]},{"name":"url_launcher_macos","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+7/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+1/","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.1+6/","dependencies":[]},{"name":"video_player_web","path":"/Users/perol/Downloads/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player_web-0.1.3+1/","dependencies":[]}]},"dependencyGraph":[{"name":"device_info","dependencies":[]},{"name":"flutter_displaymode","dependencies":[]},{"name":"flutter_inapp_purchase","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"save_in_gallery","dependencies":[]},{"name":"screen","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-07-01 21:15:32.262481","version":"1.17.5"} \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3c991b36e..73ee5e553 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,6 +2,8 @@ PODS: - device_info (0.0.1): - Flutter - Flutter (1.0.0) + - flutter_displaymode (0.0.1): + - Flutter - flutter_inapp_purchase (0.0.1): - Flutter - flutter_plugin_android_lifecycle (0.0.1): @@ -56,6 +58,7 @@ PODS: DEPENDENCIES: - device_info (from `.symlinks/plugins/device_info/ios`) - Flutter (from `Flutter`) + - flutter_displaymode (from `.symlinks/plugins/flutter_displaymode/ios`) - flutter_inapp_purchase (from `.symlinks/plugins/flutter_inapp_purchase/ios`) - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`) @@ -89,6 +92,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/device_info/ios" Flutter: :path: Flutter + flutter_displaymode: + :path: ".symlinks/plugins/flutter_displaymode/ios" flutter_inapp_purchase: :path: ".symlinks/plugins/flutter_inapp_purchase/ios" flutter_plugin_android_lifecycle: @@ -139,6 +144,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec + flutter_displaymode: e1847a4c70dc07d58798a06f3db57cef6ecf6422 flutter_inapp_purchase: 5c6a1ac3f11b11d0c8c0321c0c41c1f05805e4c8 flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 5aa2c9fdb..ba4737a20 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -374,7 +374,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 37; DEVELOPMENT_TEAM = L9F8ZWCR8Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -387,7 +387,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.0.12; + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez; PRODUCT_NAME = PixEz; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -510,7 +510,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 37; DEVELOPMENT_TEAM = L9F8ZWCR8Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -523,7 +523,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.0.12; + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez; PRODUCT_NAME = PixEz; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -539,7 +539,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 37; DEVELOPMENT_TEAM = L9F8ZWCR8Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -552,7 +552,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.0.12; + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez; PRODUCT_NAME = PixEz; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/page/about/about_page.dart b/lib/page/about/about_page.dart index cc57bb209..c60460199 100644 --- a/lib/page/about/about_page.dart +++ b/lib/page/about/about_page.dart @@ -306,6 +306,7 @@ class _AboutPageState extends State { title: Text(I18n.of(context).Thanks), subtitle: Text('感谢帮助我测试的弹幕委员会群友们'), onTap: () { + if(Platform.isAndroid) Navigator.of(context).push(MaterialPageRoute( builder: (_) => Scaffold( appBar: AppBar(), @@ -323,7 +324,7 @@ class _AboutPageState extends State { } }, ), - ...[ + ...Platform.isAndroid?[ ListTile( title: Text('如果你觉得这个应用还不错'), subtitle: Text('支持一下开发者吧!'), @@ -354,7 +355,7 @@ class _AboutPageState extends State { }, ), ), - ], + ]:[], ...(Platform.isIOS) ? [ Card( diff --git a/lib/page/hello/hello_page.dart b/lib/page/hello/hello_page.dart index 13a70f0cf..6006dc2af 100644 --- a/lib/page/hello/hello_page.dart +++ b/lib/page/hello/hello_page.dart @@ -44,11 +44,14 @@ class _HelloPageState extends State { @override void dispose() { _sub?.cancel(); + _pageController?.dispose(); super.dispose(); } + PageController _pageController; @override void initState() { + _pageController = PageController(); super.initState(); saveStore.saveStream.listen((stream) { listenBehavior(context, stream); @@ -128,8 +131,8 @@ class _HelloPageState extends State { } catch (e) { print(e); } - var prefs = await SharedPreferences.getInstance(); - if (prefs.getInt('language_num') == null) { + var prefs = await SharedPreferences.getInstance(); + if (prefs.getInt('language_num') == null) { Navigator.of(context) .pushReplacement(MaterialPageRoute(builder: (context) => InitPage())); } @@ -141,17 +144,35 @@ class _HelloPageState extends State { Widget build(BuildContext context) { return Scaffold( body: Observer(builder: (_) { - return IndexedStack( - index: index, - children: accountStore.now != null - ? [ - RecomSpolightPage(), - NewPage(), - SearchPage(), - SettingPage() - ] - : [PreviewPage(), NewPage(), SearchPage(), SettingPage()], - ); + return accountStore.now != null + ? PageView.builder( + controller: _pageController, + onPageChanged: (index) { + setState(() { + this.index = index; + }); + }, + itemBuilder: (context, index) { + var lists = [ + RecomSpolightPage(), + NewPage(), + SearchPage(), + SettingPage() + ]; + + return lists[index]; + }) + : PageView.builder( + controller: _pageController, + itemBuilder: (context, index) { + var lists = [ + PreviewPage(), + NewPage(), + SearchPage(), + SettingPage() + ]; + return lists[index]; + }); }), bottomNavigationBar: BottomNavigationBar( type: BottomNavigationBarType.fixed, @@ -160,6 +181,7 @@ class _HelloPageState extends State { setState(() { this.index = index; }); + _pageController.jumpToPage(index); }, items: [ BottomNavigationBarItem( diff --git a/lib/page/hello/ranking/ranking_page.dart b/lib/page/hello/ranking/ranking_page.dart index e470fa413..e587e25ec 100644 --- a/lib/page/hello/ranking/ranking_page.dart +++ b/lib/page/hello/ranking/ranking_page.dart @@ -41,7 +41,8 @@ class _RankingPageState extends State "week", "month", "day_r18", - "week_r18" + "week_r18", + "week_r18g" ]; var boolList = Map(); diff --git a/lib/page/hello/recom/recom_spotlight_page.dart b/lib/page/hello/recom/recom_spotlight_page.dart index a11557533..86c05f065 100644 --- a/lib/page/hello/recom/recom_spotlight_page.dart +++ b/lib/page/hello/recom/recom_spotlight_page.dart @@ -26,6 +26,7 @@ import 'package:pixez/component/spotlight_card.dart'; import 'package:pixez/generated/l10n.dart'; import 'package:pixez/lighting/lighting_store.dart'; import 'package:pixez/network/api_client.dart'; +import 'package:pixez/page/hello/ranking/rank_page.dart'; import 'package:pixez/page/hello/ranking/ranking_page.dart'; import 'package:pixez/page/hello/recom/spotlight_store.dart'; import 'package:pixez/page/spotlight/spotlight_page.dart'; @@ -209,7 +210,7 @@ class _RecomSpolightPageState extends State Navigator.of(context) .push(MaterialPageRoute(builder: (BuildContext context) { return Scaffold( - body: RankingPage(), + body: RankPage(), ); })); }, diff --git a/lib/page/hello/setting/setting_quality_page.dart b/lib/page/hello/setting/setting_quality_page.dart index 7fa755753..8ae2fe39d 100644 --- a/lib/page/hello/setting/setting_quality_page.dart +++ b/lib/page/hello/setting/setting_quality_page.dart @@ -14,6 +14,8 @@ * */ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:pixez/generated/l10n.dart'; @@ -38,6 +40,7 @@ class _SettingQualityPageState extends State InkWell( onTap: () { try { + if(Platform.isAndroid) launch('https://github.com/itzXian'); } catch (e) {} }, @@ -59,6 +62,7 @@ class _SettingQualityPageState extends State InkWell( onTap: () { try { + if(Platform.isAndroid) launch('https://github.com/TragicLifeHu'); } catch (e) {} }, diff --git a/pubspec.yaml b/pubspec.yaml index e2b70caaa..eb2deb69a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # 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.0.12+35 +version: 1.1.0+37 environment: sdk: ">=2.2.2 <3.0.0"