Merge pull request #1674 from atsign-foundation/1615-npt-desktop-refresh-button

fix: npt refresh problems resolved.

Author: CurtlyCritchlow

packages/dart/npt_flutter/lib/features/onboarding/util/profile_progress_listener.dart

@@ -0,0 +1,20 @@
+import 'dart:developer';
+
+import 'package:at_client_mobile/at_client_mobile.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:npt_flutter/app.dart';
+import 'package:npt_flutter/features/profile_list/bloc/profile_list_bloc.dart';
+
+class ProfileProgressListener extends SyncProgressListener {
+  @override
+  void onSyncProgressEvent(SyncProgress syncProgress) {
+    final profileListBlock = App.navState.currentContext!.read<ProfileListBloc>();
+
+    if (syncProgress.syncStatus == SyncStatus.success &&
+        (profileListBlock.state is ProfileListLoaded &&
+            (profileListBlock.state as ProfileListLoaded).profiles.isEmpty)) {
+      profileListBlock.add(const ProfileListLoadEvent());
+      log('ProfileProgressListener: ProfileListLoadEvent triggered to reload profiles');
+    }
+  }
+}

packages/dart/npt_flutter/lib/features/onboarding/widgets/activate_atsign_dialog.dart

@@ -133,6 +133,10 @@ class _ActivateAtsignDialogState extends State<ActivateAtsignDialog> {
       setState(() {
         status = ActivationStatus.otpWait;
       });
+      // pinFocusNode.
+      if (!pinFocusNode.hasFocus) {
+        pinFocusNode.requestFocus();
+      }
     } else {
       if (!mounted) return;
       if (status == ActivationStatus.preparing) {
@@ -148,9 +152,6 @@ class _ActivateAtsignDialogState extends State<ActivateAtsignDialog> {
         ),
       );
     }
-    if (!pinFocusNode.hasFocus) {
-      pinFocusNode.requestFocus();
-    }
   }
 
   Widget get cancelButton => TextButton(

packages/dart/npt_flutter/lib/features/onboarding/widgets/at_directory_selector.dart

@@ -23,7 +23,8 @@ class _AtDirectorySelectorState extends State<AtDirectorySelector> {
   Widget build(BuildContext context) {
     final rootDomains = Constants.getRootDomains(context);
     return BlocBuilder<OnboardingCubit, OnboardingState>(builder: (context, state) {
-      controller.value = TextEditingValue(text: state.rootDomain);
+      controller.value =
+          TextEditingValue(text: state.rootDomain, selection: TextSelection.collapsed(offset: state.rootDomain.length));
       return TextFormField(
         enabled: !widget.options.containsKey(state.atSign),
         controller: controller,

packages/dart/npt_flutter/lib/features/onboarding/widgets/atsign_selector.dart

@@ -21,7 +21,8 @@ class _AtsignSelectorState extends State<AtsignSelector> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<OnboardingCubit, OnboardingState>(builder: (context, state) {
-      controller.value = TextEditingValue(text: state.atSign);
+      controller.value =
+          TextEditingValue(text: state.atSign, selection: TextSelection.collapsed(offset: state.atSign.length));
       return TextFormField(
         controller: controller,
         onChanged: (atsign) {

packages/dart/npt_flutter/lib/features/onboarding/widgets/onboarding_button.dart

@@ -15,6 +15,7 @@ import 'package:npt_flutter/constants.dart';
 import 'package:npt_flutter/features/onboarding/onboarding.dart';
 import 'package:npt_flutter/features/onboarding/util/atsign_manager.dart';
 import 'package:npt_flutter/features/onboarding/util/onboarding_util.dart';
+import 'package:npt_flutter/features/onboarding/util/profile_progress_listener.dart';
 import 'package:npt_flutter/features/onboarding/widgets/activate_atsign_dialog.dart';
 import 'package:npt_flutter/features/onboarding/widgets/onboarding_dialog.dart';
 import 'package:npt_flutter/routes.dart';
@@ -136,13 +137,15 @@ class _OnboardingButtonState extends State<OnboardingButton> {
     switch (onboardingResult?.status ?? AtOnboardingResultStatus.cancel) {
       case AtOnboardingResultStatus.success:
         await initializeContactsService(rootDomain: rootDomain);
+        AtClientManager.getInstance().atClient.syncService.addProgressListener(ProfileProgressListener());
         postOnboard(onboardingResult!.atsign!, rootDomain);
         final result = await saveAtsignInformation(
           AtsignInformation(
             atSign: onboardingResult.atsign!,
             rootDomain: rootDomain,
           ),
         );
+
         log('atsign result is:$result');
 
         if (!mounted) return;

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

@@ -86,17 +86,6 @@ class ProfilePopupMenuButton extends StatelessWidget {
                             strings.yaml: Export.getExportCallback(ExportableProfileFiletype.yaml, [json]),
                           }));
                 }),
-            PopupMenuItem(
-                child: Row(
-                  children: [
-                    PhosphorIcon(PhosphorIcons.arrowClockwise()),
-                    gapW10,
-                    Text(strings.refresh),
-                  ],
-                ),
-                onTap: () {
-                  context.read<ProfileBloc>().add(const ProfileLoadEvent(useCache: false));
-                }),
             PopupMenuItem(
                 child: Row(
                   children: [

packages/dart/npt_flutter/lib/features/profile_form/widgets/profile_device_at_sign_text_field.dart

@@ -36,7 +36,8 @@ class _ProfileDeviceAtSignTextFieldState extends State<ProfileDeviceAtSignTextFi
           },
           builder: (BuildContext context, String? state) {
             if (state == null) return gap0;
-            Future.microtask(() => controller.text = state);
+            Future.microtask(() => controller.value =
+                TextEditingValue(text: state, selection: TextSelection.collapsed(offset: state.length)));
             return SizedBox(
               width: Sizes.p300,
               height: Sizes.p80,

packages/dart/npt_flutter/lib/features/profile_form/widgets/profile_relay_at_sign_text_field.dart

@@ -4,6 +4,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:npt_flutter/features/profile/profile.dart';
 import 'package:npt_flutter/styles/sizes.dart';
 import 'package:npt_flutter/util/form_validator.dart';
+import 'package:npt_flutter/util/general_extensions.dart';
 
 class ProfileRelayAtSignTextField extends StatefulWidget {
   const ProfileRelayAtSignTextField({super.key});
@@ -25,7 +26,8 @@ class _ProfileRelayAtSignTextFieldState extends State<ProfileRelayAtSignTextFiel
       },
       builder: (BuildContext context, String? relayAtsign) {
         if (relayAtsign == null) return gap0;
-        Future.microtask(() => controller.text = relayAtsign);
+        Future.microtask(() => controller.value =
+            TextEditingValue(text: relayAtsign, selection: TextSelection.collapsed(offset: relayAtsign.length)));
         return SizedBox(
           width: Sizes.p200,
           height: Sizes.p70,
@@ -38,9 +40,9 @@ class _ProfileRelayAtSignTextFieldState extends State<ProfileRelayAtSignTextFiel
               ),
               validator: FormValidator.validateEmptyRelayField,
               onChanged: (value) {
-                if (!value.startsWith('@')) {
-                  value = '@$value';
-                }
+                value = value.atsignify();
+                controller.value =
+                    TextEditingValue(text: value, selection: TextSelection.collapsed(offset: value.length));
                 var bloc = context.read<ProfileBloc>();
                 bloc.add(ProfileEditEvent(
                   profile: (bloc.state as ProfileLoadedState).profile.copyWith(relayAtsign: value),

packages/dart/npt_flutter/lib/features/profile_form/widgets/profile_relay_quick_buttons.dart

@@ -66,7 +66,10 @@ class ProfileRelayQuickButtons extends StatelessWidget {
                             ),
                           ),
                         ),
-                        const ProfileRelayAtSignTextField(),
+                        const Padding(
+                          padding: EdgeInsets.only(top: Sizes.p4),
+                          child: ProfileRelayAtSignTextField(),
+                        ),
                       ],
                     ),
                   )),

packages/dart/npt_flutter/lib/features/profile_list/view/profile_list_view.dart

@@ -1,3 +1,6 @@
+import 'dart:developer';
+
+import 'package:at_client_mobile/at_client_mobile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -46,7 +49,8 @@ class ProfileListView extends StatelessWidget {
 
             final profiles = state.profiles.toList();
             final isFullProfile = profiles.isNotEmpty;
-
+            log('profile: isFullProfile: $isFullProfile');
+            AtClientManager.getInstance().atClient.syncService.isInSync();
             return Stack(
               children: [
                 Align(
@@ -68,8 +72,6 @@ class ProfileListView extends StatelessWidget {
                                       gapW10,
                                       ProfileListImportButton(),
                                       gapW10,
-                                      ProfileListRefreshButton(),
-                                      gapW10,
                                       ProfileSelectedExportButton(),
                                       gapW10,
                                       ProfileSelectedDeleteButton(),
@@ -106,13 +108,34 @@ class ProfileListView extends StatelessWidget {
                                         alignment: Alignment.center,
                                         child: SvgPicture.asset('assets/empty_state_profile_bg.svg'),
                                       ),
-                                      Align(
-                                        alignment: Alignment.bottomCenter,
-                                        child: Text(
-                                          strings.emptyProfileMessage,
-                                          textAlign: TextAlign.center,
-                                        ),
-                                      ),
+                                      FutureBuilder(
+                                          future: AtClientManager.getInstance().atClient.syncService.isInSync(),
+                                          builder: (context, AsyncSnapshot<bool> snapshot) {
+                                            if (snapshot.connectionState == ConnectionState.waiting) {
+                                              return const CircularProgressIndicator();
+                                            }
+                                            if (snapshot.hasData && snapshot.data == false) {
+                                              return Align(
+                                                alignment: Alignment.bottomCenter,
+                                                child: Row(
+                                                  mainAxisAlignment: MainAxisAlignment.center,
+                                                  children: [
+                                                    Text(
+                                                      strings.syncInProgress,
+                                                      textAlign: TextAlign.center,
+                                                    ),
+                                                  ],
+                                                ),
+                                              );
+                                            }
+                                            return Align(
+                                              alignment: Alignment.bottomCenter,
+                                              child: Text(
+                                                strings.emptyProfileMessage,
+                                                textAlign: TextAlign.center,
+                                              ),
+                                            );
+                                          }),
                                     ],
                                   ),
                           ],

packages/dart/npt_flutter/lib/features/settings/view/settings_view.dart

@@ -43,13 +43,13 @@ class SettingsView extends StatelessWidget {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                         children: [
-                          // gapH30,
-                          CustomTextButton.discord(),
-                          CustomTextButton.email(),
+                          gapH10,
+                          CustomTextButton.backUpYourKey(),
                           CustomTextButton.faq(),
-                          CustomTextButton.privacyPolicy(),
+                          CustomTextButton.email(),
+                          CustomTextButton.discord(),
                           CustomTextButton.feedback(),
-                          CustomTextButton.backUpYourKey(),
+                          CustomTextButton.privacyPolicy(),
                           CustomTextButton.signOut(),
                           ContactListTile(),
                         ],

packages/dart/npt_flutter/lib/features/settings/widgets/contact_list_tile.dart

@@ -21,21 +21,18 @@ class ContactListTile extends StatelessWidget {
         builder: ((context, snapshot) {
           if (snapshot.hasData) {
             return Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 13.0),
+              padding: const EdgeInsets.symmetric(horizontal: Sizes.p15),
               child: Container(
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(Sizes.p10),
                   color: AppColor.cardColorDark,
                 ),
                 child: ListTile(
+                    contentPadding: const EdgeInsets.symmetric(horizontal: Sizes.p30),
+                    dense: true,
                     shape: RoundedRectangleBorder(
                       borderRadius: BorderRadius.circular(Sizes.p8.toFont),
                     ),
-                    leading: CircleAvatar(
-                      radius: Sizes.p18.toFont,
-                      backgroundColor: AppColor.primaryColor,
-                      backgroundImage: snapshot.data!['image'] != null ? MemoryImage(snapshot.data!['image']) : null,
-                    ),
                     title: Text(
                       snapshot.data?['name'] ?? '',
                       style: bodyMedium.copyWith(fontSize: 8.toFont),
@@ -48,9 +45,6 @@ class ContactListTile extends StatelessWidget {
             );
           } else {
             return ListTile(
-              leading: const CircleAvatar(
-                child: Icon(Icons.person),
-              ),
               title: Text(strings.noName),
               subtitle: Text(strings.noAtsign),
             );

packages/dart/npt_flutter/lib/features/settings/widgets/settings_relay_at_sign_text_field.dart

@@ -4,6 +4,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:npt_flutter/features/settings/settings.dart';
 import 'package:npt_flutter/styles/sizes.dart';
 import 'package:npt_flutter/util/form_validator.dart';
+import 'package:npt_flutter/util/general_extensions.dart';
 
 class SettingsRelayAtSignTextField extends StatefulWidget {
   const SettingsRelayAtSignTextField({super.key});
@@ -25,18 +26,23 @@ class _SettingsRelayAtSignTextFieldState extends State<SettingsRelayAtSignTextFi
       },
       builder: (BuildContext context, String? relayAtsign) {
         if (relayAtsign == null) return gap0;
-        Future.microtask(() => controller.text = relayAtsign);
+        Future.microtask(() => controller.value =
+            TextEditingValue(text: relayAtsign, selection: TextSelection.collapsed(offset: relayAtsign.length)));
         return SizedBox(
           width: Sizes.p200,
           height: Sizes.p70,
           child: TextFormField(
               controller: controller,
               autovalidateMode: AutovalidateMode.onUserInteraction,
-              validator: FormValidator.validateRequiredAtsignField,
+              validator: FormValidator.validateEmptyRelayField,
               decoration: InputDecoration(
                 labelText: AppLocalizations.of(context)!.custom,
+                errorMaxLines: 2,
               ),
               onChanged: (value) {
+                value = value.atsignify();
+                controller.value =
+                    TextEditingValue(text: value, selection: TextSelection.collapsed(offset: value.length));
                 var bloc = context.read<SettingsBloc>();
                 bloc.add(SettingsEditEvent(
                   settings: (bloc.state as SettingsLoadedState).settings.copyWith(relayAtsign: value),

packages/dart/npt_flutter/lib/localization/app_en.arb

@@ -15,7 +15,7 @@
    "atsignDialogTitle": "AtSign",
    "back": "Back",
    "backupKeyDialogTitle": "Please select a file to export to:",
-   "backupYourKey": "Back up your Key",
+   "backupYourKey": "Back Up Your Key",
    "cancel": "Cancel",
    "confirm": "Confirm",
    "connected": "Connected",
@@ -128,6 +128,7 @@
    "status": "Status",
    "stopping": "Stopping",
    "submit": "Submit",
+   "syncInProgress": "Sync in progress.",
    "validationErrorAtsignField": "Field must be a valid atsign that starts with @",
    "validationErrorDeviceNameField": "Field can only contain lowercase letters, digits, underscores.",
    "validationErrorEmptyField": "This field cannot be left blank",

packages/dart/npt_flutter/lib/localization/app_es.arb

@@ -128,6 +128,7 @@
   "status": "Estado",
   "stopping": "Apagando",
   "submit": "Enviar",
+  "syncInProgress": "Sincronización en curso.",
   "validationErrorAtsignField": "El campo debe ser un atSign válido que comience con @",
   "validationErrorDeviceNameField": "El campo solo puede contener letras minúsculas, dígitos, guiones bajos.",
   "validationErrorEmptyField": "Este campo no puede quedar vacío",

packages/dart/npt_flutter/lib/localization/app_pt.arb

@@ -34,7 +34,7 @@
   "done": "Concluído",
   "duplicate": "Duplicar",
   "edit": "Editar",
-  "email": "Suporte por E-mail",
+  "email": "Suporte por Email",
   "emptyProfileMessage": "Nenhum perfil encontrado\nCrie ou importe um perfil para começar a usar NoPorts.",
   "enableLogging": "Habilitar Log",
   "errorAtKeySaveFailed": "Falha ao salvar o arquivo atKeys: {error}",
@@ -70,7 +70,7 @@
   "minimal": "Simples",
   "next": "Próximo",
   "noAtsign": "Sem atSign",
-  "noEmailClientAvailable": "Nenhum cliente de e-mail disponível",
+  "noEmailClientAvailable": "Nenhum cliente de email disponível",
   "noName": "Sem Nome",
   "noPorts": "NoPorts",
   "onboard": "Integrar",
@@ -128,6 +128,7 @@
   "status": "Status",
   "stopping": "Desligando",
   "submit": "Enviar",
+  "syncInProgress": "Sincronização em andamento.",
   "validationErrorAtsignField": "O campo deve ser um atSign válido que comece com @",
   "validationErrorDeviceNameField": "O campo só pode conter letras minúsculas, dígitos e underscores.",
   "validationErrorEmptyField": "Este campo não pode ser deixado em branco",

packages/dart/npt_flutter/lib/localization/app_pt_BR.arb

@@ -34,7 +34,7 @@
   "done": "Concluído",
   "duplicate": "Duplicar",
   "edit": "Editar",
-  "email": "Suporte por E-mail",
+  "email": "Suporte por Email",
   "emptyProfileMessage": "Nenhum perfil encontrado\nCrie ou importe um perfil para começar a usar NoPorts.",
   "enableLogging": "Habilitar Log",
   "errorAtKeySaveFailed": "Falha ao salvar o arquivo atKeys: {error}",
@@ -70,7 +70,7 @@
   "minimal": "Simples",
   "next": "Próximo",
   "noAtsign": "Sem atSign",
-  "noEmailClientAvailable": "Nenhum cliente de e-mail disponível",
+  "noEmailClientAvailable": "Nenhum cliente de email disponível",
   "noName": "Sem Nome",
   "noPorts": "NoPorts",
   "onboard": "Integrar",
@@ -128,6 +128,7 @@
   "status": "Status",
   "stopping": "Desligando",
   "submit": "Enviar",
+  "syncInProgress": "Sincronização em andamento.",
   "validationErrorAtsignField": "O campo deve ser um atSign válido que comece com @",
   "validationErrorDeviceNameField": "O campo só pode conter letras minúsculas, dígitos e underscores.",
   "validationErrorEmptyField": "Este campo não pode ser deixado em branco",

packages/dart/npt_flutter/lib/localization/app_zh.arb

@@ -128,6 +128,7 @@
   "status": "状态",
   "stopping": "正在关闭",
   "submit": "提交",
+  "syncInProgress": "同步进行中。",
   "validationErrorAtsignField": "字段必须是以 @ 开头的有效 atsign",
   "validationErrorDeviceNameField": "字段只能包含小写字母、数字和下划线。",
   "validationErrorEmptyField": "此字段不能为空",