diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh new file mode 100755 index 0000000..34beb2f --- /dev/null +++ b/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/elliotxin/Documents/Flutter/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/elliotxin/AndroidStudioProjects/fun_android_flutter" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "SYMROOT=${SOURCE_ROOT}/../build/ios" +export "FLUTTER_FRAMEWORK_DIR=/Users/elliotxin/Documents/Flutter/flutter/bin/cache/artifacts/engine/ios" +export "FLUTTER_BUILD_NAME=0.1.11" +export "FLUTTER_BUILD_NUMBER=1" diff --git a/lib/ui/helper/favourite_helper.dart b/lib/ui/helper/favourite_helper.dart index 9d06cc1..292cd84 100644 --- a/lib/ui/helper/favourite_helper.dart +++ b/lib/ui/helper/favourite_helper.dart @@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:fun_android/config/router_manger.dart'; import 'package:fun_android/generated/i18n.dart'; import 'package:fun_android/model/article.dart'; -import 'package:fun_android/provider/view_state.dart'; +// import 'package:fun_android/provider/view_state.dart'; import 'package:fun_android/ui/widget/favourite_animation.dart'; import 'package:fun_android/view_model/favourite_model.dart'; import 'package:fun_android/view_model/user_model.dart'; diff --git a/lib/ui/page/article/article_detail_page.dart b/lib/ui/page/article/article_detail_page.dart index d5008f7..45bd7c1 100644 --- a/lib/ui/page/article/article_detail_page.dart +++ b/lib/ui/page/article/article_detail_page.dart @@ -70,7 +70,6 @@ class _ArticleDetailPageState extends State { // 加载js javascriptMode: JavascriptMode.unrestricted, navigationDelegate: (NavigationRequest request) { - ///TODO isForMainFrame为false,页面不跳转.导致网页内很多链接点击没效果 debugPrint('导航$request'); if (!request.url.startsWith('http')) { ThirdAppUtils.openAppByUrl(request.url); diff --git a/lib/ui/page/search/search_suggestions.dart b/lib/ui/page/search/search_suggestions.dart index e327da9..203f8d2 100644 --- a/lib/ui/page/search/search_suggestions.dart +++ b/lib/ui/page/search/search_suggestions.dart @@ -88,6 +88,7 @@ class _SearchHotKeysWidgetState extends State { S.of(context).searchHot, style: Provider.of(context), ), + onPressed: () {}, ), Consumer( builder: (context, model, _) { @@ -160,6 +161,7 @@ class _SearchHistoriesWidgetState extends State { S.of(context).searchHistory, style: Provider.of(context), ), + onPressed: () {}, ), Consumer( builder: (context, model, child) => Visibility( diff --git a/lib/ui/page/tab/user_page.dart b/lib/ui/page/tab/user_page.dart index 2526ba7..c8dee54 100644 --- a/lib/ui/page/tab/user_page.dart +++ b/lib/ui/page/tab/user_page.dart @@ -234,13 +234,11 @@ class UserListWidget extends StatelessWidget { } void switchDarkMode(BuildContext context) { - if (MediaQuery.of(context).platformBrightness == - Brightness.dark) { - showToast("检测到系统为暗黑模式,已为你自动切换",position: ToastPosition.bottom); + if (MediaQuery.of(context).platformBrightness == Brightness.dark) { + showToast("检测到系统为暗黑模式,已为你自动切换", position: ToastPosition.bottom); } else { Provider.of(context).switchTheme( - userDarkMode: - Theme.of(context).brightness == Brightness.light); + userDarkMode: Theme.of(context).brightness == Brightness.light); } } } @@ -269,7 +267,7 @@ class SettingThemeWidget extends StatelessWidget { child: InkWell( onTap: () { var model = Provider.of(context); - var brightness = Theme.of(context).brightness; + // var brightness = Theme.of(context).brightness; model.switchTheme(color: color); }, child: Container( diff --git a/lib/utils/status_bar_utils.dart b/lib/utils/status_bar_utils.dart index 17aeb87..2314525 100644 --- a/lib/utils/status_bar_utils.dart +++ b/lib/utils/status_bar_utils.dart @@ -1,13 +1,12 @@ -import 'dart:convert'; +// import 'dart:convert'; import 'dart:ui'; -import 'package:convert/convert.dart'; -import 'package:crypto/crypto.dart'; +// import 'package:convert/convert.dart'; +// import 'package:crypto/crypto.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:html_unescape/html_unescape.dart'; +// import 'package:html_unescape/html_unescape.dart'; class StatusBarUtils { - /// 根据主题色彩控制状态栏字体颜色 /// 通过AnnotatedRegion实现 static systemUiOverlayStyle(BuildContext context) { diff --git a/pubspec.lock b/pubspec.lock index 63d0283..99e660d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,125 +1,118 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.0.10" args: dependency: transitive description: name: args - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.5.2" async: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.3.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.0.5" cached_network_image: dependency: "direct main" description: name: cached_network_image - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.2+1" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.2" collection: dependency: "direct main" description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.14.11" convert: dependency: transitive description: name: convert - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.1.1" cookie_jar: dependency: "direct main" description: name: cookie_jar - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.0.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.1.3" csslib: dependency: transitive description: name: csslib - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.16.1" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.1.2" device_info: dependency: "direct main" description: name: device_info - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.4.0+2" + version: "0.4.0+4" dio: dependency: "direct main" description: name: dio - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.3" dio_cookie_manager: dependency: "direct main" description: name: dio_cookie_manager - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.0.0" flare_dart: dependency: transitive description: name: flare_dart - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.4.7" + version: "2.2.2" flare_flutter: dependency: "direct main" description: name: flare_flutter - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.5.9" + version: "1.6.2" flutter: dependency: "direct main" description: flutter @@ -129,14 +122,14 @@ packages: dependency: transitive description: name: flutter_cache_manager - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.3" flutter_html: dependency: "direct main" description: name: flutter_html - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.10.4" flutter_localizations: @@ -148,28 +141,28 @@ packages: dependency: "direct main" description: name: flutter_markdown - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.2.0" flutter_page_indicator: dependency: transitive description: name: flutter_page_indicator - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.0.3" flutter_slidable: dependency: "direct main" description: name: flutter_slidable - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.5.3" flutter_swiper: dependency: "direct main" description: name: flutter_swiper - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.6" flutter_test: @@ -181,177 +174,170 @@ packages: dependency: "direct main" description: name: flutter_webview_plugin - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.3.8" html: dependency: transitive description: name: html - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.14.0+2" + version: "0.14.0+3" html_unescape: dependency: "direct main" description: name: html_unescape - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.0.1+3" http: dependency: transitive description: name: http - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.12.0+2" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "3.1.3" - image: - dependency: transitive - description: - name: image - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.4" intl: dependency: transitive description: name: intl - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.16.0" + version: "0.15.8" launch_review: dependency: "direct main" description: name: launch_review - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.0" localstorage: dependency: "direct main" description: name: localstorage - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.0" markdown: dependency: transitive description: name: markdown - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.12.5" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.7" oktoast: dependency: "direct main" description: name: oktoast - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.2.0" open_file: dependency: "direct main" description: name: open_file - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.3" package_info: dependency: "direct main" description: name: package_info - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.4.0+6" + version: "0.4.0+8" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.6.4" path_provider: dependency: transitive description: name: path_provider - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.8.0+1" - petitparser: + platform: dependency: transitive description: - name: petitparser - url: "https://pub.flutter-io.cn" + name: platform + url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "2.2.1" provider: dependency: "direct main" description: name: provider - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.0+1" pull_to_refresh: dependency: "direct main" description: name: pull_to_refresh - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.5.6" + version: "1.5.7" quiver: dependency: "direct main" description: name: quiver - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.5" share: dependency: "direct main" description: name: share - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.6.2+1" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.5.3+5" shimmer: dependency: "direct main" description: name: shimmer - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" sky_engine: dependency: transitive description: flutter @@ -361,107 +347,100 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.5.5" sqflite: dependency: transitive description: name: sqflite - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.1.6+4" + version: "1.1.7+1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.9.3" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.0.5" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.1.0+1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.0" test_api: dependency: transitive description: name: test_api - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.2.5" transformer_page_view: dependency: transitive description: name: transformer_page_view - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.1.6" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.6" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "5.1.6" + version: "5.2.2" uuid: dependency: transitive description: name: uuid - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.2" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.8" webview_flutter: dependency: "direct main" description: name: webview_flutter - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.3.13" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "3.5.0" + version: "0.3.15+1" sdks: - dart: ">2.4.0 <3.0.0" - flutter: ">=1.7.8+hotfix.3 <2.0.0" + dart: ">=2.5.0 <3.0.0" + flutter: ">=1.9.1+hotfix.4 <2.0.0"