From 96b84e2ddd613ed5391b795d4232859bc07c6770 Mon Sep 17 00:00:00 2001 From: zypherift Date: Sun, 28 Apr 2024 16:29:31 +0200 Subject: [PATCH 1/2] fix padding --- .../lib/screens/login/login_screen.dart | 50 +++++++++++-------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/refilc_mobile_ui/lib/screens/login/login_screen.dart b/refilc_mobile_ui/lib/screens/login/login_screen.dart index fa83ec4..5be1c65 100644 --- a/refilc_mobile_ui/lib/screens/login/login_screen.dart +++ b/refilc_mobile_ui/lib/screens/login/login_screen.dart @@ -123,11 +123,11 @@ class LoginScreenState extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - const SizedBox(height: 32), + const SizedBox(height: 23), CarouselSlider( options: CarouselOptions( height: MediaQuery.of(context).size.height, - viewportFraction: 0.957, //math is mathing + viewportFraction: 1, autoPlay: true, autoPlayInterval: const Duration(seconds: 4), pauseAutoPlayOnTouch: true), @@ -139,26 +139,32 @@ class LoginScreenState extends State { 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)), + padding: const EdgeInsets.only(left: 24), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + mainAxisAlignment: + MainAxisAlignment.start, + children: [ + 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: 14.375), //meth + 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') ], ); From 89604a8b4fd3504d4a6715398b73a5571f740033 Mon Sep 17 00:00:00 2001 From: zypherift Date: Sun, 28 Apr 2024 16:39:13 +0200 Subject: [PATCH 2/2] fix width --- .../lib/screens/login/login_screen.dart | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/refilc_mobile_ui/lib/screens/login/login_screen.dart b/refilc_mobile_ui/lib/screens/login/login_screen.dart index 5be1c65..5bb8b65 100644 --- a/refilc_mobile_ui/lib/screens/login/login_screen.dart +++ b/refilc_mobile_ui/lib/screens/login/login_screen.dart @@ -5,6 +5,7 @@ import 'package:refilc/api/login.dart'; import 'package:refilc/theme/colors/colors.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'; @@ -123,7 +124,7 @@ class LoginScreenState extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - const SizedBox(height: 23), + const SizedBox(height: 21), CarouselSlider( options: CarouselOptions( height: MediaQuery.of(context).size.height, @@ -157,15 +158,26 @@ class LoginScreenState extends State { height: 1.3), ), const SizedBox(height: 14.375), //meth - Text("welcome_text_$i".i18n, + Padding( + padding: const EdgeInsets.only( + right: 20), + child: Text( + "welcome_text_$i".i18n, style: const TextStyle( fontFamily: 'FigTree', fontWeight: FontWeight.w500, 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)), ], ); },