poll [nfc]: Move vote count paddings inside children of Row

It makes it easier to adjust the size of the vote count box touch
target later.

This preserves the visuals. In particular, we add bottom paddings
to both the vote count box and the option/voters text to ensure
that there is always 5px between option rows, as it was before.

The end padding is equivalent to the spacing previously specified on
the Row; the bottom padding is equivalent to the padding specified on
the outer (now removed) Padding.  The ConstrainedBox is expanded
because it now also contains the paddings.

Signed-off-by: Zixuan James Li <[email protected]>

Author: PIG208

lib/widgets/poll.dart

@@ -68,15 +68,15 @@ class _PollWidgetState extends State<PollWidget> {
           store.users[userId]?.fullName ?? zulipLocalizations.unknownUserName)
         .join(', ');
 
-      return Padding(
-        padding: const EdgeInsets.only(bottom: 5),
-        child: Row(
-          spacing: 5,
-          crossAxisAlignment: CrossAxisAlignment.baseline,
-          textBaseline: localizedTextBaseline(context),
-          children: [
-            ConstrainedBox(
-              constraints: const BoxConstraints(minWidth: 25, minHeight: 25),
+      return Row(
+        crossAxisAlignment: CrossAxisAlignment.baseline,
+        textBaseline: localizedTextBaseline(context),
+        children: [
+          ConstrainedBox(
+            constraints: const BoxConstraints(
+              minWidth: 25 + 5, minHeight: 25 + 5),
+            child: Padding(
+              padding: const EdgeInsetsDirectional.only(bottom: 5, end: 5),
               child: Container(
                 // Inner padding preserves whitespace even when the text's
                 // width approaches the button's min-width (e.g. because
@@ -89,26 +89,35 @@ class _PollWidgetState extends State<PollWidget> {
                 child: Center(
                   child: Text(option.voters.length.toString(),
                     style: textStyleBold.copyWith(
-                      color: theme.colorPollVoteCountText, fontSize: 13))))),
-            Expanded(
+                      color: theme.colorPollVoteCountText, fontSize: 13)))))),
+          Expanded(
+            child: Padding(
+              // This and the bottom padding on the vote count box both extend
+              // the row by the same extent. This ensures that there still will
+              // be consistent spacing between rows when the text takes more
+              // vertical space than the vote count box.
+              padding: const EdgeInsets.only(bottom: 5),
               child: Wrap(
                 spacing: 5,
                 children: [
                   Text(option.text, style: textStyleBold.copyWith(fontSize: 16)),
                   if (option.voters.isNotEmpty)
                     // TODO(i18n): Localize parenthesis characters.
                     Text('($voterNames)', style: textStyleVoterNames),
-                ])),
-          ]));
+                ]))),
+        ]);
     }
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Padding(padding: const EdgeInsets.only(bottom: 6), child: question),
         if (widget.poll.options.isEmpty)
-          Text(zulipLocalizations.pollWidgetOptionsMissing,
-            style: textStyleVoterNames.copyWith(fontStyle: FontStyle.italic)),
+          Padding(
+            // This is consistent with the option rows' bottom padding.
+            padding: const EdgeInsets.only(bottom: 5),
+            child: Text(zulipLocalizations.pollWidgetOptionsMissing,
+              style: textStyleVoterNames.copyWith(fontStyle: FontStyle.italic))),
         for (final option in widget.poll.options)
           buildOptionItem(option),
       ]);