glglove 1 тиждень тому
батько
коміт
5db2047002

+ 0 - 1
packages/cpt_services/lib/components/chooseHouseCleanContent.dart

@@ -129,7 +129,6 @@ class ChooseHouseCleanContent extends HookConsumerWidget {
                 fontWeight: FontWeight.w500,
                 enable: !isDisable,
                 textColor:  DarkThemeUtil.multiColors(context, !isChecked? context.appColors.textPrimary : context.appColors.textWhite, darkColor: isChecked? context.appColors.textPrimary :Colors.white)  ,
-                // backgroundColor: !isChecked ? context.appColors.textWhite : context.appColors.textPrimary,
                 backgroundColor: !isChecked ? context.appColors.textWhite : AppColorsTheme.colorPrimary,
                 disabledBackgroundColor: context.appColors.disEnableGray,
                 disabledTextColor: context.appColors.textWhite,

+ 3 - 4
packages/cpt_services/lib/modules/services/service_clean_detail/service_clean_detail_page.dart

@@ -390,7 +390,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
           child: Container(
             margin: const EdgeInsets.only(right: 5),
             decoration: BoxDecoration(
-              color: ColorUtils.string2Color("#F8F8F8"),
+              color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F8F8F8"), darkColor: Colors.white12),
               borderRadius: BorderRadius.circular(8),
               // boxShadow: [
               //   BoxShadow(
@@ -489,7 +489,6 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
         children: [
           Container(
             width: 122,
-            color: Colors.red,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,
@@ -531,7 +530,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
                       MyTextView(
                         "${_likes_count.value}",
                         fontSize: 18,
-                        textColor: context.appColors.textWhite,
+                        textColor: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.white),
                         isFontRegular: true,
                         marginLeft: 5,
                         marginRight: 15,
@@ -560,7 +559,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
                   ],
                 ),
               ],
-            ).backgroundColor(context.appColors.textPrimary),
+            ).backgroundColor(DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: AppColorsTheme.colorPrimary)),
           ),
           Expanded(
             child: Container(

+ 3 - 3
packages/cpt_services/lib/modules/services/service_order_confirm/service_order_confirm_page.dart

@@ -623,7 +623,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
           height: 200,
           padding: const EdgeInsets.all(15),
           decoration: BoxDecoration(
-              color: ColorUtils.string2Color("#F2F3F6"),
+              color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: ColorUtils.string2Color("#F2F3F6")),
               borderRadius: BorderRadius.circular(5),
               boxShadow: [
                 BoxShadow(
@@ -661,13 +661,13 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
                 border: InputBorder.none,
                 hintText: state.remarkInfo[key]!['hintText'],
                 hintStyle: TextStyle(
-                  color: context.appColors.authFiledHint,
+                  color: DarkThemeUtil.multiColors(context, context.appColors.authFiledHint, darkColor: Colors.black),
                   fontSize: 16.0,
                   fontWeight: FontWeight.w400,
                 ),
               ),
               style: TextStyle(
-                color: context.appColors.authFiledText,
+                color: DarkThemeUtil.multiColors(context, context.appColors.authFiledText, darkColor: Colors.black),
                 fontSize: 16.0,
                 fontWeight: FontWeight.w400,
               ),

+ 3 - 2
packages/cs_widgets/lib/my_cart_num.dart

@@ -1,6 +1,7 @@
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 class MyCartNum extends StatefulWidget {
   final int initialNum;
@@ -55,7 +56,7 @@ class _MyCartNumState extends State<MyCartNum> {
           ),
             fillColor: context.appColors.textPrimary,
             splashColor: context.appColors.textPrimary,
-            textStyle: TextStyle(color: Colors.white),
+            textStyle: TextStyle(color: DarkThemeUtil.multiColors(context, Colors.white, darkColor: Colors.black54)),
             onPressed: _decrementNum,
             child: const Icon(Icons.remove),
         ),
@@ -77,7 +78,7 @@ class _MyCartNumState extends State<MyCartNum> {
           ),
           fillColor: context.appColors.textPrimary,
           splashColor: context.appColors.textPrimary,
-          textStyle: TextStyle(color: Colors.white),
+          textStyle: TextStyle(color: DarkThemeUtil.multiColors(context, Colors.white, darkColor: Colors.black54)),
           onPressed: _incrementNum,
           child: const Icon(Icons.add),
         ),