no message

devtools_options.yaml

@@ -0,0 +1 @@
+extensions:

lib/common/AC.dart

@@ -36,8 +36,14 @@ class AC {
   static  final String assets_images_search_history_time=HexColor.isDarkMode?A.assets_images_search_history_time_dark:A.assets_images_search_history_time;
   static  final String assets_images_mine_fill_space=HexColor.isDarkMode?A.assets_images_mine_fill_space_dark:A.assets_images_mine_fill_space;
   static  final String assets_images_my_setting=HexColor.isDarkMode?A.assets_images_my_setting_dark:A.assets_images_my_setting;
+  static  final String assets_images_empty_page=HexColor.isDarkMode?A.assets_images_empty_page_dark:A.assets_images_empty_page;
+  static  final String assets_images_empty_page_network=HexColor.isDarkMode?A.assets_images_empty_page_network_dark:A.assets_images_empty_page_network;
+  static  final String assets_images_empty_page_footprint=HexColor.isDarkMode?A.assets_images_empty_page_footprint_dark:A.assets_images_empty_page_footprint;
+  static  final String assets_images_renew_pro_vip=HexColor.isDarkMode?A.assets_images_renew_pro_vip_dark:A.assets_images_renew_pro_vip;
+  static  final String assets_images_up_pro_vip=HexColor.isDarkMode?A.assets_images_up_pro_vip_dark:A.assets_images_up_pro_vip;
 
-
+  static  final String assets_images_shading_background=HexColor.isDarkMode?A.assets_images_shading_background_dark:A.assets_images_shading_background;
+  static  final String assets_images_mood_text_bg=HexColor.isDarkMode?A.assets_images_mood_text_bg_dark:A.assets_images_mood_text_bg;
 
 }
 

lib/common/empty_data_page.dart

@@ -5,6 +5,7 @@ import 'package:poetry/utils/hex_color.dart';
 import 'package:poetry/utils/rgb_color.dart';
 
 import '../gen_a/A.dart';
+import 'AC.dart';
 
 class EmptyDataPage extends StatelessWidget {
 
@@ -37,7 +38,7 @@ class EmptyDataPage extends StatelessWidget {
           width: 200.h,
           height: 136.h,
           child: Image.asset(
-            image??A.assets_images_empty_page_seat,
+            image??AC.assets_images_empty_page,
             width: 200.h,
             height: 136.h,
             fit: BoxFit.fill,
@@ -51,7 +52,7 @@ class EmptyDataPage extends StatelessWidget {
                 title??"",
                 style: TextStyle(
                     fontSize: 14.sp,
-                    color: HexColor("#000000"),
+                    color: HexColor.QUKKA_T1,
                     fontWeight: FontWeight.w500
                 ),
               )
@@ -64,7 +65,7 @@ class EmptyDataPage extends StatelessWidget {
                 subTitle??"",
                 style: TextStyle(
                   fontSize: 12.sp,
-                  color: HexColor("#666666"),
+                  color: HexColor.QUKKA_T2,
                 ),
               )
           ),
@@ -76,7 +77,7 @@ class EmptyDataPage extends StatelessWidget {
                 button??"",
                 style: TextStyle(
                   fontSize: 14.sp,
-                  color: HexColor("#FFFFFF"),
+                  color: HexColor.QUKKA_BG1,
                   fontWeight: FontWeight.w500,
                 ),
               ),
@@ -84,7 +85,7 @@ class EmptyDataPage extends StatelessWidget {
                   minimumSize: MaterialStateProperty.all(Size(1, 36.h)),
                   padding: MaterialStateProperty.all(EdgeInsets.only(left: 27.w, right: 27.w)),
                   elevation: MaterialStateProperty.all(0),
-                  backgroundColor: MaterialStateProperty.all(HexColor("#FCA14C")),
+                  backgroundColor: MaterialStateProperty.all(HexColor.QUKKA_BTN),
                   shape: MaterialStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(18.h)))
               ),
               onPressed: () {

lib/gen_a/A.dart

@@ -1,5 +1,6 @@
 class A{
  //auto gen ,do not edit! 
+static  final String assets_images_empty_page_network_dark="assets/images/empty_page_network_dark.png";
 static  final String assets_images_home_back_all="assets/images/home_back_all.png";
 static  final String assets_images_ic_close_dark="assets/images/ic_close_dark.png";
 static  final String assets_images_get_badge="assets/images/get_badge.png";
@@ -64,6 +65,7 @@ static  final String assets_images_edit_pen_orange="assets/images/edit_pen_orang
 static  final String assets_images_report_maoboli="assets/images/report_maoboli.png";
 static  final String assets_images_tabBar_explore_select="assets/images/tabBar_explore_select.png";
 static  final String assets_images_home_back_down_dark="assets/images/home_back_down_dark.png";
+static  final String assets_images_shading_background="assets/images/shading_background.png";
 static  final String assets_images_change_font_ic="assets/images/change_font_ic.png";
 static  final String assets_images_tabBar_today_select_dark="assets/images/tabBar_today_select_dark.png";
 static  final String assets_images_pwd_lock_logo="assets/images/pwd_lock_logo.png";
@@ -75,6 +77,7 @@ static  final String assets_images_share_wechat="assets/images/share_wechat.png"
 static  final String assets_images_searchbox_close="assets/images/searchbox_close.png";
 static  final String assets_images_mood_right_arrow="assets/images/mood_right_arrow.png";
 static  final String assets_images_badge_share_logo="assets/images/badge_share_logo.png";
+static  final String assets_images_empty_page_network="assets/images/empty_page_network.png";
 static  final String assets_images_mine_history_record="assets/images/mine_history_record.png";
 static  final String assets_images_search_clear="assets/images/search_clear.png";
 static  final String assets_images_discover_all_assess="assets/images/discover_all_assess.png";
@@ -89,6 +92,7 @@ static  final String assets_images_tabBar_explore_no_dark="assets/images/tabBar_
 static  final String assets_images_pwd_lock_background="assets/images/pwd_lock_background.png";
 static  final String assets_images_mood_analysis_share_unfull="assets/images/mood_analysis_share_unfull.png";
 static  final String assets_images_tabBar_today_no="assets/images/tabBar_today_no.png";
+static  final String assets_images_shading_background_dark="assets/images/shading_background_dark.png";
 static  final String assets_images_mood_ic_read="assets/images/mood_ic_read.png";
 static  final String assets_images_search_icon="assets/images/search_icon.png";
 static  final String assets_images_personal_info_arrow_dark="assets/images/personal_info_arrow_dark.png";
@@ -98,6 +102,7 @@ static  final String assets_images_practice_noSelect="assets/images/practice_noS
 static  final String assets_images_practice_lesson_lock="assets/images/practice_lesson_lock.png";
 static  final String assets_images_mood_analysis_vague="assets/images/mood_analysis_vague.png";
 static  final String assets_images_login_bottom_arrow="assets/images/login_bottom_arrow.png";
+static  final String assets_images_empty_page_dark="assets/images/empty_page_dark.png";
 static  final String assets_images_mood_ic_partner="assets/images/mood_ic_partner.png";
 static  final String assets_images_search_history_time="assets/images/search_history_time.png";
 static  final String assets_images_home_back_down="assets/images/home_back_down.png";
@@ -106,7 +111,7 @@ static  final String assets_images_finish_good_unselected="assets/images/finish_
 static  final String assets_images_badge_share_edging="assets/images/badge_share_edging.png";
 static  final String assets_images_everyday_word_share_ocean="assets/images/everyday_word_share_ocean.png";
 static  final String assets_images_badge_mine="assets/images/badge_mine.png";
-static  final String assets_images_empty_data_network="assets/images/empty_data_network.png";
+static  final String assets_images_up_pro_vip_dark="assets/images/up_pro_vip_dark.png";
 static  final String assets_images_mine_mood_stat="assets/images/mine_mood_stat.png";
 static  final String assets_images_vip_pro_ic="assets/images/vip_pro_ic.png";
 static  final String assets_images_logo_80="assets/images/logo_80.png";
@@ -114,6 +119,7 @@ static  final String assets_images_my_setting_dark="assets/images/my_setting_dar
 static  final String assets_images_badge_share_background="assets/images/badge_share_background.png";
 static  final String assets_images_badge_list_right="assets/images/badge_list_right.png";
 static  final String assets_images_guide_icon1="assets/images/guide_icon1.png";
+static  final String assets_images_empty_page="assets/images/empty_page.png";
 static  final String assets_images_guide_icon2="assets/images/guide_icon2.png";
 static  final String assets_images_badge_new="assets/images/badge_new.png";
 static  final String assets_images_mood_text_bg="assets/images/mood_text_bg.png";
@@ -125,6 +131,7 @@ static  final String assets_images_everyday_word_share_mark="assets/images/every
 static  final String assets_images_mood_ic_wealth="assets/images/mood_ic_wealth.png";
 static  final String assets_images_mood_ic_sport_dark="assets/images/mood_ic_sport_dark.png";
 static  final String assets_images_finish_title_bg="assets/images/finish_title_bg.png";
+static  final String assets_images_renew_pro_vip_dark="assets/images/renew_pro_vip_dark.png";
 static  final String assets_images_delete_red_icon="assets/images/delete_red_icon.png";
 static  final String assets_images_everyday_word_share_icon1="assets/images/everyday_word_share_icon1.png";
 static  final String assets_images_analysis_right_arrow="assets/images/analysis_right_arrow.png";
@@ -153,6 +160,7 @@ static  final String assets_images_everyday_word_mark_dark="assets/images/everyd
 static  final String assets_images_ic_lable_chapter="assets/images/ic_lable_chapter.png";
 static  final String assets_images_mood_ic_life_dark="assets/images/mood_ic_life_dark.png";
 static  final String assets_images_mood_ic_music_dark="assets/images/mood_ic_music_dark.png";
+static  final String assets_images_empty_page_footprint_dark="assets/images/empty_page_footprint_dark.png";
 static  final String assets_images_mood_record_delete_photo="assets/images/mood_record_delete_photo.png";
 static  final String assets_images_personal_info_edit_pic="assets/images/personal_info_edit_pic.png";
 static  final String assets_images_practice_report_ic="assets/images/practice_report_ic.png";
@@ -169,6 +177,7 @@ static  final String assets_images_personal_info_arrow="assets/images/personal_i
 static  final String assets_images_mood_ic_food_dark="assets/images/mood_ic_food_dark.png";
 static  final String assets_images_edit_pen_grey="assets/images/edit_pen_grey.png";
 static  final String assets_images_mood_record_shading_200="assets/images/mood_record_shading_200.png";
+static  final String assets_images_mood_text_bg_dark="assets/images/mood_text_bg_dark.png";
 static  final String assets_images_login_down_arrow="assets/images/login_down_arrow.png";
 static  final String assets_images_edit_pen_orange_dark="assets/images/edit_pen_orange_dark.png";
 static  final String assets_images_mood_ic_food="assets/images/mood_ic_food.png";
@@ -185,6 +194,7 @@ static  final String assets_images_tabBar_mine_no_dark="assets/images/tabBar_min
 static  final String assets_images_practice_edit_ic="assets/images/practice_edit_ic.png";
 static  final String assets_images_mood_ic_custom_dark="assets/images/mood_ic_custom_dark.png";
 static  final String assets_images_default_avatar="assets/images/default_avatar.png";
+static  final String assets_images_empty_page_footprint="assets/images/empty_page_footprint.png";
 static  final String assets_images_mood_ic_health="assets/images/mood_ic_health.png";
 static  final String assets_images_ic_back="assets/images/ic_back.png";
 static  final String assets_images_analysis_left_arrow="assets/images/analysis_left_arrow.png";
@@ -192,14 +202,12 @@ static  final String assets_images_practice_time_ic="assets/images/practice_time
 static  final String assets_images_mood_ic_study_dark="assets/images/mood_ic_study_dark.png";
 static  final String assets_images_mood_ic_friend="assets/images/mood_ic_friend.png";
 static  final String assets_images_mood_ic_society_dark="assets/images/mood_ic_society_dark.png";
-static  final String assets_images_empty_page_seat="assets/images/empty_page_seat.png";
 static  final String assets_images_badge_list_left="assets/images/badge_list_left.png";
 static  final String assets_images_mood_list_reason_back="assets/images/mood_list_reason_back.png";
 static  final String assets_images_tabBar_today_select="assets/images/tabBar_today_select.png";
 static  final String assets_images_mood_list_type_back_dark="assets/images/mood_list_type_back_dark.png";
 static  final String assets_images_everyday_word_mark="assets/images/everyday_word_mark.png";
 static  final String assets_images_finish_normal_unselected="assets/images/finish_normal_unselected.png";
-static  final String assets_images_empty_page_icon="assets/images/empty_page_icon.png";
 static  final String assets_images_default_avatar_login="assets/images/default_avatar_login.png";
 static  final String assets_images_finish_normal_selected="assets/images/finish_normal_selected.png";
 static  final String assets_images_mark_pay="assets/images/mark_pay.png";

lib/pages/explore/main/page/discover_page.dart

@@ -150,7 +150,7 @@ class DiscoverPage extends GetView<DiscoverCtrl> {
                   child: GetBuilder<DiscoverCtrl>(
                     id: "list",
                     builder: (_)=> _.isPageDataRequestFailed?EmptyDataPage(
-                      image: A.assets_images_empty_data_network,
+                      image: AC.assets_images_empty_page_network,
                       title: "网络出问题了",
                       button: "刷新",
                       buttonClickBlock: () {

lib/pages/footprint/main/page/footprint_page.dart

@@ -202,7 +202,7 @@ class FootprintPage extends GetView<FootprintCtrl> {
                     child: GetBuilder<FootprintCtrl>(
                       id: "list",
                       builder: (_)=> _.recordsList.isEmpty?EmptyDataPage(
-                        image: A.assets_images_empty_page_icon,
+                        image: AC.assets_images_empty_page_footprint,
                         title: "暂时没有足迹",
                         subTitle: "试试心情记录、练习或测评，开始心境奇旅吧",
                       ):SmartRefresher(

lib/pages/my/login/page/captcha_page.dart

@@ -17,6 +17,7 @@ import 'package:poetry/utils/app_static.dart';
 import 'package:poetry/utils/rgb_color.dart';
 import 'package:poetry/utils/toast_utils.dart';
 
+import '../../../../common/AC.dart';
 import '../../../../module/app_service.dart';
 import '../../../../utils/hex_color.dart';
 
@@ -95,22 +96,18 @@ class _CaptchaState extends State<CaptchaPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: HexColor.QUKKA_BG1,
         body: Stack(
           children: [
             Positioned(
-              left: 0,
-              top: 0,
-              right: 0,
-              height: 326.h,
-              child: Container(
-                decoration: BoxDecoration(
-                  gradient: LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: [HexColor("#FFECDA"), HexColor("#FFFFFF")]
-                  ),
-                ),
-              ),
+                left: 0,
+                top: 0,
+                right: 0,
+                height: 390.h,
+                child: Image.asset(
+                  AC.assets_images_home_back_all,
+                  fit: BoxFit.fill,
+                )
             ),
             Positioned(
               left: 15,
@@ -134,7 +131,7 @@ class _CaptchaState extends State<CaptchaPage> {
                       "请输入验证码",
                       style: TextStyle(
                           fontSize: 24.sp,
-                          color: RgbColor.Black_087,
+                          color: HexColor.QUKKA_T1,
                           fontWeight: FontWeight.w600
                       ),
                     ),
@@ -148,7 +145,7 @@ class _CaptchaState extends State<CaptchaPage> {
                           "已发送至 "+widget.areaCode+" "+widget.phone,
                           style: TextStyle(
                             fontSize: 12.sp,
-                            color: Color.fromRGBO(102, 102, 102, 1),
+                            color: HexColor.QUKKA_T2,
                           ),
                         ),
                         allowSendCaptcha ? Container(
@@ -161,7 +158,7 @@ class _CaptchaState extends State<CaptchaPage> {
                               "重新发送",
                               style: TextStyle(
                                 fontSize: 12.0.w,
-                                color: RgbColor(252, 161, 76, 1),
+                                color: HexColor.QUKKA_BTN,
                                 decoration: TextDecoration.underline,
                               ),
                             ),
@@ -177,14 +174,14 @@ class _CaptchaState extends State<CaptchaPage> {
                                         text: _remainSeconds.toString()+"s",
                                         style: TextStyle(
                                             fontSize: 12.sp,
-                                            color: HexColor("#FCA14C")
+                                            color: HexColor.QUKKA_BTN
                                         ),
                                     ),
                                     TextSpan(
                                       text: " 后重新发送",
                                       style: TextStyle(
                                         fontSize: 12.sp,
-                                        color: RgbColor(102, 102, 102, 1),
+                                        color: HexColor.QUKKA_T2,
                                       ),
                                     ),
                                   ]
@@ -207,19 +204,23 @@ class _CaptchaState extends State<CaptchaPage> {
                           cursorColor: HexColor.QUOKKA_FCA14C,
                           cursorHeight: 24.w,
                           focusNode: focusNode,
+                          enableActiveFill: true,
                           pinTheme: PinTheme(
                             shape: PinCodeFieldShape.box,
                             borderRadius: BorderRadius.circular(12.w),
                             fieldHeight: 48.w,
                             fieldWidth: 48.w,
-                            activeColor: RgbColor(0, 0, 0, 0.03),
-                            activeFillColor: RgbColor(0, 0, 0, 0.03),
-                            selectedColor: RgbColor(0, 0, 0, 0.03),
-                            inactiveColor: RgbColor(0, 0, 0, 0.03),
+                            activeColor: HexColor.QUKKA_BG2,
+                            activeFillColor: HexColor.QUKKA_BG2,
+                            selectedColor: HexColor.QUKKA_BG2,
+                            selectedFillColor: HexColor.QUKKA_BG2,
+                            inactiveColor: HexColor.QUKKA_BG2,
+                            inactiveFillColor: HexColor.QUKKA_BG2,
+                            disabledColor: HexColor.QUKKA_BG2,
                           ),
                           textStyle: TextStyle(
                               fontSize: 24.w,
-                              color: RgbColor(32, 32, 31, 1)
+                              color: HexColor.QUKKA_T1
                           ),
                           //cursorColor: RgbColor(0, 0, 0, 0.03),
                           onCompleted: (String value) {
@@ -279,7 +280,7 @@ class _CaptchaState extends State<CaptchaPage> {
                     child: Text(
                       "其他方式登录",
                       style: TextStyle(
-                          color: RgbColor(102, 102, 102, 1),
+                          color: HexColor.QUKKA_T2,
                           fontSize: 12.sp
                       ),
                     ),

lib/pages/my/login/page/login_page.dart

@@ -169,7 +169,7 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
             left: 0,
             top: 0,
             right: 0,
-            height: 326.h,
+            height: 390.h,
             child: Image.asset(
               AC.assets_images_home_back_all,
               fit: BoxFit.fill,

lib/pages/my/main/page/mine_page.dart

@@ -86,7 +86,7 @@ class MinePage extends GetView<MineCtrl> {
                 id: "all",
                 builder: (_)=> _.isRequestFailed?EmptyDataPage(
                   top: ScreenUtil().statusBarHeight+AppStatic.navBarHeight,
-                  image: A.assets_images_empty_data_network,
+                  image: AC.assets_images_empty_page_network,
                   title: "网络出问题了",
                   button: "刷新",
                   buttonClickBlock: () {

lib/pages/my/main/view/mine_info_view.dart

@@ -18,6 +18,7 @@ import 'package:poetry/utils/app_static.dart';
 import 'package:poetry/utils/base_app_bar.dart';
 import 'package:poetry/utils/image_button.dart';
 
+import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';
 import '../../../../module/user_service.dart';
 import '../../../../routers/app_routers.dart';
@@ -371,7 +372,7 @@ class MyInfoView extends GetView<MineCtrl> {
             height: 20.w,
             alignment: Alignment.centerLeft,
             child: Image.asset(
-              A.assets_images_renew_pro_vip,
+              AC.assets_images_renew_pro_vip,
               fit: BoxFit.fill,
             )
         ),
@@ -387,7 +388,7 @@ class MyInfoView extends GetView<MineCtrl> {
             width: 102.w,
             height: 20.w,
             child: Image.asset(
-              A.assets_images_up_pro_vip,
+              AC.assets_images_up_pro_vip,
               fit: BoxFit.fill,
             )
         ),

lib/pages/today/favorite/page/my_favorite_tab_page.dart

@@ -157,7 +157,7 @@ class _MyFavoriteTabState extends State<MyFavoriteTabPage>
                   //indicatorWeight: 5,
                   indicatorPadding: EdgeInsets.fromLTRB(2, 2, 2, 2),
                   indicator: BoxDecoration(
-                      color: Colors.white,
+                      color: HexColor.QUKKA_BG4,
                       borderRadius: BorderRadius.circular(16.w)
                   ),
                 ),

lib/pages/today/main/page/home_page.dart

@@ -171,7 +171,7 @@ class HomePage extends GetView<HomeCtrl> {
                         child: GetBuilder<HomeCtrl>(
                             id: "all",
                             builder: (_)=> _.isPageDataRequestFailed?EmptyDataPage(
-                              image: A.assets_images_empty_data_network,
+                              image: AC.assets_images_empty_page_network,
                               title: "网络出问题了",
                               button: "刷新",
                               buttonClickBlock: () {

lib/pages/today/mood_record/page/mood_choose_page.dart

@@ -10,6 +10,7 @@ import 'package:poetry/pages/today/mood_record/view/mood_bar_view.dart';
 import 'package:poetry/utils/hex_color.dart';
 import 'package:poetry/utils/rgb_color.dart';
 
+import '../../../../common/AC.dart';
 import '../bindings/mood_record_binding.dart';
 import '../view/mood_next_button.dart';
 
@@ -24,9 +25,9 @@ class MoodChoosePage extends GetView<MoodChooseCtrl> {
         },
         child: Container(
             decoration: BoxDecoration(
-                color: HexColor("#FFF8F0"),
+                //color: HexColor("#FFF8F0"),
                 image: DecorationImage(
-                  image: AssetImage(A.assets_images_mood_choose_back),
+                  image: AssetImage(AC.assets_images_shading_background),
                   fit: BoxFit.fill,
                 )
             ),
@@ -44,7 +45,7 @@ class MoodChoosePage extends GetView<MoodChooseCtrl> {
                         text: "你的",
                         style: TextStyle(
                           fontSize: 20.sp,
-                          color: RgbColor(0, 0, 0, 0.87),
+                          color: HexColor.QUKKA_T1,
                           fontWeight: FontWeight.w500,
                         ),
                         children: [
@@ -53,7 +54,7 @@ class MoodChoosePage extends GetView<MoodChooseCtrl> {
                               child: Container (
                                 decoration: BoxDecoration(
                                   image: DecorationImage(
-                                    image: AssetImage(A.assets_images_mood_text_bg),
+                                    image: AssetImage(AC.assets_images_mood_text_bg),
                                     fit: BoxFit.fill,
                                   ),
                                 ),
@@ -61,7 +62,7 @@ class MoodChoosePage extends GetView<MoodChooseCtrl> {
                                   "心情",
                                   style: TextStyle(
                                     fontSize: 20.sp,
-                                    color: RgbColor(0, 0, 0, 0.87),
+                                    color: HexColor.QUKKA_T1,
                                     fontWeight: FontWeight.w500,
                                   ),
                                 ),
@@ -72,7 +73,7 @@ class MoodChoosePage extends GetView<MoodChooseCtrl> {
                               text: "如何？",
                               style: TextStyle(
                                 fontSize: 20.sp,
-                                color: RgbColor(0, 0, 0, 0.87),
+                                color: HexColor.QUKKA_T1,
                                 fontWeight: FontWeight.w500,
                               )
                           ),
@@ -155,14 +156,14 @@ class MoodChoosePage extends GetView<MoodChooseCtrl> {
               height: 85.h,
               alignment: Alignment.center,
               decoration: BoxDecoration(
-                color: controller.index>=(index+1)?_getColor(controller.index):Colors.white,
-                border: index<4?Border(top: BorderSide(color: RgbColor(0, 0, 0, 0.1), width: 0.5),):Border(),
+                color: controller.index>=(index+1)?_getColor(controller.index):HexColor.QUKKA_BG2,
+                border: index<4?Border(top: BorderSide(color: HexColor.QUKKA_L1, width: 0.5),):Border(),
               ),
               child: Text(
                 controller.moodList[index],
                 style: TextStyle(
                     fontSize: 14.sp,
-                    color: controller.index>=(index+1)?Colors.white:HexColor.QUOKKA_TEXT_999999
+                    color: controller.index>=(index+1)?Colors.white:HexColor.QUKKA_T3
                 ),
               ),
             );
@@ -182,11 +183,11 @@ class MoodChoosePage extends GetView<MoodChooseCtrl> {
                 return Container(
                   height: 17.h,
                   width: 100.w,
-                  color: controller.index>=(index+1)?_getColor((controller.index/5).ceil()):Colors.white,
+                  color: controller.index>=(index+1)?_getColor((controller.index/5).ceil()):HexColor.QUKKA_BG2,
                   alignment: Alignment.topRight,
                   child: Container(
                     width: (index+1)%5==0?100.w:24.w,
-                    color: RgbColor(0, 0, 0, 0.1),
+                    color: HexColor.QUKKA_L1,
                     height: 0.5,
                   )
                 );
@@ -247,7 +248,7 @@ class MoodChoosePage extends GetView<MoodChooseCtrl> {
         return Colors.white;
       }
     }
-    return HexColor.QUOKKA_TEXT_999999;
+    return HexColor.QUKKA_BG3;
   }
 
 

lib/pages/today/mood_record/page/mood_reason_page.dart

@@ -14,6 +14,7 @@ import 'package:poetry/pages/today/mood_record/view/mood_next_button.dart';
 import 'package:poetry/utils/oss_utils.dart';
 import 'package:poetry/utils/toast_utils.dart';
 
+import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';
 import '../../../../net/http_utils.dart';
 import '../../../../utils/hex_color.dart';
@@ -32,9 +33,9 @@ class MoodReasonPage extends GetView<MoodReasonCtrl>{
     return Scaffold(
         body: Container(
             decoration: BoxDecoration(
-                color: HexColor("#FFF8F0"),
+                //color: HexColor("#FFF8F0"),
                 image: DecorationImage(
-                  image: AssetImage(A.assets_images_mood_choose_back),
+                  image: AssetImage(AC.assets_images_shading_background),
                   fit: BoxFit.fill,
                 )
             ),
@@ -52,7 +53,7 @@ class MoodReasonPage extends GetView<MoodReasonCtrl>{
                         text: "是什么让你觉得心情",
                         style: TextStyle(
                           fontSize: 20.sp,
-                          color: RgbColor(0, 0, 0, 0.87),
+                          color: HexColor.QUKKA_T1,
                           fontWeight: FontWeight.w500,
                         ),
                         children: [
@@ -61,7 +62,7 @@ class MoodReasonPage extends GetView<MoodReasonCtrl>{
                               child: Container (
                                 decoration: BoxDecoration(
                                   image: DecorationImage(
-                                    image: AssetImage(A.assets_images_mood_text_bg),
+                                    image: AssetImage(AC.assets_images_mood_text_bg),
                                     fit: BoxFit.fill,
                                   ),
                                 ),
@@ -69,7 +70,7 @@ class MoodReasonPage extends GetView<MoodReasonCtrl>{
                                   controller.moodStr,
                                   style: TextStyle(
                                     fontSize: 20.sp,
-                                    color: RgbColor(0, 0, 0, 0.87),
+                                    color: HexColor.QUKKA_T1,
                                     fontWeight: FontWeight.w500,
                                   ),
                                 ),
@@ -79,7 +80,7 @@ class MoodReasonPage extends GetView<MoodReasonCtrl>{
                               text: "？",
                               style: TextStyle(
                                 fontSize: 20.sp,
-                                color: RgbColor(0, 0, 0, 0.87),
+                                color: HexColor.QUKKA_T1,
                                 fontWeight: FontWeight.w500,
                               )
                           ),

lib/pages/today/mood_record/page/mood_type_page.dart

@@ -12,6 +12,7 @@ import 'package:poetry/utils/oss_utils.dart';
 import 'package:poetry/utils/string_count.dart';
 import 'package:poetry/utils/toast_utils.dart';
 
+import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';
 import '../../../../utils/hex_color.dart';
 import '../../../../utils/rgb_color.dart';
@@ -29,9 +30,9 @@ class MoodTypePage extends GetView<MoodTypeCtrl> {
     return Scaffold(
         body: Container(
             decoration: BoxDecoration(
-                color: HexColor("#FFF8F0"),
+                //color: HexColor("#FFF8F0"),
                 image: DecorationImage(
-                  image: AssetImage(A.assets_images_mood_choose_back),
+                  image: AssetImage(AC.assets_images_shading_background),
                   fit: BoxFit.fill,
                 )
             ),
@@ -57,7 +58,7 @@ class MoodTypePage extends GetView<MoodTypeCtrl> {
                         text: "你感受到了哪些",
                         style: TextStyle(
                           fontSize: 20.sp,
-                          color: RgbColor(0, 0, 0, 0.87),
+                          color: HexColor.QUKKA_T1,
                           fontWeight: FontWeight.w500,
                         ),
                         children: [
@@ -74,7 +75,7 @@ class MoodTypePage extends GetView<MoodTypeCtrl> {
                                   "情绪",
                                   style: TextStyle(
                                     fontSize: 20.sp,
-                                    color: RgbColor(0, 0, 0, 0.87),
+                                    color: HexColor.QUKKA_T1,
                                     fontWeight: FontWeight.w500,
                                   ),
                                 ),
@@ -84,7 +85,7 @@ class MoodTypePage extends GetView<MoodTypeCtrl> {
                               text: "？",
                               style: TextStyle(
                                 fontSize: 20.sp,
-                                color: RgbColor(0, 0, 0, 0.87),
+                                color: HexColor.QUKKA_T1,
                                 fontWeight: FontWeight.w500,
                               )
                           ),

lib/pages/today/mood_record/view/mood_bar_view.dart

@@ -13,6 +13,7 @@ import 'package:poetry/utils/rgb_color.dart';
 import 'package:poetry/utils/toast_utils.dart';
 import 'package:sp_util/sp_util.dart';
 
+import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';
 import '../../../../utils/app_event.dart';
 import '../../../../utils/time_util.dart';
@@ -57,7 +58,7 @@ class MoodBarView extends GetView<MoodChooseCtrl> {
                 InkWell(
                   child: Image.asset(
                     width: 24.w,
-                    A.assets_images_ic_back,
+                    AC.assets_images_ic_back,
                     fit: BoxFit.cover,
                   ),
                   onTap: () async{
@@ -107,7 +108,7 @@ class MoodBarView extends GetView<MoodChooseCtrl> {
                 InkWell(
                   child: Image.asset(
                     width: 24.w,
-                    A.assets_images_ic_close,
+                    AC.assets_images_ic_close,
                     fit: BoxFit.cover,
                   ),
                   onTap: () async {
@@ -141,14 +142,14 @@ class MoodBarView extends GetView<MoodChooseCtrl> {
                       height: 24.h,
                       decoration: BoxDecoration(
                           border: Border(
-                              bottom: BorderSide(color: RgbColor(0, 0, 0, 0.24), width: 1)
+                              bottom: BorderSide(color: HexColor.QUKKA_L1, width: 1)
                           )
                       ),
                       child: Text(
                         showTime,
                         style: TextStyle(
                           fontSize: 14.sp,
-                          color: HexColor.QUOKKA_TEXT_666666,
+                          color: HexColor.QUKKA_T2,
                           // decoration: TextDecoration.underline,
                           // decorationColor: RgbColor(0, 0, 0, 0.24),
                           // decorationThickness: 1,
@@ -174,7 +175,7 @@ class MoodBarView extends GetView<MoodChooseCtrl> {
                       right??"",
                       style: TextStyle(
                           fontSize: 16.sp,
-                          color: HexColor.QUOKKA_FCA14C
+                          color: HexColor.QUKKA_BTN
                       ),
                     ),
                     onTap: () {
@@ -201,7 +202,7 @@ class MoodBarView extends GetView<MoodChooseCtrl> {
               width: _getWidth(),
               height: 4.h,
               decoration: BoxDecoration(
-                  color: HexColor("#FCA14C"),
+                  color: HexColor.QUKKA_BTN,
                   borderRadius: BorderRadius.circular(2.h)
               ),
             ),
@@ -235,18 +236,23 @@ class MoodBarView extends GetView<MoodChooseCtrl> {
         showTitleActions: true,
         maxTime: DateTime.now(),
         theme: DatePickerTheme1(
-            headerColor: Colors.white,
-            backgroundColor: Colors.white,
+            headerColor: HexColor.QUKKA_BG2,
+            backgroundColor: HexColor.QUKKA_BG2,
             itemStyle: TextStyle(
-                color: HexColor("#FCA14C"),
+                color: HexColor.QUKKA_BTN,
                 fontSize: 18,
                 fontWeight: FontWeight.w500
             ),
             doneStyle: TextStyle(
-                color: HexColor("#FCA14C"),
+                color: HexColor.QUKKA_BTN,
                 fontSize: 16,
                 fontWeight: FontWeight.bold
             ),
+          cancelStyle: TextStyle(
+              color: HexColor.QUKKA_T2,
+              fontSize: 16,
+              fontWeight: FontWeight.w400
+          ),
         ),
         //onChanged: (dateTime) {},
         onConfirm: (dateTime) {

lib/pages/today/mood_record/view/mood_next_button.dart

@@ -41,36 +41,22 @@ class _MoodNextButtonState extends State<MoodNextButton> with AutomaticKeepAlive
         width: widget.width??128.w,
         height: widget.height??48.h,
           decoration: BoxDecoration(
-              color: HexColor("#FCA14C"),
+              color: widget.isNext?HexColor.QUKKA_BTN:HexColor.QUKKA_BTN.withOpacity(0.5),
               borderRadius: BorderRadius.circular(24.h)
           ),
-          child: Stack(
-            children: [
-              Positioned.fill(
-                child: widget.showStyle==1?Icon(
-                  Icons.arrow_forward,
-                  color: Colors.white,
-                ):Container(
-                  alignment: Alignment.center,
-                  child: Text(
-                    widget.title??"",
-                    style: TextStyle(
-                        fontSize: 16.sp,
-                        color: Colors.white,
-                        fontWeight: FontWeight.w500
-                    ),
-                  ),
-                ),
+          child: widget.showStyle==1?Icon(
+            Icons.arrow_forward,
+            color: HexColor.QUKKA_BG1,
+          ):Container(
+            alignment: Alignment.center,
+            child: Text(
+              widget.title??"",
+              style: TextStyle(
+                  fontSize: 16.sp,
+                  color: HexColor.QUKKA_BG1,
+                  fontWeight: FontWeight.w500
               ),
-              Positioned.fill(
-                  child: Container(
-                    decoration: BoxDecoration(
-                        color: _getNextButtonMask(),
-                        borderRadius: BorderRadius.circular(24.h)
-                    ),
-                  )
-              ),
-            ],
+            ),
           )
       ),
       onTapDown: (details){
@@ -91,15 +77,15 @@ class _MoodNextButtonState extends State<MoodNextButton> with AutomaticKeepAlive
     );
   }
 
-  Color _getNextButtonMask() {
-    if (!widget.isNext) {
-      return RgbColor(255, 255, 255, 0.5);
-    }
-    if (_isPress) {
-      return RgbColor(0, 0, 0, 0.1);
-    }
-    return Colors.transparent;
-  }
+  // Color _getNextButtonMask() {
+  //   if (!widget.isNext) {
+  //     return RgbColor(255, 255, 255, 0.5);
+  //   }
+  //   if (_isPress) {
+  //     return RgbColor(0, 0, 0, 0.1);
+  //   }
+  //   return Colors.transparent;
+  // }
 
   @override
   bool get wantKeepAlive => true;

lib/pages/today/mood_record/view/mood_reason_cell.dart

@@ -31,7 +31,7 @@ class MoodReasonCell extends GetView<MoodReasonCtrl> {
         height: 98.w,
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(12.w),
-          color: showType==1?(reasonModel.isSelected?RgbColor(250, 177, 109, 0.2):HexColor(HexColor.QUOKKA_FFFFFF)):HexColor("#FAFAFA")
+          color: showType==1?(reasonModel.isSelected?HexColor.QUKKA_BTN.withOpacity(0.2):HexColor.QUKKA_LIGHT_BG1_DARK_BG2):HexColor("#FAFAFA")
         ),
         child: (reasonModel.isCustom && showType==1)?Column(
           children: [
@@ -57,13 +57,14 @@ class MoodReasonCell extends GetView<MoodReasonCtrl> {
                     child: Image.asset(
                       A.assets_images_setting_orange,
                       fit: BoxFit.fill,
+                      color: HexColor.QUKKA_BTN,
                     ),
                   ),
                   Text(
                     "自定义",
                     style: TextStyle(
                         fontSize: 14.sp,
-                        color: HexColor.QUOKKA_TEXT_666666
+                        color: HexColor.QUKKA_T2
                     ),
                   ),
                 ],
@@ -109,7 +110,7 @@ class MoodReasonCell extends GetView<MoodReasonCtrl> {
                 Icons.add,
                 color: HexColor("#E2965F"),
               ): Image.asset(
-                "assets/images/mood_ic_${reasonModel.icon}.png",
+                HexColor.isDarkMode?"assets/images/mood_ic_${reasonModel.icon}_dark.png":"assets/images/mood_ic_${reasonModel.icon}.png",
                 fit: BoxFit.cover,
               ),
             ),
@@ -118,7 +119,7 @@ class MoodReasonCell extends GetView<MoodReasonCtrl> {
               (showType == 2 && reasonModel.isCustom)?"新增":reasonModel.name??"",
               style: TextStyle(
                 fontSize: 14.sp,
-                color: (showType == 2 && reasonModel.isCustom)?HexColor("#222222"):(reasonModel.isSelected&&showType==1)?HexColor.QUOKKA_FCA14C:HexColor.QUOKKA_TEXT_666666,
+                color: (showType == 2 && reasonModel.isCustom)?HexColor("#222222"):(reasonModel.isSelected&&showType==1)?HexColor.QUKKA_BTN:HexColor.QUKKA_T2,
                 fontWeight: (showType == 2 && reasonModel.isCustom)?FontWeight.w500:FontWeight.w400
               ),
             ),

lib/pages/today/mood_record/view/mood_type_cell.dart

@@ -28,7 +28,7 @@ class MoodTypeCell extends GetView {
         height: 48.w,
         decoration: BoxDecoration(
             borderRadius: BorderRadius.circular(24.w),
-            color: showType==1?(typeModel.isSelected?RgbColor(250, 177, 109, 0.2):HexColor(HexColor.QUOKKA_FFFFFF)):HexColor("#FAFAFA")
+            color: showType==1?(typeModel.isSelected?HexColor.QUKKA_BTN.withOpacity(0.2):HexColor.QUKKA_LIGHT_BG1_DARK_BG2):HexColor("#FAFAFA")
         ),
         child: (typeModel.isCustom && (showType==1 || showType == 2))?Stack(
           children: [
@@ -44,14 +44,14 @@ class MoodTypeCell extends GetView {
                       fit: BoxFit.fill,
                     ):Icon(
                       Icons.add,
-                      color: HexColor.QUOKKA_FCA14C,
+                      color: HexColor.QUKKA_BTN,
                     ),
                   ),
                   Text(
                     showType==1?"自定义":"新增",
                     style: TextStyle(
                         fontSize: 14.sp,
-                        color: RgbColor.Black_087
+                        color: HexColor.QUKKA_T1
                     ),
                   ),
                 ],
@@ -74,7 +74,7 @@ class MoodTypeCell extends GetView {
                   typeModel.name??"",
                   style: TextStyle(
                       fontSize: 14.sp,
-                      color: (typeModel.isSelected&&showType==1)?HexColor.QUOKKA_FCA14C:HexColor.QUOKKA_TEXT_666666
+                      color: (typeModel.isSelected&&showType==1)?HexColor.QUKKA_BTN:HexColor.QUKKA_T2
                   ),
                 ),
               ),

lib/utils/hex_color.dart

@@ -52,6 +52,7 @@ class HexColor extends Color {
   static final Color QUKKA_BG1 = QUOKKA_BG_FFFFFF;
   static final Color QUKKA_BG2 = QUOKKA_BG_F8F8F8;
   static final Color QUKKA_BG3 = QUOKKA_BG_000000_4;
+  static final Color QUKKA_BG4 = isDarkMode?HexColor("#444444"):HexColor("#FFFFFF");
 
   static final Color QUKKA_LIGHT_BG1_DARK_BG2 = isDarkMode?HexColor("#1F1F1F"):HexColor("#FFFFFF");
   static final Color QUKKA_LIGHT_BG2_DARK_BG1 = isDarkMode?HexColor("#111111"):HexColor("#F8F8F8");

pubspec.lock

@@ -1212,10 +1212,10 @@ packages:
     dependency: "direct main"
     description:
       name: pin_code_fields
-      sha256: c8652519d14688f3fe2a8288d86910a46aa0b9046d728f292d3bf6067c31b4c7
+      sha256: "4c0db7fbc889e622e7c71ea54b9ee624bb70c7365b532abea0271b17ea75b729"
       url: "https://pub.dev"
     source: hosted
-    version: "7.4.0"
+    version: "8.0.1"
   platform:
     dependency: transitive
     description:

pubspec.yaml

@@ -74,7 +74,7 @@ dependencies:
   webview_flutter: ^4.7.0
   flutter_widget_from_html: ^0.14.4
 #  package_info_plus: ^1.4.2
-  pin_code_fields: ^7.4.0
+  pin_code_fields: ^8.0.1
 #  flutter_swiper : ^1.1.6
   flutter_sound: ^9.2.13
   umeng_common_sdk: ^1.2.7