flutter/flutter-todos
1
0
Fork 0
mirror of https://github.com/asjqkkkk/flutter-todos.git synced 2025-08-26 05:59:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎉 One Day List 1.0.7 released!

Browse Source 
1.🐛Fixed: some bugs had been discovered!
2.✨Add: Now you can change your background to network image in main page!It will be very beautiful!
This commit is contained in:
oldchen
2019-09-17 11:10:02 +08:00
parent 2975a26402
commit dee147c571
23 changed files with 434 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/logic/account_page_logic.dart
View File

@ -80,7 +80,7 @@ class AccountPageLogic{
}
void onBackgroundTap(){
Navigator.of(_model.context).push(new MaterialPageRoute(builder: (ctx) {
Navigator.of(_model.context).push(new CupertinoPageRoute(builder: (ctx) {
return ProviderConfig.getInstance().getNetPicturesPage(
useType: NetPicturesUseType.accountBackground,
accountPageModel: _model,

34
lib/logic/global_logic.dart
View File

@ -46,6 +46,7 @@ class GlobalLogic{
return themeType == MyTheme.darkTheme ? Colors.white : Colors.black;
}
///获取当前的语言code
Future getCurrentLanguageCode() async{
final list = await SharedUtil.instance.getStringList(Keys.currentLanguageCode);
if (list == null) return;
@ -53,6 +54,7 @@ class GlobalLogic{
_model.currentLanguageCode = list;
}
///获取当前的语言
Future getCurrentLanguage() async{
final currentLanguage = await SharedUtil.instance.getString(Keys.currentLanguage);
if (currentLanguage == null) return;
@ -60,6 +62,7 @@ class GlobalLogic{
_model.currentLanguage = currentLanguage;
}
///获取当前的主题数据
Future getCurrentTheme() async{
final theme = await SharedUtil.instance.getString(Keys.currentThemeBean);
if(theme == null) return;
@ -68,6 +71,7 @@ class GlobalLogic{
_model.currentThemeBean = themeBean;
}
///获取app的名字
Future getAppName() async{
final appName = await SharedUtil.instance.getString(Keys.appName);
if(appName == null) return;
@ -76,6 +80,7 @@ class GlobalLogic{
}
///是否开启背景渐变
Future getIsBgGradient()async{
final isBgGradient = await SharedUtil.instance.getBoolean(Keys.backgroundGradient);
if(isBgGradient == null) return;
@ -83,6 +88,7 @@ class GlobalLogic{
_model.isBgGradient = isBgGradient;
}
///获取导航栏的类型
Future getCurrentNavHeader()async{
final currentNavHeader = await SharedUtil.instance.getString(Keys.currentNavHeader);
if(currentNavHeader == null) return;
@ -90,6 +96,7 @@ class GlobalLogic{
_model.currentNavHeader = currentNavHeader;
}
///获取当前导航栏头部选择网络图片时的图片地址
Future getCurrentNetPicUrl()async{
final currentNetPicUrl = await SharedUtil.instance.getString(Keys.currentNetPicUrl);
if(currentNetPicUrl == null) return;
@ -97,27 +104,25 @@ class GlobalLogic{
_model.currentNetPicUrl = currentNetPicUrl;
}
///是否开启主页背景跟随任务卡片颜色
Future getIsBgChangeWithCard() async {
final isBgChangeWithCard = await SharedUtil.instance.getBoolean(Keys.backgroundChangeWithCard);
if(isBgChangeWithCard == null) return;
if(isBgChangeWithCard == _model.isBgChangeWithCard) return;
_model.isBgChangeWithCard = isBgChangeWithCard;
}
///是否开启任务卡片颜色跟随背景
Future getIsCardChangeWithBg() async {
final isCardChangeWithBg = await SharedUtil.instance.getBoolean(Keys.cardChangeWithBackground);
if(isCardChangeWithBg == null) return;
if(isCardChangeWithBg == _model.isCardChangeWithBg) return;
_model.isCardChangeWithBg = isCardChangeWithBg;
}
///是否开启主页的卡片左右无限循环
Future getEnableInfiniteScroll() async{
final enableInfiniteScroll = await SharedUtil.instance.getBoolean(Keys.enableInfiniteScroll);
if(enableInfiniteScroll == null) return;
if(enableInfiniteScroll == _model.enableInfiniteScroll) return;
_model.enableInfiniteScroll = enableInfiniteScroll;
}
///获取当前的位置,拿到天气
Future getCurrentPosition() async{
final currentPosition = await SharedUtil.instance.getString(Keys.currentPosition);
if(currentPosition == null) return;
@ -125,10 +130,9 @@ class GlobalLogic{
_model.currentPosition = currentPosition;
}
///是否开启天气
Future getEnableWeatherShow() async{
final enableWeatherShow = await SharedUtil.instance.getBoolean(Keys.enableWeatherShow);
if(enableWeatherShow == null) return;
if(enableWeatherShow == _model.enableWeatherShow) return;
_model.enableWeatherShow = enableWeatherShow;
}
@ -138,6 +142,20 @@ class GlobalLogic{
_model.goToLogin = !hasLogged;
}
///是否开启主页背景为网络图片
Future getEnableNetPicBgInMainPage() async{
final enableNetPicBgInMainPage = await SharedUtil.instance.getBoolean(Keys.enableNetPicBgInMainPage);
_model.enableNetPicBgInMainPage = enableNetPicBgInMainPage;
}
///获取当前主页背景图片的url
Future getCurrentMainPageBgUrl() async{
final currentMainPageBgUrl = await SharedUtil.instance.getString(Keys.currentMainPageBackgroundUrl);
if(currentMainPageBgUrl == null) return;
if(currentMainPageBgUrl == _model.currentMainPageBgUrl) return;
_model.currentMainPageBgUrl = currentMainPageBgUrl;
}
void getWeatherNow(String position,{BuildContext context, LoadingController controller}){
ApiService.instance.getWeatherNow(success : (WeatherBean weatherBean){
_model.weatherBean = weatherBean;

150
lib/logic/main_page_logic.dart
View File

@ -3,6 +3,7 @@ import 'dart:math';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:todo_list/config/all_types.dart';
import 'package:todo_list/config/api_service.dart';
import 'package:todo_list/config/api_strategy.dart';
import 'package:todo_list/config/provider_config.dart';
@ -22,7 +23,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:todo_list/widgets/net_loading_widget.dart';
import 'package:todo_list/widgets/update_dialog.dart';
import 'package:package_info/package_info.dart';
import 'package:cached_network_image/cached_network_image.dart';
class MainPageLogic {
final MainPageModel _model;
@ -91,15 +92,23 @@ class MainPageLogic {
Decoration getBackground(GlobalModel globalModel) {
bool isBgGradient = globalModel.isBgGradient;
bool isBgChangeWithCard = globalModel.isBgChangeWithCard;
return BoxDecoration(
gradient: isBgGradient
? LinearGradient(
colors: _getGradientColors(isBgChangeWithCard),
begin: Alignment.topCenter,
end: Alignment.bottomCenter)
: null,
color: _getBgColor(isBgGradient, isBgChangeWithCard),
);
bool enableBg = globalModel.enableNetPicBgInMainPage;
return enableBg
? BoxDecoration(
image: DecorationImage(
image: CachedNetworkImageProvider(
globalModel.currentMainPageBgUrl),
fit: BoxFit.cover,
))
: BoxDecoration(
gradient: isBgGradient
? LinearGradient(
colors: _getGradientColors(isBgChangeWithCard),
begin: Alignment.topCenter,
end: Alignment.bottomCenter)
: null,
color: _getBgColor(isBgGradient, isBgChangeWithCard),
);
}
List<Color> _getGradientColors(bool isBgChangeWithCard) {
@ -138,18 +147,21 @@ class MainPageLogic {
return ColorBean.fromBean(_model.tasks[index].taskIconBean.colorBean);
}
void deleteTask(TaskBean taskBean) async{
final account = await SharedUtil.instance.getString(Keys.account) ?? 'default';
if(account == "defalut"){
void deleteTask(TaskBean taskBean) async {
final account =
await SharedUtil.instance.getString(Keys.account) ?? 'default';
if (account == "defalut") {
_deleteDataBaseTask(taskBean);
} else {
if(taskBean.uniqueId == null){
if (taskBean.uniqueId == null) {
_deleteDataBaseTask(taskBean);
} else {
final token = await SharedUtil.instance.getString(Keys.token);
showDialog(context: _model.context, builder: (ctx){
return NetLoadingWidget();
});
showDialog(
context: _model.context,
builder: (ctx) {
return NetLoadingWidget();
});
ApiService.instance.postDeleteTask(
success: (CommonBean bean) {
Navigator.of(_model.context).pop();
@ -157,7 +169,7 @@ class MainPageLogic {
},
failed: (CommonBean bean) {
Navigator.of(_model.context).pop();
if(bean.description.contains("任务不存在")){
if (bean.description.contains("任务不存在")) {
_deleteDataBaseTask(taskBean);
} else {
_showTextDialog(bean.description);
@ -218,6 +230,7 @@ class MainPageLogic {
///无论是网络头像还是asset头像，最后将转换为本地文件头像
Future getCurrentAvatar() async {
switch (_model.currentAvatarType) {
///头像为默认头像的时候，将asset转换为file，方便imageCrop与之后的suggestion直接用到file
case CurrentAvatarType.defaultAvatar:
final path = await FileUtil.getInstance()
@ -245,11 +258,12 @@ class MainPageLogic {
url: net,
filePath: "/avatar/",
fileName: net.split('/').last ?? "avatar.png",
onComplete: (path){
onComplete: (path) {
_model.currentAvatarUrl = path;
_model.currentAvatarType = CurrentAvatarType.local;
SharedUtil().saveString(Keys.localAvatarPath, path);
SharedUtil().saveInt(Keys.currentAvatarType, CurrentAvatarType.local);
SharedUtil()
.saveInt(Keys.currentAvatarType, CurrentAvatarType.local);
_model.refresh();
},
);
@ -257,8 +271,6 @@ class MainPageLogic {
}
}
Widget getAvatarWidget() {
switch (_model.currentAvatarType) {
case CurrentAvatarType.defaultAvatar:
@ -279,15 +291,16 @@ class MainPageLogic {
height: 60,
width: 60,
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation(Theme.of(_model.context).primaryColorLight),
valueColor: AlwaysStoppedAnimation(
Theme.of(_model.context).primaryColorLight),
),
);
break;
}
return Image.asset(
"images/icon.png",
fit: BoxFit.cover,
);
"images/icon.png",
fit: BoxFit.cover,
);
}
Future getAvatarType() async {
@ -317,18 +330,20 @@ class MainPageLogic {
_model.currentEditingUserName = text;
},
initialValue: _model.currentUserName,
onPositive: () async{
onPositive: () async {
if (_model.currentEditingUserName.isEmpty) {
_showTextDialog(DemoLocalizations.of(context).userNameCantBeNull);
_showTextDialog(
DemoLocalizations.of(context).userNameCantBeNull);
return;
}
final account = await SharedUtil.instance.getString(Keys.account);
if(account == "default" || account == null){
if (account == "default" || account == null) {
_model.currentUserName = _model.currentEditingUserName;
SharedUtil.instance.saveString(Keys.currentUserName, _model.currentUserName);
SharedUtil.instance
.saveString(Keys.currentUserName, _model.currentUserName);
Navigator.of(context).pop();
_model.refresh();
} else{
} else {
_changeUserName(account, _model.currentEditingUserName);
}
},
@ -336,29 +351,28 @@ class MainPageLogic {
});
}
void _showTextDialog(String text){
void _showTextDialog(String text) {
final context = _model.context;
showDialog(
context: context,
builder: (ctx) {
return AlertDialog(
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.all(Radius.circular(20.0))),
content: Text(
text),
borderRadius: BorderRadius.all(Radius.circular(20.0))),
content: Text(text),
);
});
}
void _changeUserName(String account, String userName) async{
void _changeUserName(String account, String userName) async {
final context = _model.context;
final token = await SharedUtil.instance.getString(Keys.token);
_showLoadingDialog(context);
ApiService.instance.changeUserName(
success: (bean) async {
_model.currentUserName = _model.currentEditingUserName;
SharedUtil.instance.saveString(Keys.currentUserName, _model.currentUserName);
SharedUtil.instance
.saveString(Keys.currentUserName, _model.currentUserName);
Navigator.of(context).pop();
_model.refresh();
Navigator.pop(context);
@ -367,34 +381,31 @@ class MainPageLogic {
Navigator.of(context).pop();
_showTextDialog(msg);
},
failed: (CommonBean commonBean){
failed: (CommonBean commonBean) {
Navigator.of(context).pop();
_showTextDialog(commonBean.description);
},
params: {
"account": account,
"token": token,
"userName": userName
},
params: {"account": account, "token": token, "userName": userName},
token: _model.cancelToken,
);
}
void _showLoadingDialog(BuildContext context) {
showDialog(context: context, builder: (ctx){
return NetLoadingWidget();
});
showDialog(
context: context,
builder: (ctx) {
return NetLoadingWidget();
});
}
void onSearchTap() {
Navigator.of(_model.context).push(new CupertinoPageRoute(builder: (ctx) {
return ProviderConfig.getInstance().getSearchPage();
}));
}
void checkUpdate(GlobalModel globalModel){
if(Platform.isIOS) return;
void checkUpdate(GlobalModel globalModel) {
if (Platform.isIOS) return;
final context = _model.context;
CancelToken cancelToken = CancelToken();
ApiService.instance.checkUpdate(
@ -412,14 +423,12 @@ class MainPageLogic {
updateInfo: updateInfo.updateInfo,
updateInfoColor: globalModel.logic.getBgInDark(),
backgroundColor:
globalModel.logic.getPrimaryGreyInDark(context),
globalModel.logic.getPrimaryGreyInDark(context),
);
});
}
},
error: (msg) {
},
error: (msg) {},
params: {
"language": globalModel.currentLocale.languageCode,
"appId": "001"
@ -429,22 +438,22 @@ class MainPageLogic {
}
///在云端更新一个任务
void postUpdateTask(TaskBean taskBean) async{
void postUpdateTask(TaskBean taskBean) async {
final account = await SharedUtil.instance.getString(Keys.account);
if(account == 'default') return;
if (account == 'default') return;
final token = await SharedUtil.instance.getString(Keys.token);
ApiService.instance.postUpdateTask(
success: (CommonBean bean){
success: (CommonBean bean) {
taskBean.needUpdateToCloud = 'false';
DBProvider.db.updateTask(taskBean);
},
failed: (CommonBean bean){
failed: (CommonBean bean) {
taskBean.needUpdateToCloud = 'true';
_model.needSyn = true;
_model.refresh();
DBProvider.db.updateTask(taskBean);
},
error: (msg){
error: (msg) {
taskBean.needUpdateToCloud = 'true';
_model.needSyn = true;
_model.refresh();
@ -457,24 +466,26 @@ class MainPageLogic {
}
///在云端创建一个任务
void postCreateTask(TaskBean taskBean) async{
showDialog(context: _model.context, builder: (ctx){
return NetLoadingWidget();
});
void postCreateTask(TaskBean taskBean) async {
showDialog(
context: _model.context,
builder: (ctx) {
return NetLoadingWidget();
});
final token = await SharedUtil.instance.getString(Keys.token);
ApiService.instance.postCreateTask(
success: (UploadTaskBean bean){
success: (UploadTaskBean bean) {
taskBean.needUpdateToCloud = 'false';
taskBean.uniqueId = bean.uniqueId;
DBProvider.db.updateTask(taskBean);
},
failed: (UploadTaskBean bean){
failed: (UploadTaskBean bean) {
taskBean.needUpdateToCloud = 'true';
_model.needSyn = true;
_model.refresh();
DBProvider.db.updateTask(taskBean);
},
error: (msg){
error: (msg) {
taskBean.needUpdateToCloud = 'true';
_model.needSyn = true;
_model.refresh();
@ -486,4 +497,11 @@ class MainPageLogic {
);
}
void onBackGroundTap(GlobalModel globalModel){
Navigator.of(_model.context).push(new CupertinoPageRoute(builder: (ctx) {
return ProviderConfig.getInstance().getNetPicturesPage(
useType: NetPicturesUseType.mainPageBackground,
);
}));
}
}

17
lib/logic/net_pictures_page_logic.dart
View File

@ -92,20 +92,33 @@ class NetPicturesPageLogic{
initialPageIndex: index,
onSelect: (current) {
final currentUrl =
_model.photos[current].urls.small;
_model.photos[current].urls.regular;
if(_model.useType == NetPicturesUseType.accountBackground){
SharedUtil.instance.saveString(Keys.currentAccountBackground, currentUrl);
SharedUtil.instance.saveString(Keys.currentAccountBackgroundType, AccountBGType.netPicture);
final accountPageModel = _model.accountPageModel;
accountPageModel.backgroundUrl = currentUrl;
accountPageModel.backgroundType = AccountBGType.netPicture;
accountPageModel.refresh();
} else {
} else if(_model.useType == NetPicturesUseType.navigatorHeader){
SharedUtil.instance.saveString(Keys.currentNetPicUrl, currentUrl);
SharedUtil.instance.saveString(Keys.currentNavHeader, _model.useType);
globalModel.currentNetPicUrl = currentUrl;
globalModel.currentNavHeader = _model.useType;
globalModel.refresh();
} else {
SharedUtil.instance.saveString(Keys.currentMainPageBackgroundUrl, currentUrl);
SharedUtil.instance.saveBoolean(Keys.enableNetPicBgInMainPage, true);
globalModel.currentMainPageBgUrl = currentUrl;
globalModel.enableNetPicBgInMainPage = true;
globalModel.refresh();
}
Navigator.of(_model.context).pop();
},