Skip to content

1.0.2 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Mar 23, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0e101c4
style: 修改样式
wanwusangzhi Mar 19, 2019
4492eb6
Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev
wanwusangzhi Mar 19, 2019
54fccec
style:修改样式
wanwusangzhi Mar 19, 2019
1121e35
feat:修改线上线下环境值
wanwusangzhi Mar 19, 2019
6fce888
更新代码
Mar 20, 2019
63bf655
Merge branch 'magic' into dev
Mar 20, 2019
c4f1189
Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev
Mar 20, 2019
40748dd
feat:增加gesturedetector组件
wanwusangzhi Mar 20, 2019
acf0fb4
Merge branch 'dev' of github.com:efoxTeam/flutter-ui into dev
zxxlx Mar 20, 2019
de19a89
feat:增加颜色切换 优化内容页体验
ckken Mar 21, 2019
204dfe5
Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev
ckken Mar 21, 2019
bcbd230
feat:多主题支持
ckken Mar 21, 2019
c6c3174
feat:增加gesturedector
wanwusangzhi Mar 21, 2019
7a8cf01
Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev
wanwusangzhi Mar 21, 2019
edf22b8
feat:完成主題切換
ckken Mar 21, 2019
e7d6bb4
Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev
ckken Mar 21, 2019
87c709b
fix:解決主題閃動問題
ckken Mar 21, 2019
dc3774f
style:优化二级页面主题样式
wanwusangzhi Mar 22, 2019
e5d004f
加入自动更新功能
ckken Mar 22, 2019
63da2e7
Merge branch 'master' into dev
ckken Mar 22, 2019
be2b3b4
feat:v1.0.2
ckken Mar 22, 2019
298b2ce
doc:更新文档
ckken Mar 22, 2019
fc7ad76
feat:屏蔽ios版本检测功能
ckken Mar 22, 2019
fe5b7db
feat:自定义expansionTile 组件
ckken Mar 22, 2019
a2a8269
feat:增加gesturedetector
wanwusangzhi Mar 22, 2019
4b5a9e9
Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev
wanwusangzhi Mar 22, 2019
03dfa24
doc:增加demo预览图
ckken Mar 23, 2019
29b5307
Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev
ckken Mar 23, 2019
c400197
doc:更新预览
ckken Mar 23, 2019
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
Prev Previous commit
Next Next commit
feat:自定义expansionTile 组件
  • Loading branch information
ckken committed Mar 22, 2019
commit fe5b7dba121945acec8e20e19cc70817ef17bd7d
4 changes: 2 additions & 2 deletions lib/components/expansionTile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,10 @@ class _ExpansionTileState extends State<ExpansionTile>
_borderColorTween..end = theme.dividerColor;
_headerColorTween
..begin = theme.textTheme.subhead.color
..end = theme.accentColor;
..end = theme.primaryColor;
_iconColorTween
..begin = theme.unselectedWidgetColor
..end = theme.accentColor;
..end = theme.primaryColor;
_backgroundColorTween..end = widget.backgroundColor;
super.didChangeDependencies();
}
Expand Down
15 changes: 6 additions & 9 deletions lib/config/theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class AppTheme {
static int blackColor = 0xFF000000;
static int lineColor = 0xFFEEEEEE;
static getThemeData(String theme) {
print('==================================getThemeData=$theme');
//print('==================================getThemeData=$theme');
mainColor = materialColor[theme];
ThemeData themData = ThemeData(
textTheme: TextTheme(
Expand All @@ -36,14 +36,11 @@ class AppTheme {
),
accentColor: Colors.grey, // 选中颜色
primaryColor: Color(mainColor), // appbar背景
primaryTextTheme:TextTheme(
title:TextStyle(
// color: Colors.red
),
button: TextStyle(
color: Colors.red
)
),
primaryTextTheme: TextTheme(
title: TextStyle(
// color: Colors.red
),
button: TextStyle(color: Colors.red)),
scaffoldBackgroundColor: Color(secondColor), // 整体的scaffold背景颜色
);
return themData;
Expand Down
4 changes: 3 additions & 1 deletion lib/page/mine/index_2.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:efox_flutter/config/theme.dart' show AppTheme;
import 'package:efox_flutter/store/index.dart' show model;
import 'package:efox_flutter/config/color.dart' show materialColor;
import 'package:efox_flutter/utils/appVersion.dart' show AppVersion;
import 'package:efox_flutter/components/expansionTile.dart' as Comp;

class _IndexState extends State<Index> {
@override
Expand Down Expand Up @@ -75,8 +76,9 @@ class _IndexState extends State<Index> {
Divider(
color: Color(AppTheme.lineColor),
),
ExpansionTile(
Comp.ExpansionTile(
leading: Icon(Icons.color_lens),
headerBackgroundColor: Colors.transparent,
title: Row(
children: <Widget>[
Text(AppLocalizations.$t('common_mine_1.theme')),
Expand Down