This commit is contained in:
zhutao
2025-08-29 11:41:00 +08:00
parent fafb6c010a
commit ec7848ad57
2 changed files with 69 additions and 72 deletions

View File

@@ -207,83 +207,79 @@ class _LoginPageState extends State<LoginPage> {
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
body: SafeArea( body: SafeArea(
child: Stack( child: Container(
alignment: Alignment.center, width: double.infinity,
children: [ padding: EdgeInsets.only(
Container( top: 0.07.sh,
width: double.infinity, left: 20,
padding: EdgeInsets.only( right: 20,
top: 0.07.sh, ),
left: 20, child: Column(
right: 20, children: [
LogoBox(),
PageHeader(),
InputBox(
hintText: "Email",
controller: _emailController,
), ),
child: Column( SizedBox(height: 15),
children: [ InputBox(
LogoBox(), obscureText: _hidePassword,
PageHeader(), hintText: "Password",
InputBox( controller: _passwordController,
hintText: "Email", suffix: InkWell(
controller: _emailController, onTap: () {
setState(() {
_hidePassword = !_hidePassword;
});
},
child: Icon(
_hidePassword ? RemixIcons.eye_off_fill : RemixIcons.eye_fill,
size: 20,
color: Theme.of(context).colorScheme.onSurfaceVariant,
), ),
SizedBox(height: 15), ),
InputBox(
obscureText: _hidePassword,
hintText: "Password",
controller: _passwordController,
suffix: InkWell(
onTap: () {
setState(() {
_hidePassword = !_hidePassword;
});
},
child: Icon(
_hidePassword ? RemixIcons.eye_off_fill : RemixIcons.eye_fill,
size: 20,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
),
Container(
margin: EdgeInsets.only(top: 20),
height: 45,
child: CustomButton(
loading: _subLoading,
round: false,
onPressed: _handSubmit,
child: Text("Continue"),
),
),
LoginDivider(),
OtherButton(
title: "Continue with Google",
icon: "assets/image/google.png",
onTap: () {
_handleGoogleSignIn();
},
),
SizedBox(height: 15),
OtherButton(
title: "Continue with Apple",
icon: "assets/image/apple.png",
onTap: () {
_handAppleSignIn();
},
),
],
), ),
), Container(
Positioned( margin: EdgeInsets.only(top: 20),
bottom: 20, height: 45,
child: AgreementBox( child: CustomButton(
checked: _agree, loading: _subLoading,
onChanged: (value) { round: false,
setState(() { onPressed: _handSubmit,
_agree = value; child: Text("Continue"),
}); ),
),
LoginDivider(),
OtherButton(
title: "Continue with Google",
icon: "assets/image/google.png",
onTap: () {
_handleGoogleSignIn();
}, },
), ),
), SizedBox(height: 15),
], OtherButton(
title: "Continue with Apple",
icon: "assets/image/apple.png",
onTap: () {
_handAppleSignIn();
},
),
Container(
margin: EdgeInsets.only(top: 20),
width: double.infinity,
child: AgreementBox(
checked: _agree,
onChanged: (value) {
setState(() {
_agree = value;
});
},
),
),
],
),
), ),
), ),
), ),

View File

@@ -17,6 +17,7 @@ class AgreementBox extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SizedBox( SizedBox(
width: 25, width: 25,