Bug List 的修复与反馈修改

packages/cpt_form/lib/modules/apply/form_payment_page.dart

@@ -19,6 +19,7 @@ import 'package:widgets/my_appbar.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 '../../router/page/form_page_router.dart';
 import 'vm/apply_view_model.dart';
@@ -79,7 +80,12 @@ class FormPaymentPage extends HookConsumerWidget {
                           visible: state.formItem != null && state.formItem!.price > 0,
                           child: Row(
                             children: [
-                              const MyAssetImage(Assets.paymentInfoDetails, width: 27, height: 27),
+                              MyAssetImage(
+                                Assets.paymentInfoDetails,
+                                width: 27,
+                                height: 27,
+                                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+                              ),
                               MyTextView(
                                 S.current.payment,
                                 textColor: context.appColors.textBlack,
@@ -135,7 +141,12 @@ class FormPaymentPage extends HookConsumerWidget {
                           visible: state.formItem != null && state.formItem!.deposit > 0,
                           child: Row(
                             children: [
-                              const MyAssetImage(Assets.paymentInfoDetails, width: 27, height: 27),
+                              MyAssetImage(
+                                Assets.paymentInfoDetails,
+                                width: 27,
+                                height: 27,
+                                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+                              ),
                               MyTextView(
                                 S.current.deposit,
                                 textColor: context.appColors.textBlack,
@@ -300,7 +311,7 @@ class FormPaymentPage extends HookConsumerWidget {
 
                 //底部按钮
                 MyButton(
-                  onPressed: () async{
+                  onPressed: () async {
                     final isFilled = handSignatureControl.isFilled;
                     if (!isFilled) {
                       ToastEngine.show("Please sign first");

packages/cpt_form/lib/modules/form/form_page.dart

@@ -53,7 +53,6 @@ class FormPage extends HookConsumerWidget {
                 color: context.appColors.whiteBG,
                 height: 120,
                 child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceAround,
                   children: [
                     _buildCategory(
                       context,
@@ -62,11 +61,12 @@ class FormPage extends HookConsumerWidget {
                       44,
                       S.current.apply,
                       tabsRouter.activeIndex == 0,
+                      14.0,
                     ).onTap(
                       () {
                         tabsRouter.setActiveIndex(0);
                       },
-                    ),
+                    ).expanded(),
                     _buildCategory(
                       context,
                       Assets.formSubmitIcon,
@@ -74,11 +74,12 @@ class FormPage extends HookConsumerWidget {
                       39,
                       S.current.form_submit_title,
                       tabsRouter.activeIndex == 1,
+                      14.0,
                     ).onTap(
                       () {
                         tabsRouter.setActiveIndex(1);
                       },
-                    ),
+                    ).expanded(),
                     _buildCategory(
                       context,
                       Assets.formApprovedIcon,
@@ -86,11 +87,12 @@ class FormPage extends HookConsumerWidget {
                       39,
                       S.current.approved,
                       tabsRouter.activeIndex == 2,
+                      14.0,
                     ).onTap(
                       () {
                         tabsRouter.setActiveIndex(2);
                       },
-                    ),
+                    ).expanded(),
                     _buildCategory(
                       context,
                       Assets.formNotApprovedIcon,
@@ -98,13 +100,14 @@ class FormPage extends HookConsumerWidget {
                       39.5,
                       S.current.not_approved,
                       tabsRouter.activeIndex == 3,
+                      13.0,
                     ).onTap(
                       () {
                         tabsRouter.setActiveIndex(3);
                       },
-                    ),
+                    ).expanded(),
                   ],
-                ),
+                ).paddingOnly(left: 5, right: 5),
               ),
               Expanded(
                 child: child,
@@ -117,7 +120,7 @@ class FormPage extends HookConsumerWidget {
   }
 
   //顶部的Tab布局
-  Widget _buildCategory(BuildContext context, String iconPath, double iconWidth, double iconHeight, String title, bool isSelected) {
+  Widget _buildCategory(BuildContext context, String iconPath, double iconWidth, double iconHeight, String title, bool isSelected, double testSize) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.center,
@@ -146,7 +149,7 @@ class FormPage extends HookConsumerWidget {
         const SizedBox(height: 7),
         MyTextView(
           title,
-          fontSize: 15,
+          fontSize: testSize,
           isFontMedium: true,
           textColor: isSelected ? context.appColors.tabTextSelectedDefault : context.appColors.tabTextUnSelectedDefault,
         ),

packages/cpt_main/lib/modules/home/home_page.dart

@@ -18,6 +18,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_appbar.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 'item_home_category.dart';
@@ -235,7 +236,12 @@ class HomePage extends HookConsumerWidget {
                 fontSize: 14,
                 isFontRegular: true,
               ).paddingOnly(left: 8, right: 8).expanded(),
-              const MyAssetImage(Assets.mainHomeMoreIcon, width: 6, height: 8.5).marginOnly(right: 15),
+              MyAssetImage(
+                Assets.mainHomeMoreIcon,
+                width: 6,
+                height: 8.5,
+                color: context.appColors.textBlack,
+              ).marginOnly(right: 15),
             ],
           )
               .constrained(height: 46)
@@ -267,7 +273,12 @@ class HomePage extends HookConsumerWidget {
                 fontSize: 14,
                 isFontBold: true,
               ).paddingOnly(left: 1, right: 4),
-              const MyAssetImage(Assets.mainHomeMoreIcon, width: 6, height: 8.5).marginOnly(right: 8),
+              MyAssetImage(
+                Assets.mainHomeMoreIcon,
+                width: 6,
+                height: 8.5,
+                color: context.appColors.textBlack,
+              ).marginOnly(right: 8),
             ],
           )
               .constrained(height: 46)

packages/cpt_main/lib/modules/notification/item_notification.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 class NotificationItem extends StatelessWidget {
   final String item;
@@ -24,7 +25,11 @@ class NotificationItem extends StatelessWidget {
         children: [
           Row(
             children: [
-              const MyAssetImage(Assets.mainNotificationItemIcon, width: 42.5, height: 42.5).marginOnly(right: 16),
+            const  MyAssetImage(
+                Assets.mainNotificationItemIcon,
+                width: 42.5,
+                height: 42.5,
+              ).marginOnly(right: 16),
               Column(
                 children: [
                   //标题

packages/cpt_payment/lib/modules/payment/manage/item_manage.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 ///  Condo的Manage的Item
 class ManageItem extends StatelessWidget {
@@ -32,6 +33,7 @@ class ManageItem extends StatelessWidget {
           //选中
           MyAssetImage(
             item ? Assets.baseServiceRadioChecked : Assets.baseServiceRadioUncheck,
+            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
             width: 25,
             height: 25,
           ),

packages/cs_plugin_basic/lib/dialog/country_code_selecter.dart

@@ -154,8 +154,8 @@ class _AttachCountryDialog extends StatelessWidget {
                 MyAssetImage(item['icon']!, width: 28, height: 20),
                 MyTextView(
                   item['code']!,
-                  marginLeft: 8,
-                  marginRight: 10,
+                  marginLeft: 6,
+                  marginRight: 0,
                   textColor: context.appColors.textBlack,
                   isFontMedium: true,
                   fontSize: 16,

packages/cs_resources/lib/generated/assets.dart

@@ -112,14 +112,14 @@ class Assets {
   static const String mainHomeCommunityIcon = 'assets/main/home_community_icon.webp';
   static const String mainHomeFacilityIcon = 'assets/main/home_facility_icon.webp';
   static const String mainHomeFormsIcon = 'assets/main/home_forms_icon.webp';
-  static const String mainHomeInfoNews = 'assets/main/home_info_news.webp';
-  static const String mainHomeInternalNews = 'assets/main/home_internal_news.webp';
+  static const String mainHomeInfoNews = 'assets/main/home_info_news.png';
+  static const String mainHomeInternalNews = 'assets/main/home_internal_news.png';
   static const String mainHomeMoreIcon = 'assets/main/home_more_icon.webp';
   static const String mainHomeNotificationIcon = 'assets/main/home_notification_icon.webp';
   static const String mainHomePaymentIcon = 'assets/main/home_payment_icon.webp';
   static const String mainHomePropertyIcon = 'assets/main/home_property_icon.webp';
-  static const String mainHomePropertyNews = 'assets/main/home_property_news.webp';
-  static const String mainHomePublishNews = 'assets/main/home_publish_news.webp';
+  static const String mainHomePropertyNews = 'assets/main/home_property_news.png';
+  static const String mainHomePublishNews = 'assets/main/home_publish_news.png';
   static const String mainHomeRewardsIcon = 'assets/main/home_rewards_icon.webp';
   static const String mainHomeServiceIcon = 'assets/main/home_service_icon.webp';
   static const String mainHomeTopImgBg = 'assets/main/home_top_img_bg.webp';

packages/cs_resources/lib/generated/intl/messages_en.dart

@@ -274,7 +274,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Forgot Password?"),
         "forgot_text": MessageLookupByLibrary.simpleMessage(
             "Enter your email and mobile phone number"),
-        "form": MessageLookupByLibrary.simpleMessage("Form"),
+        "form": MessageLookupByLibrary.simpleMessage("Forms"),
         "form_submit_title": MessageLookupByLibrary.simpleMessage("Submit"),
         "full_name": MessageLookupByLibrary.simpleMessage("Full Name"),
         "function_room": MessageLookupByLibrary.simpleMessage("Function Room"),

packages/cs_resources/lib/generated/l10n.dart

@@ -90,10 +90,10 @@ class S {
     );
   }
 
-  /// `Form`
+  /// `Forms`
   String get form {
     return Intl.message(
-      'Form',
+      'Forms',
       name: 'form',
       desc: '',
       args: [],

packages/cs_resources/lib/l10n/intl_en.arb

@@ -4,7 +4,7 @@
   "rewards": "Rewards",
   "notification": "Notification",
   "facility": "Facility",
-  "form": "Form",
+  "form": "Forms",
   "notice_board": "Notice Board",
   "phone_email": "Phone/Email",
   "password": "Password",