Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion lib/ui/helper/favourite_helper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 0 additions & 1 deletion lib/ui/page/article/article_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ class _ArticleDetailPageState extends State<ArticleDetailPage> {
// 加载js
javascriptMode: JavascriptMode.unrestricted,
navigationDelegate: (NavigationRequest request) {
///TODO isForMainFrame为false,页面不跳转.导致网页内很多链接点击没效果
debugPrint('导航$request');
if (!request.url.startsWith('http')) {
ThirdAppUtils.openAppByUrl(request.url);
Expand Down
2 changes: 2 additions & 0 deletions lib/ui/page/search/search_suggestions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class _SearchHotKeysWidgetState extends State<SearchHotKeysWidget> {
S.of(context).searchHot,
style: Provider.of<TextStyle>(context),
),
onPressed: () {},
),
Consumer<SearchHotKeyModel>(
builder: (context, model, _) {
Expand Down Expand Up @@ -160,6 +161,7 @@ class _SearchHistoriesWidgetState extends State<SearchHistoriesWidget> {
S.of(context).searchHistory,
style: Provider.of<TextStyle>(context),
),
onPressed: () {},
),
Consumer<SearchHistoryModel>(
builder: (context, model, child) => Visibility(
Expand Down
10 changes: 4 additions & 6 deletions lib/ui/page/tab/user_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<ThemeModel>(context).switchTheme(
userDarkMode:
Theme.of(context).brightness == Brightness.light);
userDarkMode: Theme.of(context).brightness == Brightness.light);
}
}
}
Expand Down Expand Up @@ -269,7 +267,7 @@ class SettingThemeWidget extends StatelessWidget {
child: InkWell(
onTap: () {
var model = Provider.of<ThemeModel>(context);
var brightness = Theme.of(context).brightness;
// var brightness = Theme.of(context).brightness;
model.switchTheme(color: color);
},
child: Container(
Expand Down
9 changes: 4 additions & 5 deletions lib/utils/status_bar_utils.dart
Original file line number Diff line number Diff line change
@@ -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<SystemUiOverlayStyle>实现
static systemUiOverlayStyle(BuildContext context) {
Expand Down
Loading