From e9abac79337d0491a65ec2cb317776181d7669f0 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Thu, 22 May 2025 16:44:22 +0300 Subject: [PATCH 1/4] added analytics icon. --- assets/icons/landing_analytics.svg | 19 +++++ lib/utils/constants/assets.dart | 112 ++++++++++------------------- 2 files changed, 58 insertions(+), 73 deletions(-) create mode 100644 assets/icons/landing_analytics.svg diff --git a/assets/icons/landing_analytics.svg b/assets/icons/landing_analytics.svg new file mode 100644 index 00000000..6f9fbbf0 --- /dev/null +++ b/assets/icons/landing_analytics.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart index c86b7458..51053c9f 100644 --- a/lib/utils/constants/assets.dart +++ b/lib/utils/constants/assets.dart @@ -14,13 +14,14 @@ class Assets { static const String rightLine = "assets/images/right_line.png"; static const String google = "assets/images/google.svg"; static const String facebook = "assets/images/facebook.svg"; - static const String invisiblePassword = - "assets/images/Password_invisible.svg"; + static const String invisiblePassword = "assets/images/Password_invisible.svg"; static const String visiblePassword = "assets/images/password_visible.svg"; static const String accessIcon = "assets/images/access_icon.svg"; static const String spaseManagementIcon = "assets/images/spase_management_icon.svg"; static const String devicesIcon = "assets/images/devices_icon.svg"; + static const String analyticsIcon = "assets/icons/landing_analytics.svg"; + static const String moveinIcon = "assets/images/movein_icon.svg"; static const String constructionIcon = "assets/images/construction_icon.svg"; static const String energyIcon = "assets/images/energy_icon.svg"; @@ -32,8 +33,7 @@ class Assets { static const String emptyTable = "assets/images/empty_table.svg"; // General assets - static const String motionlessDetection = - "assets/icons/motionless_detection.svg"; + static const String motionlessDetection = "assets/icons/motionless_detection.svg"; static const String acHeating = "assets/icons/ac_heating.svg"; static const String acPowerOff = "assets/icons/ac_power_off.svg"; static const String acFanMiddle = "assets/icons/ac_fan_middle.svg"; @@ -70,22 +70,19 @@ class Assets { "assets/icons/automation_functions/temp_password_unlock.svg"; static const String doorlockNormalOpen = "assets/icons/automation_functions/doorlock_normal_open.svg"; - static const String doorbell = - "assets/icons/automation_functions/doorbell.svg"; + static const String doorbell = "assets/icons/automation_functions/doorbell.svg"; static const String remoteUnlockViaApp = "assets/icons/automation_functions/remote_unlock_via_app.svg"; static const String doubleLock = "assets/icons/automation_functions/double_lock.svg"; static const String selfTestResult = "assets/icons/automation_functions/self_test_result.svg"; - static const String lockAlarm = - "assets/icons/automation_functions/lock_alarm.svg"; + static const String lockAlarm = "assets/icons/automation_functions/lock_alarm.svg"; static const String presenceState = "assets/icons/automation_functions/presence_state.svg"; static const String currentTemp = "assets/icons/automation_functions/current_temp.svg"; - static const String presence = - "assets/icons/automation_functions/presence.svg"; + static const String presence = "assets/icons/automation_functions/presence.svg"; static const String residualElectricity = "assets/icons/automation_functions/residual_electricity.svg"; static const String hijackAlarm = @@ -102,15 +99,12 @@ class Assets { // Presence Sensor Assets static const String sensorMotionIcon = "assets/icons/sensor_motion_ic.svg"; - static const String sensorPresenceIcon = - "assets/icons/sensor_presence_ic.svg"; + static const String sensorPresenceIcon = "assets/icons/sensor_presence_ic.svg"; static const String sensorVacantIcon = "assets/icons/sensor_vacant_ic.svg"; static const String illuminanceRecordIcon = "assets/icons/illuminance_record_ic.svg"; - static const String presenceRecordIcon = - "assets/icons/presence_record_ic.svg"; - static const String helpDescriptionIcon = - "assets/icons/help_description_ic.svg"; + static const String presenceRecordIcon = "assets/icons/presence_record_ic.svg"; + static const String helpDescriptionIcon = "assets/icons/help_description_ic.svg"; static const String lightPulp = "assets/icons/light_pulb.svg"; static const String acDevice = "assets/icons/ac_device.svg"; @@ -160,12 +154,10 @@ class Assets { static const String unit = 'assets/icons/unit_icon.svg'; static const String villa = 'assets/icons/villa_icon.svg'; static const String iconEdit = 'assets/icons/icon_edit_icon.svg'; - static const String textFieldSearch = - 'assets/icons/textfield_search_icon.svg'; + static const String textFieldSearch = 'assets/icons/textfield_search_icon.svg'; static const String roundedAddIcon = 'assets/icons/rounded_add_icon.svg'; static const String addIcon = 'assets/icons/add_icon.svg'; - static const String smartThermostatIcon = - 'assets/icons/smart_thermostat_icon.svg'; + static const String smartThermostatIcon = 'assets/icons/smart_thermostat_icon.svg'; static const String smartLightIcon = 'assets/icons/smart_light_icon.svg'; static const String presenceSensor = 'assets/icons/presence_sensor.svg'; static const String Gang3SwitchIcon = 'assets/icons/3_Gang_switch_icon.svg'; @@ -213,8 +205,7 @@ class Assets { //assets/icons/water_leak_normal.svg static const String waterLeakNormal = 'assets/icons/water_leak_normal.svg'; //assets/icons/water_leak_detected.svg - static const String waterLeakDetected = - 'assets/icons/water_leak_detected.svg'; + static const String waterLeakDetected = 'assets/icons/water_leak_detected.svg'; //assets/icons/automation_records.svg static const String automationRecords = 'assets/icons/automation_records.svg'; @@ -285,16 +276,13 @@ class Assets { "assets/icons/functions_icons/sensitivity.svg"; static const String assetsSensitivityOperationIcon = "assets/icons/functions_icons/sesitivity_operation_icon.svg"; - static const String assetsAcPower = - "assets/icons/functions_icons/ac_power.svg"; + static const String assetsAcPower = "assets/icons/functions_icons/ac_power.svg"; static const String assetsAcPowerOFF = "assets/icons/functions_icons/ac_power_off.svg"; static const String assetsChildLock = "assets/icons/functions_icons/child_lock.svg"; - static const String assetsFreezing = - "assets/icons/functions_icons/freezing.svg"; - static const String assetsFanSpeed = - "assets/icons/functions_icons/fan_speed.svg"; + static const String assetsFreezing = "assets/icons/functions_icons/freezing.svg"; + static const String assetsFanSpeed = "assets/icons/functions_icons/fan_speed.svg"; static const String assetsAcCooling = "assets/icons/functions_icons/ac_cooling.svg"; static const String assetsAcHeating = @@ -303,8 +291,7 @@ class Assets { "assets/icons/functions_icons/celsius_degrees.svg"; static const String assetsTempreture = "assets/icons/functions_icons/tempreture.svg"; - static const String assetsAcFanLow = - "assets/icons/functions_icons/ac_fan_low.svg"; + static const String assetsAcFanLow = "assets/icons/functions_icons/ac_fan_low.svg"; static const String assetsAcFanMiddle = "assets/icons/functions_icons/ac_fan_middle.svg"; static const String assetsAcFanHigh = @@ -323,8 +310,7 @@ class Assets { "assets/icons/functions_icons/far_detection.svg"; static const String assetsFarDetectionFunction = "assets/icons/functions_icons/far_detection_function.svg"; - static const String assetsIndicator = - "assets/icons/functions_icons/indicator.svg"; + static const String assetsIndicator = "assets/icons/functions_icons/indicator.svg"; static const String assetsMotionDetection = "assets/icons/functions_icons/motion_detection.svg"; static const String assetsMotionlessDetection = @@ -337,8 +323,7 @@ class Assets { "assets/icons/functions_icons/master_state.svg"; static const String assetsSwitchAlarmSound = "assets/icons/functions_icons/switch_alarm_sound.svg"; - static const String assetsResetOff = - "assets/icons/functions_icons/reset_off.svg"; + static const String assetsResetOff = "assets/icons/functions_icons/reset_off.svg"; // Assets for automation_functions static const String assetsCardUnlock = @@ -382,14 +367,12 @@ class Assets { static const String activeUser = 'assets/icons/active_user.svg'; static const String deActiveUser = 'assets/icons/deactive_user.svg'; static const String invitedIcon = 'assets/icons/invited_icon.svg'; - static const String rectangleCheckBox = - 'assets/icons/rectangle_check_box.png'; + static const String rectangleCheckBox = 'assets/icons/rectangle_check_box.png'; static const String CheckBoxChecked = 'assets/icons/box_checked.png'; static const String emptyBox = 'assets/icons/empty_box.png'; static const String completeProcessIcon = 'assets/icons/compleate_process_icon.svg'; - static const String currentProcessIcon = - 'assets/icons/current_process_icon.svg'; + static const String currentProcessIcon = 'assets/icons/current_process_icon.svg'; static const String uncomplete_ProcessIcon = 'assets/icons/uncompleate_process_icon.svg'; static const String wrongProcessIcon = 'assets/icons/wrong_process_icon.svg'; @@ -410,11 +393,9 @@ class Assets { static const String successIcon = 'assets/icons/success_icon.svg'; static const String spaceLocationIcon = 'assets/icons/spaseLocationIcon.svg'; static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.png'; - static const String scenesPlayIconCheck = - 'assets/icons/scenesPlayIconCheck.png'; + static const String scenesPlayIconCheck = 'assets/icons/scenesPlayIconCheck.png'; static const String presenceStateIcon = 'assets/icons/presence_state.svg'; - static const String currentDistanceIcon = - 'assets/icons/current_distance_icon.svg'; + static const String currentDistanceIcon = 'assets/icons/current_distance_icon.svg'; static const String farDetectionIcon = 'assets/icons/far_detection_icon.svg'; static const String motionDetectionSensitivityIcon = @@ -437,44 +418,29 @@ class Assets { static const String cpsMode4 = 'assets/icons/cps_mode4.svg'; static const String closeToMotion = 'assets/icons/close_to_motion.svg'; static const String farAwayMotion = 'assets/icons/far_away_motion.svg'; - static const String communicationFault = - 'assets/icons/communication_fault.svg'; + static const String communicationFault = 'assets/icons/communication_fault.svg'; static const String radarFault = 'assets/icons/radar_fault.svg'; - static const String selfTestingSuccess = - 'assets/icons/self_testing_success.svg'; - static const String selfTestingFailure = - 'assets/icons/self_testing_failure.svg'; - static const String selfTestingTimeout = - 'assets/icons/self_testing_timeout.svg'; + static const String selfTestingSuccess = 'assets/icons/self_testing_success.svg'; + static const String selfTestingFailure = 'assets/icons/self_testing_failure.svg'; + static const String selfTestingTimeout = 'assets/icons/self_testing_timeout.svg'; static const String movingSpeed = 'assets/icons/moving_speed.svg'; static const String boundary = 'assets/icons/boundary.svg'; static const String motionMeter = 'assets/icons/motion_meter.svg'; - static const String spatialStaticValue = - 'assets/icons/spatial_static_value.svg'; - static const String spatialMotionValue = - 'assets/icons/spatial_motion_value.svg'; + static const String spatialStaticValue = 'assets/icons/spatial_static_value.svg'; + static const String spatialMotionValue = 'assets/icons/spatial_motion_value.svg'; static const String presenceJudgementThrshold = 'assets/icons/presence_judgement_threshold.svg'; static const String spaceType = 'assets/icons/space_type.svg'; static const String sportsPara = 'assets/icons/sports_para.svg'; - static const String sensitivityFeature1 = - 'assets/icons/sensitivity_feature_1.svg'; - static const String sensitivityFeature2 = - 'assets/icons/sensitivity_feature_2.svg'; - static const String sensitivityFeature3 = - 'assets/icons/sensitivity_feature_3.svg'; - static const String sensitivityFeature4 = - 'assets/icons/sensitivity_feature_4.svg'; - static const String sensitivityFeature5 = - 'assets/icons/sensitivity_feature_5.svg'; - static const String sensitivityFeature6 = - 'assets/icons/sensitivity_feature_6.svg'; - static const String sensitivityFeature7 = - 'assets/icons/sensitivity_feature_7.svg'; - static const String sensitivityFeature8 = - 'assets/icons/sensitivity_feature_8.svg'; - static const String sensitivityFeature9 = - 'assets/icons/sensitivity_feature_9.svg'; + static const String sensitivityFeature1 = 'assets/icons/sensitivity_feature_1.svg'; + static const String sensitivityFeature2 = 'assets/icons/sensitivity_feature_2.svg'; + static const String sensitivityFeature3 = 'assets/icons/sensitivity_feature_3.svg'; + static const String sensitivityFeature4 = 'assets/icons/sensitivity_feature_4.svg'; + static const String sensitivityFeature5 = 'assets/icons/sensitivity_feature_5.svg'; + static const String sensitivityFeature6 = 'assets/icons/sensitivity_feature_6.svg'; + static const String sensitivityFeature7 = 'assets/icons/sensitivity_feature_7.svg'; + static const String sensitivityFeature8 = 'assets/icons/sensitivity_feature_8.svg'; + static const String sensitivityFeature9 = 'assets/icons/sensitivity_feature_9.svg'; static const String deviceTagIcon = 'assets/icons/device_tag_ic.svg'; static const String targetConfirmTimeIcon = 'assets/icons/target_confirm_time_icon.svg'; @@ -482,5 +448,5 @@ class Assets { static const String indentLevelIcon = 'assets/icons/indent_level_icon.svg'; static const String triggerLevelIcon = 'assets/icons/trigger_level_icon.svg'; static const String blankCalendar = 'assets/icons/blank_calendar.svg'; - static const String refreshStatusIcon = 'assets/icons/refresh_status_icon.svg'; + static const String refreshStatusIcon = 'assets/icons/refresh_status_icon.svg'; } From 7aa9e7e5dc90eb59c47f0362f874324cc12a04db Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Thu, 22 May 2025 16:44:32 +0300 Subject: [PATCH 2/4] fixed typos. --- lib/pages/visitor_password/view/visitor_password_dialog.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/visitor_password/view/visitor_password_dialog.dart b/lib/pages/visitor_password/view/visitor_password_dialog.dart index 4db5017c..fff845f5 100644 --- a/lib/pages/visitor_password/view/visitor_password_dialog.dart +++ b/lib/pages/visitor_password/view/visitor_password_dialog.dart @@ -32,7 +32,7 @@ class VisitorPasswordDialog extends StatelessWidget { .stateDialog( context: context, message: 'Password Created Successfully', - title: 'Send Success', + title: 'Sent Successfully', widgeta: Column( children: [ if (visitorBloc.passwordStatus!.failedOperations.isNotEmpty) @@ -95,7 +95,7 @@ class VisitorPasswordDialog extends StatelessWidget { visitorBloc.stateDialog( context: context, message: state.message, - title: 'Something Wrong', + title: 'Something went wrong', ); } }, From 92abcdc4f9173ab26bb04f70a69bb0f140e95293 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 25 May 2025 10:57:23 +0300 Subject: [PATCH 3/4] SP-1492-landing_page_analytics_button_design. --- lib/pages/home/bloc/home_bloc.dart | 78 ++--------------------- lib/pages/home/view/home_card.dart | 30 ++------- lib/pages/home/view/home_page_mobile.dart | 57 +---------------- lib/pages/home/view/home_page_web.dart | 3 +- 4 files changed, 16 insertions(+), 152 deletions(-) diff --git a/lib/pages/home/bloc/home_bloc.dart b/lib/pages/home/bloc/home_bloc.dart index 33d55628..f6aab9eb 100644 --- a/lib/pages/home/bloc/home_bloc.dart +++ b/lib/pages/home/bloc/home_bloc.dart @@ -11,16 +11,11 @@ import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart'; import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart'; import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart'; import 'package:syncrow_web/services/home_api.dart'; -import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/constants/routes_const.dart'; import 'package:syncrow_web/utils/navigation_service.dart'; class HomeBloc extends Bloc { - // final Graph graph = Graph()..isTree = true; - // final BuchheimWalkerConfiguration builder = BuchheimWalkerConfiguration(); - // List sourcesList = []; - // List destinationsList = []; UserModel? user; String terms = ''; String policy = ''; @@ -33,22 +28,6 @@ class HomeBloc extends Bloc { on(_confirmUserAgreement); } - // void _createNode(CreateNewNode event, Emitter emit) async { - // emit(HomeInitial()); - // sourcesList.add(event.sourceNode); - // destinationsList.add(event.destinationNode); - // for (int i = 0; i < sourcesList.length; i++) { - // graph.addEdge(sourcesList[i], destinationsList[i]); - // } - - // builder - // ..siblingSeparation = (100) - // ..levelSeparation = (150) - // ..subtreeSeparation = (150) - // ..orientation = (BuchheimWalkerConfiguration.ORIENTATION_TOP_BOTTOM); - // emit(HomeUpdateTree(graph: graph, builder: builder)); - // } - Future _fetchUserInfo(FetchUserInfo event, Emitter emit) async { try { var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey); @@ -99,16 +78,6 @@ class HomeBloc extends Bloc { } } -// static Future fetchUserInfo() async { -// try { -// var uuid = -// await const FlutterSecureStorage().read(key: UserModel.userUuidKey); -// user = await HomeApi().fetchUserInfo(uuid); -// } catch (e) { -// return; -// } -// } - List homeItems = [ HomeItemModel( title: 'Access Management', @@ -118,7 +87,7 @@ class HomeBloc extends Bloc { context.read().add(ClearCachedData()); context.go(RoutesConst.accessManagementPage); }, - color: null, + color: const Color(0xFF0036E6), ), HomeItemModel( title: 'Space Management', @@ -128,7 +97,7 @@ class HomeBloc extends Bloc { context.read().add(ClearCachedData()); context.go(RoutesConst.spacesManagementPage); }, - color: ColorsManager.primaryColor, + color: const Color(0xFF0026A2), ), HomeItemModel( title: 'Devices Management', @@ -140,12 +109,11 @@ class HomeBloc extends Bloc { .add(const TriggerSwitchTabsEvent(isRoutineTab: false)); context.go(RoutesConst.deviceManagementPage); }, - color: ColorsManager.primaryColor, + color: const Color(0xFF00165E), ), - HomeItemModel( title: 'Syncrow Analytics', - icon: Assets.devicesIcon, + icon: Assets.analyticsIcon, active: true, onPress: (context) { context.read().add(ClearCachedData()); @@ -153,43 +121,7 @@ class HomeBloc extends Bloc { .add(const TriggerSwitchTabsEvent(isRoutineTab: false)); context.go(RoutesConst.analytics); }, - color: ColorsManager.primaryColor, + color: const Color(0xFF023DFE), ), - - // HomeItemModel( - // title: 'Move in', - // icon: Assets.moveinIcon, - // active: false, - // onPress: (context) {}, - // color: ColorsManager.primaryColor, - // ), - // HomeItemModel( - // title: 'Construction', - // icon: Assets.constructionIcon, - // active: false, - // onPress: (context) {}, - // color: ColorsManager.primaryColor, - // ), - // HomeItemModel( - // title: 'Energy', - // icon: Assets.energyIcon, - // active: false, - // onPress: (context) {}, - // color: ColorsManager.slidingBlueColor.withOpacity(0.2), - // ), - // HomeItemModel( - // title: 'Integrations', - // icon: Assets.integrationsIcon, - // active: false, - // onPress: (context) {}, - // color: ColorsManager.slidingBlueColor.withOpacity(0.2), - // ), - // HomeItemModel( - // title: 'Asset', - // icon: Assets.assetIcon, - // active: false, - // onPress: (context) {}, - // color: ColorsManager.slidingBlueColor.withOpacity(0.2), - // ), ]; } diff --git a/lib/pages/home/view/home_card.dart b/lib/pages/home/view/home_card.dart index d2e71608..ef3bd8de 100644 --- a/lib/pages/home/view/home_card.dart +++ b/lib/pages/home/view/home_card.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:syncrow_web/utils/color_manager.dart'; class HomeCard extends StatelessWidget { final bool active; @@ -8,6 +7,7 @@ class HomeCard extends StatelessWidget { final int index; final String name; final Function()? onTap; + final Color? color; const HomeCard({ super.key, required this.name, @@ -15,28 +15,16 @@ class HomeCard extends StatelessWidget { this.active = false, required this.img, required this.onTap, + required this.color, }); @override Widget build(BuildContext context) { - // bool evenNumbers = index % 2 == 0; return InkWell( onTap: active ? onTap : null, child: Container( padding: const EdgeInsets.only(left: 10, right: 10, bottom: 10), decoration: BoxDecoration( - color: index == 0 && active - ? ColorsManager.blue1.withOpacity(0.9) - : index == 1 && active - ? ColorsManager.blue2.withOpacity(0.9) - : index == 2 && active - ? ColorsManager.blue3 - : index == 4 && active == false - ? ColorsManager.blue4.withOpacity(0.2) - : index == 7 && active == false - ? ColorsManager.blue4.withOpacity(0.2) - : ColorsManager.blueColor.withOpacity(0.2), - // (active ?ColorsManager.blueColor - // : ColorsManager.blueColor.withOpacity(0.2)), + color: color, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -64,15 +52,9 @@ class HomeCard extends StatelessWidget { ), const SizedBox(height: 10), Expanded( - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - SizedBox( - child: SvgPicture.asset( - img, - ), - ), - ], + child: Align( + alignment: AlignmentDirectional.bottomEnd, + child: SvgPicture.asset(img), ), ), ], diff --git a/lib/pages/home/view/home_page_mobile.dart b/lib/pages/home/view/home_page_mobile.dart index d0719c3e..ad019ea8 100644 --- a/lib/pages/home/view/home_page_mobile.dart +++ b/lib/pages/home/view/home_page_mobile.dart @@ -50,7 +50,7 @@ class HomeMobilePage extends StatelessWidget { height: size.height * 0.6, width: size.width * 0.68, child: GridView.builder( - itemCount: homeItems.length, + itemCount: homeBloc.homeItems.length, gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, @@ -61,7 +61,8 @@ class HomeMobilePage extends StatelessWidget { itemBuilder: (context, index) { return HomeCard( index: index, - active: homeBloc.homeItems[index].active!, + active: true, + color: homeBloc.homeItems[index].color, name: homeBloc.homeItems[index].title!, img: homeBloc.homeItems[index].icon!, onTap: () => @@ -78,56 +79,4 @@ class HomeMobilePage extends StatelessWidget { ), ); } - - final dynamic homeItems = [ - { - 'title': 'Access', - 'icon': Assets.accessIcon, - 'active': true, - }, - { - 'title': 'Space\nManagement', - 'icon': Assets.spaseManagementIcon, - 'color': ColorsManager.primaryColor, - 'active': true, - }, - { - 'title': 'Devices', - 'icon': Assets.devicesIcon, - 'active': true, - }, - { - 'title': 'Syncrow Analytics', - 'icon': Assets.iconEdit, - 'active': true, - }, - // { - // 'title': 'Move in', - // 'icon': Assets.moveinIcon, - // 'active': false, - // }, - // { - // 'title': 'Construction', - // 'icon': Assets.constructionIcon, - // 'active': false, - // }, - // { - // 'title': 'Energy', - // 'icon': Assets.energyIcon, - // 'color': ColorsManager.slidingBlueColor.withOpacity(0.2), - // 'active': false, - // }, - // { - // 'title': 'Integrations', - // 'icon': Assets.integrationsIcon, - // 'color': ColorsManager.slidingBlueColor.withOpacity(0.2), - // 'active': false, - // }, - // { - // 'title': 'Asset', - // 'icon': Assets.assetIcon, - // 'color': ColorsManager.slidingBlueColor.withOpacity(0.2), - // 'active': false, - // }, - ]; } diff --git a/lib/pages/home/view/home_page_web.dart b/lib/pages/home/view/home_page_web.dart index 9a59f51c..334cec4d 100644 --- a/lib/pages/home/view/home_page_web.dart +++ b/lib/pages/home/view/home_page_web.dart @@ -106,8 +106,9 @@ class _HomeWebPageState extends State { ), itemBuilder: (context, index) { return HomeCard( + color: homeBloc.homeItems[index].color, index: index, - active: homeBloc.homeItems[index].active!, + active: true, name: homeBloc.homeItems[index].title!, img: homeBloc.homeItems[index].icon!, onTap: () => homeBloc.homeItems[index].onPress(context), From 660649145833f476adb1854c9ca18e309778e773 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 25 May 2025 10:59:41 +0300 Subject: [PATCH 4/4] made `active` dynamic --- lib/pages/home/view/home_page_web.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/home/view/home_page_web.dart b/lib/pages/home/view/home_page_web.dart index 334cec4d..fb35fa04 100644 --- a/lib/pages/home/view/home_page_web.dart +++ b/lib/pages/home/view/home_page_web.dart @@ -108,7 +108,7 @@ class _HomeWebPageState extends State { return HomeCard( color: homeBloc.homeItems[index].color, index: index, - active: true, + active: homeBloc.homeItems[index].active!, name: homeBloc.homeItems[index].title!, img: homeBloc.homeItems[index].icon!, onTap: () => homeBloc.homeItems[index].onPress(context),