feat: updating closing submission dialog (#2785)

Author: LynxLynxx

catalyst_voices/apps/voices/lib/common/formatters/date_formatter.dart

@@ -81,16 +81,16 @@ abstract class DateFormatter {
     return DateFormat('d MMM, yyyy - HH:mm').format(dateTime);
   }
 
-  /// Formats full date and time.
+  /// Formats full date and time in 24 format with leading day of week.
   /// If [timeOnNewline] is true then the time will be placed on a new line.
   ///
   /// Example:
-  /// - Thu, 6 June 2024 10:00 am
+  /// - Thu, 6 June 2024 10:00
   static String formatFullDateTime(
     DateTime dateTime, {
     bool timeOnNewline = false,
   }) {
-    final format = timeOnNewline ? 'EEE, d MMMM yyyy\nh:mm a' : 'EEE, d MMMM yyyy h:mm a';
+    final format = timeOnNewline ? 'EEE, d MMMM yyyy\nHH:mm' : 'EEE, d MMMM yyyy, HH:mm';
     return DateFormat(format).format(dateTime);
   }
 

catalyst_voices/apps/voices/lib/pages/workspace/submission_closing_warning_dialog.dart

@@ -113,20 +113,15 @@ class _Header extends StatelessWidget {
 
 class _HeadsUpInfo extends StatelessWidget {
   final String text;
-  final bool isBold;
 
-  const _HeadsUpInfo(
-    this.text, {
-    this.isBold = false,
-  });
+  const _HeadsUpInfo(this.text);
 
   @override
   Widget build(BuildContext context) {
     return Text(
-      text.withBullet(),
+      text.withBullet().withIndent(),
       style: context.textTheme.bodyLarge?.copyWith(
         color: context.colors.textOnPrimaryLevel1,
-        fontWeight: isBold ? FontWeight.w700 : null,
       ),
     );
   }
@@ -202,12 +197,11 @@ class _RightSide extends StatelessWidget {
         const SizedBox(height: 12),
         ProposalSubmissionClosesText(dateTime: date),
         const SizedBox(height: 12),
-        _HeadsUpInfo(context.l10n.submitProposalBeforeClosing),
+        _Text(context.l10n.stepsToDoBeforeAppCloses),
         _HeadsUpInfo(context.l10n.checkMaxProposal(ProposalDocument.maxSubmittedProposalsPerUser)),
-        _HeadsUpInfo(
-          context.l10n.catalystAppNotAvailableAfterSubmissionCloses,
-          isBold: true,
-        ),
+        _HeadsUpInfo(context.l10n.moveFinalProposalsToReviewStage),
+        const SizedBox(height: 20),
+        _Text(context.l10n.importCatalystAppUnavailableAfterDeadline),
         const Spacer(),
         _Countdown(date: date),
         const SizedBox(height: 10),
@@ -223,3 +217,19 @@ class _RightSide extends StatelessWidget {
     );
   }
 }
+
+class _Text extends StatelessWidget {
+  final String stepsToDoBeforeAppCloses;
+
+  const _Text(this.stepsToDoBeforeAppCloses);
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      stepsToDoBeforeAppCloses,
+      style: context.textTheme.bodyLarge?.copyWith(
+        color: context.colors.textOnPrimaryLevel1,
+      ),
+    );
+  }
+}

catalyst_voices/apps/voices/lib/widgets/text/proposal_submission_closes_text.dart

@@ -18,7 +18,7 @@ class ProposalSubmissionClosesText extends StatelessWidget {
     return TimezoneDateTimeTextTheme(
       data: TimezoneDateTimeTextThemeData(
         timestampTextStyle: WidgetStatePropertyAll<TextStyle>(
-          context.textTheme.titleLarge ?? const TextStyle(),
+          context.textTheme.titleMedium ?? const TextStyle(),
         ),
         foregroundColor: WidgetStatePropertyAll(context.colors.textOnPrimaryLevel1),
       ),

catalyst_voices/packages/internal/catalyst_voices_localization/lib/l10n/intl_en.arb

@@ -2541,7 +2541,7 @@
   "@dontShowAgain": {
     "description": "Action to not show again"
   },
-  "proposalSubmissionWindowClosesAt": "The proposal submission window closes {date}",
+  "proposalSubmissionWindowClosesAt": "The proposal submission window closes on {date}",
   "@proposalSubmissionWindowClosesAt": {
     "description": "Description for the proposal submission window closes at",
     "placeholders": {
@@ -2550,11 +2550,11 @@
       }
     }
   },
-  "submitProposalBeforeClosing": "Submit your final proposals to Review stage well before the App closes.",
-  "@submitProposalBeforeClosing": {
-    "description": "Information for user to submit proposal before the submission window closes"
+  "moveFinalProposalsToReviewStage": "Move your Final proposals into the Review stage.",
+  "@moveFinalProposalsToReviewStage": {
+    "description": "Information for user to to move their final proposals to review stage before submission window closes"
   },
-  "checkMaxProposal": "Check your finals (max {count}) in My proposals.",
+  "checkMaxProposal": "Submit no more than {count} {count, plural, =1{proposal} other{proposals}} as Final.",
   "@checkMaxProposal": {
     "description": "Information for user to check their final proposals before submission window closes",
     "placeholders": {
@@ -2563,10 +2563,6 @@
       }
     }
   },
-  "catalystAppNotAvailableAfterSubmissionCloses": "The Catalyst App won’t be available after submission close.",
-  "@catalystAppNotAvailableAfterSubmissionCloses": {
-    "description": "Information that app won't be available after submission closes"
-  },
   "wantToBackUpProposals": "Want to back up your proposals?",
   "@wantToBackUpProposals": {
     "description": "Title for section informing user that they can backup their proposals"
@@ -3005,5 +3001,13 @@
   "reviewTimelineHeader": "Community review:",
   "@reviewTimelineHeader": {
     "description": "Header for the review timeline"
+  },
+  "stepsToDoBeforeAppCloses": "Before the Catalyst app closes, make sure to:",
+  "@stepsToDoBeforeAppCloses": {
+    "description": "Title for the steps to do before the app closes"
+  },
+  "importCatalystAppUnavailableAfterDeadline": "IMPORTANT: The Catalyst app won’t be accessible after the deadline.",
+  "@importCatalystAppUnavailableAfterDeadline": {
+    "description": "note for user that app will not be available after submission deadline"
   }
 }

catalyst_voices/packages/internal/catalyst_voices_shared/lib/src/utils/string_ext.dart

@@ -20,17 +20,6 @@ extension StringExt on String {
     return toLowerCase() == other?.toLowerCase();
   }
 
-  String replaceAllMappedIndexed(
-    Pattern from,
-    String Function(Match match, int index) replace,
-  ) {
-    var index = 0;
-    return replaceAllMapped(
-      from,
-      (match) => replace(match, index++),
-    );
-  }
-
   // TODO(dtscalac): temporary solution to format dynamic strings as plural,
   // after F14 the document schema must be altered to support
   // other languages than English.
@@ -61,6 +50,17 @@ extension StringExt on String {
     return this;
   }
 
+  String replaceAllMappedIndexed(
+    Pattern from,
+    String Function(Match match, int index) replace,
+  ) {
+    var index = 0;
+    return replaceAllMapped(
+      from,
+      (match) => replace(match, index++),
+    );
+  }
+
   String starred({
     bool leading = true,
     bool isEnabled = true,
@@ -74,6 +74,8 @@ extension StringExt on String {
 
   String withBullet() => withPrefix('• ');
 
+  String withIndent() => '  $this';
+
   String withPrefix(String value) => '$value$this';
 
   String withSuffix(