暗黑样式调整

packages/cpt_community/lib/components/newfeed_card_header.dart

@@ -51,7 +51,7 @@ class NewsFeedCardHeader extends StatelessWidget {
           }),
           Expanded(
             child: Container(
-              padding: const EdgeInsets.only(left:15, right: 0),
+              padding: const EdgeInsets.only(left:10, right: 0),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.start,

packages/cpt_community/lib/modules/community/community_page.dart

@@ -374,7 +374,7 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
                   marginLeft: 15,
                   alignment: Alignment.centerLeft,
                   textAlign: TextAlign.left,
-                  backgroundColor: ColorUtils.string2Color('#ffffff'),
+                  backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.black),
                   maxLines: 1,
                   isFontMedium: true,
                 ),

packages/cpt_community/lib/modules/community/following/following_page.dart

@@ -17,6 +17,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/newfeed_card_header.dart';
@@ -58,7 +59,7 @@ class FollowingPage extends HookConsumerWidget {
       //   "following",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      // backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
+        backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
         body: Column(
           mainAxisSize: MainAxisSize.max,
           children: [

packages/cpt_community/lib/modules/community/foryou/foryou_page.dart

@@ -17,6 +17,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/newfeed_card_header.dart';
@@ -59,7 +60,7 @@ class ForyouPage extends HookConsumerWidget {
       //   "foryou",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      // backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
         body: Column(
           mainAxisSize: MainAxisSize.max,
           children: [

packages/cpt_community/lib/modules/community/newsfeed_detail/newsfeed_detail_page.dart

@@ -198,9 +198,9 @@ class NewsfeedDetailPage extends HookConsumerWidget {
                       final isFollowedState = useState<bool>(card_followed);
                       return MyButton(
                         text: isFollowedState.value ?  S.current.followed:S.current.to_follow,
-                        textColor: isFollowedState.value ?  context.appColors.disEnableGray: context.appColors.textWhite,
+                        textColor: DarkThemeUtil.multiColors(context, isFollowedState.value ? context.appColors.disEnableGray: context.appColors.textWhite, darkColor: isFollowedState.value ? context.appColors.textWhite: context.appColors.textWhite),
                         disabledTextColor: context.appColors.disEnableGray,
-                        backgroundColor: isFollowedState.value ? Colors.transparent : context.appColors.textPrimary,
+                        backgroundColor: DarkThemeUtil.multiColors(context, isFollowedState.value ? Colors.transparent : context.appColors.textPrimary, darkColor: isFollowedState.value ? Colors.white38 : AppColorsTheme.colorPrimary),
                         side: BorderSide(color: !isFollowedState.value ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
                         radius: 8,
                         minHeight: 27.5,

packages/cpt_community/lib/modules/community/newsfeed_post/newsfeed_post_page.dart

@@ -106,7 +106,8 @@ class NewsfeedPostPage extends HookConsumerWidget {
                         text: S.current.submit,
                         radius: 0,
                         minHeight: 50,
-                        backgroundColor: context.appColors.textPrimary,
+                        // backgroundColor: context.appColors.textPrimary,
+                        backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textPrimary,darkColor: AppColorsTheme.color666666),
                         textColor: context.appColors.textWhite,
                         fontWeight: FontWeight.w500,
                         fontSize: 16,

packages/cpt_community/lib/modules/garage/garagesale_post/garagesale_post_page.dart

@@ -12,6 +12,7 @@ import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_text_field.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:widgets/shatter/picker_container.dart';
 import 'package:widgets/shatter/form_require_text.dart';
@@ -58,7 +59,7 @@ class GaragesalePostPage extends HookConsumerWidget {
         (type==1 || type==2) ? S.current.post_new_item : S.current.edit,
         backgroundColor: context.appColors.backgroundWhite,
       ),
-      backgroundColor: Colors.white,
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: Column(
           children: [
             Expanded(
@@ -191,7 +192,7 @@ class GaragesalePostPage extends HookConsumerWidget {
                           Container(
                             width: double.infinity,
                             height: 200,
-                            color: Colors.white,
+                            color: DarkThemeUtil.multiColors(context, Colors.white,darkColor: Colors.black),
                             margin: const EdgeInsets.only(left:15, right:15, top: 15, bottom: 20),
                             // 选择图片上传 控件
                             child: _buildImageSelectCmp(context, ref,vm),
@@ -209,7 +210,7 @@ class GaragesalePostPage extends HookConsumerWidget {
                         text: S.current.submit,
                         radius: 0,
                         minHeight: 50,
-                        backgroundColor: context.appColors.textPrimary,
+                        backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textPrimary,darkColor: AppColorsTheme.color666666),
                         textColor: Colors.white,
                         fontWeight: FontWeight.w500,
                         fontSize: 16,

packages/cpt_property/lib/modules/ioan/property_ioan_page.dart

@@ -36,14 +36,14 @@ class PropertyIoanPage extends HookConsumerWidget {
       children: [
         MyTextView(
           "24IFM",
-          textColor: context.appColors.textBlack,
+          textColor: DarkThemeUtil.multiColors(context, context.appColors.textBlack, darkColor: Colors.white),
           fontSize: 27,
           isFontMedium: true,
           textAlign: TextAlign.center,
         ),
         MyTextView(
           S.current.find_best_loan,
-          textColor: context.appColors.textBlack,
+          textColor: DarkThemeUtil.multiColors(context, context.appColors.textBlack, darkColor: Colors.white),
           fontSize: 16,
           isFontRegular: true,
           marginBottom: 14,
@@ -64,7 +64,7 @@ class PropertyIoanPage extends HookConsumerWidget {
             children: [
               MyTextView(
                 S.current.exclusive_rates,
-                textColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#FEFEFE'), darkColor: Colors.black),
+                textColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#FEFEFE'), darkColor: Colors.white),
                 fontSize: 15,
                 boxWidth: 237,
                 boxHeight: 35,
@@ -138,7 +138,7 @@ class PropertyIoanPage extends HookConsumerWidget {
           boxHeight: 40.5,
           alignment: Alignment.center,
           textAlign: TextAlign.center,
-          backgroundColor: context.appColors.textPrimary,
+          backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: Colors.black),
         ),
 
         const SizedBox(height: 20),

packages/cpt_services/lib/components/chooseVisitTimeBottomFooter.dart

@@ -70,7 +70,7 @@ class ChooseVisitTimeBottomFooter extends HookConsumerWidget {
                       MyTextView(
                         "\$$totalPrice",
                         fontSize: 18,
-                        textColor: context.appColors.textWhite,
+                        textColor: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.white),
                         isFontRegular: true,
                         maxLines:2,
                         isTextEllipsis: true,
@@ -89,7 +89,7 @@ class ChooseVisitTimeBottomFooter extends HookConsumerWidget {
               child: Center(
                 child: MyTextView(
                  S.current.confirm,
-                  textColor: context.appColors.textWhite,
+                  textColor: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.white),
                   fontSize: 17,
                   isFontMedium: true,
                   textAlign: TextAlign.center,

packages/cpt_services/lib/components/chooseVisitTimeContent.dart

@@ -19,8 +19,10 @@ import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:widgets/my_cart_num.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import 'chooseVisitTimeContent_state.dart';
 
@@ -67,7 +69,7 @@ class ChooseVisitTimeContent extends HookConsumerWidget {
         return Container(
           width: double.infinity,
           // width: 80,
-          color: ColorUtils.string2Color("#F5F5F7"),
+          color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F5F5F7"), darkColor: AppColorsTheme.color666666),
           padding: const EdgeInsets.only(left:20, right: 20, top: 12, bottom: 12),
           constraints: const BoxConstraints(
             minHeight: 0,
@@ -137,7 +139,7 @@ class ChooseVisitTimeContent extends HookConsumerWidget {
                   borderRadius: BorderRadius.circular(8),
                   boxShadow: [
                     BoxShadow(
-                      color: ColorUtils.string2Color('#E5E5E5'),
+                      color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)??Colors.transparent,
                       offset: const Offset(0, 2),
                       blurRadius: 8,
                     ),
@@ -153,6 +155,7 @@ class ChooseVisitTimeContent extends HookConsumerWidget {
                   text: '$timeText',
                   padding: const EdgeInsets.only(left: 5, right: 5, top: 5, bottom: 5),
                   textColor: itemIsChecked ?context.appColors.textPrimary: context.appColors.textDarkGray999,
+                  backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.disEnableGray, darkColor: itemIsChecked? AppColorsTheme.colorPrimary:Colors.black),
                   enable: enable.value,
                   disabledBackgroundColor: context.appColors.disEnableGray,
                   disabledTextColor: context.appColors.textWhite,

packages/cpt_services/lib/modules/services/service_repair_detail/getQuoteDialogContent.dart

@@ -17,6 +17,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 class GetQuoteDialogContent extends HookConsumerWidget {
 
@@ -28,7 +29,7 @@ class GetQuoteDialogContent extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final vm = ref.read(cleanOrderDetailVmProvider.notifier);
 
-    return SizedBox(
+    return Container(
       width: double.infinity,
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
@@ -55,7 +56,7 @@ class GetQuoteDialogContent extends HookConsumerWidget {
     final noteCount = useState(0);
     return Stack(children: [
       Container(
-        color: ColorUtils.string2Color("#F2F3F6"),
+        color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
         margin: const EdgeInsets.only(top: 15, bottom: 28.5),
         padding: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
         child: TextField(

packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_page.dart

@@ -25,6 +25,7 @@ import 'package:widgets/my_button.dart';
 import 'package:widgets/my_like_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import 'service_repair_detail_vm.dart';
@@ -141,7 +142,6 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
       Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          //  评分
           Column(
             children: [
               Container(
@@ -222,10 +222,11 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Center(
+                      //  Get A Quote
                       child: MyButton(
                         text: S.current.get_a_quote,
                         textColor: context.appColors.textWhite,
-                        backgroundColor: context.appColors.textPrimary,
+                        backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: AppColorsTheme.color666666),
                         fontSize: 15,
                         minWidth: 310,
                         minHeight: 44.5,
@@ -255,7 +256,8 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
               child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
+                  children:
+                  [
                     // description
                     Html(data: description),
                   ]
@@ -273,7 +275,8 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
                   //     fit: BoxFit.cover,
                   //   );
                   // }).toList(),
-                  )),
+              ),
+          ),
         ],
       ),
     ]);

packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_vm.dart

@@ -5,6 +5,7 @@ import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
 import 'package:domain/entity/service_repair_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:plugin_platform/engine/dialog/dialog_engine.dart';
 import 'package:plugin_platform/engine/permission/permission_engine.dart';
@@ -18,6 +19,7 @@ import 'package:widgets/dialog/dialog_content_wrap.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:flutter/src/widgets/framework.dart';
 
@@ -290,10 +292,10 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
           isShowCancelBtn: false,
           confirmTxt: S.current.confirm,
           title: S.current.confirm_information,
-          titleBackgroundColor: context.appColors.textPrimary,
-          closeIconColor: context.appColors.textWhite,
+          titleBackgroundColor:  DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: AppColorsTheme.color666666),
+          closeIconColor: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.white),
           titleTextStyle: TextStyle(
-            color: context.appColors.textWhite,
+            color: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.white),
           ),
           messageBuilder: (context) {
             return const GetQuoteDialogContent();
@@ -311,7 +313,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
                 minHeight: 45,
                 fontSize: 16,
                 fontWeight: FontWeight.w500,
-                backgroundColor: context.appColors.textPrimary,
+                backgroundColor:  DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: Colors.black),
                 textColor: context.appColors.textWhite,
               ),
             );
@@ -402,7 +404,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
                     fontSize: 16,
                     isFontMedium: true,
                     textAlign: TextAlign.center,
-                    textColor: ColorUtils.string2Color("#000000"),
+                    textColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#000000"), darkColor: Colors.white),
                     // textColor: context.appColors.textPrimary,
                   ),
                 ]));

packages/cs_widgets/lib/dialog/dialog_content_wrap.dart

@@ -9,6 +9,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/no_shadow_scroll_behavior.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../load_state_layout.dart';
@@ -48,6 +49,8 @@ class DialogContentWrap extends StatefulWidget {
   double? bottomBtnRadius;
   EdgeInsets? bottomBtnSectionPadding;
   EdgeInsets? contentPadding;
+  Color? contentBgColor;
+  Color? bottomBtnSectionBgColor;
   final double? bottomBtnSpace;
   final double? topLeftRadius;
   final double? topRightRadius;
@@ -156,7 +159,7 @@ class DialogContentWrapState extends State<DialogContentWrap> {
               maxHeight: widget.maxHeight!,
             ),
             decoration: BoxDecoration(
-              color: widget.backgroundColor?? context.appColors.whiteBG,
+              color: DarkThemeUtil.multiColors(context, widget.backgroundColor?? context.appColors.whiteBG, darkColor: AppColorsTheme.color666666),
               // borderRadius: BorderRadius.only(
               //   topLeft: Radius.circular(topLeftRadius!),
               //   topRight: Radius.circular(topRightRadius!),
@@ -170,14 +173,15 @@ class DialogContentWrapState extends State<DialogContentWrap> {
               successSliverWidget: [
                 SliverList(delegate: SliverChildBuilderDelegate(
                     (context, index){
-                        return SizedBox(
+                        return Container(
                           height: _scrollMaxHeight + _bottomBtnSectionHeight ,
+                          color: DarkThemeUtil.multiColors(context, context.appColors.whiteBG, darkColor: AppColorsTheme.color666666),
                           child: Column(
                             children: [
                               // 标题区
                               Container(
                                 width: double.infinity,
-                                color: widget.titleBackgroundColor,
+                                color: DarkThemeUtil.multiColors(context, widget.titleBackgroundColor, darkColor: Colors.black),
                                 child: Visibility(
                                   visible: _showTitleSection,
                                   child: (widget.title != null && widget.title!.isNotEmpty)? MyTextView(
@@ -201,6 +205,7 @@ class DialogContentWrapState extends State<DialogContentWrap> {
                                       child: Container(
                                         width: double.infinity,
                                         padding: widget.contentPadding,
+                                        color: widget.contentBgColor?? DarkThemeUtil.multiColors(context, context.appColors.whiteBG, darkColor: AppColorsTheme.color666666),
                                         child: widget.messageBuilder?.call(context) ??
                                             MyTextView(
                                               widget.message!,
@@ -219,7 +224,7 @@ class DialogContentWrapState extends State<DialogContentWrap> {
                                 visible: _showBottomBtnSection,
                                 child: (widget.isShowCancelBtn || widget.isShowConfirmBtn)? Container(
                                   height: _bottomBtnSectionHeight,
-                                  color: context.appColors.whiteBG,
+                                  color: widget.bottomBtnSectionBgColor?? DarkThemeUtil.multiColors(context, context.appColors.whiteBG, darkColor: Colors.black),
                                   padding: widget.bottomBtnSectionPadding,
                                   child: Row(
                                     mainAxisAlignment: MainAxisAlignment.center,