diff --git a/lib/screens/auth/login.dart b/lib/screens/auth/login.dart index fe7bd74..e5e5567 100644 --- a/lib/screens/auth/login.dart +++ b/lib/screens/auth/login.dart @@ -33,67 +33,67 @@ class _LoginScreenState extends State { @override Widget build(BuildContext context) { - return Container( - constraints: const BoxConstraints(maxWidth: 280), - child: Theme( - data: Theme.of(context).copyWith(canvasColor: Colors.transparent), - child: SingleChildScrollView( - child: PageTransitionSwitcher( - transitionBuilder: ( - Widget child, - Animation primaryAnimation, - Animation secondaryAnimation, - ) { - return SharedAxisTransition( - animation: primaryAnimation, - secondaryAnimation: secondaryAnimation, - transitionType: SharedAxisTransitionType.horizontal, + return Theme( + data: Theme.of(context).copyWith(canvasColor: Colors.transparent), + child: SingleChildScrollView( + child: PageTransitionSwitcher( + transitionBuilder: ( + Widget child, + Animation primaryAnimation, + Animation secondaryAnimation, + ) { + return SharedAxisTransition( + animation: primaryAnimation, + secondaryAnimation: secondaryAnimation, + transitionType: SharedAxisTransitionType.horizontal, + child: Container( + constraints: BoxConstraints(maxWidth: 380), child: child, - ); - }, - child: switch (_period % 3) { - 1 => _LoginPickerScreen( - key: const ValueKey(1), - ticket: _currentTicket, - factors: _factors, - onTicket: (p0) => setState(() { - _currentTicket = p0; - }), - onPickFactor: (p0) => setState(() { - _factorPicked = p0; - }), - onNext: () => setState(() { - _period++; - }), - ), - 2 => _LoginCheckScreen( - key: const ValueKey(2), - ticket: _currentTicket, - factor: _factorPicked, - onTicket: (p0) => setState(() { - _currentTicket = p0; - }), - onNext: () => setState(() { - _period = 1; - }), - ), - _ => _LoginLookupScreen( - key: const ValueKey(0), - ticket: _currentTicket, - onTicket: (p0) => setState(() { - _currentTicket = p0; - }), - onFactor: (p0) => setState(() { - _factors = p0; - }), - onNext: () => setState(() { - _period++; - }), - ), - }, - ).padding(all: 24), - ).center(), - ), + ), + ); + }, + child: switch (_period % 3) { + 1 => _LoginPickerScreen( + key: const ValueKey(1), + ticket: _currentTicket, + factors: _factors, + onTicket: (p0) => setState(() { + _currentTicket = p0; + }), + onPickFactor: (p0) => setState(() { + _factorPicked = p0; + }), + onNext: () => setState(() { + _period++; + }), + ), + 2 => _LoginCheckScreen( + key: const ValueKey(2), + ticket: _currentTicket, + factor: _factorPicked, + onTicket: (p0) => setState(() { + _currentTicket = p0; + }), + onNext: () => setState(() { + _period = 1; + }), + ), + _ => _LoginLookupScreen( + key: const ValueKey(0), + ticket: _currentTicket, + onTicket: (p0) => setState(() { + _currentTicket = p0; + }), + onFactor: (p0) => setState(() { + _factors = p0; + }), + onNext: () => setState(() { + _period++; + }), + ), + }, + ).padding(all: 24), + ).center(), ); } } diff --git a/lib/screens/auth/register.dart b/lib/screens/auth/register.dart index b5d5047..718ee1a 100644 --- a/lib/screens/auth/register.dart +++ b/lib/screens/auth/register.dart @@ -52,109 +52,107 @@ class _RegisterScreenState extends State { @override Widget build(BuildContext context) { - return Container( - constraints: const BoxConstraints(maxWidth: 280), - child: StyledWidget( - SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Align( - alignment: Alignment.centerLeft, - child: CircleAvatar( - radius: 26, - child: const Icon( - Symbols.person_add, - size: 28, - ), - ).padding(bottom: 8), + return StyledWidget(Container( + constraints: const BoxConstraints(maxWidth: 380), + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Align( + alignment: Alignment.centerLeft, + child: CircleAvatar( + radius: 26, + child: const Icon( + Symbols.person_add, + size: 28, + ), + ).padding(bottom: 8), + ), + Text( + 'screenAuthRegister', + style: const TextStyle( + fontSize: 28, + fontWeight: FontWeight.w900, ), - Text( - 'screenAuthRegister', - style: const TextStyle( - fontSize: 28, - fontWeight: FontWeight.w900, + ).tr().padding(left: 4, bottom: 16), + Column( + children: [ + TextField( + autocorrect: false, + enableSuggestions: false, + controller: _usernameController, + autofillHints: const [AutofillHints.username], + decoration: InputDecoration( + isDense: true, + border: const UnderlineInputBorder(), + labelText: 'fieldUsername'.tr(), + ), + onTapOutside: (_) => + FocusManager.instance.primaryFocus?.unfocus(), ), - ).tr().padding(left: 4, bottom: 16), - Column( - children: [ - TextField( - autocorrect: false, - enableSuggestions: false, - controller: _usernameController, - autofillHints: const [AutofillHints.username], - decoration: InputDecoration( - isDense: true, - border: const UnderlineInputBorder(), - labelText: 'fieldUsername'.tr(), - ), - onTapOutside: (_) => - FocusManager.instance.primaryFocus?.unfocus(), - ), - const Gap(12), - TextField( - autocorrect: false, - enableSuggestions: false, - controller: _nicknameController, - autofillHints: const [AutofillHints.nickname], - decoration: InputDecoration( - isDense: true, - border: const UnderlineInputBorder(), - labelText: 'fieldNickname'.tr(), - ), - onTapOutside: (_) => - FocusManager.instance.primaryFocus?.unfocus(), - ), - const Gap(12), - TextField( - autocorrect: false, - enableSuggestions: false, - controller: _emailController, - autofillHints: const [AutofillHints.email], - decoration: InputDecoration( - isDense: true, - border: const UnderlineInputBorder(), - labelText: 'fieldEmail'.tr(), - ), - onTapOutside: (_) => - FocusManager.instance.primaryFocus?.unfocus(), - ), - const Gap(12), - TextField( - obscureText: true, - autocorrect: false, - enableSuggestions: false, - autofillHints: const [AutofillHints.password], - controller: _passwordController, - decoration: InputDecoration( - isDense: true, - border: const UnderlineInputBorder(), - labelText: 'fieldPassword'.tr(), - ), - onTapOutside: (_) => - FocusManager.instance.primaryFocus?.unfocus(), - onSubmitted: (_) => _performAction(context), - ), - ], - ).padding(horizontal: 7), - const Gap(16), - Align( - alignment: Alignment.centerRight, - child: TextButton( - onPressed: () => _performAction(context), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text('next').tr(), - const Icon(Symbols.chevron_right), - ], + const Gap(12), + TextField( + autocorrect: false, + enableSuggestions: false, + controller: _nicknameController, + autofillHints: const [AutofillHints.nickname], + decoration: InputDecoration( + isDense: true, + border: const UnderlineInputBorder(), + labelText: 'fieldNickname'.tr(), ), + onTapOutside: (_) => + FocusManager.instance.primaryFocus?.unfocus(), ), - ) - ], - ), + const Gap(12), + TextField( + autocorrect: false, + enableSuggestions: false, + controller: _emailController, + autofillHints: const [AutofillHints.email], + decoration: InputDecoration( + isDense: true, + border: const UnderlineInputBorder(), + labelText: 'fieldEmail'.tr(), + ), + onTapOutside: (_) => + FocusManager.instance.primaryFocus?.unfocus(), + ), + const Gap(12), + TextField( + obscureText: true, + autocorrect: false, + enableSuggestions: false, + autofillHints: const [AutofillHints.password], + controller: _passwordController, + decoration: InputDecoration( + isDense: true, + border: const UnderlineInputBorder(), + labelText: 'fieldPassword'.tr(), + ), + onTapOutside: (_) => + FocusManager.instance.primaryFocus?.unfocus(), + onSubmitted: (_) => _performAction(context), + ), + ], + ).padding(horizontal: 7), + const Gap(16), + Align( + alignment: Alignment.centerRight, + child: TextButton( + onPressed: () => _performAction(context), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text('next').tr(), + const Icon(Symbols.chevron_right), + ], + ), + ), + ) + ], ), - ).padding(all: 24).center(), - ); + ), + )).padding(all: 24).center(); } }