Skip to content

auth: keep OTP code readable with larger text scales #9405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lnilluv wants to merge 1 commit into
base: main
Choose a base branch
from
+112 −30
Open

auth: keep OTP code readable with larger text scales #9405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 59 additions & 30 deletions mobile/apps/auth/lib/ui/code_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import 'package:ente_auth/store/code_display_store.dart';
import 'package:ente_auth/store/code_store.dart';
import 'package:ente_auth/theme/ente_theme.dart';
import 'package:ente_auth/ui/code_timer_progress.dart';
import 'package:ente_auth/ui/code_widget_layout_utils.dart';
import 'package:ente_auth/ui/components/auth_qr_dialog.dart';
import 'package:ente_auth/ui/components/note_dialog.dart';
import 'package:ente_auth/ui/home/shortcuts.dart';
Expand Down Expand Up @@ -337,7 +338,8 @@ class _CodeWidgetState extends State<CodeWidget> {
);
}

return Container(
final bool isIOS = !kIsWeb && Platform.isIOS;
final Widget content = Container(
margin: widget.isCompactMode
? const EdgeInsets.only(left: 16, right: 16, bottom: 6, top: 6)
: const EdgeInsets.only(left: 16, right: 16, bottom: 8, top: 8),
Expand Down Expand Up @@ -368,34 +370,56 @@ class _CodeWidgetState extends State<CodeWidget> {
},
),
);
if (!isIOS) return content;
final double scale =
MediaQuery.textScalerOf(context).scale(1.0).clamp(1.0, 2.0);
return MediaQuery(
data:
MediaQuery.of(context).copyWith(textScaler: TextScaler.linear(scale)),
child: content,
);
}

Widget _getBottomRow(AppLocalizations l10n) {
return Container(
padding: const EdgeInsets.only(left: 16, right: 16),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: ValueListenableBuilder<String>(
valueListenable: _currentCode,
builder: (context, value, child) {
return Material(
type: MaterialType.transparency,
child: AutoSizeText(
_getFormattedCode(value),
style: TextStyle(fontSize: widget.isCompactMode ? 14 : 24),
maxLines: 1,
textDirection: TextDirection.ltr,
),
);
},
),
),
const SizedBox(width: 8),
widget.code.type.isTOTPCompatible
? IgnorePointer(
final textScaleFactor = MediaQuery.textScalerOf(context).scale(1.0);
final isIOS = !kIsWeb && Platform.isIOS;
return LayoutBuilder(
builder: (context, constraints) {
final showNextTotp = widget.code.type.isTOTPCompatible &&
shouldShowNextTotpCode(
isIOS: isIOS,
availableWidth: constraints.maxWidth,
textScaleFactor: textScaleFactor,
isCompactMode: widget.isCompactMode,
);
return Container(
padding: const EdgeInsets.only(left: 16, right: 16),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: ValueListenableBuilder<String>(
valueListenable: _currentCode,
builder: (context, value, child) {
return Material(
type: MaterialType.transparency,
child: AutoSizeText(
_getFormattedCode(value),
style: TextStyle(
fontSize: widget.isCompactMode ? 14 : 24,
),
maxLines: 1,
minFontSize: widget.isCompactMode ? 12 : 16,
textDirection: TextDirection.ltr,
),
);
},
),
),
if (showNextTotp) ...[
const SizedBox(width: 8),
IgnorePointer(
ignoring:
CodeDisplayStore.instance.isSelectionModeActive.value,
child: GestureDetector(
Expand Down Expand Up @@ -428,8 +452,10 @@ class _CodeWidgetState extends State<CodeWidget> {
],
),
),
)
: IgnorePointer(
),
] else if (!widget.code.type.isTOTPCompatible) ...[
const SizedBox(width: 8),
IgnorePointer(
ignoring:
CodeDisplayStore.instance.isSelectionModeActive.value,
child: Column(
Expand All @@ -450,8 +476,11 @@ class _CodeWidgetState extends State<CodeWidget> {
],
),
),
],
),
],
],
),
);
},
);
}

Expand Down
14 changes: 14 additions & 0 deletions mobile/apps/auth/lib/ui/code_widget_layout_utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
bool shouldShowNextTotpCode({
required bool isIOS,
required double availableWidth,
required double textScaleFactor,
required bool isCompactMode,
}) {
if (isIOS) return true;

final double minWidth = isCompactMode ? 230 : 320;
final double scaleAdjustedMinWidth = textScaleFactor >= 1.2
? minWidth + (textScaleFactor - 1.2) * 140
: minWidth;
return availableWidth >= scaleAdjustedMinWidth;
}
39 changes: 39 additions & 0 deletions mobile/apps/auth/test/ui/code_widget_layout_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import 'package:ente_auth/ui/code_widget_layout_utils.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
group('shouldShowNextTotpCode', () {
test('returns false for constrained width and large text scale', () {
final value = shouldShowNextTotpCode(
isIOS: false,
availableWidth: 260,
textScaleFactor: 1.4,
isCompactMode: false,
);

expect(value, isFalse);
});

test('returns true for comfortable width', () {
final value = shouldShowNextTotpCode(
isIOS: false,
availableWidth: 420,
textScaleFactor: 1.0,
isCompactMode: false,
);

expect(value, isTrue);
});

test('returns true on iOS regardless of width', () {
final value = shouldShowNextTotpCode(
isIOS: true,
availableWidth: 260,
textScaleFactor: 3.12,
isCompactMode: false,
);

expect(value, isTrue);
});
});
}