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:59:05 +02:00
commit d204af42db
1 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ 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/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_button.dart';
import 'package:refilc_mobile_ui/screens/login/login_input.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';
@ -123,11 +124,11 @@ class LoginScreenState extends State<LoginScreen> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
const SizedBox(height: 32), const SizedBox(height: 21),
CarouselSlider( CarouselSlider(
options: CarouselOptions( options: CarouselOptions(
height: MediaQuery.of(context).size.height, height: MediaQuery.of(context).size.height,
viewportFraction: 0.957, //math is mathing viewportFraction: 1,
autoPlay: true, autoPlay: true,
autoPlayInterval: const Duration(seconds: 4), autoPlayInterval: const Duration(seconds: 4),
pauseAutoPlayOnTouch: true), pauseAutoPlayOnTouch: true),
@ -140,8 +141,13 @@ class LoginScreenState extends State<LoginScreen> {
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.only(left: 24), padding: const EdgeInsets.only(left: 24),
//TODO: fix padding child: Column(
child: Text( crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
Text(
"welcome_title_$i".i18n, "welcome_title_$i".i18n,
style: TextStyle( style: TextStyle(
color: AppColors.of(context) color: AppColors.of(context)
@ -151,15 +157,27 @@ class LoginScreenState extends State<LoginScreen> {
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
height: 1.3), height: 1.3),
), ),
), const SizedBox(height: 14.375), //meth
const SizedBox(height: 20), Padding(
Text("welcome_text_$i".i18n, padding: const EdgeInsets.only(
right: 20),
child: Text(
"welcome_text_$i".i18n,
style: const TextStyle( style: const TextStyle(
fontFamily: 'FigTree', fontFamily: 'FigTree',
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 18, fontSize: 18,
height: 1.3)), height: 1.3),
Image.asset('assets/images/showcase$i.png') ),
),
],
)),
const SizedBox(height: 15.625),
Padding(
padding: const EdgeInsets.only(
left: 16, right: 16),
child: Image.asset(
'assets/images/showcase$i.png', fit: BoxFit.fitWidth)),
], ],
); );
}, },