Update button behavior in DeviceManagementPage based on routineTab state

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -40,13 +40,14 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 style: TextButton.styleFrom(
                   backgroundColor: null,
                 ),
-                onPressed: () {
+                onPressed: !state.routineTab
+                    ? null
+                    : () {
                         BlocProvider.of<CreateRoutineBloc>(context)
                             .add(const ResetSelectedEvent());
 
-                  context
+                        context.read<RoutineBloc>().add(
-                      .read<RoutineBloc>()
+                            const TriggerSwitchTabsEvent(isRoutineTab: false));
-                      .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
                         context
                             .read<DeviceManagementBloc>()
                             .add(FetchDevices(context));
@@ -66,13 +67,14 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 style: TextButton.styleFrom(
                   backgroundColor: null,
                 ),
-                onPressed: () {
+                onPressed: state.routineTab
+                    ? null
+                    : () {
                         BlocProvider.of<CreateRoutineBloc>(context)
                             .add(const ResetSelectedEvent());
 
-                  context
+                        context.read<RoutineBloc>().add(
-                      .read<RoutineBloc>()
+                            const TriggerSwitchTabsEvent(isRoutineTab: true));
-                      .add(const TriggerSwitchTabsEvent(isRoutineTab: true));
                       },
                 child: Text(
                   'Routines',

lib/pages/device_managment/device_setting/device_management_content.dart

@@ -1,12 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/device_info_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/sub_space_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/sub_space_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/web_layout/default_container.dart';
 
@@ -30,7 +28,7 @@ class DeviceManagementContent extends StatelessWidget {
         Widget? trailing,
         required Color? valueColor}) {
       return Padding(
-        padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 10),
+        padding: const EdgeInsets.symmetric(vertical: 6.0),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
@@ -41,7 +39,6 @@ class DeviceManagementContent extends StatelessWidget {
                 color: ColorsManager.grayColor,
               ),
             ),
-            const SizedBox(width: 15),
             Expanded(
               child: Text(
                 value,
@@ -51,7 +48,7 @@ class DeviceManagementContent extends StatelessWidget {
                 overflow: TextOverflow.ellipsis,
               ),
             ),
-            const SizedBox(width: 12),
+            const SizedBox(width: 8),
             trailing ?? const SizedBox.shrink(),
           ],
         ),
@@ -78,13 +75,13 @@ class DeviceManagementContent extends StatelessWidget {
               child: infoRow(
                 label: 'Sub-Space:',
                 value: deviceInfo.subspace.subspaceName,
-                  valueColor: ColorsManager.blackColor,
+                valueColor: ColorsManager.textGray,
-                  trailing: SvgPicture.asset(
+                trailing: const Icon(
-                    Assets.arrowDown,
+                  Icons.arrow_forward_ios,
-                    width: 10,
+                  size: 16,
-                    height: 10,
                   color: ColorsManager.greyColor,
-                  )),
+                ),
+              ),
             ),
           ),
           const Divider(color: ColorsManager.dividerColor),
@@ -107,7 +104,7 @@ class DeviceManagementContent extends StatelessWidget {
                 },
                 child: const Icon(
                   Icons.copy,
-                  size: 15,
+                  size: 16,
                   color: ColorsManager.greyColor,
                 ),
               ),

lib/pages/device_managment/device_setting/device_settings_panel.dart

@@ -51,7 +51,8 @@ class DeviceSettingsPanel extends StatelessWidget {
                   Container(
                     width: MediaQuery.of(context).size.width * 0.3,
                     color: ColorsManager.grey25,
-                    padding: const EdgeInsets.all(10),
+                    padding: const EdgeInsets.symmetric(
+                        horizontal: 20, vertical: 24),
                     child: ListView(
                       children: [
                         Row(
@@ -69,26 +70,22 @@ class DeviceSettingsPanel extends StatelessWidget {
                           children: [
                             Text(
                               'Device Settings',
-                              style: context.theme.textTheme.titleLarge!
+                              style:
-                                  .copyWith(
+                                  context.theme.textTheme.titleLarge!.copyWith(
-                                      fontWeight: FontWeight.w700,
+                                fontWeight: FontWeight.bold,
-                                      color: ColorsManager.vividBlue
+                                color: ColorsManager.primaryColor,
-                                          .withOpacity(0.7),
+                              ),
-                                      fontSize: 24),
                             ),
                           ],
                         ),
                         const SizedBox(height: 24),
                         DefaultContainer(
-                          borderRadius: BorderRadius.circular(15),
                           child: Row(
                             children: [
-                              Padding(
+                              CircleAvatar(
-                                padding: const EdgeInsets.only(left: 15),
+                                radius: 40,
-                                child: CircleAvatar(
-                                  radius: 38,
                                 backgroundColor:
-                                      ColorsManager.grayBorder.withOpacity(0.5),
+                                    const Color.fromARGB(177, 213, 213, 213),
                                 child: CircleAvatar(
                                   backgroundColor: ColorsManager.whiteColors,
                                   radius: 36,
@@ -98,14 +95,12 @@ class DeviceSettingsPanel extends StatelessWidget {
                                   ),
                                 ),
                               ),
-                              ),
+                              const SizedBox(width: 12),
-                              const SizedBox(width: 25),
                               Expanded(
                                 child: Column(
                                   mainAxisAlignment: MainAxisAlignment.start,
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
-                                    const SizedBox(height: 15),
                                     Text(
                                       'Device Name:',
                                       style: context.textTheme.bodyMedium!
@@ -113,19 +108,10 @@ class DeviceSettingsPanel extends StatelessWidget {
                                         color: ColorsManager.grayColor,
                                       ),
                                     ),
-                                    SizedBox(
+                                    TextFormField(
-                                      height: 35,
-                                      child: Row(
-                                        children: [
-                                          SizedBox(
-                                            height: 50,
-                                            width: 190,
-                                            child: TextFormField(
-                                              scrollPadding: EdgeInsets.zero,
                                       maxLength: 30,
                                       style: const TextStyle(
                                         color: ColorsManager.blackColor,
-                                                fontSize: 16,
                                       ),
                                       textAlign: TextAlign.start,
                                       focusNode: _bloc.focusNode,
@@ -135,57 +121,37 @@ class DeviceSettingsPanel extends StatelessWidget {
                                         _bloc.add(const ChangeNameEvent(
                                             value: false));
                                       },
-                                              decoration: InputDecoration(
+                                      decoration: const InputDecoration(
-                                                isDense: true,
-                                                contentPadding: EdgeInsets.zero,
                                         border: InputBorder.none,
                                         fillColor: Colors.white10,
                                         counterText: '',
                                       ),
                                     ),
+                                  ],
                                 ),
-                                          Column(
+                              ),
-                                            children: [
+                              const SizedBox(width: 8),
-                                              SizedBox(
+                              Visibility(
-                                                width: 15,
+                                visible: _bloc.editName != true,
-                                                height: 25,
-                                                child: Visibility(
-                                                  visible:
-                                                      _bloc.editName != true,
                                 replacement: const SizedBox(),
-                                                  child: InkWell(
+                                child: GestureDetector(
                                   onTap: () {
                                     _bloc.add(
-                                                          const ChangeNameEvent(
+                                        const ChangeNameEvent(value: true));
-                                                              value: true));
                                   },
                                   child: SvgPicture.asset(
-                                                      Assets
+                                    Assets.editNameIconSettings,
-                                                          .editNameIconSettings,
+                                    color: ColorsManager.grayColor,
-                                                      color: ColorsManager
+                                    height: 20,
-                                                          .lightGrayBorderColor,
+                                    width: 20,
-                                                      height: 15,
-                                                      width: 15,
-                                                    ),
-                                                  ),
-                                                ),
-                                              ),
-                                            ],
-                                          ),
-                                        ],
-                                      ),
-                                    ),
-                                  ],
                                   ),
                                 ),
+                              )
                             ],
                           ),
                         ),
                         const SizedBox(height: 32),
-                        Padding(
+                        Text('Device Management', style: sectionTitle),
-                          padding: const EdgeInsets.only(left: 10),
-                          child: Text('Device Management', style: sectionTitle),
-                        ),
                         DeviceManagementContent(
                           device: device,
                           subSpaces: subSpaces.cast<SubSpaceModel>(),