Skip to content

Commit f3243d0

Browse files
ckkenckken
committed
Merge remote-tracking branch 'origin/master' into dev
2 parents 0b7adeb + ea103ac commit f3243d0

File tree

9 files changed

+92
-23
lines changed

9 files changed

+92
-23
lines changed

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
15BE2897D1518D9BDD5AF970 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
4646
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4747
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
48+
3DB87B9B20AEA710C58FBCC8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
49+
6F6754CA16FD7E3C9E4FCEB3 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4850
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4951
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
5052
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -58,6 +60,7 @@
5860
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5961
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6062
BEBBA521223FEA6600583D52 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
63+
C1D6F379F6B3C85C2CC34999 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
6164
D7BE9010C4F7FF033BA299B7 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6265
FDCB5E5FC17434D1FF8247D2 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
6366
/* End PBXFileReference section */

‎lib/components/widget_comp.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ class IndexState extends State<Index> {
106106
actions: this.getActions(
107107
context,
108108
),
109+
brightness: Brightness.light,
109110
leading: IconButton(
110111
icon: Icon(Icons.arrow_back),
111112
color: Color(AppTheme.blackColor),

‎lib/controller/index.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:efox_flutter/utils/appVersion.dart' show AppVersion;
55

66
void initState() async {
77
// 获取版本号
8-
Store.valueNotCtx<ConfigModel>().$getAppVersion();
8+
Store.valueNotCtx<ConfigModel>().getAppVersion();
99
// 登录
1010
Store.valueNotCtx<UserModel>().getLocalUserInfo().then((res) {
1111
if (res) {

‎lib/main.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class MainAppState extends State<MainApp> {
3131

3232
@override
3333
Widget build(BuildContext context) {
34-
Store.value<ConfigModel>(context).$getTheme();
34+
Store.value<ConfigModel>(context).getTheme();
3535

3636
return Store.connect<ConfigModel>(
3737
builder: (context, child, model) {

‎lib/page/mine/index.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class _IndexState extends State<Index> {
152152
Widget Edage(name, color, context) {
153153
return GestureDetector(
154154
onTap: () {
155-
Store.value<ConfigModel>(context).$setTheme(name);
155+
Store.value<ConfigModel>(context).setTheme(name);
156156
},
157157
child: Container(
158158
color: Color(color),

‎lib/store/models/config_state_model.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ class ConfigInfo {
1212
}
1313

1414
class ConfigModel extends ConfigInfo with ChangeNotifier {
15-
Future $getAppVersion() async {
15+
Future getAppVersion() async {
1616
PackageInfo packageInfo = await PackageInfo.fromPlatform();
1717
appVersion = await packageInfo.version;
1818
notifyListeners();
1919
}
2020

21-
Future $getTheme() async {
21+
Future getTheme() async {
2222
String _theme = await LocalStorage.get('theme');
2323
print('config get Theme ${_theme}');
2424
if (_theme != null) {
25-
$setTheme(_theme);
25+
setTheme(_theme);
2626
}
2727
}
2828

29-
Future $setTheme(payload) async {
29+
Future setTheme(payload) async {
3030
theme = payload;
3131
LocalStorage.set('theme', payload);
3232
notifyListeners();

‎readme.md‎

Lines changed: 81 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,95 @@
1-
# Flutter UI <img src="android/app/src/main/res/mipmap-ldpi/ic_launcher.png" height="20"> <sup>v1.0.2</sup>
1+
# Flutter UI <img src="https://github.com/YYFlutter/flutter-ui/blob/master/android/app/src/main/res/mipmap-ldpi/ic_launcher.png?raw=true" height="20"> <sup>v1.0.2</sup>
22

3+
> YY Flutter 开发者社区
4+
5+
[![License](https://img.shields.io/github/issues/YYFlutter/flutter-ui.svg)](https://jitpack.io/#YYFlutter/flutter-ui)
6+
[![Stars](https://img.shields.io/github/stars/YYFlutter/flutter-ui.svg)](https://jitpack.io/#YYFlutter/flutter-ui)
7+
[![Stars](https://img.shields.io/github/forks/YYFlutter/flutter-ui.svg)](https://jitpack.io/#YYFlutter/flutter-ui)
8+
[![Forks](https://img.shields.io/github/issues/YYFlutter/flutter-ui.svg)](https://jitpack.io/#YYFlutter/flutter-ui)
9+
10+
## 社区功能介绍
11+
+ [团队介绍]()
12+
+ FlutterUI Demo
13+
+ 文章类
14+
+ Flutter系列教程
15+
+ Flutter实战组件集锦
16+
+ 其它推文
17+
+ 插件类
18+
+ [Flutter-animation-set 动画插件](https://github.com/YYFlutter/flutter-animation-set)
19+
+ [安卓包下载](https://github.com/YYFlutter/flutter-ui/releases/download/v1.0.2/app-release.apk)
20+
+ 社区互动与交流
21+
22+
23+
## FlutterUI Demo预览
24+
<img src="https://github.com/YYFlutter/flutter-ui/blob/master/readme/1.0.2/1.jpg?raw=true" width="200" /> <img src="https://github.com/YYFlutter/flutter-ui/blob/master/readme/1.0.2/2.jpg?raw=true" width="200" /> <img src="https://github.com/YYFlutter/flutter-ui/blob/master/readme/1.0.2/3.jpg?raw=true" width="200" />
25+
<img src="https://github.com/YYFlutter/flutter-ui/blob/master/readme/1.0.2/4.jpg?raw=true" width="200" /> <img src="https://github.com/YYFlutter/flutter-ui/blob/master/readme/1.0.2/5.jpg?raw=true" width="200" /> <img src="https://github.com/YYFlutter/flutter-ui/blob/master/readme/1.0.2/6.jpg?raw=true" width="200" />
26+
27+
### Flutter系列教程
28+
| 文章 | 文章状态 | 作者 | 变更日志 |
29+
| --- | --- | --- | --- |
30+
| | 进行中 | | |
31+
| | 进行中 | | |
32+
| | 进行中 | | |
33+
34+
35+
<a name="1b4593e9"></a>
36+
### Flutter实战组件集锦
37+
#### 弹层【集锦】
38+
| 文章 | 文章状态 | 作者 | 变更日志 |
39+
| --- | --- | --- | --- |
40+
| 透明弹窗背景 | 进行中 | | |
41+
| 确认框 | 进行中 | | |
42+
| 聊天输入框 | 进行中 | | |
43+
| | 进行中 | | |
44+
| | 进行中 | | |
45+
| | 已完成 | | |
46+
47+
48+
#### 列表【集锦】
49+
| 文章 | 文章状态 | 作者 | 变更日志 |
50+
| --- | --- | --- | --- |
51+
| 上下拉加载 | 进行中 | | |
52+
| | 进行中 | | |
53+
54+
55+
#### 列表【导航】
56+
| 文章 | 文章状态 | 作者 | 变更日志 |
57+
| --- | --- | --- | --- |
58+
| 顶部透明 | 进行中 | | |
59+
| | 进行中 | | |
60+
61+
62+
#### 列表【适配方案】
63+
| 文章 | 文章状态 | 作者 | 变更日志 |
64+
| --- | --- | --- | --- |
65+
| 适配iphonex底部 | 进行中 | | |
66+
| | 进行中 | | |
67+
68+
### 其它推文
69+
| 文章 | 文章状态 | 作者 | 变更日志 |
70+
| --- | --- | --- | --- |
71+
| [Flutter UI APP 低调上线](https://juejin.im/post/5c90514e6fb9a070c859029c) | 已完成 | [ken](https://github.com/ckken) | 2019/03/19 |
72+
| [Flutter 接入 firebase 快速构建应用](https://juejin.im/post/5c90514e6fb9a070c859029c) | 已完成 | [ken](https://github.com/ckken) | 2019/03/19 |
73+
| [Flutter UI 1.0.2落地与优化小结](https://juejin.im/post/5c95e691f265da610c06905c) | 已完成 | [ken](https://github.com/ckken) | 2019/03/23 |
74+
| [Flutter 全局弹窗](https://juejin.im/post/5c9f2c37518825609415d11d) | 已完成 | [wanwu](https://github.com/wanwusangzhi) | 2019/03/30 |
75+
| [Flutter UI使用Provide实现主题切换](https://juejin.im/post/5ca5e240f265da30c1725021) | 已完成 | [DIVINER-onlys](https://github.com/DIVINER-onlys) | 2019/04/04 |
76+
| [Flutter provide ProvideMulti](https://juejin.im/post/5cc685835188252e8925f056) | 已完成 | [wanwu](https://github.com/wanwusangzhi) | 2019/03/23 |
77+
| [以$t形式使用flutter多语言](https://juejin.im/post/5cdb8adee51d453acc60162c) | 已完成 | [DIVINER-onlys](https://github.com/DIVINER-onlys) | 2019/05/15 |
78+
| [Flutter Provider 3.0实战教程](https://juejin.im/post/5d2c19c6e51d4558936aa11c) | 已完成 | [DIVINER-onlys](https://github.com/DIVINER-onlys) | 2019/07/15 |
379

4-
> flutter 开发者社区
5-
## 功能清单
6-
+ widget 组件教程
7-
+ 多语言切换
8-
+ 多主题切换
9-
+ 自动更新检测
10-
+ firebase 崩溃监控
1180

1281
## apk 下载
13-
![安卓包下载](readme/apk.png)
14-
[安卓包下载](https://github.com/efoxTeam/flutter-ui/releases/download/v1.0.2/app-release.apk)
15-
16-
## Demo 预览
17-
<img src="readme/1.0.2/1.jpg" width="200" /> <img src="readme/1.0.2/2.jpg" width="200" /> <img src="readme/1.0.2/3.jpg" width="200" />
18-
<img src="readme/1.0.2/4.jpg" width="200" /> <img src="readme/1.0.2/5.jpg" width="200" /> <img src="readme/1.0.2/6.jpg" width="200" />
82+
![安卓包下载](https://github.com/YYFlutter/flutter-ui/blob/master/readme/apk.png?raw=true)
83+
[安卓包下载](https://github.com/YYFlutter/flutter-ui/releases/download/v1.0.2/app-release.apk)
1984

2085
## 项目相关
21-
+ [apk包历史版本](https://github.com/efoxTeam/flutter-ui/releases)
86+
+ [apk包历史版本](https://github.com/YYFlutter/flutter-ui/releases)
2287
+ [组件开发进度](readme/widget_progress.md)
2388
+ [贡献PR参考](readme/pr.md)
2489

2590

2691
## 项目交流
27-
<img src="readme/qq-qrcode.png" width="200" />
92+
<img src="https://github.com/YYFlutter/flutter-ui/blob/master/readme/qq-qrcode.png?raw=true" width="200" />
2893

2994

3095

‎readme/1.0.2.png‎

42 KB
Loading

‎readme/google_play.png‎

13.6 KB
Loading

0 commit comments

Comments
 (0)