diff --git a/lib/features/awards/presentation/ui/awards_page.dart b/lib/features/awards/presentation/ui/awards_page.dart index e8d7f7b..7fa3cc2 100644 --- a/lib/features/awards/presentation/ui/awards_page.dart +++ b/lib/features/awards/presentation/ui/awards_page.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:shia_game_flutter/common_ui/resources/my_spaces.dart'; -import 'package:shia_game_flutter/core/utils/gap.dart'; import 'package:shia_game_flutter/core/widgets/background/my_background.dart'; import 'package:shia_game_flutter/features/awards/presentation/controller/awards_controller.dart'; import 'package:shia_game_flutter/features/awards/presentation/ui/widgets/award_widget.dart'; @@ -13,20 +11,17 @@ class AwardsPage extends GetView { Widget build(BuildContext context) { return MyBackground( child: Column( + spacing: 28, children: [ - 60.0.gapHeight, AwardWidget( images: controller.leagueAwards, ), - MySpaces.s28.gapHeight, AwardWidget( images: controller.customAwards, ), - MySpaces.s28.gapHeight, AwardWidget( images: controller.castAwards, ), - MySpaces.s30.gapHeight, ], ), ); diff --git a/lib/features/awards/presentation/ui/widgets/award_widget.dart b/lib/features/awards/presentation/ui/widgets/award_widget.dart index 06fe414..04daf4c 100644 --- a/lib/features/awards/presentation/ui/widgets/award_widget.dart +++ b/lib/features/awards/presentation/ui/widgets/award_widget.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:shia_game_flutter/common_ui/resources/my_spaces.dart'; import 'package:shia_game_flutter/common_ui/resources/my_text_style.dart'; import 'package:shia_game_flutter/core/utils/my_localization.dart'; import 'package:shia_game_flutter/core/utils/page_scalable.dart'; @@ -74,20 +73,20 @@ class _AwardWidgetState extends State { ), color: const Color(0XFF2B105A), padding: const EdgeInsets.only( - bottom: MySpaces.s10, - top: MySpaces.s40, + bottom: 10, + top: 40, ), child: Column( - spacing: MySpaces.s12, + spacing: 12, children: [ SizedBox( - height: 100, + height: 100.h, child: Stack( alignment: Alignment.center, children: [ Padding( padding: const EdgeInsets.symmetric( - horizontal: MySpaces.s16, + horizontal: 16, ), child: PageView.builder( controller: pageController, @@ -126,16 +125,16 @@ class _AwardWidgetState extends State { ), ), Column( - spacing: MySpaces.s2, + spacing: 2, children: [ Text( context.translate.first_place, - style: Lexend.extraBold.copyWith(fontSize: 14), + style: Lexend.extraBold.copyWith(fontSize: 14.sp), ), GradientText( text: '1ST Week (May 2024)', textStyle: Lexend.semiBold.copyWith( - fontSize: 10, + fontSize: 10.sp, shadows: [ const BoxShadow( color: Color(0XFF3E1381), @@ -152,11 +151,11 @@ class _AwardWidgetState extends State { ), ), Positioned( - top: -MySpaces.s14, + top: -14, child: Container( padding: const EdgeInsets.symmetric( - horizontal: MySpaces.s10, - vertical: MySpaces.s6, + horizontal: 10, + vertical: 6, ), decoration: const BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(12)), @@ -168,7 +167,7 @@ class _AwardWidgetState extends State { text: context.translate.battle_league_awards, color: const Color(0XFFCAA8FF), textStyle: Lexend.medium.copyWith( - fontSize: 14, + fontSize: 10.sp, shadows: [ const BoxShadow( color: Color(0XFF3E1381),