From d72baf17750ac6ce8faa30fca772d02d03f55d50 Mon Sep 17 00:00:00 2001 From: oldchen <772565130@qq.com> Date: Thu, 25 Jul 2019 18:12:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=AE=8C=E6=88=90=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 2 +- android/my-release-key.jks | Bin 2301 -> 2539 bytes lib/config/custom_image_cache_manager.dart | 2 +- lib/config/floating_border.dart | 1 + lib/config/keys.dart | 1 + lib/i10n/localization_intl.dart | 6 ++ lib/i10n/messages_en_US.dart | 3 + lib/i10n/messages_zh_CN.dart | 3 + lib/logic/feedback_page_logic.dart | 1 - lib/logic/global_logic.dart | 6 ++ lib/logic/main_page_logic.dart | 34 +++++++++ lib/model/main_page_model.dart | 4 ++ lib/pages/image_page.dart | 2 +- lib/pages/main_page.dart | 36 +++++++--- lib/pages/setting_page.dart | 77 ++++++++------------- lib/widgets/edit_dialog.dart | 60 ++++++++++++++++ res/intl_en_US.arb | 18 +++++ res/intl_messages.arb | 20 +++++- res/intl_zh_CN.arb | 18 +++++ 19 files changed, 232 insertions(+), 62 deletions(-) create mode 100644 lib/widgets/edit_dialog.dart diff --git a/android/app/build.gradle b/android/app/build.gradle index b74aadc..81c9fad 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -59,7 +59,7 @@ android { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release } } } diff --git a/android/my-release-key.jks b/android/my-release-key.jks index 88ba47ea2d0b655ea7935cac774e0e5172e1a59c..e58cbb941dbadd5f2d2eee886f9f4478cd35e15f 100644 GIT binary patch literal 2539 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 delta 2276 zcmV;?-ehDe6@4FL=a0Ro_c0-G>`0+%o;1_~;M zNQU;nhJoFryt;ZgUn(T^JJD zD^`)$)WR=~C8*LuQ2d=1?^VgAN=F+fMT!5`G%qb?a)`kz9$vmIthp>&UZD_g#QFVE zC0&U@f5jMol$^Soi!&KIu7%*9^#P)dPwKi?A94zP_6EGXzJI5R-)fHxn+fRx)su3t zRsFg%1C8-6*oiBgRE9n}+|ryHnOiasi^v6IV~_cp10x+J>f;BVgTuu=a)HRi)Q<*w z_He^mH+m!-h!keN)xy;IM=*uzqaB&rA!*nm`H$;jYX?Iv*)CwPk9y8rf(VHzjkX9W z)T6eUMin{mfrvikqCYkjirtzysrUacMzY*yJUy2U>fRNB;thF}miir)L8AaqhH_$K zvo!91;deBQ^-~Z`DImGvn<($Xo{t*bK8Bkwq)d;J*(i|RKA*f( z=A-H#gUH*If!o)E?Fc}63Duzgg_YDCM z2^2959tr?$0C@mw0A&DqlV}ATB{VfRGC46dFoFe)1_>&LNQUcZQfiZ=_Ej_71Q&J}Mb^ zNt~fnHb?s_vM+@lX=>H6UFb(Foy-1n|8m=rq=8lM6a}}Owa?Z%D$p!zybbC&B1rlY zh67es5{X5N`f1Y3@m7`VG=2pyh5dx#16&;r+k zID{mIY&Eo%U-0Tabf(kcHjBxj?&GLHXbM08u$2uzG4yDba3PJ|5PBh53Ck-BL9WET zDkyi5O+Wa~ki>v6P9Yj-{}%Vt;ywn?(gN(D&Vqjv(acMTXw1;iuoE8Lu8tZVs~?>k z+LIAm(|nE-&EcNJz%GDdBWrzFBE@#F?Fu`6=08%!R1DC`7zhJ4zqg-KO|Y6F*MvOu z8>5s@CJU%Gj4?_B@LMlJm{7rtoAg;_rCv92kvBQ8D@lIOOYB+>McNeVq7qO#?Z*#5 z{nLM9`A!l};!S7Iq-^`+ViAh-0Ue@$JJpVQ!>$n!v#!nV&yIfW1!?Zi?2)1jq=lK4 z3mupl3Oj3=Ij7*8uoeJeF+4(++II5bIK19N*QnI*$Ag!&n#p)!-cZx~_7KyXOQ9d@ zeHmKfKU0Xy;b09NxS)F-jo>--* zIA$N&j!8A+M-ehPt#}J3!n{rH%!wCHY2kGU%tCTi6JJ<~h5%bIsMwyN`M`B}@>PFN z=leD~oi>Bjeqe%*Imke3$4?^esz*|4$L=)osI&snHAXPtHfMoMB0WvHdTb6YD#y~* znYxMaAa6+SU&Ic4Gm+PVXMeI#&yHXF&b!b73A0hrV6v2-+Uw9_`+i;PSLy`mlUcQD z8-}ZZY?~_#srJ!p0;ksiC}cvof2V&CnVW$$s!7O+QXBWvG`QP=GE=`dT{aJI8I_rB zcglAgX>{>gmdwA5ru?N^D(BVMdQwB^$NU#LK>aIJD7#PYpS!5*s`{~gLm55X1o_5t zm<1qQ2rcO~y-tP!;GV1+{0}4x!0*l0ETRBg$C> zHc+Uq+`j}sF{k$dbs3z#-MebGmpVT5m}lB2u>hrL;BYI-V79JBkG%YBV{e}&Y>o0D zQuItBfGcq($9q9MQ2qFYW#=ElK6Y!>Te`EIHJ~{0xUK}fQ>Ua_G){N$T?NlrBAm{L zTIfbU2W#+CyQM0@HviZlRl0w+%6fjBvG();O-`9`+^=4zQf@~+M;(LYd25DVBe}3@ zlHPvAR?xx@rYEUe947ZbxE!)(DCVBZ{LiJv=?#Rt=7qaQKOVMpv%<+C2G4wuLYwpm z@V}=d^N-_HWWZP)n^pAFOHI>NUyFregk`bq1DYIBg;)3SJ1vRc^Q?cf>>?oq^PPyI z#Yek({|^P%WcvM?IKVrptQ50$ouK4`+0@|%dvReAvh&e~UsG>r9&GGvRd5^jj{Cbx z=jJm(jFFqMz5<2J6#FT7ClCcaZX%)}TAPv2UT Intl.message('Setting your username', name: 'customUserName', desc: '昵称设置',); + String get inputUserName => Intl.message('input your username', name: 'inputUserName', desc: '输入你的昵称吧',); + String get userNameCantBeNull => Intl.message('username can not be empty', name: 'userNameCantBeNull', desc: '昵称不能为空哦!',); + + + String get pink{ return Intl.message( 'pink', diff --git a/lib/i10n/messages_en_US.dart b/lib/i10n/messages_en_US.dart index d72dd63..1e9bb6b 100644 --- a/lib/i10n/messages_en_US.dart +++ b/lib/i10n/messages_en_US.dart @@ -55,6 +55,7 @@ class MessageLookup extends MessageLookupByLibrary { "currentIcons" : MessageLookupByLibrary.simpleMessage("Current Icons"), "customIcon" : MessageLookupByLibrary.simpleMessage("Custom Icon"), "customTheme" : MessageLookupByLibrary.simpleMessage("Custom Theme"), + "customUserName" : MessageLookupByLibrary.simpleMessage("Setting your username"), "cyan" : MessageLookupByLibrary.simpleMessage("cyan"), "dailyPic" : MessageLookupByLibrary.simpleMessage("Daily wallpaper"), "dark" : MessageLookupByLibrary.simpleMessage("dark"), @@ -80,6 +81,7 @@ class MessageLookup extends MessageLookupByLibrary { "hours" : m1, "iconSetting" : MessageLookupByLibrary.simpleMessage("Icon Setting"), "inputCurrentCity" : MessageLookupByLibrary.simpleMessage("input your city"), + "inputUserName" : MessageLookupByLibrary.simpleMessage("input your username"), "itemNumber" : m2, "languageTitle" : MessageLookupByLibrary.simpleMessage("Change Language"), "loading" : MessageLookupByLibrary.simpleMessage("loading..."), @@ -118,6 +120,7 @@ class MessageLookup extends MessageLookupByLibrary { "travel" : MessageLookupByLibrary.simpleMessage("Travel"), "tryToSearch" : MessageLookupByLibrary.simpleMessage("Try searching for the title or content"), "unknownDes" : MessageLookupByLibrary.simpleMessage("Unknown permission"), + "userNameCantBeNull" : MessageLookupByLibrary.simpleMessage("username can not be empty"), "versionDescription" : MessageLookupByLibrary.simpleMessage("Version Description"), "waitAMoment" : MessageLookupByLibrary.simpleMessage("please wait for a moment..."), "weatherGetWrong" : MessageLookupByLibrary.simpleMessage("failed to get the weather，please try again"), diff --git a/lib/i10n/messages_zh_CN.dart b/lib/i10n/messages_zh_CN.dart index 6c42ba4..c248d78 100644 --- a/lib/i10n/messages_zh_CN.dart +++ b/lib/i10n/messages_zh_CN.dart @@ -55,6 +55,7 @@ class MessageLookup extends MessageLookupByLibrary { "currentIcons" : MessageLookupByLibrary.simpleMessage("当前图标"), "customIcon" : MessageLookupByLibrary.simpleMessage("自定义图标"), "customTheme" : MessageLookupByLibrary.simpleMessage("自定义主题"), + "customUserName" : MessageLookupByLibrary.simpleMessage("昵称设置"), "cyan" : MessageLookupByLibrary.simpleMessage("蓝天白云"), "dailyPic" : MessageLookupByLibrary.simpleMessage("每日壁纸"), "dark" : MessageLookupByLibrary.simpleMessage("不见五指"), @@ -80,6 +81,7 @@ class MessageLookup extends MessageLookupByLibrary { "hours" : m1, "iconSetting" : MessageLookupByLibrary.simpleMessage("图标设置"), "inputCurrentCity" : MessageLookupByLibrary.simpleMessage("手动输入你的城市"), + "inputUserName" : MessageLookupByLibrary.simpleMessage("输入你的昵称吧"), "itemNumber" : m2, "languageTitle" : MessageLookupByLibrary.simpleMessage("切换语言"), "loading" : MessageLookupByLibrary.simpleMessage("加载中..."), @@ -118,6 +120,7 @@ class MessageLookup extends MessageLookupByLibrary { "travel" : MessageLookupByLibrary.simpleMessage("旅行"), "tryToSearch" : MessageLookupByLibrary.simpleMessage("试试搜一下标题、内容吧"), "unknownDes" : MessageLookupByLibrary.simpleMessage("未知权限"), + "userNameCantBeNull" : MessageLookupByLibrary.simpleMessage("昵称不能为空哦!"), "versionDescription" : MessageLookupByLibrary.simpleMessage("版本描述"), "waitAMoment" : MessageLookupByLibrary.simpleMessage("请稍后..."), "weatherGetWrong" : MessageLookupByLibrary.simpleMessage("天气获取失败,请重新尝试"), diff --git a/lib/logic/feedback_page_logic.dart b/lib/logic/feedback_page_logic.dart index 7b3299f..67b77e5 100644 --- a/lib/logic/feedback_page_logic.dart +++ b/lib/logic/feedback_page_logic.dart @@ -4,7 +4,6 @@ import 'package:todo_list/config/api_service.dart'; import 'package:todo_list/i10n/localization_intl.dart'; import 'package:todo_list/json/common_bean.dart'; import 'package:todo_list/model/all_model.dart'; -import 'package:todo_list/utils/full_screen_dialog_util.dart'; import 'package:todo_list/utils/shared_util.dart'; import 'package:todo_list/widgets/net_loading_widget.dart'; diff --git a/lib/logic/global_logic.dart b/lib/logic/global_logic.dart index f2958ca..7e9190c 100644 --- a/lib/logic/global_logic.dart +++ b/lib/logic/global_logic.dart @@ -41,6 +41,12 @@ class GlobalLogic{ return themeType == MyTheme.darkTheme ? Colors.grey[800] : Theme.of(context).primaryColor; } + //当为夜间模式时候，黑色替换为白色 + Color getbwInDark(){ + final themeType = _model.currentThemeBean.themeType; + return themeType == MyTheme.darkTheme ? Colors.white : Colors.black; + } + Future getCurrentLanguageCode() async{ final list = await SharedUtil.instance.getStringList(Keys.currentLanguageCode); if (list == null) return; diff --git a/lib/logic/main_page_logic.dart b/lib/logic/main_page_logic.dart index b652d52..2cadf38 100644 --- a/lib/logic/main_page_logic.dart +++ b/lib/logic/main_page_logic.dart @@ -5,6 +5,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:todo_list/config/provider_config.dart'; import 'package:todo_list/database/database.dart'; +import 'package:todo_list/i10n/localization_intl.dart'; import 'package:todo_list/items/task_item.dart'; import 'package:todo_list/json/color_bean.dart'; import 'package:todo_list/json/task_bean.dart'; @@ -13,6 +14,7 @@ import 'package:todo_list/pages/search_page.dart'; import 'package:todo_list/utils/file_util.dart'; import 'package:todo_list/utils/shared_util.dart'; import 'package:todo_list/utils/theme_util.dart'; +import 'package:todo_list/widgets/edit_dialog.dart'; import 'package:todo_list/widgets/scale_animation_widget.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -72,6 +74,13 @@ class MainPageLogic { _model.tasks.addAll(tasks); } + Future getCurrentUserName() async{ + final currentUserName = await SharedUtil.instance.getString(Keys.currentUserName); + if (currentUserName == null) return; + if (currentUserName == _model.currentUserName) return; + _model.currentUserName = currentUserName; + } + Decoration getBackground(GlobalModel globalModel) { bool isBgGradient = globalModel.isBgGradient; bool isBgChangeWithCard = globalModel.isBgChangeWithCard; @@ -219,6 +228,31 @@ class MainPageLogic { })); } + void onUserNameTap(){ + final context = _model.context; + showDialog(context: context, builder: (ctx){ + return EditDialog( + title: DemoLocalizations.of(context).customUserName, + hintText: DemoLocalizations.of(context).inputUserName, + onValueChanged: (text){ + _model.currentUserName = text; + }, + initialValue: _model.currentUserName, + onSure: (){ + if(_model.currentUserName.isEmpty){ + showDialog(context: context, builder: (ctx){ + return AlertDialog(content: Text(DemoLocalizations.of(context).userNameCantBeNull),); + }); + return; + } + SharedUtil.instance.saveString(Keys.currentUserName, _model.currentUserName); + _model.refresh(); + }, + + ); + }); + } + void onSearchTap(){ Navigator.of(_model.context).push(new CupertinoPageRoute(builder: (ctx){ return ProviderConfig.getInstance().getSearchPage(); diff --git a/lib/model/main_page_model.dart b/lib/model/main_page_model.dart index f362107..42eadbf 100644 --- a/lib/model/main_page_model.dart +++ b/lib/model/main_page_model.dart @@ -21,6 +21,9 @@ class MainPageModel extends ChangeNotifier { //当前的头像url,比如本地的就是本地路径，网络就是网络地址 String currentAvatarUrl = "images/icon.png"; + //当前的用户名 + String currentUserName = ""; + //是否开启天气 bool enableWeatherShow = false; @@ -39,6 +42,7 @@ class MainPageModel extends ChangeNotifier { [ logic.getTasks(), logic.getCurrentAvatar(), + logic.getCurrentUserName(), ], ).then((value) { refresh(); diff --git a/lib/pages/image_page.dart b/lib/pages/image_page.dart index f0ad39e..76828a2 100644 --- a/lib/pages/image_page.dart +++ b/lib/pages/image_page.dart @@ -63,7 +63,7 @@ class _ImagePageState extends State { builder: (BuildContext context, int index) { final url = widget.imageUrls[index]; return PhotoViewGalleryPageOptions( - imageProvider: url == NavHeadType.dailyPicUrl ? Image.network(url) : CachedNetworkImageProvider(url), + imageProvider: url == NavHeadType.dailyPicUrl ? NetworkImage(url) : CachedNetworkImageProvider(url), initialScale: PhotoViewComputedScale.contained, heroTag: "tag_${index}", ); diff --git a/lib/pages/main_page.dart b/lib/pages/main_page.dart index 2a56c11..8e46ecc 100644 --- a/lib/pages/main_page.dart +++ b/lib/pages/main_page.dart @@ -82,11 +82,30 @@ class MainPage extends StatelessWidget { margin: EdgeInsets.fromLTRB(50, 0, 50, 0), child: Container( margin: EdgeInsets.only(top: 20, left: 12), - child: Text( - "${DemoLocalizations.of(context).welcomeWord}Old Li.", - style: TextStyle( - fontSize: 30, - color: globalModel.logic.getWhiteInDark()), + child: SingleChildScrollView( + child: Row( + children: [ + Flexible( + child: InkWell( + onTap: model.currentUserName.isEmpty ? null : model.logic.onUserNameTap, + child: Text( + "${DemoLocalizations.of(context).welcomeWord}${model.currentUserName}", + style: TextStyle( + fontSize: 30, + color: globalModel.logic.getWhiteInDark()), + maxLines: 3, + overflow: TextOverflow.ellipsis, + ), + ), + ), + model.currentUserName.isEmpty + ? IconButton( + icon: Icon(Icons.account_circle, color: globalModel.logic.getWhiteInDark(),), + onPressed: model.logic.onUserNameTap, + ) + : SizedBox() + ], + ), ), ), ), @@ -105,12 +124,13 @@ class MainPage extends StatelessWidget { model.tasks.length == 0 ? model.logic.getEmptyWidget(globalModel) : Container( - margin: EdgeInsets.only(top: 40,bottom: 40), + margin: EdgeInsets.only(top: 40, bottom: 40), child: CarouselSlider( items: model.logic.getCards(context), - aspectRatio: 16 / 9, + aspectRatio: 16 / 9, height: min(size.width, size.height) - 100, - viewportFraction: size.height >= size.width ? 0.8 : 0.5, + viewportFraction: + size.height >= size.width ? 0.8 : 0.5, initialPage: 0, enableInfiniteScroll: model.tasks.length >= 3 && globalModel.enableInfiniteScroll, diff --git a/lib/pages/setting_page.dart b/lib/pages/setting_page.dart index c27d943..641cb1a 100644 --- a/lib/pages/setting_page.dart +++ b/lib/pages/setting_page.dart @@ -9,6 +9,7 @@ import 'package:todo_list/i10n/localization_intl.dart'; import 'package:todo_list/model/global_model.dart'; import 'package:todo_list/utils/permission_request_util.dart'; import 'package:todo_list/utils/shared_util.dart'; +import 'package:todo_list/widgets/edit_dialog.dart'; import 'package:todo_list/widgets/net_loading_widget.dart'; import 'all_page.dart'; @@ -154,55 +155,33 @@ class SettingPage extends StatelessWidget { showDialog( context: context, builder: (context) { - return AlertDialog( - title: Text(DemoLocalizations.of(context).enableWeatherShow), - content: Form( - autovalidate: true, - child: TextFormField( - initialValue: globalModel.currentPosition, - validator: (text){ - globalModel.currentPosition = text; - }, - decoration: InputDecoration( - hintText: DemoLocalizations.of(context).inputCurrentCity, - ), - ), - ), - actions: [ - FlatButton( - onPressed: () { - Navigator.of(context).pop(); - }, - child: Text( - DemoLocalizations.of(context).cancel, - style: TextStyle(color: Colors.redAccent), - ), - ), - FlatButton( - onPressed: () { - if(globalModel.currentPosition.isEmpty) return; - CancelToken cancelToken = CancelToken(); - showDialog(context: context, builder: (ctx){ - return NetLoadingWidget( - onRequest: (){ - globalModel.logic.getWeatherNow(globalModel.currentPosition,controller: globalModel.loadingController); - }, - cancelToken: cancelToken, - errorText: DemoLocalizations.of(context).weatherGetWrong, - loadingText: DemoLocalizations.of(context).weatherGetting, - successText: DemoLocalizations.of(context).weatherSuccess, - onSuccess: (){ - Navigator.of(context).pop(); - Navigator.of(context).pop(); - }, - loadingController: globalModel.loadingController, - ); - }); - }, - child: Text(DemoLocalizations.of(context).ok, - style: TextStyle(color: Colors.greenAccent)), - ), - ], + return EditDialog( + title: DemoLocalizations.of(context).enableWeatherShow, + hintText: DemoLocalizations.of(context).inputCurrentCity, + initialValue: globalModel.currentPosition, + onValueChanged: (text){ + globalModel.currentPosition = text; + }, + sureTextStyle: TextStyle(color: globalModel.logic.getbwInDark()), + onSure: (){ + if(globalModel.currentPosition.isEmpty) return; + CancelToken cancelToken = CancelToken(); + showDialog(context: context, builder: (ctx){ + return NetLoadingWidget( + onRequest: (){ + globalModel.logic.getWeatherNow(globalModel.currentPosition,controller: globalModel.loadingController); + }, + cancelToken: cancelToken, + errorText: DemoLocalizations.of(context).weatherGetWrong, + loadingText: DemoLocalizations.of(context).weatherGetting, + successText: DemoLocalizations.of(context).weatherSuccess, + onSuccess: (){ + Navigator.of(context).pop(); + }, + loadingController: globalModel.loadingController, + ); + }); + }, ); },); } else { diff --git a/lib/widgets/edit_dialog.dart b/lib/widgets/edit_dialog.dart new file mode 100644 index 0000000..a08cf01 --- /dev/null +++ b/lib/widgets/edit_dialog.dart @@ -0,0 +1,60 @@ +import 'package:flutter/material.dart'; +import 'package:todo_list/i10n/localization_intl.dart'; + +class EditDialog extends StatelessWidget { + final VoidCallback onSure; + final String title; + final String hintText; + final String initialValue; + final ValueChanged onValueChanged; + final TextStyle cancelTextStyle; + final TextStyle sureTextStyle; + + const EditDialog({ + Key key, + this.onSure, + this.title, + this.hintText, + this.initialValue, this.onValueChanged, this.cancelTextStyle, this.sureTextStyle, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return AlertDialog( + title: Text(title ?? ""), + content: Form( + autovalidate: true, + child: TextFormField( + initialValue: initialValue ?? "", + validator: (text){ + if(onValueChanged != null) + onValueChanged(text); + }, + decoration: InputDecoration( + hintText: hintText ?? "", + ), + ), + ), + actions: [ + FlatButton( + onPressed: () { + Navigator.of(context).pop(); + }, + child: Text( + DemoLocalizations.of(context).cancel, + style:cancelTextStyle ?? TextStyle(color: Colors.redAccent), + ), + ), + FlatButton( + onPressed: (){ + if(onSure != null) onSure(); + Navigator.pop(context); + + }, + child: Text(DemoLocalizations.of(context).ok, + style:sureTextStyle ?? TextStyle(color: Colors.black)), + ), + ], + ); + } +} diff --git a/res/intl_en_US.arb b/res/intl_en_US.arb index 2b793a9..0b9d197 100644 --- a/res/intl_en_US.arb +++ b/res/intl_en_US.arb @@ -543,6 +543,24 @@ "type": "text", "placeholders": {} }, + "customUserName": "Setting your username", + "@customUserName": { + "description": "昵称设置", + "type": "text", + "placeholders": {} + }, + "inputUserName": "input your username", + "@inputUserName": { + "description": "输入你的昵称吧", + "type": "text", + "placeholders": {} + }, + "userNameCantBeNull": "username can not be empty", + "@userNameCantBeNull": { + "description": "昵称不能为空哦!", + "type": "text", + "placeholders": {} + }, "taskItems": "{taskNumbers,plural, =0{You have never written a list of tasks.\nLet''s get started soon.}=1{This is your todo-list,\nToday, you have 1 task to complete. }many{This is your todo-list,\nToday, you have {taskNumbers} tasks to complete. }other{This is your todo-list,\nToday, you have {taskNumbers} tasks to complete. }}", "@taskItems": { "type": "text", diff --git a/res/intl_messages.arb b/res/intl_messages.arb index a9711fe..79eacf2 100644 --- a/res/intl_messages.arb +++ b/res/intl_messages.arb @@ -1,5 +1,5 @@ { - "@@last_modified": "2019-07-25T11:08:23.468694", + "@@last_modified": "2019-07-25T17:55:44.478744", "appName": "One Day List", "@appName": { "description": "app的名字", @@ -440,6 +440,24 @@ "type": "text", "placeholders": {} }, + "customUserName": "Setting your username", + "@customUserName": { + "description": "昵称设置", + "type": "text", + "placeholders": {} + }, + "inputUserName": "input your username", + "@inputUserName": { + "description": "输入你的昵称吧", + "type": "text", + "placeholders": {} + }, + "userNameCantBeNull": "username can not be empty", + "@userNameCantBeNull": { + "description": "昵称不能为空哦!", + "type": "text", + "placeholders": {} + }, "pink": "pink", "@pink": { "description": "主题颜色", diff --git a/res/intl_zh_CN.arb b/res/intl_zh_CN.arb index aa01675..540ce48 100644 --- a/res/intl_zh_CN.arb +++ b/res/intl_zh_CN.arb @@ -542,6 +542,24 @@ "type": "text", "placeholders": {} }, + "customUserName": "昵称设置", + "@customUserName": { + "description": "昵称设置", + "type": "text", + "placeholders": {} + }, + "inputUserName": "输入你的昵称吧", + "@inputUserName": { + "description": "输入你的昵称吧", + "type": "text", + "placeholders": {} + }, + "userNameCantBeNull": "昵称不能为空哦!", + "@userNameCantBeNull": { + "description": "昵称不能为空哦!", + "type": "text", + "placeholders": {} + }, "taskItems": "{taskNumbers,plural, =0{你还没有写过任务清单呢.\n快快开始吧.}=1{下面你的任务清单,\n今天, 你有 1 项任务尚未完成. }many{下面是你的任务清单,\n今天, 你有 {taskNumbers} 份任务尚未完成. }other{下面是你的任务清单,\n今天, 你有 {taskNumbers} 份任务尚未完成. }}", "@taskItems": { "type": "text",