diff --git a/refilc/lib/api/providers/live_card_provider.dart b/refilc/lib/api/providers/live_card_provider.dart index c63c984..1d581db 100644 --- a/refilc/lib/api/providers/live_card_provider.dart +++ b/refilc/lib/api/providers/live_card_provider.dart @@ -34,6 +34,7 @@ class LiveCardProvider extends ChangeNotifier { static bool hasDayEnd = false; static DateTime? storeFirstRunDate; static bool hasActivitySettingsChanged = false; + // ignore: non_constant_identifier_names static Map LAData = {}; static DateTime? now; // diff --git a/refilc_mobile_ui/lib/pages/home/home_page.dart b/refilc_mobile_ui/lib/pages/home/home_page.dart index b05a055..8a7218e 100644 --- a/refilc_mobile_ui/lib/pages/home/home_page.dart +++ b/refilc_mobile_ui/lib/pages/home/home_page.dart @@ -213,7 +213,7 @@ class HomePageState extends State with TickerProviderStateMixin { // } // TODO: REMOVE IN PRODUCTION BUILD!!! - print(_liveCard.currentState); + // print(_liveCard.currentState); // _liveCard.currentState = LiveCardState.duringLesson; return Scaffold( diff --git a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart index e77376b..03b983a 100644 --- a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart +++ b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart @@ -1,6 +1,5 @@ import 'dart:math'; import 'package:animations/animations.dart'; -import 'package:flutter/widgets.dart'; import 'package:i18n_extension/i18n_extension.dart'; import 'package:refilc/api/providers/database_provider.dart'; import 'package:refilc/api/providers/update_provider.dart'; diff --git a/refilc_mobile_ui/lib/screens/login/login_screen_new.dart b/refilc_mobile_ui/lib/screens/login/login_screen_new.dart index a9f2dbd..7c9cab0 100644 --- a/refilc_mobile_ui/lib/screens/login/login_screen_new.dart +++ b/refilc_mobile_ui/lib/screens/login/login_screen_new.dart @@ -1,618 +1,618 @@ -// import 'dart:async'; +// // import 'dart:async'; -import 'package:refilc/api/client.dart'; -import 'package:refilc/api/login.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/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/settings/privacy_view.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'login_screen.i18n.dart'; -import 'package:carousel_slider/carousel_slider.dart'; -import 'package:flutter_svg/flutter_svg.dart'; +// import 'package:refilc/api/client.dart'; +// import 'package:refilc/api/login.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/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/settings/privacy_view.dart'; +// import 'package:flutter/material.dart'; +// import 'package:flutter/services.dart'; +// import 'login_screen.i18n.dart'; +// import 'package:carousel_slider/carousel_slider.dart'; +// import 'package:flutter_svg/flutter_svg.dart'; -class LoginScreen extends StatefulWidget { - const LoginScreen({super.key, this.back = false}); +// class LoginScreen extends StatefulWidget { +// const LoginScreen({super.key, this.back = false}); - final bool back; +// final bool back; - @override - LoginScreenState createState() => LoginScreenState(); -} +// @override +// LoginScreenState createState() => LoginScreenState(); +// } -class LoginScreenState extends State { - final usernameController = TextEditingController(); - final passwordController = TextEditingController(); - final schoolController = SchoolInputController(); - final _scrollController = ScrollController(); +// class LoginScreenState extends State { +// final usernameController = TextEditingController(); +// final passwordController = TextEditingController(); +// final schoolController = SchoolInputController(); +// final _scrollController = ScrollController(); - LoginState _loginState = LoginState.normal; - bool showBack = false; +// LoginState _loginState = LoginState.normal; +// bool showBack = false; - // Scaffold Gradient background - // final LinearGradient _backgroundGradient = const LinearGradient( - // colors: [ - // Color.fromARGB(255, 61, 122, 244), - // Color.fromARGB(255, 23, 77, 185), - // Color.fromARGB(255, 7, 42, 112), - // ], - // begin: Alignment(-0.8, -1.0), - // end: Alignment(0.8, 1.0), - // stops: [-1.0, 0.0, 1.0], - // ); +// // Scaffold Gradient background +// // final LinearGradient _backgroundGradient = const LinearGradient( +// // colors: [ +// // Color.fromARGB(255, 61, 122, 244), +// // Color.fromARGB(255, 23, 77, 185), +// // Color.fromARGB(255, 7, 42, 112), +// // ], +// // begin: Alignment(-0.8, -1.0), +// // end: Alignment(0.8, 1.0), +// // stops: [-1.0, 0.0, 1.0], +// // ); - late String tempUsername = ''; +// late String tempUsername = ''; - @override - void initState() { - super.initState(); - showBack = widget.back; +// @override +// void initState() { +// super.initState(); +// showBack = widget.back; - SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( - statusBarColor: Colors.transparent, - statusBarIconBrightness: Brightness.light, - systemNavigationBarColor: Colors.white, - systemNavigationBarIconBrightness: Brightness.dark, - )); +// SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( +// statusBarColor: Colors.transparent, +// statusBarIconBrightness: Brightness.light, +// systemNavigationBarColor: Colors.white, +// systemNavigationBarIconBrightness: Brightness.dark, +// )); - FilcAPI.getSchools().then((schools) { - if (schools != null) { - schoolController.update(() { - schoolController.schools = schools; - }); - } else { - ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar( - content: Text("schools_error".i18n, - style: const TextStyle(color: Colors.white)), - backgroundColor: AppColors.of(context).red, - context: context, - )); - } - }); - } +// FilcAPI.getSchools().then((schools) { +// if (schools != null) { +// schoolController.update(() { +// schoolController.schools = schools; +// }); +// } else { +// ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar( +// content: Text("schools_error".i18n, +// style: const TextStyle(color: Colors.white)), +// backgroundColor: AppColors.of(context).red, +// context: context, +// )); +// } +// }); +// } - @override - Widget build(BuildContext context) { - precacheImage(const AssetImage('assets/images/showcase1.png'), context); - precacheImage(const AssetImage('assets/images/showcase2.png'), context); - precacheImage(const AssetImage('assets/images/showcase3.png'), context); - precacheImage(const AssetImage('assets/images/showcase4.png'), context); - bool selected = false; +// @override +// Widget build(BuildContext context) { +// precacheImage(const AssetImage('assets/images/showcase1.png'), context); +// precacheImage(const AssetImage('assets/images/showcase2.png'), context); +// precacheImage(const AssetImage('assets/images/showcase3.png'), context); +// precacheImage(const AssetImage('assets/images/showcase4.png'), context); +// bool selected = false; - return Scaffold( - body: Container( - decoration: const BoxDecoration(color: Color(0xFFDAE4F7)), - child: SingleChildScrollView( - physics: const ClampingScrollPhysics(), - controller: _scrollController, - child: Container( - decoration: const BoxDecoration(color: Color(0xFFDAE4F7)), - width: MediaQuery.of(context).size.width, - height: MediaQuery.of(context).size.height, - child: SafeArea( - child: Column( - children: [ - // app icon - Padding( - padding: const EdgeInsets.only(left: 24, top: 20), - child: Row( - children: [ - Image.asset( - 'assets/icons/ic_rounded.png', - width: 30.0, - ), - const SizedBox(width: 8), - const Text( - 'reFilc', - style: TextStyle( - color: Color(0xFF050B15), - fontSize: 18.0, - fontWeight: FontWeight.bold, - fontFamily: 'Montserrat'), - ), - Material( - type: MaterialType.transparency, - child: showBack - ? BackButton(color: AppColors.of(context).text) - : const SizedBox(height: 48.0), - ), - ], - )), - Stack( - alignment: Alignment.bottomCenter, - children: [ - Column( - //login buttons and ui starts here - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.end, - 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: 300, - width: double.infinity, - decoration: const BoxDecoration( - gradient: LinearGradient( - colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)], - stops: [0, 0.12], - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - ), - ), - child: Padding( - padding: EdgeInsets.only(top: 50, bottom: MediaQuery.of(context).viewInsets.bottom), - 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: () { - showModalBottomSheet( - backgroundColor: Colors.transparent, - context: context, - builder: (BuildContext context) { - return Container( - height: MediaQuery.of(context) - .size - .height * - 0.5 + MediaQuery.of(context).viewInsets.bottom, - decoration: const BoxDecoration( - color: Color(0xFFDAE4F7), - borderRadius: BorderRadius.only( - topRight: - Radius.circular(24.0), - topLeft: - Radius.circular(24.0), - ), - ), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.start, - children: [ - Padding( - padding: - const EdgeInsets.only( - top: 18), - child: Container( - decoration: - const BoxDecoration( - color: - Color(0xFFB9C8E5), - borderRadius: - BorderRadius.only( - topRight: - Radius.circular( - 2.0), - topLeft: - Radius.circular( - 2.0), - ), - ), - width: 40, - height: 4, - ), - ), - Container( - width: double.infinity, - 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, - ), - ), +// return Scaffold( +// body: Container( +// decoration: const BoxDecoration(color: Color(0xFFDAE4F7)), +// child: SingleChildScrollView( +// physics: const ClampingScrollPhysics(), +// controller: _scrollController, +// child: Container( +// decoration: const BoxDecoration(color: Color(0xFFDAE4F7)), +// width: MediaQuery.of(context).size.width, +// height: MediaQuery.of(context).size.height, +// child: SafeArea( +// child: Column( +// children: [ +// // app icon +// Padding( +// padding: const EdgeInsets.only(left: 24, top: 20), +// child: Row( +// children: [ +// Image.asset( +// 'assets/icons/ic_rounded.png', +// width: 30.0, +// ), +// const SizedBox(width: 8), +// const Text( +// 'reFilc', +// style: TextStyle( +// color: Color(0xFF050B15), +// fontSize: 18.0, +// fontWeight: FontWeight.bold, +// fontFamily: 'Montserrat'), +// ), +// Material( +// type: MaterialType.transparency, +// child: showBack +// ? BackButton(color: AppColors.of(context).text) +// : const SizedBox(height: 48.0), +// ), +// ], +// )), +// Stack( +// alignment: Alignment.bottomCenter, +// children: [ +// Column( +// //login buttons and ui starts here +// mainAxisAlignment: MainAxisAlignment.end, +// crossAxisAlignment: CrossAxisAlignment.end, +// 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: 300, +// width: double.infinity, +// decoration: const BoxDecoration( +// gradient: LinearGradient( +// colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)], +// stops: [0, 0.12], +// begin: Alignment.topCenter, +// end: Alignment.bottomCenter, +// ), +// ), +// child: Padding( +// padding: EdgeInsets.only(top: 50, bottom: MediaQuery.of(context).viewInsets.bottom), +// 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: () { +// showModalBottomSheet( +// backgroundColor: Colors.transparent, +// context: context, +// builder: (BuildContext context) { +// return Container( +// height: MediaQuery.of(context) +// .size +// .height * +// 0.5 + MediaQuery.of(context).viewInsets.bottom, +// decoration: const BoxDecoration( +// color: Color(0xFFDAE4F7), +// borderRadius: BorderRadius.only( +// topRight: +// Radius.circular(24.0), +// topLeft: +// Radius.circular(24.0), +// ), +// ), +// child: Column( +// crossAxisAlignment: +// CrossAxisAlignment.center, +// mainAxisAlignment: +// MainAxisAlignment.start, +// children: [ +// Padding( +// padding: +// const EdgeInsets.only( +// top: 18), +// child: Container( +// decoration: +// const BoxDecoration( +// color: +// Color(0xFFB9C8E5), +// borderRadius: +// BorderRadius.only( +// topRight: +// Radius.circular( +// 2.0), +// topLeft: +// Radius.circular( +// 2.0), +// ), +// ), +// width: 40, +// height: 4, +// ), +// ), +// Container( +// width: double.infinity, +// 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 - Padding( - padding: - const EdgeInsets - .only( - bottom: - 6.0), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - children: [ - Expanded( - child: Text( - "password" - .i18n, - maxLines: - 1, - style: - TextStyle( - color: AppColors.of(context) - .loginPrimary, - fontWeight: - FontWeight.w500, - fontSize: - 12.0, - ), - ), - ), - Expanded( - child: Text( - "passwordHint" - .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 - .password, - controller: - passwordController, - ), - ), +// // password +// Padding( +// padding: +// const EdgeInsets +// .only( +// bottom: +// 6.0), +// child: Row( +// mainAxisAlignment: +// MainAxisAlignment +// .spaceBetween, +// children: [ +// Expanded( +// child: Text( +// "password" +// .i18n, +// maxLines: +// 1, +// style: +// TextStyle( +// color: AppColors.of(context) +// .loginPrimary, +// fontWeight: +// FontWeight.w500, +// fontSize: +// 12.0, +// ), +// ), +// ), +// Expanded( +// child: Text( +// "passwordHint" +// .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 +// .password, +// controller: +// passwordController, +// ), +// ), - // school - Padding( - padding: - const EdgeInsets - .only( - bottom: - 6.0), - child: Text( - "school".i18n, - maxLines: 1, - style: - TextStyle( - color: AppColors.of( - context) - .loginPrimary, - fontWeight: - FontWeight - .w500, - fontSize: - 12.0, - ), - ), - ), - SchoolInput( - scroll: - _scrollController, - controller: - schoolController, - ), - ], - ), - ), - ), - const Padding( - padding: EdgeInsets.only( - left: 22.0, - right: 22.0, - top: 0.0, - ), - ), - Padding( - padding: - const EdgeInsets.only( - top: 35.0, - left: 22.0, - right: 22.0, - ), - child: Visibility( - visible: _loginState != - LoginState - .inProgress, - replacement: - const Padding( - padding: EdgeInsets - .symmetric( - vertical: - 6.0), - child: - CircularProgressIndicator( - valueColor: - AlwaysStoppedAnimation< - Color>( - Colors - .white), - ), - ), - child: LoginButton( - child: Text( - "login".i18n, - maxLines: 1, - style: - const TextStyle( - fontWeight: - FontWeight - .bold, - fontSize: 20.0, - )), - onPressed: () => - _loginAPI( - context: - context), - ), - ), - ), - ]), - ); - }, - ); - }, - child: Text( - "login".i18n, - style: const TextStyle( - fontFamily: 'Montserrat', - fontSize: 20, - fontWeight: FontWeight.w700), - )), - ), - ), - const SizedBox(height: 8), - ], - ), - ), - ), - ], - ), +// // school +// Padding( +// padding: +// const EdgeInsets +// .only( +// bottom: +// 6.0), +// child: Text( +// "school".i18n, +// maxLines: 1, +// style: +// TextStyle( +// color: AppColors.of( +// context) +// .loginPrimary, +// fontWeight: +// FontWeight +// .w500, +// fontSize: +// 12.0, +// ), +// ), +// ), +// SchoolInput( +// scroll: +// _scrollController, +// controller: +// schoolController, +// ), +// ], +// ), +// ), +// ), +// const Padding( +// padding: EdgeInsets.only( +// left: 22.0, +// right: 22.0, +// top: 0.0, +// ), +// ), +// Padding( +// padding: +// const EdgeInsets.only( +// top: 35.0, +// left: 22.0, +// right: 22.0, +// ), +// child: Visibility( +// visible: _loginState != +// LoginState +// .inProgress, +// replacement: +// const Padding( +// padding: EdgeInsets +// .symmetric( +// vertical: +// 6.0), +// child: +// CircularProgressIndicator( +// valueColor: +// AlwaysStoppedAnimation< +// Color>( +// Colors +// .white), +// ), +// ), +// child: LoginButton( +// child: Text( +// "login".i18n, +// maxLines: 1, +// style: +// const TextStyle( +// fontWeight: +// FontWeight +// .bold, +// fontSize: 20.0, +// )), +// onPressed: () => +// _loginAPI( +// context: +// context), +// ), +// ), +// ), +// ]), +// ); +// }, +// ); +// }, +// child: Text( +// "login".i18n, +// style: const TextStyle( +// fontFamily: 'Montserrat', +// fontSize: 20, +// fontWeight: FontWeight.w700), +// )), +// ), +// ), +// const SizedBox(height: 8), +// ], +// ), +// ), +// ), +// ], +// ), - if (_loginState == LoginState.missingFields || - _loginState == LoginState.invalidGrant || - _loginState == LoginState.failed) - Padding( - padding: const EdgeInsets.only( - top: 8.0, left: 12.0, right: 12.0), - child: Text( - [ - "missing_fields", - "invalid_grant", - "error" - ][_loginState.index] - .i18n, - style: const TextStyle( - color: Colors.red, - fontWeight: FontWeight.w500, - ), - 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, - ), - ), - ), - ], - ), - ), - ), - ), - ), - ); - } +// if (_loginState == LoginState.missingFields || +// _loginState == LoginState.invalidGrant || +// _loginState == LoginState.failed) +// Padding( +// padding: const EdgeInsets.only( +// top: 8.0, left: 12.0, right: 12.0), +// child: Text( +// [ +// "missing_fields", +// "invalid_grant", +// "error" +// ][_loginState.index] +// .i18n, +// style: const TextStyle( +// color: Colors.red, +// fontWeight: FontWeight.w500, +// ), +// 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, +// ), +// ), +// ), +// ], +// ), +// ), +// ), +// ), +// ), +// ); +// } - void _loginAPI({required BuildContext context}) { - String username = usernameController.text; - String password = passwordController.text; +// void _loginAPI({required BuildContext context}) { +// String username = usernameController.text; +// String password = passwordController.text; - tempUsername = username; +// tempUsername = username; - if (username == "" || - password == "" || - schoolController.selectedSchool == null) { - return setState(() => _loginState = LoginState.missingFields); - } +// if (username == "" || +// password == "" || +// schoolController.selectedSchool == null) { +// return setState(() => _loginState = LoginState.missingFields); +// } - // ignore: no_leading_underscores_for_local_identifiers - void _callAPI() { - loginAPI( - username: username, - password: password, - instituteCode: schoolController.selectedSchool!.instituteCode, - context: context, - onLogin: (user) { - ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar( - context: context, - brightness: Brightness.light, - content: Text("welcome".i18n.fill([user.name]), - overflow: TextOverflow.ellipsis), - )); - }, - onSuccess: () { - ScaffoldMessenger.of(context).hideCurrentSnackBar(); - setSystemChrome(context); - Navigator.of(context).pushReplacementNamed("login_to_navigation"); - }).then( - (res) => setState(() { - // if (res == LoginState.invalidGrant && - // tempUsername.replaceAll(username, '').length <= 3) { - // tempUsername = username + ' '; - // Timer( - // const Duration(milliseconds: 500), - // () => _loginAPI(context: context), - // ); - // // _loginAPI(context: context); - // } else { - _loginState = res; - // } - }), - ); - } +// // ignore: no_leading_underscores_for_local_identifiers +// void _callAPI() { +// loginAPI( +// username: username, +// password: password, +// instituteCode: schoolController.selectedSchool!.instituteCode, +// context: context, +// onLogin: (user) { +// ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar( +// context: context, +// brightness: Brightness.light, +// content: Text("welcome".i18n.fill([user.name]), +// overflow: TextOverflow.ellipsis), +// )); +// }, +// onSuccess: () { +// ScaffoldMessenger.of(context).hideCurrentSnackBar(); +// setSystemChrome(context); +// Navigator.of(context).pushReplacementNamed("login_to_navigation"); +// }).then( +// (res) => setState(() { +// // if (res == LoginState.invalidGrant && +// // tempUsername.replaceAll(username, '').length <= 3) { +// // tempUsername = username + ' '; +// // Timer( +// // const Duration(milliseconds: 500), +// // () => _loginAPI(context: context), +// // ); +// // // _loginAPI(context: context); +// // } else { +// _loginState = res; +// // } +// }), +// ); +// } - setState(() => _loginState = LoginState.inProgress); - _callAPI(); - } -} +// setState(() => _loginState = LoginState.inProgress); +// _callAPI(); +// } +// }