fix: Typos and UI issues addressed.

packages/dart/npt_flutter/lib/features/profile/view/profile_header_view.dart

@@ -48,51 +48,50 @@ class ProfileHeaderView extends StatelessWidget {
               return null;
             },
             builder: (BuildContext context, PreferredViewLayout? viewLayout) {
-              return switch (viewLayout) {
-                null => const Center(child: Spinner()),
-                PreferredViewLayout.minimal => CustomCard.profileHeader(
-                    child: Padding(
-                      padding: const EdgeInsets.symmetric(vertical: Sizes.p10),
-                      child: Row(
-                        children: [
-                          const ProfileSelectAllBox(),
-                          gapW10,
-                          ProfileHeaderColumn(title: strings.profileName, layout: PreferredViewLayout.minimal),
-                          gapW10,
-                          Text(strings.status),
-                          // gapW10,
-                          // //Run button
-                          // gapW40,
-                          // gapW10,
-                          // favorite button
-                        ],
+              print('header rebuild');
+              return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
+                final width = SizeConfig.setProfileFieldWidth();
+                return switch (viewLayout) {
+                  null => const Center(child: Spinner()),
+                  PreferredViewLayout.minimal => CustomCard.profileHeader(
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(vertical: Sizes.p10),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          children: [
+                            const ProfileSelectAllBox(),
+                            gapW10,
+                            ProfileHeaderColumn(title: strings.profileName, width: width),
+                            gapW10,
+                            ProfileHeaderColumn(title: strings.status, width: width),
+                          ],
+                        ),
                       ),
                     ),
-                  ),
-                PreferredViewLayout.sshStyle => CustomCard.profileHeader(
-                    child: Padding(
-                      padding: const EdgeInsets.symmetric(vertical: Sizes.p10),
-                      child: Row(
-                        children: [
-                          const ProfileSelectAllBox(),
-                          gapW10,
-                          ProfileHeaderColumn(title: strings.profileName),
-                          gapW10,
-                          ProfileHeaderColumn(title: strings.deviceName),
-                          gapW10,
-                          ProfileHeaderColumn(title: strings.serviceMapping),
-                          gapW10,
-                          Text(strings.status),
-                          // gapW10,
-                          // //Run button
-                          // gapW40,
-                          // gapW10,
-                          // favorite button
-                        ],
+                  PreferredViewLayout.sshStyle => CustomCard.profileHeader(
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(vertical: Sizes.p10),
+                        child: Row(
+                          children: [
+                            const ProfileSelectAllBox(),
+                            gapW10,
+                            ProfileHeaderColumn(
+                              title: strings.profileName,
+                              width: width,
+                            ),
+                            gapW10,
+                            ProfileHeaderColumn(title: strings.deviceName, width: width),
+                            gapW10,
+                            ProfileHeaderColumn(title: strings.serviceMapping, width: width),
+                            gapW10,
+                            ProfileHeaderColumn(
+                                title: strings.status, width: SizeConfig.setProfileFieldWidth(statusField: true)),
+                          ],
+                        ),
                       ),
                     ),
-                  ),
-              };
+                };
+              });
             },
           );
       }

packages/dart/npt_flutter/lib/features/profile/view/profile_view_minimal.dart

@@ -1,26 +1,29 @@
 import 'package:flutter/material.dart';
 import 'package:npt_flutter/features/profile/profile.dart';
-import 'package:npt_flutter/features/settings/models/settings.dart';
 import 'package:npt_flutter/styles/sizes.dart';
 
 class ProfileViewMinimal extends StatelessWidget {
   const ProfileViewMinimal({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return const Row(children: [
-      ProfileSelectBox(),
-      gapW10,
-      ProfileDisplayName(layout: PreferredViewLayout.minimal),
-      gapW10,
-      ProfileStatusIndicator(),
-      gapW10,
-      ProfileRunButton(),
-      gapW10,
-      ProfileFavoriteButton(),
-      gapW10,
-      ProfilePopupMenuButton(),
-      gapW20,
-    ]);
+    return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
+      final width = SizeConfig.setProfileFieldWidth();
+
+      return Row(children: [
+        const ProfileSelectBox(),
+        gapW10,
+        ProfileDisplayName(width: width),
+        gapW10,
+        ProfileStatusIndicator(width: SizeConfig.setProfileFieldWidth(statusField: true)),
+        const Spacer(),
+        const ProfileRunButton(),
+        gapW10,
+        const ProfileFavoriteButton(),
+        gapW10,
+        const ProfilePopupMenuButton(),
+        gapW20,
+      ]);
+    });
   }
 }

packages/dart/npt_flutter/lib/features/profile/view/profile_view_ssh_style.dart

@@ -7,23 +7,26 @@ class ProfileViewSshStyle extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const Row(children: [
-      ProfileSelectBox(),
-      gapW10,
-      ProfileDisplayName(),
-      gapW10,
-      ProfileDeviceName(),
-      gapW10,
-      ProfileServiceView(),
-      gapW10,
-      ProfileStatusIndicator(),
-      gapW10,
-      ProfileRunButton(),
-      gapW10,
-      ProfileFavoriteButton(),
-      gapW10,
-      ProfilePopupMenuButton(),
-      gapW20,
-    ]);
+    return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
+      final width = SizeConfig.setProfileFieldWidth();
+      return Row(mainAxisSize: MainAxisSize.min, children: [
+        const ProfileSelectBox(),
+        gapW10,
+        ProfileDisplayName(width: width),
+        gapW10,
+        ProfileDeviceName(width: width),
+        gapW10,
+        ProfileServiceView(width: width),
+        gapW10,
+        ProfileStatusIndicator(width: SizeConfig.setProfileFieldWidth(statusField: true)),
+        gapW10,
+        const Flexible(child: ProfileRunButton()),
+        gapW10,
+        const Flexible(child: ProfileFavoriteButton()),
+        gapW10,
+        const Flexible(child: ProfilePopupMenuButton()),
+        gapW10
+      ]);
+    });
   }
 }

packages/dart/npt_flutter/lib/features/profile/widgets/profile_device_name.dart

@@ -5,13 +5,12 @@ import 'package:npt_flutter/features/profile/profile.dart';
 import '../../../styles/sizes.dart';
 
 class ProfileDeviceName extends StatelessWidget {
-  const ProfileDeviceName({super.key});
-
+  const ProfileDeviceName({required this.width, super.key});
+  final double width;
   @override
   Widget build(BuildContext context) {
-    final deviceWidth = MediaQuery.of(context).size.width;
     return SizedBox(
-      width: deviceWidth * Sizes.profileFieldsWidthFactor,
+      width: width,
       child: SingleChildScrollView(
         scrollDirection: Axis.horizontal,
         child: BlocSelector<ProfileBloc, ProfileState, (String, String)?>(selector: (state) {

packages/dart/npt_flutter/lib/features/profile/widgets/profile_display_name.dart

@@ -1,22 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:npt_flutter/features/profile/profile.dart';
-import 'package:npt_flutter/features/settings/models/settings.dart';
 
 import '../../../styles/sizes.dart';
 
 class ProfileDisplayName extends StatelessWidget {
-  const ProfileDisplayName({super.key, this.layout = PreferredViewLayout.sshStyle});
+  const ProfileDisplayName({
+    required this.width,
+    super.key,
+  });
 
-  final PreferredViewLayout layout;
+  final double width;
 
   @override
   Widget build(BuildContext context) {
-    final deviceWidth = MediaQuery.of(context).size.width;
-    final double widthFactor =
-        layout == PreferredViewLayout.sshStyle ? Sizes.profileFieldsWidthFactor : Sizes.profileFieldsWidthFactorAlt;
     return SizedBox(
-      width: deviceWidth * widthFactor,
+      width: SizeConfig.setProfileFieldWidth(),
       child: SingleChildScrollView(
         scrollDirection: Axis.horizontal,
         child: BlocSelector<ProfileBloc, ProfileState, String?>(

packages/dart/npt_flutter/lib/features/profile/widgets/profile_header_column.dart

@@ -1,19 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:npt_flutter/features/settings/models/settings.dart';
-import 'package:npt_flutter/styles/sizes.dart';
 
 class ProfileHeaderColumn extends StatelessWidget {
-  const ProfileHeaderColumn({super.key, required this.title, this.layout = PreferredViewLayout.sshStyle});
+  const ProfileHeaderColumn({super.key, required this.title, required this.width});
 
   final String title;
-  final PreferredViewLayout layout;
+  final double width;
 
   @override
   Widget build(BuildContext context) {
-    final deviceWidth = MediaQuery.of(context).size.width;
-    final double widthFactor =
-        layout == PreferredViewLayout.sshStyle ? Sizes.profileFieldsWidthFactor : Sizes.profileFieldsWidthFactorAlt;
-
-    return SizedBox(width: deviceWidth * widthFactor, child: Text(title));
+    return SizedBox(width: width, child: Text(title));
   }
 }

packages/dart/npt_flutter/lib/features/profile/widgets/profile_service_view.dart

@@ -5,13 +5,12 @@ import 'package:npt_flutter/features/profile/profile.dart';
 import '../../../styles/sizes.dart';
 
 class ProfileServiceView extends StatelessWidget {
-  const ProfileServiceView({super.key});
-
+  const ProfileServiceView({required this.width, super.key});
+  final double width;
   @override
   Widget build(BuildContext context) {
-    final deviceWidth = MediaQuery.of(context).size.width;
     return SizedBox(
-      width: deviceWidth * Sizes.profileFieldsWidthFactor,
+      width: width,
       child: SingleChildScrollView(
         scrollDirection: Axis.horizontal,
         child: BlocSelector<ProfileBloc, ProfileState, (int, String, int)?>(selector: (state) {

packages/dart/npt_flutter/lib/features/profile/widgets/profile_status_indicator.dart

@@ -8,12 +8,14 @@ import 'package:npt_flutter/styles/sizes.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 
 class ProfileStatusIndicator extends StatelessWidget {
-  const ProfileStatusIndicator({super.key});
-
+  const ProfileStatusIndicator({required this.width, super.key});
+  final double width;
   @override
   Widget build(BuildContext context) {
     final strings = AppLocalizations.of(context)!;
-    return Expanded(
+
+    return SizedBox(
+      width: width,
       child: BlocBuilder<ProfileBloc, ProfileState>(builder: (BuildContext context, ProfileState state) {
         log(state.runtimeType.toString());
         if (state is ProfileLoading) {
@@ -105,6 +107,7 @@ class StatusMessage extends StatelessWidget {
     return Tooltip(
       message: tooltip,
       child: ListTile(
+        contentPadding: EdgeInsets.zero,
         leading: PhosphorIcon(
           icon,
           color: color,

packages/dart/npt_flutter/lib/features/profile_form/view/profile_form_view.dart

@@ -28,7 +28,7 @@ class ProfileFormView extends StatelessWidget {
             Align(
               alignment: Alignment.topCenter,
               child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.center,
                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                 children: [
                   CustomCard.profileFormContent(
@@ -37,16 +37,16 @@ class ProfileFormView extends StatelessWidget {
                       child: Form(
                         key: formkey,
                         child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.center,
                           children: [
                             const ProfileDisplayNameTextField(),
                             gapH10,
                             const Padding(
                               padding: EdgeInsets.symmetric(horizontal: Sizes.p50),
                               child: Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                 children: [
                                   ProfileDeviceAtSignTextField(),
+                                  gapW143,
                                   ProfileDeviceNameTextField(),
                                 ],
                               ),
@@ -57,10 +57,12 @@ class ProfileFormView extends StatelessWidget {
                             const Padding(
                               padding: EdgeInsets.symmetric(horizontal: Sizes.p50),
                               child: Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                mainAxisAlignment: MainAxisAlignment.start,
                                 children: [
                                   ProfileLocalPortSelector(),
+                                  gapW103,
                                   ProfileRemoteHostTextField(),
+                                  gapW103,
                                   ProfileRemotePortSelector(),
                                 ],
                               ),
@@ -69,23 +71,21 @@ class ProfileFormView extends StatelessWidget {
                             Padding(
                               padding: const EdgeInsets.symmetric(horizontal: Sizes.p50),
                               child: Builder(
-                                builder: (context) => Center(
-                                  child: SizedBox(
-                                    width: double.infinity,
-                                    child: ElevatedButton(
-                                      onPressed: () {
-                                        if (!formkey.currentState!.validate()) return;
+                                builder: (context) => SizedBox(
+                                  width: Sizes.p743,
+                                  child: ElevatedButton(
+                                    onPressed: () {
+                                      if (!formkey.currentState!.validate()) return;
 
-                                        var localBloc = context.read<ProfileBloc>();
-                                        if (localBloc.state is! ProfileLoadedState) return;
+                                      var localBloc = context.read<ProfileBloc>();
+                                      if (localBloc.state is! ProfileLoadedState) return;
 
-                                        /// Now take the localBloc and upload it back to the global bloc
-                                        context.read<ProfileCacheCubit>().getProfileBloc(uuid).add(ProfileSaveEvent(
-                                              profile: (localBloc.state as ProfileLoadedState).profile,
-                                            ));
-                                      },
-                                      child: Text(strings.submit),
-                                    ),
+                                      /// Now take the localBloc and upload it back to the global bloc
+                                      context.read<ProfileCacheCubit>().getProfileBloc(uuid).add(ProfileSaveEvent(
+                                            profile: (localBloc.state as ProfileLoadedState).profile,
+                                          ));
+                                    },
+                                    child: Text(strings.submit),
                                   ),
                                 ),
                               ),