Merge pull request 'dev' (#3) from dev into main

Reviewed-on: #3
This commit is contained in:
bala 2025-11-19 20:33:38 +00:00
commit d0e1a67284
2 changed files with 59 additions and 55 deletions

View File

@ -70,6 +70,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
), ),
child: Center( child: Center(
child: SingleChildScrollView( child: SingleChildScrollView(
physics: const BouncingScrollPhysics(),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [

View File

@ -47,6 +47,7 @@ class _Turn14ScreenState extends ConsumerState<Turn14Screen> {
), ),
SingleChildScrollView( SingleChildScrollView(
physics: const BouncingScrollPhysics(),
padding: EdgeInsets.fromLTRB(16, topPadding + 55, 16, 20), padding: EdgeInsets.fromLTRB(16, topPadding + 55, 16, 20),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -163,62 +164,64 @@ class _Turn14ScreenState extends ConsumerState<Turn14Screen> {
); );
} }
Widget _inputField({required String label, required TextEditingController controller}) { Widget _inputField({
return Column( required String label,
crossAxisAlignment: CrossAxisAlignment.start, required TextEditingController controller,
children: [ }) {
Text(label, style: const TextStyle(fontWeight: FontWeight.w600)), return Column(
const SizedBox(height: 8), crossAxisAlignment: CrossAxisAlignment.start,
TextField( children: [
controller: controller, Text(label, style: const TextStyle(fontWeight: FontWeight.w600)),
decoration: InputDecoration( const SizedBox(height: 8),
filled: true, TextField(
fillColor: const Color(0xFFF0F6FF), controller: controller,
border: OutlineInputBorder( decoration: InputDecoration(
borderRadius: BorderRadius.circular(10), filled: true,
borderSide: BorderSide.none, 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 _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),
),
),
),
],
);
},
);
}
} }