Merge PR #830.

lib/oath/views/add_account_page.dart

@@ -261,23 +261,28 @@ class _OathAddAccountPageState extends ConsumerState<OathAddAccountPage> {
     }
 
     final period = int.tryParse(_periodController.text) ?? -1;
+    final issuerText = _issuerController.text.trim();
+    final nameText = _accountController.text.trim();
     final remaining = getRemainingKeySpace(
       oathType: _oathType,
       period: period,
-      issuer: _issuerController.text.trim(),
+      issuer: issuerText,
-      name: _accountController.text.trim(),
+      name: nameText,
     );
     final issuerRemaining = remaining.first;
     final nameRemaining = remaining.second;
 
+    final issuerMaxLength = max(issuerRemaining, 1);
+    final nameMaxLength = max(nameRemaining, 1);
+
     final secret = _secretController.text.replaceAll(' ', '');
     final secretLengthValid = secret.length * 5 % 8 < 5;
 
     // is this credentials name/issuer pair different from all other?
     final isUnique = _credentials
             ?.where((element) =>
-                element.name == _accountController.text.trim() &&
+                element.name == nameText &&
-                (element.issuer ?? '') == _issuerController.text.trim())
+                (element.issuer ?? '') == issuerText)
             .isEmpty ??
         true;
     final issuerNoColon = !_issuerController.text.contains(':');
@@ -285,7 +290,7 @@ class _OathAddAccountPageState extends ConsumerState<OathAddAccountPage> {
     final isLocked = oathState?.locked ?? false;
 
     final isValid = !isLocked &&
-        _accountController.text.trim().isNotEmpty &&
+        nameText.isNotEmpty &&
         secret.isNotEmpty &&
         isUnique &&
         issuerNoColon &&
@@ -311,11 +316,9 @@ class _OathAddAccountPageState extends ConsumerState<OathAddAccountPage> {
 
     void submit() async {
       if (secretLengthValid) {
-        final issuer = _issuerController.text.trim();
-
         final cred = CredentialData(
-          issuer: issuer.isEmpty ? null : issuer,
+          issuer: issuerText.isEmpty ? null : issuerText,
-          name: _accountController.text.trim(),
+          name: nameText,
           secret: secret,
           oathType: _oathType,
           hashAlgorithm: _hashAlgorithm,
@@ -389,12 +392,11 @@ class _OathAddAccountPageState extends ConsumerState<OathAddAccountPage> {
                       controller: _issuerController,
                       autofocus: widget.credentialData == null,
                       enabled: issuerRemaining > 0,
-                      maxLength: max(issuerRemaining, 1),
+                      maxLength: issuerMaxLength,
                       inputFormatters: [
                         limitBytesLength(issuerRemaining),
                       ],
-                      buildCounter:
+                      buildCounter: buildByteCounterFor(issuerText),
-                          buildByteCounterFor(_issuerController.text.trim()),
                       decoration: InputDecoration(
                         border: const OutlineInputBorder(),
                         labelText:
@@ -402,7 +404,9 @@ class _OathAddAccountPageState extends ConsumerState<OathAddAccountPage> {
                         helperText:
                             '', // Prevents dialog resizing when disabled
                         prefixIcon: const Icon(Icons.business_outlined),
-                        errorText: issuerNoColon
+                        errorText: (byteLength(issuerText) > issuerMaxLength)
+                            ? '' // needs empty string to render as error
+                            : issuerNoColon
                                 ? null
                                 : AppLocalizations.of(context)!
                                     .oath_invalid_character_issuer,
@@ -420,9 +424,8 @@ class _OathAddAccountPageState extends ConsumerState<OathAddAccountPage> {
                     TextField(
                       key: keys.nameField,
                       controller: _accountController,
-                      maxLength: max(nameRemaining, 1),
+                      maxLength: nameMaxLength,
-                      buildCounter:
+                      buildCounter: buildByteCounterFor(nameText),
-                          buildByteCounterFor(_accountController.text.trim()),
                       inputFormatters: [limitBytesLength(nameRemaining)],
                       decoration: InputDecoration(
                         border: const OutlineInputBorder(),
@@ -431,9 +434,12 @@ class _OathAddAccountPageState extends ConsumerState<OathAddAccountPage> {
                             AppLocalizations.of(context)!.oath_account_name,
                         helperText:
                             '', // Prevents dialog resizing when disabled
-                        errorText: isUnique
+                        errorText: (byteLength(nameText) > nameMaxLength)
+                            ? '' // needs empty string to render as error
+                            : isUnique
                                 ? null
-                            : AppLocalizations.of(context)!.oath_duplicate_name,
+                                : AppLocalizations.of(context)!
+                                    .oath_duplicate_name,
                       ),
                       textInputAction: TextInputAction.next,
                       onChanged: (value) {

lib/widgets/utf8_utils.dart

@@ -28,10 +28,18 @@ int byteLength(String value) => utf8.encode(value).length;
 /// used rather than number of characters. [currentValue] should always match
 /// the input text value to measure.
 InputCounterWidgetBuilder buildByteCounterFor(String currentValue) =>
-    (context, {required currentLength, required isFocused, maxLength}) => Text(
+    (context, {required currentLength, required isFocused, maxLength}) {
+      final theme = Theme.of(context);
+      final caption = theme.textTheme.caption;
+      final style = (byteLength(currentValue) <= (maxLength ?? 0))
+          ? caption
+          : caption?.copyWith(color: theme.errorColor);
+      return Text(
         maxLength != null ? '${byteLength(currentValue)}/$maxLength' : '',
-          style: Theme.of(context).textTheme.caption,
+        style: style,
+        semanticsLabel: 'Character count',
       );
+    };
 
 /// Limits the input in length based on the byte length when encoded.
 /// This is generally used together with [buildByteCounterFor].