firka/student-legacy
firka/student-legacy
8
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:refilc/naplo into dev

Browse Source
This commit is contained in:
Kima 2024-04-28 16:38:15 +02:00
commit cdde5c11ee
10 changed files with 302 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
refilc/assets/fonts/FigTree/Figtree-SemiBold.ttf Normal file
View File

Binary file not shown.

BIN
refilc/assets/icons/ic_rounded.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 47 KiB

BIN
refilc/assets/images/showcase1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 364 KiB

BIN
refilc/assets/images/showcase2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 581 KiB

BIN
refilc/assets/images/showcase3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 982 KiB

BIN
refilc/assets/images/showcase4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 KiB

8
refilc/pubspec.yaml
View File

@ -80,6 +80,7 @@ dependencies:
flutter_stripe: ^10.0.0 flutter_stripe: ^10.0.0
get_it: ^7.6.7 get_it: ^7.6.7
xml: ^6.5.0 xml: ^6.5.0
carousel_slider: ^4.2.1
dev_dependencies: dev_dependencies:
flutter_lints: ^3.0.1 flutter_lints: ^3.0.1
@ -101,7 +102,7 @@ flutter:
- assets/images/ext_logo/ - assets/images/ext_logo/
- assets/svg/menu_icons/ - assets/svg/menu_icons/
- assets/other/dirtywords.xml - assets/other/dirtywords.xml
- assets/svg/mesh_bg.svg - assets/svg/
fonts: fonts:
- family: FilcIcons - family: FilcIcons
@ -154,7 +155,10 @@ flutter:
- asset: assets/fonts/Montserrat/Montserrat-ThinItalic.ttf - asset: assets/fonts/Montserrat/Montserrat-ThinItalic.ttf
weight: 100 weight: 100
style: italic style: italic
- family: FigTree
fonts:
- asset: assets/fonts/FigTree/Figtree-SemiBold.ttf
weight: 500
# - family: SpaceMono # - family: SpaceMono
# fonts: # fonts:
# - asset: assets/fonts/SpaceMono/SpaceMono-Regular.ttf # - asset: assets/fonts/SpaceMono/SpaceMono-Regular.ttf

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

@ -12,6 +12,8 @@ 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:flutter_svg/flutter_svg.dart';
class LoginScreen extends StatefulWidget { class LoginScreen extends StatefulWidget {
const LoginScreen({super.key, this.back = false}); const LoginScreen({super.key, this.back = false});
@ -77,259 +79,278 @@ class LoginScreenState extends State<LoginScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: Container( body: Container(
decoration: BoxDecoration(color: AppColors.of(context).loginBackground), decoration: const BoxDecoration(color: Color(0xFFDAE4F7)),
child: SingleChildScrollView( child: SingleChildScrollView(
physics: const ClampingScrollPhysics(), physics: const ClampingScrollPhysics(),
controller: _scrollController, controller: _scrollController,
child: Container( child: Container(
decoration: decoration: const BoxDecoration(color: Color(0xFFDAE4F7)),
BoxDecoration(color: AppColors.of(context).loginBackground),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height, height: MediaQuery.of(context).size.height,
child: SafeArea( child: SafeArea(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container(
alignment: Alignment.topLeft,
padding: const EdgeInsets.only(left: 16.0, top: 12.0),
child: ClipOval(
child: Material(
type: MaterialType.transparency,
child: showBack
? BackButton(
color: AppColors.of(context).loginPrimary)
: const SizedBox(height: 48.0),
),
),
),
// app icon // app icon
Padding( Padding(
padding: EdgeInsets.zero, padding: const EdgeInsets.only(left: 24, top: 20),
child: Image.asset( child: Row(
'assets/icons/ic_rounded.png',
width: 50.0,
),
),
// texts
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 10.0,
vertical: 12.0,
),
child: Text(
'reFilc',
style: TextStyle(
color: AppColors.of(context).loginPrimary,
fontSize: 28.0,
fontWeight: FontWeight.bold,
),
),
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 10.0,
),
child: Text(
'login_w_kreten'.i18n,
textAlign: TextAlign.center,
style: TextStyle(
color: AppColors.of(context).loginPrimary,
fontSize: 18.0,
fontWeight: FontWeight.w500,
height: 1.2,
),
),
),
const Spacer(
flex: 2,
),
// inputs
Padding(
padding: const EdgeInsets.only(
left: 22.0,
right: 22.0,
top: 0.0,
),
child: AutofillGroup(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// username Image.asset(
Padding( 'assets/icons/ic_rounded.png',
padding: const EdgeInsets.only(bottom: 6.0), width: 30.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( const SizedBox(width: 8),
padding: const EdgeInsets.only(bottom: 12.0), Text(
child: LoginInput( 'reFilc',
style: LoginInputStyle.username, style: TextStyle(
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,
),
),
// school
Padding(
padding: const EdgeInsets.only(bottom: 6.0),
child: Text(
"school".i18n,
maxLines: 1,
style: TextStyle(
color: AppColors.of(context).loginPrimary, color: AppColors.of(context).loginPrimary,
fontWeight: FontWeight.w500, fontSize: 18.0,
fontSize: 12.0, fontWeight: FontWeight.bold,
), fontFamily: 'Montserrat'),
),
), ),
SchoolInput( Material(
scroll: _scrollController, type: MaterialType.transparency,
controller: schoolController, child: showBack
? BackButton(
color: AppColors.of(context).loginPrimary)
: const SizedBox(height: 48.0),
), ),
], ],
)),
Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const SizedBox(height: 32),
CarouselSlider(
options: CarouselOptions(
height: MediaQuery.of(context).size.height,
viewportFraction: 0.957, //math is mathing
autoPlay: true,
autoPlayInterval: const Duration(seconds: 4),
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),
//TODO: fix padding
child: Text(
"welcome_title_$i".i18n,
style: TextStyle(
color: AppColors.of(context)
.loginPrimary,
fontSize: 20,
fontFamily: 'Montserrat',
fontWeight: FontWeight.w700,
height: 1.3),
),
),
const SizedBox(height: 20),
Text("welcome_text_$i".i18n,
style: const TextStyle(
fontFamily: 'FigTree',
fontWeight: FontWeight.w500,
fontSize: 18,
height: 1.3)),
Image.asset('assets/images/showcase$i.png')
],
);
},
);
}).toList(),
), ),
), ],
), )
// login button // // inputs
Padding( // Padding(
padding: const EdgeInsets.only( // padding: const EdgeInsets.only(
top: 35.0, // left: 22.0,
left: 22.0, // right: 22.0,
right: 22.0, // top: 0.0,
), // ),
child: Visibility( // child: AutofillGroup(
visible: _loginState != LoginState.inProgress, // child: Column(
replacement: const Padding( // crossAxisAlignment: CrossAxisAlignment.start,
padding: EdgeInsets.symmetric(vertical: 6.0), // children: [
child: CircularProgressIndicator( // // username
valueColor: // Padding(
AlwaysStoppedAnimation<Color>(Colors.white), // padding: const EdgeInsets.only(bottom: 6.0),
), // child: Row(
), // mainAxisAlignment: MainAxisAlignment.spaceBetween,
child: LoginButton( // children: [
child: Text("login".i18n, // Expanded(
maxLines: 1, // child: Text(
style: const TextStyle( // "username".i18n,
fontWeight: FontWeight.bold, // maxLines: 1,
fontSize: 20.0, // style: TextStyle(
)), // color: AppColors.of(context).loginPrimary,
onPressed: () => _loginAPI(context: context), // 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,
// ),
// ),
// error messages // // password
if (_loginState == LoginState.missingFields || // Padding(
_loginState == LoginState.invalidGrant || // padding: const EdgeInsets.only(bottom: 6.0),
_loginState == LoginState.failed) // child: Row(
Padding( // mainAxisAlignment: MainAxisAlignment.spaceBetween,
padding: const EdgeInsets.only( // children: [
top: 8.0, left: 12.0, right: 12.0), // Expanded(
child: Text( // child: Text(
[ // "password".i18n,
"missing_fields", // maxLines: 1,
"invalid_grant", // style: TextStyle(
"error" // color: AppColors.of(context).loginPrimary,
][_loginState.index] // fontWeight: FontWeight.w500,
.i18n, // fontSize: 12.0,
style: const TextStyle( // ),
color: Colors.red, // ),
fontWeight: FontWeight.w500, // ),
), // Expanded(
textAlign: TextAlign.center, // child: Text(
), // "passwordHint".i18n,
), // maxLines: 1,
const SizedBox(height: 22.0), // 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,
// ),
// ),
// privacy policy // // school
GestureDetector( // Padding(
onTap: () => PrivacyView.show(context), // padding: const EdgeInsets.only(bottom: 6.0),
child: Text( // child: Text(
'privacy'.i18n, // "school".i18n,
style: TextStyle( // maxLines: 1,
color: AppColors.of(context).loginSecondary, // style: TextStyle(
fontWeight: FontWeight.w500, // color: AppColors.of(context).loginPrimary,
fontSize: 14.0, // fontWeight: FontWeight.w500,
), // fontSize: 12.0,
), // ),
), // ),
// ),
// SchoolInput(
// scroll: _scrollController,
// controller: schoolController,
// ),
// ],
// ),
// ),
// ),
const Spacer( // // login button
flex: 1, // 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),
// ),
// ),
// ),
// // error messages
// 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,
// ),
// ),
// const SizedBox(height: 22.0),
// // privacy policy
// GestureDetector(
// onTap: () => PrivacyView.show(context),
// child: Text(
// 'privacy'.i18n,
// style: TextStyle(
// color: AppColors.of(context).loginSecondary,
// fontWeight: FontWeight.w500,
// fontSize: 14.0,
// ),
// ),
// ),
// const Spacer(
// flex: 1,
// ),
], ],
), ),
), ),

42
refilc_mobile_ui/lib/screens/login/login_screen.i18n.dart
View File

@ -19,6 +19,20 @@ extension Localization on String {
"schools_error": "Failed to get schools.", "schools_error": "Failed to get schools.",
"login_w_kreten": "Log in with your e-KRÉTA account to continue!", "login_w_kreten": "Log in with your e-KRÉTA account to continue!",
"privacy": "Privacy Policy", "privacy": "Privacy Policy",
"welcome_title_1": "This is your home",
"welcome_text_1":
"In the day view, you'll find everything you need: your timetable, your tasks, your assignments and your unread messages, all in one place.",
"welcome_title_2":
"You can see your deteriorating tendency in ten different ways",
"welcome_text_2":
"You will see so many statistics that 8 years of elementary maths will not be enough to comprehend it.",
"welcome_title_3":
"Follow your goals and turn maths one into maths five.",
"welcome_text_3":
"Set your target and we'll tell you how many grades you should get. You even get confetti when you reach your goal.",
"welcome_title_4": "Take as many notes as you want.",
"welcome_text_4":
"You can also organise your notes by lesson in the built-in notebook, so you can find everything in one app.",
}, },
"hu_hu": { "hu_hu": {
"username": "Felhasználónév", "username": "Felhasználónév",
@ -37,6 +51,19 @@ extension Localization on String {
"login_w_kreten": "login_w_kreten":
"Jelentkezz be az e-KRÉTA fiókoddal a folytatáshoz!", "Jelentkezz be az e-KRÉTA fiókoddal a folytatáshoz!",
"privacy": "Adatkezelési tájékoztató", "privacy": "Adatkezelési tájékoztató",
"welcome_title_1": "Ez a te kis otthonod",
"welcome_text_1":
"A nap nézetben mindent megtalálsz, amire éppen szükséged van: az órarended, a feladataid, a számonkéréseid és az olvasatlan üzeneteid, egy helyen.",
"welcome_title_2": "A romló tendenciádat tízféle képpen láthatod",
"welcome_text_2":
"Annyi statisztikát láthatsz, hogy a 8 általánosos matek nem lesz elég a kisilabizálására.",
"welcome_title_3":
"Kövesd a céljaidat, és legyen a matek egyesből matek ötös.",
"welcome_text_3":
"Állítsd be a célodat, és mi megmondjuk, hányas jegyet kell szerezned. Még konfetti is van a cél elérésekor.",
"welcome_title_4": "Füzetelj annyit, amennyit csak szeretnél.",
"welcome_text_4":
"A beépített jegyzetfüzetbe órák szerint is rendezheted a jegyzeteidet, így mindent megtalálsz egy appban.",
}, },
"de_de": { "de_de": {
"username": "Benutzername", "username": "Benutzername",
@ -53,6 +80,21 @@ extension Localization on String {
"login_w_kreten": "login_w_kreten":
"Melden Sie sich mit Ihrem e-KRÉTA-Konto an, um fortzufahren!", "Melden Sie sich mit Ihrem e-KRÉTA-Konto an, um fortzufahren!",
"privacy": "Datenschutzrichtlinie", "privacy": "Datenschutzrichtlinie",
//TODO: translate to german, waiting for translator
"welcome_title_1": "This is your home",
"welcome_text_1":
"In the day view, you'll find everything you need: your timetable, your tasks, your assignments and your unread messages, all in one place.",
"welcome_title_2":
"You can see your deteriorating tendency in ten different ways",
"welcome_text_2":
"You will see so many statistics that 8 years of elementary maths will not be enough to comprehend it.",
"welcome_title_3":
"Follow your goals and turn maths one into maths five.",
"welcome_text_3":
"Set your target and we'll tell you how many grades you should get. You even get confetti when you reach your goal.",
"welcome_title_4": "Take as many notes as you want.",
"welcome_text_4":
"You can also organise your notes by lesson in the built-in notebook, so you can find everything in one app.",
}, },
}; };

3
refilc_mobile_ui/pubspec.yaml
View File

@ -69,7 +69,8 @@ dependencies:
get_it: ^7.6.7 get_it: ^7.6.7
xml: ^6.5.0 xml: ^6.5.0
markdown: ^7.2.2 markdown: ^7.2.2
carousel_slider: ^4.2.1
dev_dependencies: dev_dependencies:
flutter_lints: ^3.0.1 flutter_lints: ^3.0.1