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

fix that, and add new progress indicator

Browse Source
This commit is contained in:
Zypherift 2024-08-22 20:58:12 +02:00
parent d426d4866a
commit c4a17633f8
1 changed files with 147 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,14 +3,19 @@
import 'package:refilc/api/client.dart'; import 'package:refilc/api/client.dart';
import 'package:refilc/api/login.dart'; import 'package:refilc/api/login.dart';
import 'package:refilc/theme/colors/colors.dart'; import 'package:refilc/theme/colors/colors.dart';
import 'package:refilc_mobile_ui/common/bottom_sheet_menu/rounded_bottom_sheet.dart';
import 'package:refilc_mobile_ui/common/custom_snack_bar.dart'; import 'package:refilc_mobile_ui/common/custom_snack_bar.dart';
import 'package:refilc_mobile_ui/common/system_chrome.dart'; import 'package:refilc_mobile_ui/common/system_chrome.dart';
import 'package:refilc_mobile_ui/common/widgets/absence/absence_display.dart';
import 'package:refilc_mobile_ui/screens/login/login_button.dart';
import 'package:refilc_mobile_ui/screens/login/login_input.dart';
import 'package:refilc_mobile_ui/screens/login/school_input/school_input.dart'; import 'package:refilc_mobile_ui/screens/login/school_input/school_input.dart';
import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart'; import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'login_screen.i18n.dart'; import 'login_screen.i18n.dart';
import 'package:carousel_slider/carousel_slider.dart'; import 'package:carousel_slider/carousel_slider.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:refilc_mobile_ui/screens/login/kreten_login.dart'; //new library for new web login import 'package:refilc_mobile_ui/screens/login/kreten_login.dart'; //new library for new web login
class LoginScreen extends StatefulWidget { class LoginScreen extends StatefulWidget {
@ -27,8 +32,8 @@ class LoginScreenState extends State<LoginScreen> {
final passwordController = TextEditingController(); final passwordController = TextEditingController();
final schoolController = SchoolInputController(); final schoolController = SchoolInputController();
final _scrollController = ScrollController(); final _scrollController = ScrollController();
// new controllers
final codeController = TextEditingController(); final codeController = TextEditingController();
LoginState _loginState = LoginState.normal; LoginState _loginState = LoginState.normal;
bool showBack = false; bool showBack = false;
@ -54,7 +59,7 @@ class LoginScreenState extends State<LoginScreen> {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
statusBarColor: Colors.transparent, statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.light, statusBarIconBrightness: Brightness.light,
systemNavigationBarColor: Color(0xFFDAE4F7), systemNavigationBarColor: Colors.white,
systemNavigationBarIconBrightness: Brightness.dark, systemNavigationBarIconBrightness: Brightness.dark,
)); ));
@ -80,7 +85,7 @@ class LoginScreenState extends State<LoginScreen> {
precacheImage(const AssetImage('assets/images/showcase2.png'), context); precacheImage(const AssetImage('assets/images/showcase2.png'), context);
precacheImage(const AssetImage('assets/images/showcase3.png'), context); precacheImage(const AssetImage('assets/images/showcase3.png'), context);
precacheImage(const AssetImage('assets/images/showcase4.png'), context); precacheImage(const AssetImage('assets/images/showcase4.png'), context);
// bool selected = false; bool selected = false;
return Scaffold( return Scaffold(
body: Container( body: Container(
@ -97,17 +102,9 @@ class LoginScreenState extends State<LoginScreen> {
children: [ children: [
// app icon // app icon
Padding( Padding(
padding: const EdgeInsets.only(left: 24, top: 0), padding: const EdgeInsets.only(left: 24, top: 20),
child: Row( child: Row(
children: [ children: [
if (showBack)
Material(
type: MaterialType.transparency,
child: showBack
? const BackButton(color: Colors.black)
: const SizedBox(height: 48.0),
),
if (showBack) const SizedBox(width: 8),
Image.asset( Image.asset(
'assets/icons/ic_rounded.png', 'assets/icons/ic_rounded.png',
width: 30.0, width: 30.0,
@ -121,6 +118,12 @@ class LoginScreenState extends State<LoginScreen> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Montserrat'), fontFamily: 'Montserrat'),
), ),
Material(
type: MaterialType.transparency,
child: showBack
? BackButton(color: AppColors.of(context).text)
: const SizedBox(height: 48.0),
),
], ],
)), )),
Stack( Stack(
@ -131,7 +134,7 @@ class LoginScreenState extends State<LoginScreen> {
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
const SizedBox(height: 20), const SizedBox(height: 21),
CarouselSlider( CarouselSlider(
options: CarouselOptions( options: CarouselOptions(
height: MediaQuery.of(context).size.height, height: MediaQuery.of(context).size.height,
@ -198,115 +201,145 @@ class LoginScreenState extends State<LoginScreen> {
], ],
), ),
Container( Container(
height: 330, height: 300,
width: double.infinity, width: double.infinity,
decoration: const BoxDecoration( decoration: const BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)], colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)],
stops: [0, 0.24], stops: [0, 0.12],
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
), ),
), ),
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 90, top: 50,
bottom: MediaQuery.of(context).viewInsets.bottom), bottom: MediaQuery.of(context).viewInsets.bottom),
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
height: 52, height: 48,
width: double.infinity, width: double.infinity,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 16), horizontal: 16),
child: GestureDetector( child: FilledButton(
onTap: () { style: ButtonStyle(
final NavigatorState navigator = shape: WidgetStateProperty.all<
Navigator.of(context); RoundedRectangleBorder>(
navigator const RoundedRectangleBorder(
.push( borderRadius: BorderRadius.all(
MaterialPageRoute( Radius.circular(12)),
builder: (context) => ))),
KretenLoginScreen( onPressed: () {
onLogin: (String code) { showModalBottomSheet(
codeController.text = code; backgroundColor: Colors.transparent,
navigator.pop(); context: context,
}, isScrollControlled:
), true, // This ensures the modal accommodates input fields properly
), builder: (BuildContext context) {
) return Container(
.then((value) { height: MediaQuery.of(context)
if (codeController.text != "") { .size
_NewLoginAPI(context: context); .height *
} 0.8 +
}); MediaQuery.of(context)
}, .viewInsets
child: Container( .bottom,
width: decoration: const BoxDecoration(
MediaQuery.of(context).size.width * color: Color(0xFFDAE4F7),
0.75, borderRadius: BorderRadius.only(
height: 60.0, topRight:
decoration: BoxDecoration( Radius.circular(24.0),
// image: const DecorationImage( topLeft:
// image: Radius.circular(24.0),
// AssetImage('assets/images/btn_kreten_login.png'), ),
// fit: BoxFit.scaleDown,
// ),
borderRadius:
BorderRadius.circular(12.0),
color: const Color(0xFF0097C1),
),
padding: const EdgeInsets.only(
top: 5.0,
left: 5.0,
right: 5.0,
bottom: 5.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Image.asset(
'assets/images/btn_kreten_login.png',
),
const SizedBox(
width: 10.0,
),
Container(
width: 1.0,
height: 30.0,
color: Colors.white,
),
const SizedBox(
width: 10.0,
),
Text(
'login_w_kreta_acc'.i18n,
textAlign: TextAlign.center,
style: const TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 14.0,
), ),
), child: Column(
], crossAxisAlignment:
)), CrossAxisAlignment.center,
), mainAxisAlignment:
), MainAxisAlignment.start,
), children: [
const SizedBox(height: 17), Padding(
// privacy policy padding: const EdgeInsets
GestureDetector( .symmetric(
onTap: () => PrivacyView.show(context), vertical: 18),
child: Text( child: Container(
'privacy'.i18n, decoration:
style: const TextStyle( const BoxDecoration(
color: Colors.black, color:
fontWeight: FontWeight.w500, Color(0xFFB9C8E5),
fontSize: 14.0, borderRadius:
), BorderRadius.only(
topRight:
Radius.circular(
2.0),
topLeft:
Radius.circular(
2.0),
),
),
width: 40,
height: 4,
),
),
Expanded(
child: Padding(
padding:
const EdgeInsets.only(
right: 14,
left: 14,
bottom: 24),
child: ClipRRect(
borderRadius:
BorderRadius
.circular(16),
child: Container(
decoration:
BoxDecoration(
borderRadius:
BorderRadius
.circular(
16),
),
child:
KretenLoginWidget(
onLogin:
(String code) {
codeController
.text = code;
Navigator.of(
context)
.pop();
},
),
),
),
),
)
],
),
);
},
).then((value) {
// After closing the modal bottom sheet, check if the code is set
if (codeController.text.isNotEmpty) {
// Call your API after retrieving the code
_NewLoginAPI(context: context);
}
});
},
child: Text(
"login_w_kreta_acc".i18n,
style: const TextStyle(
fontFamily: 'Montserrat',
fontSize: 16,
fontWeight: FontWeight.w700),
)),
), ),
), ),
const SizedBox(height: 8),
], ],
), ),
), ),
@ -334,6 +367,18 @@ class LoginScreenState extends State<LoginScreen> {
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),
// privacy policy
GestureDetector(
onTap: () => PrivacyView.show(context),
child: Text(
'privacy'.i18n,
style: TextStyle(
color: AppColors.of(context).loginSecondary,
fontWeight: FontWeight.w500,
fontSize: 14.0,
),
),
),
], ],
), ),
), ),
@ -390,13 +435,6 @@ class LoginScreenState extends State<LoginScreen> {
// }), // }),
// ); // );
// } // }
// setState(() => _loginState = LoginState.inProgress);
// _callAPI();
// }
// new login api
// ignore: non_constant_identifier_names
void _NewLoginAPI({required BuildContext context}) { void _NewLoginAPI({required BuildContext context}) {
String code = codeController.text; String code = codeController.text;
@ -441,4 +479,4 @@ class LoginScreenState extends State<LoginScreen> {
setState(() => _loginState = LoginState.inProgress); setState(() => _loginState = LoginState.inProgress);
_callAPI(); _callAPI();
} }
} }