Skip to content

Commit 4f88fdb

Browse files
committed
完成主题切换保存
1 parent 1b232d0 commit 4f88fdb

4 files changed

Lines changed: 43 additions & 25 deletions

File tree

‎lib/common/config/Config.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ class Config {
1212
static const LANGUAGE_SELECT = "language-select";
1313
static const LANGUAGE_SELECT_NAME = "language-select-name";
1414
static const REFRESH_LANGUAGE = "refreshLanguageApp";
15+
static const THEME_COLOR = "theme-color";
1516
}

‎lib/common/dao/UserDao.dart‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import 'package:gsy_github_app_flutter/common/model/UserOrg.dart';
1616
import 'package:gsy_github_app_flutter/common/net/Address.dart';
1717
import 'package:gsy_github_app_flutter/common/net/Api.dart';
1818
import 'package:gsy_github_app_flutter/common/redux/UserRedux.dart';
19+
import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
1920
import 'package:redux/redux.dart';
2021

2122
class UserDao {
@@ -59,6 +60,13 @@ class UserDao {
5960
if (res != null && res.result && token != null) {
6061
store.dispatch(UpdateUserAction(res.data));
6162
}
63+
64+
///读取主题
65+
String themeIndex = await LocalStorage.get(Config.THEME_COLOR);
66+
if (themeIndex != null && themeIndex.length != 0) {
67+
CommonUtils.pushTheme(store, int.parse(themeIndex));
68+
}
69+
6270
return new DataResult(res.data, (res.result && (token != null)));
6371
}
6472

‎lib/common/utils/CommonUtils.dart‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ import 'package:flutter/material.dart';
55
import 'package:flutter/services.dart';
66
import 'package:fluttertoast/fluttertoast.dart';
77
import 'package:gsy_github_app_flutter/common/net/Address.dart';
8+
import 'package:gsy_github_app_flutter/common/redux/ThemeRedux.dart';
89
import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
910
import 'package:gsy_github_app_flutter/common/utils/NavigatorUtils.dart';
1011
import 'package:gsy_github_app_flutter/widget/GSYFlexButton.dart';
1112
import 'package:gsy_github_app_flutter/widget/IssueEditDIalog.dart';
1213
import 'package:flutter_spinkit/flutter_spinkit.dart';
14+
import 'package:redux/redux.dart';
1315
import 'package:url_launcher/url_launcher.dart';
1416
import 'package:flutter_statusbar/flutter_statusbar.dart';
1517

@@ -81,6 +83,34 @@ class CommonUtils {
8183
return fullName;
8284
}
8385

86+
static pushTheme(Store store, int index) {
87+
ThemeData themeData;
88+
switch (index) {
89+
case 0:
90+
themeData = new ThemeData(primarySwatch: GSYColors.primarySwatch);
91+
break;
92+
case 1:
93+
themeData = new ThemeData(primarySwatch: Colors.brown);
94+
break;
95+
case 2:
96+
themeData = new ThemeData(primarySwatch: Colors.blue);
97+
break;
98+
case 3:
99+
themeData = new ThemeData(primarySwatch: Colors.teal);
100+
break;
101+
case 4:
102+
themeData = new ThemeData(primarySwatch: Colors.amber);
103+
break;
104+
case 5:
105+
themeData = new ThemeData(primarySwatch: Colors.blueGrey);
106+
break;
107+
case 6:
108+
themeData = new ThemeData(primarySwatch: Colors.deepOrange);
109+
break;
110+
}
111+
store.dispatch(new RefreshThemeDataAction(themeData));
112+
}
113+
84114
static const IMAGE_END = [".png", ".jpg", ".jpeg", ".gif", ".svg"];
85115

86116
static isImageEnd(path) {

‎lib/widget/HomeDrawer.dart‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import 'package:get_version/get_version.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_redux/flutter_redux.dart';
4+
import 'package:gsy_github_app_flutter/common/config/Config.dart';
45
import 'package:gsy_github_app_flutter/common/dao/EventDao.dart';
56
import 'package:gsy_github_app_flutter/common/dao/IssueDao.dart';
67
import 'package:gsy_github_app_flutter/common/dao/ReposDao.dart';
78
import 'package:gsy_github_app_flutter/common/dao/UserDao.dart';
9+
import 'package:gsy_github_app_flutter/common/local/LocalStorage.dart';
810
import 'package:gsy_github_app_flutter/common/model/User.dart';
911
import 'package:gsy_github_app_flutter/common/redux/GSYState.dart';
1012
import 'package:gsy_github_app_flutter/common/redux/ThemeRedux.dart';
@@ -43,31 +45,8 @@ class HomeDrawer extends StatelessWidget {
4345
GSYStrings.home_theme_6,
4446
];
4547
CommonUtils.showCommitOptionDialog(context, list, (index) {
46-
ThemeData themeData;
47-
switch (index) {
48-
case 0:
49-
themeData = new ThemeData(primarySwatch: GSYColors.primarySwatch);
50-
break;
51-
case 1:
52-
themeData = new ThemeData(primarySwatch: Colors.brown);
53-
break;
54-
case 2:
55-
themeData = new ThemeData(primarySwatch: Colors.blue);
56-
break;
57-
case 3:
58-
themeData = new ThemeData(primarySwatch: Colors.teal);
59-
break;
60-
case 4:
61-
themeData = new ThemeData(primarySwatch: Colors.amber);
62-
break;
63-
case 5:
64-
themeData = new ThemeData(primarySwatch: Colors.blueGrey);
65-
break;
66-
case 6:
67-
themeData = new ThemeData(primarySwatch: Colors.deepOrange);
68-
break;
69-
}
70-
store.dispatch(new RefreshThemeDataAction(themeData));
48+
CommonUtils.pushTheme(store, index);
49+
LocalStorage.save(Config.THEME_COLOR, index.toString());
7150
});
7251
}
7352

0 commit comments

Comments
 (0)