diff --git a/lib/presentation/screens/auth/login_screen.dart b/lib/presentation/screens/auth/login_screen.dart index 0418cbc..e64e54f 100644 --- a/lib/presentation/screens/auth/login_screen.dart +++ b/lib/presentation/screens/auth/login_screen.dart @@ -70,6 +70,7 @@ class _LoginScreenState extends ConsumerState { ), child: Center( child: SingleChildScrollView( + physics: const BouncingScrollPhysics(), child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/presentation/screens/turn14_screen/turn14_screen.dart b/lib/presentation/screens/turn14_screen/turn14_screen.dart index 5713c36..5c3fc9f 100644 --- a/lib/presentation/screens/turn14_screen/turn14_screen.dart +++ b/lib/presentation/screens/turn14_screen/turn14_screen.dart @@ -47,6 +47,7 @@ class _Turn14ScreenState extends ConsumerState { ), SingleChildScrollView( + physics: const BouncingScrollPhysics(), padding: EdgeInsets.fromLTRB(16, topPadding + 55, 16, 20), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -163,62 +164,64 @@ class _Turn14ScreenState extends ConsumerState { ); } - Widget _inputField({required String label, required TextEditingController controller}) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(label, style: const TextStyle(fontWeight: FontWeight.w600)), - const SizedBox(height: 8), - TextField( - controller: controller, - decoration: InputDecoration( - filled: true, - fillColor: const Color(0xFFF0F6FF), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(10), - borderSide: BorderSide.none, - ), - ), - ), - ], - ); -} - -Widget _passwordField({ - required String label, - required TextEditingController controller, -}) { - bool _obscure = true; - - return StatefulBuilder( - builder: (context, setStateSB) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(label, style: const TextStyle(fontWeight: FontWeight.w600)), - const SizedBox(height: 8), - TextField( - controller: controller, - obscureText: _obscure, - decoration: InputDecoration( - filled: true, - fillColor: const Color(0xFFF0F6FF), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(10), - borderSide: BorderSide.none, - ), - suffixIcon: IconButton( - icon: Icon( - _obscure ? Icons.visibility_off : Icons.visibility, - ), - onPressed: () => setStateSB(() => _obscure = !_obscure), - ), + Widget _inputField({ + required String label, + required TextEditingController controller, + }) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, style: const TextStyle(fontWeight: FontWeight.w600)), + const SizedBox(height: 8), + TextField( + controller: controller, + decoration: InputDecoration( + filled: true, + fillColor: const Color(0xFFF0F6FF), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(10), + borderSide: BorderSide.none, ), ), - ], - ); - }, - ); -} + ), + ], + ); + } + Widget _passwordField({ + required String label, + required TextEditingController controller, + }) { + bool _obscure = true; + + return StatefulBuilder( + builder: (context, setStateSB) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, style: const TextStyle(fontWeight: FontWeight.w600)), + const SizedBox(height: 8), + TextField( + controller: controller, + obscureText: _obscure, + decoration: InputDecoration( + filled: true, + fillColor: const Color(0xFFF0F6FF), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(10), + borderSide: BorderSide.none, + ), + suffixIcon: IconButton( + icon: Icon( + _obscure ? Icons.visibility_off : Icons.visibility, + ), + onPressed: () => setStateSB(() => _obscure = !_obscure), + ), + ), + ), + ], + ); + }, + ); + } }