balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

login screen temp fix

Browse Source
This commit is contained in:
Kima 2024-05-02 21:55:06 +02:00
parent b9b43fe961
commit ae17e9f8b7
1 changed files with 274 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

524
refilc_mobile_ui/lib/screens/login/login_screen.dart
View File

@ -122,7 +122,7 @@ class LoginScreenState extends State<LoginScreen> {
type: MaterialType.transparency, type: MaterialType.transparency,
child: showBack child: showBack
? BackButton( ? BackButton(
color: AppColors.of(context).loginPrimary) color: AppColors.of(context).text)
: const SizedBox(height: 48.0), : const SizedBox(height: 48.0),
), ),
], ],
@ -130,280 +130,284 @@ class LoginScreenState extends State<LoginScreen> {
Stack( Stack(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
children: [ children: [
// Column(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// const SizedBox(height: 21),
// CarouselSlider(
// options: CarouselOptions(
// height: MediaQuery.of(context).size.height,
// viewportFraction: 1,
// autoPlay: true,
// autoPlayInterval: const Duration(seconds: 6),
// pauseAutoPlayOnTouch: true),
// items: [1, 2, 3, 4].map((i) {
// return Builder(
// builder: (BuildContext context) {
// return Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
// mainAxisAlignment:
// MainAxisAlignment.start,
// children: [
// Padding(
// padding:
// const EdgeInsets.only(left: 24),
// child: Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
// mainAxisAlignment:
// MainAxisAlignment.start,
// children: [
// Text(
// "welcome_title_$i".i18n,
// style: const TextStyle(
// color: Color(0xFF050B15),
// fontSize: 19,
// fontFamily: 'Montserrat',
// fontWeight:
// FontWeight.w700,
// height: 1.3),
// ),
// const SizedBox(
// height: 14.375), //meth
// Padding(
// padding:
// const EdgeInsets.only(
// right: 20),
// child: Text(
// "welcome_text_$i".i18n,
// style: const TextStyle(
// color:
// Color(0xFF050B15),
// fontFamily: 'FigTree',
// fontWeight:
// FontWeight.w500,
// fontSize: 17,
// height: 1.3),
// ),
// ),
// ],
// )),
// const SizedBox(height: 15.625),
// Padding(
// padding: const EdgeInsets.only(
// left: 16, right: 16),
// child: Image.asset(
// 'assets/images/showcase$i.png'))
// ],
// );
// },
// );
// }).toList(),
// ),
// ],
// ),
// Container(
// height: 250,
// width: double.infinity,
// decoration: const BoxDecoration(
// gradient: LinearGradient(
// colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)],
// stops: [0, 0.1],
// begin: Alignment.topCenter,
// end: Alignment.bottomCenter,
// ),
// ),
// child: Padding(
// padding: const EdgeInsets.only(top: 3),
// child: Column(
// children: [
// SizedBox(
// height: 48,
// width: double.infinity,
// child: Padding(
// padding: const EdgeInsets.symmetric(
// horizontal: 16),
// child: FilledButton(
// style: ButtonStyle(
// shape: MaterialStateProperty.all<
// RoundedRectangleBorder>(
// const RoundedRectangleBorder(
// borderRadius: BorderRadius.all(
// Radius.circular(12)),
// ))),
// onPressed: () {},
// child: Text(
// "login".i18n,
// style: const TextStyle(
// fontFamily: 'Montserrat',
// fontSize: 20,
// fontWeight: FontWeight.w700),
// )),
// ),
// ),
// const SizedBox(height: 8),
// ],
// ),
// ),
// )
//
//
// TODO: OLD LOGIN FROM HERE
Column( Column(
mainAxisAlignment: MainAxisAlignment.center, //login buttons and ui starts here
crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
const SizedBox(height: 21),
CarouselSlider(
options: CarouselOptions(
height: MediaQuery.of(context).size.height,
viewportFraction: 1,
autoPlay: true,
autoPlayInterval: const Duration(seconds: 6),
pauseAutoPlayOnTouch: true),
items: [1, 2, 3, 4].map((i) {
return Builder(
builder: (BuildContext context) {
return Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
Padding(
padding:
const EdgeInsets.only(left: 24),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
Text(
"welcome_title_$i".i18n,
style: const TextStyle(
color: Color(0xFF050B15),
fontSize: 19,
fontFamily: 'Montserrat',
fontWeight:
FontWeight.w700,
height: 1.3),
),
const SizedBox(
height: 14.375), //meth
Padding(
padding:
const EdgeInsets.only(
right: 20),
child: Text(
"welcome_text_$i".i18n,
style: const TextStyle(
color:
Color(0xFF050B15),
fontFamily: 'FigTree',
fontWeight:
FontWeight.w500,
fontSize: 17,
height: 1.3),
),
),
],
)),
const SizedBox(height: 15.625),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 16, right: 16), left: 22.0,
child: Image.asset( right: 22.0,
'assets/images/showcase$i.png')) top: 0.0,
],
);
},
);
}).toList(),
), ),
], child: AutofillGroup(
),
Container(
height: 250,
width: double.infinity,
decoration: const BoxDecoration(
gradient: LinearGradient(
colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)],
stops: [0, 0.1],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
),
),
child: Padding(
padding: const EdgeInsets.only(top: 3),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
SizedBox( // username
height: 48, Padding(
width: double.infinity, padding:
child: Padding( const EdgeInsets.only(bottom: 6.0),
padding: const EdgeInsets.symmetric( child: Row(
horizontal: 16), mainAxisAlignment:
child: FilledButton( MainAxisAlignment.spaceBetween,
style: ButtonStyle( children: [
shape: MaterialStateProperty.all< Expanded(
RoundedRectangleBorder>(
const RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Radius.circular(12)),
))),
onPressed: () {},
child: Text( child: Text(
"login".i18n, "username".i18n,
style: const TextStyle( maxLines: 1,
fontFamily: 'Montserrat', style: TextStyle(
fontSize: 20, color: AppColors.of(context)
fontWeight: FontWeight.w700), .loginPrimary,
)), fontWeight: FontWeight.w500,
fontSize: 12.0,
),
),
),
Expanded(
child: Text(
"usernameHint".i18n,
maxLines: 1,
textAlign: TextAlign.right,
style: TextStyle(
color: AppColors.of(context)
.loginSecondary,
fontWeight: FontWeight.w500,
fontSize: 12.0,
),
), ),
), ),
const SizedBox(height: 8),
], ],
), ),
), ),
) Padding(
// Column( padding:
// //login buttons and ui starts here const EdgeInsets.only(bottom: 12.0),
// mainAxisAlignment: MainAxisAlignment.end, child: LoginInput(
// crossAxisAlignment: CrossAxisAlignment.end, style: LoginInputStyle.username,
// children: [ controller: usernameController,
// Padding( ),
// padding: const EdgeInsets.only( ),
// left: 22.0,
// right: 22.0,
// top: 0.0,
// ),
// child: AutofillGroup(
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.end,
// children: [
// // username
// Padding(
// padding:
// const EdgeInsets.only(bottom: 6.0),
// child: Row(
// mainAxisAlignment:
// MainAxisAlignment.spaceBetween,
// children: [
// Expanded(
// child: Text(
// "username".i18n,
// maxLines: 1,
// style: TextStyle(
// color: AppColors.of(context)
// .loginPrimary,
// fontWeight: FontWeight.w500,
// fontSize: 12.0,
// ),
// ),
// ),
// Expanded(
// child: Text(
// "usernameHint".i18n,
// maxLines: 1,
// textAlign: TextAlign.right,
// style: TextStyle(
// color: AppColors.of(context)
// .loginSecondary,
// fontWeight: FontWeight.w500,
// fontSize: 12.0,
// ),
// ),
// ),
// ],
// ),
// ),
// Padding(
// padding:
// const EdgeInsets.only(bottom: 12.0),
// child: LoginInput(
// style: LoginInputStyle.username,
// controller: usernameController,
// ),
// ),
// // password // password
// Padding( Padding(
// padding: padding:
// const EdgeInsets.only(bottom: 6.0), const EdgeInsets.only(bottom: 6.0),
// child: Row( child: Row(
// mainAxisAlignment: mainAxisAlignment:
// MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
// children: [ children: [
// Expanded( Expanded(
// child: Text( child: Text(
// "password".i18n, "password".i18n,
// maxLines: 1, maxLines: 1,
// style: TextStyle( style: TextStyle(
// color: AppColors.of(context) color: AppColors.of(context)
// .loginPrimary, .loginPrimary,
// fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
// fontSize: 12.0, fontSize: 12.0,
// ), ),
// ), ),
// ), ),
// Expanded( Expanded(
// child: Text( child: Text(
// "passwordHint".i18n, "passwordHint".i18n,
// maxLines: 1, maxLines: 1,
// textAlign: TextAlign.right, textAlign: TextAlign.right,
// style: TextStyle( style: TextStyle(
// color: AppColors.of(context) color: AppColors.of(context)
// .loginSecondary, .loginSecondary,
// fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
// fontSize: 12.0, fontSize: 12.0,
// ), ),
// ), ),
// ), ),
// ], ],
// ), ),
// ), ),
// Padding( Padding(
// padding: padding:
// const EdgeInsets.only(bottom: 12.0), const EdgeInsets.only(bottom: 12.0),
// child: LoginInput( child: LoginInput(
// style: LoginInputStyle.password, style: LoginInputStyle.password,
// controller: passwordController, controller: passwordController,
// ), ),
// ), ),
// // school // school
// Padding( Padding(
// padding: padding:
// const EdgeInsets.only(bottom: 6.0), const EdgeInsets.only(bottom: 6.0),
// child: Text( child: Text(
// "school".i18n, "school".i18n,
// maxLines: 1, maxLines: 1,
// style: TextStyle( style: TextStyle(
// color: AppColors.of(context) color: AppColors.of(context)
// .loginPrimary, .loginPrimary,
// fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
// fontSize: 12.0, fontSize: 12.0,
// ), ),
// ), ),
// ), ),
// SchoolInput( SchoolInput(
// scroll: _scrollController, scroll: _scrollController,
// controller: schoolController, controller: schoolController,
// ), ),
// ], ],
// ), ),
// ), ),
// ), ),
// Padding( Padding(
// padding: const EdgeInsets.only( padding: const EdgeInsets.only(
// top: 35.0, top: 35.0,
// left: 22.0, left: 22.0,
// right: 22.0, right: 22.0,
// ), ),
// child: Visibility( child: Visibility(
// visible: _loginState != LoginState.inProgress, visible: _loginState != LoginState.inProgress,
// replacement: const Padding( replacement: const Padding(
// padding: EdgeInsets.symmetric(vertical: 6.0), padding: EdgeInsets.symmetric(vertical: 6.0),
// child: CircularProgressIndicator( child: CircularProgressIndicator(
// valueColor: AlwaysStoppedAnimation<Color>( valueColor: AlwaysStoppedAnimation<Color>(
// Colors.white), Colors.white),
// ), ),
// ), ),
// child: LoginButton( child: LoginButton(
// child: Text("login".i18n, child: Text("login".i18n,
// maxLines: 1, maxLines: 1,
// style: const TextStyle( style: const TextStyle(
// fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
// fontSize: 20.0, fontSize: 20.0,
// )), )),
// onPressed: () => _loginAPI(context: context), onPressed: () => _loginAPI(context: context),
// ), ),
// ), ),
// ), ),
// ], ],
// ), ),
// TODO: OLD LOGIN FROM HERE
], ],
), ),