change the color in nightly mode

lib/apps/assistant/message.dart

@@ -31,7 +31,7 @@ class AssistantMessage extends StatelessWidget {
       constraints: BoxConstraints(minWidth: 50, maxWidth: isDesktop ? width - 300.0 : width),
       padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 14.0),
       decoration: BoxDecoration(
-        color: isMe ? color.primary : color.primaryVariant,
+        color: isMe ? Color(0xFF6174FF) : color.primaryVariant,
         borderRadius: BorderRadius.circular(15.0),
       ),
       child: Text(content,

lib/apps/assistant/page.dart

@@ -220,7 +220,7 @@ class _AssistantPageState extends State<AssistantPage> {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Text('esse',
+                    Text('Jarvis',
                       style: TextStyle(fontWeight: FontWeight.bold),
                     ),
                     SizedBox(height: 6.0),
@@ -259,7 +259,7 @@ class _AssistantPageState extends State<AssistantPage> {
                 },
                 itemBuilder: (context) {
                   return <PopupMenuEntry<int>>[
-                    _menuItem(color.primary, 1, Icons.vertical_align_top_rounded, lang.cancelTop),
+                    _menuItem(Color(0xFF6174FF), 1, Icons.vertical_align_top_rounded, lang.cancelTop),
                   ];
                 },
               )
@@ -273,7 +273,7 @@ class _AssistantPageState extends State<AssistantPage> {
             itemCount: recentMessageKeys.length,
             reverse: true,
             itemBuilder: (BuildContext context, index) => AssistantMessage(
-              name: 'esse',
+              name: 'Jarvis',
               message: recentMessages[recentMessageKeys[index]],
               answers: this.answers,
             )

lib/apps/chat/detail.dart

@@ -349,12 +349,12 @@ class _ChatDetailState extends State<ChatDetail> {
                 },
                 itemBuilder: (context) {
                   return <PopupMenuEntry<int>>[
-                    _menuItem(color.primary, 1, Icons.vertical_align_top_rounded, this.friend.isTop ? lang.cancelTop : lang.setTop),
-                    _menuItem(color.primary, 2, Icons.qr_code_rounded, lang.friendInfo),
+                    _menuItem(Color(0xFF6174FF), 1, Icons.vertical_align_top_rounded, this.friend.isTop ? lang.cancelTop : lang.setTop),
+                    _menuItem(Color(0xFF6174FF), 2, Icons.qr_code_rounded, lang.friendInfo),
                     //_menuItem(color.primary, 3, Icons.turned_in_rounded, lang.remark),
                     this.friend.isClosed
-                    ? _menuItem(color.primary, 5, Icons.send_rounded, lang.addFriend)
-                    : _menuItem(color.primary, 4, Icons.block_rounded, lang.unfriend),
+                    ? _menuItem(Color(0xFF6174FF), 5, Icons.send_rounded, lang.addFriend)
+                    : _menuItem(Color(0xFF6174FF), 4, Icons.block_rounded, lang.unfriend),
                     _menuItem(Colors.red, 6, Icons.delete_rounded, lang.delete),
                   ];
                 },

lib/apps/device/page.dart

@@ -127,7 +127,7 @@ class _DevicesPageState extends State<DevicesPage> {
         children: <Widget>[
           ListTile(
             leading: (isLocal || device.online)
-            ? Icon(Icons.cloud_done_rounded, size: 38.0, color: Colors.green)
+            ? Icon(Icons.cloud_done_rounded, size: 38.0, color: Color(0xFF6174FF))
             : Icon(Icons.cloud_off_rounded, size: 38.0, color: Colors.grey),
             title: Text(name),
             subtitle: Container(
@@ -386,7 +386,7 @@ class _DeviceListenPageState extends State<DeviceListenPage> {
                             status.cpu_p(),
                             "CPU: ${status.cpu_u()} cores",
                             radius,
-                            color.primary,
+                            Color(0xFF6174FF),
                           ),
                           percentWidget(
                             status.memory_p(),

lib/apps/service/list.dart

@@ -72,14 +72,14 @@ class _ListService extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Expanded(
-                      child: Text('esse',
+                      child: Text('Jarvis',
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                         style: TextStyle(fontSize: 16.0))
                     ),
                     SizedBox(height: 5.0),
                     Expanded(
-                      child: Text(lang.robotEsse,
+                      child: Text(lang.robotJarvis,
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                         style: const TextStyle(color: Color(0xFFADB0BB), fontSize: 12.0)),

lib/l10n/localizations.dart

@@ -77,7 +77,7 @@ abstract class AppLocalizations {
   String get delete;
   String get open;
   String get unknown;
-  String get robotEsse;
+  String get robotJarvis;
 
   // theme
   String get themeDark;

lib/l10n/localizations_en.dart

@@ -79,7 +79,7 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get unknown => 'Unknown';
   @override
-  String get robotEsse => 'esse is a robot, only belongs to you.';
+  String get robotJarvis => 'Jarvis is a robot, only belongs to you.';
 
   // theme
   @override

lib/l10n/localizations_zh.dart

@@ -79,7 +79,7 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get unknown => '未知';
   @override
-  String get robotEsse => 'esse 是个机器人，只属于你。';
+  String get robotJarvis => 'Jarvis 是个机器人，只属于你。';
 
   // theme
   @override

lib/pages/account_generate.dart

@@ -214,7 +214,7 @@ class _AccountGeneratePageState extends State<AccountGeneratePage> {
       this._mnemoicWords.split(" ").asMap().forEach((index, value) {
           mnemonicWordWidgets.add(Chip(
               avatar: CircleAvatar(
-                backgroundColor: color.primary,
+                backgroundColor: Color(0xFF6174FF),
                 child: Text("${index + 1}",
                   style: TextStyle(fontSize: 12, color: Colors.white))),
               label: Text(value.trim(), style: TextStyle(fontSize: 16)),
@@ -231,7 +231,7 @@ class _AccountGeneratePageState extends State<AccountGeneratePage> {
 
     return Column(
       children: <Widget>[
-        _header(lang.newMnemonicTitle, color, () => Navigator.of(context).pop()),
+        _header(lang.newMnemonicTitle, () => Navigator.of(context).pop()),
         SizedBox(height: maxHeight),
         Column(
           mainAxisAlignment: MainAxisAlignment.center,
@@ -278,7 +278,7 @@ class _AccountGeneratePageState extends State<AccountGeneratePage> {
                       child: Container(
                         height: 45.0,
                         decoration: BoxDecoration(
-                          color: color.primary,
+                          color: Color(0xFF6174FF),
                           borderRadius: BorderRadius.circular(15.0)),
                         child: Center(
                           child: Text(lang.newMnemonicInput,
@@ -327,7 +327,7 @@ class _AccountGeneratePageState extends State<AccountGeneratePage> {
 
     return Column(crossAxisAlignment: CrossAxisAlignment.center, children: <
       Widget>[
-        _header(lang.newAccountTitle, color, () => setState(() { this._isAccount = false; })),
+        _header(lang.newAccountTitle, () => setState(() { this._isAccount = false; })),
         SizedBox(height: maxHeight),
         Column(
           mainAxisAlignment: MainAxisAlignment.center,
@@ -340,14 +340,13 @@ class _AccountGeneratePageState extends State<AccountGeneratePage> {
               width: 450.0,
               padding: const EdgeInsets.symmetric(horizontal: 20.0),
               decoration: BoxDecoration(
-                color:
-                _nameFocus.hasFocus ? color.primaryVariant : color.surface,
+                color: color.surface,
                 border: Border.all(
                   color: _nameFocus.hasFocus ? color.primary : color.surface),
                 borderRadius: BorderRadius.circular(15.0),
               ),
               child: TextField(
-                style: TextStyle(color: Color(0xFF1C1939), fontSize: 16.0),
+                style: TextStyle(fontSize: 16.0),
                 decoration: InputDecoration(
                   border: InputBorder.none,
                   hintText: lang.newAccountName,
@@ -418,7 +417,7 @@ class _AccountGeneratePageState extends State<AccountGeneratePage> {
   }
 }
 
-Widget _header(String value, ColorScheme color, Function callback) {
+Widget _header(String value, Function callback) {
   return Container(
     width: 700.0,
     child: Row(
@@ -431,7 +430,7 @@ Widget _header(String value, ColorScheme color, Function callback) {
             width: 40.0,
             height: 40.0,
             decoration: BoxDecoration(
-              color: color.primaryVariant,
+              color: Color(0xFF6174FF),
               borderRadius: BorderRadius.circular(15.0)),
             child: Center(child: Icon(Icons.arrow_back, color: Colors.white)),
         )),

lib/pages/account_restore.dart

@@ -58,7 +58,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
     this._mnemoicWords.asMap().forEach((index, value) {
       mnemonicWordWidgets.add(Chip(
           avatar: CircleAvatar(
-              backgroundColor: color.primary,
+              backgroundColor: Color(0xFF6174FF),
               child: Text("${index + 1}",
                   style: TextStyle(fontSize: 12, color: Colors.white))),
           label: Text(value.trim(), style: TextStyle(fontSize: 16)),
@@ -87,7 +87,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
                               width: 40.0,
                               height: 40.0,
                               decoration: BoxDecoration(
-                                color: color.primaryVariant,
+                                color: Color(0xFF6174FF),
                                 borderRadius: BorderRadius.circular(15.0)),
                               child: Center(
                                 child: Icon(Icons.arrow_back, color: Colors.white)),
@@ -125,9 +125,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
                                   padding: const EdgeInsets.symmetric(
                                     horizontal: 20.0),
                                   decoration: BoxDecoration(
-                                    color: this._addrFocus.hasFocus
-                                    ? color.primaryVariant
-                                    : color.surface,
+                                    color: color.surface,
                                     border: Border.all(
                                       color: this._addrFocus.hasFocus
                                       ? color.primary
@@ -135,9 +133,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
                                     borderRadius: BorderRadius.circular(15.0),
                                   ),
                                   child: TextField(
-                                    style: TextStyle(
-                                      color: Color(0xFF1C1939),
-                                      fontSize: 16.0),
+                                    style: TextStyle(fontSize: 16.0),
                                     decoration: InputDecoration(
                                       border: InputBorder.none,
                                       hintText: lang.address),
@@ -171,7 +167,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
                                     height: 45.0,
                                     decoration: BoxDecoration(
                                       color: this._addrChecked
-                                      ? color.primary
+                                      ? Color(0xFF6174FF)
                                       : Color(0xFFADB0BB),
                                       borderRadius:
                                       BorderRadius.circular(15.0)),
@@ -215,7 +211,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
                                 height: 40.0,
                                 child: CircleAvatar(
                                   backgroundColor: this._wordFocus.hasFocus
-                                  ? color.primary
+                                  ? Color(0xFF6174FF)
                                   : color.surface,
                                   child: Text(
                                     (this._mnemoicWords.length + 1)
@@ -229,9 +225,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
                                   padding: const EdgeInsets.symmetric(
                                     horizontal: 20.0),
                                   decoration: BoxDecoration(
-                                    color: this._wordFocus.hasFocus
-                                    ? color.primaryVariant
-                                    : color.surface,
+                                    color: color.surface,
                                     border: Border.all(
                                       color: this._wordFocus.hasFocus
                                       ? color.primary
@@ -267,7 +261,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
                                     height: 45.0,
                                     decoration: BoxDecoration(
                                       color: this._wordChecked
-                                      ? color.primary
+                                      ? Color(0xFF6174FF)
                                       : Color(0xFFADB0BB),
                                       borderRadius:
                                       BorderRadius.circular(15.0)),

lib/pages/home.dart

@@ -284,25 +284,12 @@ class _HomeListState extends State<HomeList> {
                                 },
                                 itemBuilder: (context) {
                                   return <PopupMenuEntry<int>>[
-                                    _menuItem(
-                                        color.primary,
-                                        0,
-                                        Icons.qr_code_scanner_rounded,
-                                        lang.scan),
-                                    _menuItem(
-                                        color.primary,
-                                        1,
-                                        Icons.person_add_rounded,
-                                        lang.addFriend,
-                                        provider.systemAppFriendAddNew),
-                                    _menuItem(
-                                        color.primary,
-                                        2,
-                                        Icons.add_business_rounded,
-                                        lang.addGroup,
-                                        provider.systemAppGroupAddNew),
-                                    _menuItem(color.primary, 3,
-                                        Icons.qr_code_rounded, lang.myQrcode),
+                                    _menuItem(0, Icons.qr_code_scanner_rounded, lang.scan),
+                                    _menuItem(1, Icons.person_add_rounded, lang.addFriend,
+                                      provider.systemAppFriendAddNew),
+                                    _menuItem(2, Icons.add_business_rounded, lang.addGroup,
+                                      provider.systemAppGroupAddNew),
+                                    _menuItem(3, Icons.qr_code_rounded, lang.myQrcode),
                                   ];
                                 },
                               )
@@ -548,7 +535,7 @@ class DrawerWidget extends StatelessWidget {
                       trailing: Transform.scale(
                         scale: 0.7,
                         child: CupertinoSwitch(
-                          activeColor: color.primary,
+                          activeColor: Color(0xFF6174FF),
                           value: !isLight,
                           onChanged: (_) {
                             final themeMode =
@@ -575,7 +562,7 @@ class DrawerWidget extends StatelessWidget {
   }
 }
 
-Widget _menuItem(Color color, int value, IconData icon, String text,
+Widget _menuItem(int value, IconData icon, String text,
     [bool hasNew = false]) {
   return PopupMenuItem<int>(
     value: value,
@@ -585,7 +572,7 @@ Widget _menuItem(Color color, int value, IconData icon, String text,
           Container(
             width: 30.0,
             height: 30.0,
-            child: Icon(icon, color: color),
+            child: Icon(icon, color: Color(0xFF6174FF)),
           ),
           if (hasNew)
             Positioned(

lib/pages/setting/network.dart

@@ -101,7 +101,7 @@ class _NetworkDetailState extends State<NetworkDetail> {
           width: 500.0,
           padding: const EdgeInsets.all(20.0),
           decoration: BoxDecoration(
-            color: color.primary, borderRadius: BorderRadius.circular(15.0)),
+            color: Color(0xFF6174FF), borderRadius: BorderRadius.circular(15.0)),
           child: Row(children: [
               Container(
                 width: 40.0,
@@ -110,7 +110,7 @@ class _NetworkDetailState extends State<NetworkDetail> {
                 decoration: BoxDecoration(
                   color: color.background,
                   borderRadius: BorderRadius.circular(15.0)),
-                child: Icon(Icons.info, color: color.primary, size: 24.0),
+                child: Icon(Icons.info, color: Color(0xFF6174FF), size: 24.0),
               ),
               Expanded(
                 child: Text(

lib/pages/setting/profile.dart

@@ -323,7 +323,7 @@ class _ProfileDetailState extends State<ProfileDetail> {
       _mnemoicWords.asMap().forEach((index, value) {
         mnemonicWordWidgets.add(Chip(
           avatar: CircleAvatar(
-              backgroundColor: color.primary,
+            backgroundColor: Color(0xFF6174FF),
               child: Text("${index + 1}",
                   style: TextStyle(fontSize: 12, color: Colors.white))),
           label: Text(value.trim(), style: TextStyle(fontSize: 16)),

lib/theme.dart

@@ -60,8 +60,8 @@ class AppTheme {
   );
 
   static const ColorScheme darkColorScheme = ColorScheme(
-    primary: Color(0xFF009688),
-    primaryVariant: Color(0xFF4DB6AC),
+    primary: Colors.white, //Color(0xFF009688),
+    primaryVariant: Color(0xFFADB0BB), //Color(0xFF4DB6AC),
     secondary: Color(0xFF4D1F7C),
     secondaryVariant: Color(0xFF451B6F),
     background: Color(0xFF241E30),

lib/widgets/button_text.dart

@@ -19,15 +19,13 @@ class ButtonText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final color = Theme.of(context).colorScheme;
-
     return InkWell(
       onTap: this.enable ? action : () {},
       child: Container(
         width: width,
         height: height,
         decoration: BoxDecoration(
-          color: this.enable ? color.primary : Color(0xFFADB0BB),
+          color: this.enable ? Color(0xFF6174FF) : Color(0xFFADB0BB),
           borderRadius: BorderRadius.circular(15.0)),
         child: Center(child: Text(text, style: TextStyle(
               fontSize: 20.0,

lib/widgets/chat_message.dart

@@ -31,7 +31,7 @@ class ChatMessage extends StatelessWidget {
       constraints: BoxConstraints(minWidth: 50, maxWidth: isDesktop ? width - 300.0 : width),
       padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 14.0),
       decoration: BoxDecoration(
-        color: message.isMe ? color.primary : color.primaryVariant,
+        color: message.isMe ? Color(0xFF6174FF) : color.primaryVariant,
         borderRadius: BorderRadius.circular(15.0),
       ),
       child: Text(message.content,

lib/widgets/input_text.dart

@@ -17,7 +17,7 @@ class InputText extends StatelessWidget {
       padding: const EdgeInsets.symmetric(horizontal: 20.0),
       height: 50.0,
       decoration: BoxDecoration(
-        color: focus.hasFocus ? color.primaryVariant : color.surface,
+        color: color.surface,
         border: Border.all(color: focus.hasFocus ? color.primary : color.surface),
         borderRadius: BorderRadius.circular(15.0)
       ),

lib/widgets/show_pin.dart

@@ -152,10 +152,10 @@ class _PinWordsState extends State<PinWords> {
             margin: EdgeInsets.all(5.0),
             decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(15.0),
-              color: color.primary,
+              color: Color(0xFF6174FF),
               boxShadow: [
                 BoxShadow(
-                  color: color.primary.withOpacity(0.5),
+                  color: Color(0x2A6174FF),
                   spreadRadius: 0.0,
                   blurRadius: 10.0,
                   offset: Offset(0, 10),
@@ -291,10 +291,10 @@ class _SetPinWordsState extends State<SetPinWords> {
             margin: EdgeInsets.all(5.0),
             decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(15.0),
-              color: color.primary,
+              color: Color(0xFF6174FF),
               boxShadow: [
                 BoxShadow(
-                  color: color.primary.withOpacity(0.5),
+                  color: Color(0x2A6174FF),
                   spreadRadius: 0.0,
                   blurRadius: 10.0,
                   offset: Offset(0, 10),