glglove 2 mesiacov pred
rodič
commit
4786380141

+ 8 - 11
packages/cpt_community/lib/components/garage_card.dart

@@ -76,20 +76,17 @@ class GarageCard extends StatelessWidget {
                 child: MyLoadImage(
                   card_img,
                   width: 166.5,
-                  height: 102.5,
+                  height: 102.5.ap,
                   isCircle: false,
                   fit: BoxFit.cover,
-                ).onTap(() {
-                  // 点击头像
-                  // onTap?.call();
-                }),
+                ),
               ),
             ),
           ],
         ),
         // 标题
         Padding(
-          padding: const EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12),
+          padding: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
@@ -109,7 +106,7 @@ class GarageCard extends StatelessWidget {
         ),
         // 价格 及 收藏
         Padding(
-          padding: const EdgeInsets.only(left: 10, right: 10,top: 10, bottom: 10),
+          padding: const EdgeInsets.only(left: 10, right: 10,top: 0, bottom: 0),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceAround,
             crossAxisAlignment: CrossAxisAlignment.center,
@@ -134,10 +131,10 @@ class GarageCard extends StatelessWidget {
             ],
           ),
         ),
-          // 发布人信息
-          Expanded(
+        // 发布人信息
+        Expanded(
           child: Padding(
-            padding: EdgeInsets.only(left: (useType == GarageCardUseType.forSale || useType == GarageCardUseType.forRent)?10:0, right: 10),
+            padding: EdgeInsets.only(left: (useType == GarageCardUseType.forSale || useType == GarageCardUseType.forRent)?10:0, right: 10, bottom: 17.5),
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               crossAxisAlignment: CrossAxisAlignment.center,
@@ -229,7 +226,7 @@ class CollectionWidget extends HookConsumerWidget {
           ),
           MyLoadImage(
             isCollectionState.value? Assets.communityLikeActive: Assets.communityLike,
-            width: 15,
+            width: 14.1,
             height: 14,
           )
         ]

+ 2 - 2
packages/cpt_community/lib/modules/community/newsfeed_detail/newsfeed_detail_page.dart

@@ -136,7 +136,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
     return Stack(
       children: [
         Container(
-          margin: const EdgeInsets.only(left: 15, right: 15,top: 14,bottom: 14),
+          margin: const EdgeInsets.only(left: 15, right: 15,top: 14,bottom: 0),
           padding: const EdgeInsets.only(left: 15, right: 15,top: 17,bottom: 17),
           decoration: BoxDecoration(
               color: context.appColors.textWhite,
@@ -225,7 +225,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
     return HookBuilder(
       builder: (context) {
         return Container(
-          margin: const EdgeInsets.only(left: 15, right: 15,top: 18,bottom: 18),
+          margin: const EdgeInsets.only(left: 15, right: 15,top: 15,bottom: 18),
           padding: const EdgeInsets.only(bottom: 30),
           decoration: BoxDecoration(
               color: context.appColors.textWhite,

+ 1 - 1
packages/cpt_community/lib/modules/garage/for_sale/for_sale_page.dart

@@ -93,7 +93,7 @@ class ForsalePage extends HookConsumerWidget {
                   crossAxisSpacing: 15,
                   // childAspectRatio: 166.5/214, // 宽高比
                   // childAspectRatio:  166.5/214 * ScreenUtil.getAdapterSizeCtx(context, 166.5/214), // 宽高比
-                  childAspectRatio: 166.5/214 * ((166.5/214).ap), // 宽高比
+                  childAspectRatio:  166.5/214 * ((166.5/214).ap), // 宽高比
                 ),
                 delegate: SliverChildBuilderDelegate(
                       (context, index) {

+ 36 - 15
packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_page.dart

@@ -8,9 +8,14 @@ import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:plugin_basic/provider/app_config/app_config.dart';
+import 'package:plugin_basic/provider/app_config/app_config_service.dart';
+import 'package:plugin_platform/engine/image/image_preview.dart';
 import 'package:router/ext/auto_router_extensions.dart';
 import 'package:shared/utils/color_utils.dart';
+import 'package:shared/utils/ext_dart.dart';
 import 'package:shared/utils/log_utils.dart';
+import 'package:shared/utils/size_config.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_appbar.dart';
@@ -42,15 +47,14 @@ class GaragesaleDetailPage extends HookConsumerWidget {
     final String pageTitle = (type == 'forSale') ? 'For Sale' :'For Rent';
     GlobalKey _likeButtonKey = GlobalKey<MyLikeButtonState>();
 
-    GarageSaleRentDetailEntity detailInfo = state.datas?? GarageSaleRentDetailEntity();
-    String title =  detailInfo.title?? '';
-    int price =  detailInfo.price?? 0;
+    GarageSaleRentDetailEntity? detailInfo = state.datas?? null;
+    String title =  detailInfo?.title?? '';
+    int price =  detailInfo?.price?? 0;
 
-    String contactType =  detailInfo.contact??'';
+    String contactType =  detailInfo?.contact??'';
 
     String description = '';
 
-
     useEffect((){
       vm.setInitPageData(id: id!, type: type);
       // 组件挂载时执行 - 执行接口请求
@@ -98,7 +102,7 @@ class GaragesaleDetailPage extends HookConsumerWidget {
                       SliverList(
                         delegate: SliverChildBuilderDelegate(
                                 (context, index){
-                              return _buildContentBox(context, ref, detailInfo);
+                              return detailInfo !=null? _buildContentBox(context, ref, detailInfo): Container();
                             },
                             childCount: 1
                         ),
@@ -124,13 +128,13 @@ class GaragesaleDetailPage extends HookConsumerWidget {
           // 底部联系信息
           Visibility(
             visible: state.loadingState == LoadState.State_Success,
-            child: _buildBottomConcatInfo(context, ref, _likeButtonKey,
+            child: detailInfo !=null ? _buildBottomConcatInfo(context, ref, _likeButtonKey,
               title:title,
               price:price,
               contactType:contactType,
               description:description,
               detailInfo:detailInfo,
-            ),
+            ): Container(),
           )
         ],
       ),
@@ -165,17 +169,29 @@ class GaragesaleDetailPage extends HookConsumerWidget {
       children: [
         // 图片
         SizedBox(
-          width: double.infinity,
+          width: SizeConfig().screenWidth,
           height: 173.5,
           child: CarouselSlider(
             // items: [MyLoadImage(goods_img)] ,
-            items: resources.map((resource) => MyLoadImage(resource)).toList(),
+            items: resources.map((resource) => MyLoadImage(
+              resource,
+              fit: BoxFit.cover, // 确保图片覆盖整个区域
+              width: SizeConfig().screenWidth, // 确保图片宽度与屏幕宽度一致
+              height: 173.5, // 确保图片高度与 CarouselSlider 高度一致
+            ).onTap((){
+              ImagePreviewEngine.multipleImagePreview(
+                  context,
+                  resources,
+                  heroes: List.generate(resources.length, (index) => resources[index]),
+                  onLongPressAction: (url) {}
+              );
+            })
+            ).toList(),
             carouselController: buttonCarouselController,
             options: CarouselOptions(
-              autoPlay: true,
+              autoPlay: false,
               enlargeCenterPage: true,
-              viewportFraction: 0.9,
-              aspectRatio: 2.0,
+              viewportFraction: 1,
               initialPage: 0,
             ),
           ),
@@ -221,15 +237,20 @@ class GaragesaleDetailPage extends HookConsumerWidget {
 
     GarageSaleRentDetailAccount  account = detailInfo.account?? GarageSaleRentDetailAccount();
 
+    Log.d("0000000 ${detailInfo.likesCount}");
     String publisher =  account.name??'-';
     String publisherAvatar = account.avatar??'-';
 
     String contactType =  detailInfo.contact??'';
     String publisherTime =  detailInfo.createdAt??'-';
-    int likes_count =  detailInfo!.likesCount??0;
+    int? likes_count =  detailInfo.likesCount??0;
+    Log.d("666666 ${likes_count}");
 
-    final _likes_count = useState(likes_count);
+
+    final _likes_count = useState<int>(likes_count!);
     final _isLiked = useState<bool>(false);
+    Log.d("4344 ${_likes_count.value}");
+
 
     return Container(
       height: 50,

+ 1 - 1
packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_state.dart

@@ -9,7 +9,7 @@ class GarageDetailState {
   final int? id;
   final String? type;  // forsale  forrent
 
-  GarageSaleRentDetailEntity datas;
+  GarageSaleRentDetailEntity? datas;
 
   GarageDetailState({
     this.loadingState = LoadState.State_Loading,

+ 1 - 1
packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_vm.dart

@@ -39,7 +39,7 @@ class GaragesaleDetailVm extends _$GaragesaleDetailVm {
 
   GarageDetailState initState() {
     return GarageDetailState(
-        datas: GarageSaleRentDetailEntity()
+        datas: null,
     );
   }
 

+ 3 - 3
packages/cpt_community/lib/modules/garage/garagesale_post/garagesale_post_vm.dart

@@ -328,11 +328,11 @@ class GaragesalePostVm extends _$GaragesalePostVm {
 
     String totalContactStr = '';
     if(contactTypeValue == 'Mobile Phone'){
-      totalContactStr = 'mobile:$contactInfoValue)';
+      totalContactStr = 'mobile:$contactInfoValue';
     }else if(contactTypeValue == 'WhatsApp'){
-      totalContactStr = 'whatsapp:$contactInfoValue)';
+      totalContactStr = 'whatsapp:$contactInfoValue';
     }else if(contactTypeValue == 'Email'){
-      totalContactStr = 'email:$contactInfoValue)';
+      totalContactStr = 'email:$contactInfoValue';
     }
 
     // 提交数据

+ 22 - 22
packages/cpt_property/lib/modules/ioan/property_ioan_page.dart

@@ -394,28 +394,28 @@ class PropertyIoanPage extends HookConsumerWidget {
               ),
             )
           ),
-          Visibility(
-            visible: state.loadingState == LoadState.State_Success,
-            child: Container(
-              height: 50,
-              color: ColorUtils.string2Color('#4161D0'),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  // MyLoadImage(Assets.propertyIoanItemBg,width: 60,height: 50,),
-                  const SizedBox(width: 10,),
-                  MyTextView(
-                    "Request a Quote",
-                    fontSize: 16,
-                    textColor: Colors.white,
-                    isFontMedium: true,
-                  ),
-                ],
-              ),
-            ).onTap((){
-              _vm.handlerRequestQuote(context);
-            }),
-          )
+          // Visibility(
+          //   visible: state.loadingState == LoadState.State_Success,
+          //   child: Container(
+          //     height: 50,
+          //     color: ColorUtils.string2Color('#4161D0'),
+          //     child: Row(
+          //       mainAxisAlignment: MainAxisAlignment.center,
+          //       children: [
+          //         // MyLoadImage(Assets.propertyIoanItemBg,width: 60,height: 50,),
+          //         const SizedBox(width: 10,),
+          //         MyTextView(
+          //           "Request a Quote",
+          //           fontSize: 16,
+          //           textColor: Colors.white,
+          //           isFontMedium: true,
+          //         ),
+          //       ],
+          //     ),
+          //   ).onTap((){
+          //     _vm.handlerRequestQuote(context);
+          //   }),
+          // )
         ],
       ),
     );

+ 1 - 1
packages/cpt_property/lib/modules/news/page/property_news_page.dart

@@ -136,7 +136,7 @@ class PropertyNewsPage extends HookConsumerWidget {
           Positioned(
             right: 5,
             bottom: 0,
-            child: MyAssetImage(liked? Assets.propertyCollectionActive:Assets.propertyCollection,width:22,height: 20.5,).onTap((){
+            child: MyAssetImage(liked? Assets.propertyCollectionActive:Assets.propertyCollection,width:22.5,height: 21,).onTap((){
               Log.d("点击了收藏按钮");
               vm.handlerCollection(item, liked);
             }),

+ 12 - 0
packages/cpt_property/lib/modules/news/vm/property_news_vm.dart

@@ -18,6 +18,11 @@ class PropertyNewsVm extends _$PropertyNewsVm {
   int _page = 1;  // 当前页
   int _limit = 10; // 每页数量
   int _count = 0; // 总条数
+
+  Map<String, dynamic> _newsQueryMap = {
+    "isCollection": false,
+  };
+
   // Refresh 控制器
   final EasyRefreshController refreshController = EasyRefreshController(
     controlFinishRefresh: true,  //允许刷新
@@ -84,6 +89,7 @@ class PropertyNewsVm extends _$PropertyNewsVm {
   Future retryRequest() async {
     _page = 1;
     _needShowPlaceholder = true;
+
     getListData();
   }
 
@@ -98,6 +104,7 @@ class PropertyNewsVm extends _$PropertyNewsVm {
     try {
       //请求网络
       Map<String, dynamic>  params = {
+        "isCollection": _newsQueryMap['isCollection'],
         "page": _page,
         "limit": _limit,
       };
@@ -241,4 +248,9 @@ class PropertyNewsVm extends _$PropertyNewsVm {
     }
   }
 
+
+  changeQueryMap(Map<String, dynamic> queryMap){
+    _newsQueryMap = { ..._newsQueryMap, ...queryMap};
+  }
+
 }

+ 16 - 0
packages/cpt_property/lib/modules/property/page/property_page.dart

@@ -1,6 +1,8 @@
+import 'package:cs_resources/generated/assets.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:router/ext/auto_router_extensions.dart';
 import 'package:shared/utils/color_utils.dart';
@@ -92,11 +94,25 @@ class PropertyPage extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final _vm = ref.read(propertyVmProvider.notifier);
+    final state = ref.watch(propertyVmProvider);
+
+    final isCollection = useState<bool>(false);
     return Scaffold(
         appBar: MyAppBar.appBar(
           context,
           "Property",
           backgroundColor: context.appColors.backgroundWhite,
+          actions: [
+             MyAssetImage(
+              isCollection.value? Assets.propertyCollectionActive: Assets.propertyCollection,
+              width: 22.5,
+              height: 21,
+            ).onTap((){
+               isCollection.value = !isCollection.value;
+              _vm.handlerCollectionFilter(context,isCollection.value);
+            }),
+            const SizedBox(width: 20),
+          ],
         ),
         body: AutoTabsRouter.pageView(
           routes: const [

+ 51 - 0
packages/cpt_property/lib/modules/property/page/property_page_state.dart

@@ -0,0 +1,51 @@
+import 'package:cs_resources/generated/assets.dart';
+
+import '../../ioan/property_ioan_page.dart';
+import '../../news/page/property_news_page.dart';
+import '../../rent/page/property_rent_page.dart';
+import '../../sale/page/property_sale_page.dart';
+
+class PropertyVmState {
+  List<Map<String, dynamic>>? topSectionsData;
+  int? curIdx;
+
+  PropertyVmState({
+    List<Map<String, dynamic>>? topSectionsData,
+    this.curIdx = 0,
+  }) : topSectionsData = topSectionsData?? [
+    {
+      "title": "Ioan",
+      "icon": Assets.propertyIoan,
+      "pageStartInstanceFn": PropertyIoanPage.startInstance,
+      "page": const PropertyIoanPage(),
+    },
+    {
+      "title": "News",
+      "icon": Assets.propertyNews,
+      "pageStartInstanceFn": PropertyNewsPage.startInstance,
+      "page": const PropertyNewsPage(),
+    },
+    {
+      "title": "Sale",
+      "icon": Assets.propertySale,
+      "pageStartInstanceFn": PropertySalePage.startInstance,
+      "page": const PropertySalePage(),
+    },
+    {
+      "title": "Rent",
+      "icon": Assets.propertyRent,
+      "pageStartInstanceFn": PropertyRentPage.startInstance,
+      "page": const PropertyRentPage(),
+    },
+  ];
+
+  PropertyVmState copyWith({
+    List<Map<String, dynamic>>? topSectionsData,
+    int? curIdx = 0,
+  }) {
+    return PropertyVmState(
+      topSectionsData: topSectionsData ?? this.topSectionsData,
+      curIdx: curIdx ?? 0,
+    );
+  }
+}

+ 17 - 46
packages/cpt_property/lib/modules/property/vm/property_vm.dart

@@ -1,4 +1,5 @@
 
+import 'package:cpt_property/modules/news/vm/property_news_vm.dart';
 import 'package:cs_resources/generated/assets.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
@@ -9,59 +10,18 @@ import '../../ioan/property_ioan_page.dart';
 import '../../news/page/property_news_page.dart';
 import '../../rent/page/property_rent_page.dart';
 import '../../sale/page/property_sale_page.dart';
+import '../page/property_page_state.dart';
 
 part 'property_vm.g.dart';
 
-
-class PropertyVmState {
-  List<Map<String, dynamic>>? topSectionsData;
-  int? curIdx;
-
-  PropertyVmState({
-    List<Map<String, dynamic>>? topSectionsData,
-    this.curIdx = 0,
-  }) : topSectionsData = topSectionsData?? [
-    {
-      "title": "Ioan",
-      "icon": Assets.propertyIoan,
-      "pageStartInstanceFn": PropertyIoanPage.startInstance,
-      "page": const PropertyIoanPage(),
-    },
-    {
-      "title": "News",
-      "icon": Assets.propertyNews,
-      "pageStartInstanceFn": PropertyNewsPage.startInstance,
-      "page": const PropertyNewsPage(),
-    },
-    {
-      "title": "Sale",
-      "icon": Assets.propertySale,
-      "pageStartInstanceFn": PropertySalePage.startInstance,
-      "page": const PropertySalePage(),
-    },
-    {
-      "title": "Rent",
-      "icon": Assets.propertyRent,
-      "pageStartInstanceFn": PropertyRentPage.startInstance,
-      "page": const PropertyRentPage(),
-    },
-  ];
-
-  PropertyVmState copyWith({
-    List<Map<String, dynamic>>? topSectionsData,
-    int? curIdx = 0,
-  }) {
-    return PropertyVmState(
-      topSectionsData: topSectionsData ?? this.topSectionsData,
-      curIdx: curIdx ?? 0,
-    );
-  }
-}
-
 @riverpod
 class PropertyVm extends _$PropertyVm {
   get topSectionsData => state.topSectionsData;
 
+  Map<String, dynamic> _newsQueryMap = {
+    "isCollection": false,
+  };
+
   PropertyVmState initState() {
     return PropertyVmState();
   }
@@ -96,5 +56,16 @@ class PropertyVm extends _$PropertyVm {
     }
   }
 
+  // 点击了导航的 搜索 进行筛选
+  handlerCollectionFilter(BuildContext? context, bool isCollection ){
+    _newsQueryMap['isCollection'] = isCollection;
+
+    // 重新加载数据
+    final newsPageVm = ref.read(propertyNewsVmProvider.notifier);
+    newsPageVm..changeQueryMap({
+      "isCollection": _newsQueryMap['isCollection'],
+    })..retryRequest();
+  }
+
 }
 

+ 0 - 59
packages/cs_domain/lib/generated/assets.dart

@@ -1,59 +0,0 @@
-///This file is automatically generated. DO NOT EDIT, all your changes would be lost.
-class Assets {
-  Assets._();
-
-  static const String baseJsonConvertContent = 'lib/generated/json/base/json_convert_content.dart';
-  static const String baseJsonField = 'lib/generated/json/base/json_field.dart';
-  static const String constantsApiConstants = 'lib/constants/api_constants.dart';
-  static const String entityAuthLoginEntity = 'lib/entity/auth_login_entity.dart';
-  static const String entityCaptchaImgEntity = 'lib/entity/captcha_img_entity.dart';
-  static const String entityFacilityBookEntity = 'lib/entity/facility_book_entity.dart';
-  static const String entityFacilityIndexEntity = 'lib/entity/facility_index_entity.dart';
-  static const String entityFacilityPageEntity = 'lib/entity/facility_page_entity.dart';
-  static const String entityFeedbackDetailEntity = 'lib/entity/feedback_detail_entity.dart';
-  static const String entityFeedbackListEntity = 'lib/entity/feedback_list_entity.dart';
-  static const String entityFormContentEntity = 'lib/entity/form_content_entity.dart';
-  static const String entityFormDetailEntity = 'lib/entity/form_detail_entity.dart';
-  static const String entityFormListEntity = 'lib/entity/form_list_entity.dart';
-  static const String entityFormOptionEntity = 'lib/entity/form_option_entity.dart';
-  static const String entityFormSubmittedEntity = 'lib/entity/form_submitted_entity.dart';
-  static const String entityFormSubmittedPageEntity = 'lib/entity/form_submitted_page_entity.dart';
-  static const String entityGarageSaleRentDetailEntity = 'lib/entity/garage_sale_rent_detail_entity.dart';
-  static const String entityGarageSaleRentEntity = 'lib/entity/garage_sale_rent_entity.dart';
-  static const String entityHomeModule = 'lib/entity/home_module.dart';
-  static const String entityIdNameEntity = 'lib/entity/id_name_entity.dart';
-  static const String entityMyfollowingListEntity = 'lib/entity/myfollowing_list_entity.dart';
-  static const String entityMypostsNewsfeedEntity = 'lib/entity/myposts_newsfeed_entity.dart';
-  static const String entityMypostsSaleRentEntity = 'lib/entity/myposts_sale_rent_entity.dart';
-  static const String entityNewsfeedCommentPublishEntity = 'lib/entity/newsfeed_comment_publish_entity.dart';
-  static const String entityNewsfeedDetailEntity = 'lib/entity/newsfeed_detail_entity.dart';
-  static const String entityNewsfeedFollowingEntity = 'lib/entity/newsfeed_following_entity.dart';
-  static const String entityNewsfeedForyouEntity = 'lib/entity/newsfeed_foryou_entity.dart';
-  static const String entityNewsfeedNewsEntity = 'lib/entity/newsfeed_news_entity.dart';
-  static const String entityNoticeBoardAnnounEntity = 'lib/entity/notice_board_announ_entity.dart';
-  static const String entityNoticeBoardDocumentsEntity = 'lib/entity/notice_board_documents_entity.dart';
-  static const String entityNoticeBoardEventEntity = 'lib/entity/notice_board_event_entity.dart';
-  static const String entityPaymentPageEntity = 'lib/entity/payment_page_entity.dart';
-  static const String entityPropertyNewsEntity = 'lib/entity/property_news_entity.dart';
-  static const String entityPropertySaleRentEntity = 'lib/entity/property_sale_rent_entity.dart';
-  static const String entityRewardsCategoryEntity = 'lib/entity/rewards_category_entity.dart';
-  static const String entityRewardsHistoryEarnedEntity = 'lib/entity/rewards_history_earned_entity.dart';
-  static const String entityRewardsHomeEntity = 'lib/entity/rewards_home_entity.dart';
-  static const String entityRewardsHomeTesEntity = 'lib/entity/rewards_home_tes_entity.dart';
-  static const String entityRewardsHomeTestEntity = 'lib/entity/rewards_home_test_entity.dart';
-  static const String entityRewardsHomeTxEntity = 'lib/entity/rewards_home_tx_entity.dart';
-  static const String entityRewardsIndexEntity = 'lib/entity/rewards_index_entity.dart';
-  static const String entityRewardsListEntity = 'lib/entity/rewards_list_entity.dart';
-  static const String entityServerTime = 'lib/entity/server_time.dart';
-  static const String entityTextKonEntity = 'lib/entity/text_kon_entity.dart';
-  static const String entityUserMeEntity = 'lib/entity/user_me_entity.dart';
-  static const String entityVisitorPageEntity = 'lib/entity/visitor_page_entity.dart';
-  static const String generatedAssets = 'lib/generated/assets.dart';
-  static const String repositoryAuthRepository = 'lib/repository/auth_repository.dart';
-  static const String repositoryFacilityRepository = 'lib/repository/facility_repository.dart';
-  static const String repositoryFormRepository = 'lib/repository/form_repository.dart';
-  static const String repositoryMainRepository = 'lib/repository/main_repository.dart';
-  static const String repositoryPaymentRepository = 'lib/repository/payment_repository.dart';
-  static const String repositoryProfileRepository = 'lib/repository/profile_repository.dart';
-
-}

+ 0 - 2
packages/cs_domain/pubspec.yaml

@@ -58,7 +58,5 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
-  assets:
-    - lib/entity/
 
 

+ 6 - 0
packages/cs_shared/lib/utils/size_config.dart

@@ -6,6 +6,7 @@ class SizeConfig {
   factory SizeConfig() => _instance;
 
   late MediaQueryData _mediaQueryData;
+  late Size size;
   late double screenWidth;
   late double screenHeight;
   late double blockSizeHorizontal;
@@ -20,6 +21,7 @@ class SizeConfig {
 
   void init(BuildContext context) {
     _mediaQueryData = MediaQuery.of(context);
+    size = _mediaQueryData.size;
     screenWidth = _mediaQueryData.size.width;
     screenHeight = _mediaQueryData.size.height;
     refHeight = 1450;
@@ -48,6 +50,10 @@ class SizeConfig {
     }
   }
 
+  Size getSize() {
+    return size;
+  }
+
   double getWidthRatio(double val) {
     double res = (val / refWidth) * 100;
     double temp = res * blockSizeHorizontal;