fix: battle league page

lib/features/battle_league/presentation/ui/battle_league_page.dart

@@ -1,9 +1,9 @@
 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/common_ui/theme/my_theme.dart';
 import 'package:shia_game_flutter/core/utils/gap.dart';
 import 'package:shia_game_flutter/core/utils/my_localization.dart';
+import 'package:shia_game_flutter/core/utils/screen_size.dart';
 import 'package:shia_game_flutter/core/widgets/app_bar/enums/app_bar_type.dart';
 import 'package:shia_game_flutter/core/widgets/app_bar/my_app_bar.dart';
 import 'package:shia_game_flutter/features/battle_league/presentation/controller/battle_league_controller.dart';
@@ -29,13 +29,12 @@ class BattleLeaguePage extends GetView<BattleLeagueController> {
       body: SafeArea(
         child: Column(
           children: [
-            MySpaces.s30.gapHeight,
+            20.h.gapHeight,
             _tabBars(context),
-            MySpaces.s12.gapHeight,
+            12.h.gapHeight,
             _tabViews(),
             56.0.gapHeight,
             _startButton(context),
-            MySpaces.s16.gapHeight,
           ],
         ),
       ),
@@ -44,7 +43,7 @@ class BattleLeaguePage extends GetView<BattleLeagueController> {
 
   Padding _tabBars(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: MySpaces.s30),
+      padding: const EdgeInsets.symmetric(horizontal: 30),
       child: BattleLeagueTabBar(
         controller: controller.tabController,
         tabs: [
@@ -61,11 +60,11 @@ class BattleLeaguePage extends GetView<BattleLeagueController> {
         controller: controller.tabController,
         children: const [
           Padding(
-            padding: EdgeInsets.symmetric(horizontal: MySpaces.s30),
+            padding: EdgeInsets.symmetric(horizontal: 30),
             child: TimeRanking(),
           ),
           Padding(
-            padding: EdgeInsets.symmetric(horizontal: MySpaces.s30),
+            padding: EdgeInsets.symmetric(horizontal: 30),
             child: RegionalRanking(),
           ),
         ],
@@ -75,7 +74,7 @@ class BattleLeaguePage extends GetView<BattleLeagueController> {
 
   Padding _startButton(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: MySpaces.s30),
+      padding: const EdgeInsets.symmetric(horizontal: 30),
       child: BattleLeagueStartButton(
         title: context.translate.play_now,
         onTap: () {},

lib/features/battle_league/presentation/ui/widgets/battle_league_start_button.dart

@@ -18,7 +18,7 @@ class BattleLeagueStartButton extends StatelessWidget {
     return MyContainer(
       onTap: onTap,
       width: context.widthScreen,
-      height: 64,
+      height: 64.h,
       borderRadius: const BorderRadius.all(Radius.circular(20)),
       borderGradient: const LinearGradient(
           begin: AlignmentDirectional.topStart,
@@ -36,9 +36,9 @@ class BattleLeagueStartButton extends StatelessWidget {
           Color(0xFFCD8402),
         ],
       ),
-      child:  GradientText(
+      child: GradientText(
         text: title,
-        fontSize: 22,
+        fontSize: 22.sp,
         color: const Color(0xFFF5D69F),
         offset: const Offset(0, 1.04),
         blurRadius: 0.52,

lib/features/battle_league/presentation/ui/widgets/battle_league_tab_bar.dart

@@ -1,7 +1,7 @@
 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/common_ui/theme/my_theme.dart';
+import 'package:shia_game_flutter/core/utils/screen_size.dart';
 
 class BattleLeagueTabBar extends StatelessWidget {
   const BattleLeagueTabBar({
@@ -18,20 +18,20 @@ class BattleLeagueTabBar extends StatelessWidget {
     return Container(
       padding: const EdgeInsets.all(3),
       decoration: const BoxDecoration(
-        borderRadius: BorderRadius.all(Radius.circular(MySpaces.s10)),
+        borderRadius: BorderRadius.all(Radius.circular(10)),
         color: Color(0XFF310D6F),
       ),
       child: TabBar(
         controller: controller,
         tabs: tabs.map((e) => Tab(text: e)).toList(),
         indicator: const BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(MySpaces.s8)),
+          borderRadius: BorderRadius.all(Radius.circular(8)),
           color: Color(0XFF897AB8),
         ),
         indicatorSize: TabBarIndicatorSize.tab,
         labelColor: context.primaryColor,
         unselectedLabelColor: const Color(0XFF897AB8),
-        labelStyle: Lexend.semiBold.copyWith(fontSize: 14),
+        labelStyle: Lexend.semiBold.copyWith(fontSize: 14.sp),
         dividerHeight: 0,
       ),
     );

lib/features/battle_league/presentation/ui/widgets/filter_ranking_button.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:shia_game_flutter/common_ui/resources/my_colors.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/screen_size.dart';
 import 'package:shia_game_flutter/core/widgets/container/my_container.dart';
 
 class FilterRankingButton extends StatelessWidget {
@@ -20,7 +20,7 @@ class FilterRankingButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return MyContainer(
       onTap: select ? null : onTap,
-      padding: const EdgeInsets.symmetric(vertical: MySpaces.s16),
+      padding: const EdgeInsets.symmetric(vertical: 16),
       borderRadius: const BorderRadius.all(Radius.circular(7)),
       color: select ? null : MyColors.black.withValues(alpha: 0.2),
       gradient: select
@@ -33,7 +33,7 @@ class FilterRankingButton extends StatelessWidget {
       child: Text(
         title ?? '',
         style: Lexend.semiBold.copyWith(
-          fontSize: 12,
+          fontSize: 12.sp,
           color: select ? MyColors.white : const Color(0XFFBCA1EA),
         ),
       ),

lib/features/battle_league/presentation/ui/widgets/my_ranking_widget.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:shia_game_flutter/common_ui/resources/my_assets.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/gap.dart';
+import 'package:shia_game_flutter/core/utils/screen_size.dart';
 import 'package:shia_game_flutter/core/widgets/image/my_image.dart';
 
 class MyRankingWidget extends StatelessWidget {
@@ -11,23 +11,23 @@ class MyRankingWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      height: 48,
+      height: 48.h,
       child: Row(
         children: [
-          Text('1', style: Lexend.extraBold.copyWith(fontSize: 12)),
-          MySpaces.s20.gapWidth,
-          const MyImage(asset: MyAssets.sampleAvatar, size: MySpaces.s20),
-          MySpaces.s6.gapWidth,
+          Text('1', style: Lexend.extraBold.copyWith(fontSize: 12.sp)),
+          20.w.gapWidth,
+          const MyImage(asset: MyAssets.sampleAvatar, size: 20),
+          6.w.gapWidth,
           Expanded(
             child: Text(
               'Amirreza',
-              style: Lexend.medium.copyWith(fontSize: 12),
+              style: Lexend.medium.copyWith(fontSize: 12.sp),
             ),
           ),
-          MySpaces.s6.gapWidth,
+          6.w.gapWidth,
           const MyImage(asset: MyAssets.iconRank),
-          MySpaces.s6.gapWidth,
-          Text('1234', style: Lexend.black.copyWith(fontSize: 12)),
+          6.w.gapWidth,
+          Text('1234', style: Lexend.black.copyWith(fontSize: 12.sp)),
         ],
       ),
     );

lib/features/battle_league/presentation/ui/widgets/ranking_region.dart

@@ -1,7 +1,7 @@
 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/screen_size.dart';
 
 class RankingRegion extends StatelessWidget {
   const RankingRegion({super.key});
@@ -9,15 +9,15 @@ class RankingRegion extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
-      spacing: MySpaces.s2,
+      spacing: 2,
       children: [
         const Icon(
           Icons.location_on_rounded,
-          size: MySpaces.s18,
+          size: 18,
           color: Color(0xFF8249E2),
         ),
         Text.rich(
-          style: Lexend.medium.copyWith(fontSize: 12),
+          style: Lexend.medium.copyWith(fontSize: 12.sp),
           TextSpan(
             text: '${context.translate.region}: ',
             style: const TextStyle(color: Color(0xFF8249E2)),

lib/features/battle_league/presentation/ui/widgets/ranking_scrollbar.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:shia_game_flutter/common_ui/resources/my_spaces.dart';
 
 class RankingScrollbar extends StatelessWidget {
   const RankingScrollbar({
@@ -21,7 +20,7 @@ class RankingScrollbar extends StatelessWidget {
       trackRadius: const Radius.circular(10),
       radius: const Radius.circular(10),
       thickness: 3,
-      crossAxisMargin: MySpaces.s0,
+      crossAxisMargin: 0,
       trackVisibility: true,
       child: child,
     );

lib/features/battle_league/presentation/ui/widgets/ranking_time.dart

@@ -1,8 +1,8 @@
 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/common_ui/theme/my_theme.dart';
 import 'package:shia_game_flutter/core/utils/gap.dart';
+import 'package:shia_game_flutter/core/utils/screen_size.dart';
 import 'package:shia_game_flutter/core/widgets/container/my_container.dart';
 
 class RankingTime extends StatelessWidget {
@@ -22,38 +22,38 @@ class RankingTime extends StatelessWidget {
         Text(
           '1ST ${filterTitles[selectedIndex]}',
           style: Lexend.black.copyWith(
-            fontSize: 14,
+            fontSize: 14.sp,
           ),
         ),
-        MySpaces.s8.gapWidth,
+        8.w.gapWidth,
         Text(
           '(May 2024)',
           style: Lexend.medium.copyWith(
-            fontSize: 10,
+            fontSize: 10.sp,
           ),
         ),
         const Spacer(),
         MyContainer(
-          height: MySpaces.s32,
-          width: MySpaces.s32,
+          height: 32,
+          width: 32,
           borderRadius: const BorderRadius.all(Radius.circular(7)),
           color: const Color(0XFF5210AC),
           child: Icon(
             Icons.arrow_back_ios_rounded,
             color: context.primaryColor,
-            size: MySpaces.s18,
+            size: 18,
           ),
         ),
-        MySpaces.s10.gapWidth,
+        10.w.gapWidth,
         MyContainer(
-          height: MySpaces.s32,
-          width: MySpaces.s32,
+          height: 32,
+          width: 32,
           borderRadius: const BorderRadius.all(Radius.circular(7)),
           color: const Color(0XFF5210AC),
           child: Icon(
             Icons.arrow_forward_ios_rounded,
             color: context.primaryColor,
-            size: MySpaces.s18,
+            size: 18,
           ),
         )
       ],

lib/features/battle_league/presentation/ui/widgets/ranking_widget.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:shia_game_flutter/common_ui/resources/my_assets.dart';
 import 'package:shia_game_flutter/common_ui/resources/my_colors.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/gap.dart';
+import 'package:shia_game_flutter/core/utils/screen_size.dart';
 import 'package:shia_game_flutter/core/widgets/image/my_image.dart';
 
 class RankingWidget extends StatelessWidget {
@@ -12,29 +12,29 @@ class RankingWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: 48,
+      height: 48.h,
       decoration: BoxDecoration(
-        borderRadius: const BorderRadius.all(Radius.circular(MySpaces.s10)),
+        borderRadius: const BorderRadius.all(Radius.circular(10)),
         color: MyColors.black.withValues(alpha: 0.2),
       ),
       child: Row(
         children: [
-          MySpaces.s10.gapWidth,
-          Text('1', style: Lexend.extraBold.copyWith(fontSize: 12)),
-          MySpaces.s20.gapWidth,
-          const MyImage(asset: MyAssets.sampleAvatar, size: MySpaces.s20),
-          MySpaces.s6.gapWidth,
+          10.w.gapWidth,
+          Text('1', style: Lexend.extraBold.copyWith(fontSize: 12.sp)),
+          20.w.gapWidth,
+          const MyImage(asset: MyAssets.sampleAvatar, size: 20),
+          6.w.gapWidth,
           Expanded(
             child: Text(
               'Amirreza',
-              style: Lexend.medium.copyWith(fontSize: 12),
+              style: Lexend.medium.copyWith(fontSize: 12.sp),
             ),
           ),
-          MySpaces.s6.gapWidth,
+          6.w.gapWidth,
           const MyImage(asset: MyAssets.iconRank),
-          MySpaces.s6.gapWidth,
-          Text('1234', style: Lexend.black.copyWith(fontSize: 12)),
-          MySpaces.s30.gapWidth,
+          6.w.gapWidth,
+          Text('1234', style: Lexend.black.copyWith(fontSize: 12.sp)),
+          30.w.gapWidth,
         ],
       ),
     );

lib/features/battle_league/presentation/ui/widgets/regional_ranking.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.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/utils/my_localization.dart';
+import 'package:shia_game_flutter/core/utils/screen_size.dart';
 import 'package:shia_game_flutter/features/battle_league/presentation/ui/widgets/filter_ranking_button.dart';
 import 'package:shia_game_flutter/features/battle_league/presentation/ui/widgets/my_ranking_widget.dart';
 import 'package:shia_game_flutter/features/battle_league/presentation/ui/widgets/ranking_region.dart';
@@ -39,18 +39,18 @@ class _RegionalRankingState extends State<RegionalRanking> {
   Widget build(BuildContext context) {
     return Container(
       padding: const EdgeInsets.only(
-        top: MySpaces.s12,
-        left: MySpaces.s12,
-        right: MySpaces.s12,
+        top: 12,
+        left: 12,
+        right: 12,
       ),
       decoration: const BoxDecoration(
-        borderRadius: BorderRadius.all(Radius.circular(MySpaces.s10)),
+        borderRadius: BorderRadius.all(Radius.circular(10)),
         color: Color(0XFF310D6F),
       ),
       child: Column(
         children: [
           Row(
-            spacing: MySpaces.s10,
+            spacing: 10,
             children: List.generate(
               filterTitles.length,
               (index) => Expanded(
@@ -66,18 +66,18 @@ class _RegionalRankingState extends State<RegionalRanking> {
               ),
             ),
           ),
-          MySpaces.s22.gapHeight,
+          22.h.gapHeight,
           const RankingRegion(),
-          MySpaces.s12.gapHeight,
+          12.h.gapHeight,
           Expanded(
             child: RankingScrollbar(
               scrollController: scrollController,
               child: ListView.separated(
                 controller: scrollController,
                 itemCount: 10,
-                padding: const EdgeInsetsDirectional.only(end: MySpaces.s14),
+                padding: const EdgeInsetsDirectional.only(end: 14),
                 itemBuilder: (context, index) => const RankingWidget(),
-                separatorBuilder: (context, index) => MySpaces.s10.gapHeight,
+                separatorBuilder: (context, index) => 10.h.gapHeight,
               ),
             ),
           ),

lib/features/battle_league/presentation/ui/widgets/time_ranking.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.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/utils/my_localization.dart';
+import 'package:shia_game_flutter/core/utils/screen_size.dart';
 import 'package:shia_game_flutter/features/battle_league/presentation/ui/widgets/filter_ranking_button.dart';
 import 'package:shia_game_flutter/features/battle_league/presentation/ui/widgets/my_ranking_widget.dart';
 import 'package:shia_game_flutter/features/battle_league/presentation/ui/widgets/ranking_scrollbar.dart';
@@ -40,18 +40,18 @@ class _TimeRankingState extends State<TimeRanking> {
   Widget build(BuildContext context) {
     return Container(
       padding: const EdgeInsets.only(
-        top: MySpaces.s12,
-        left: MySpaces.s12,
-        right: MySpaces.s12,
+        top: 12,
+        left: 12,
+        right: 12,
       ),
       decoration: const BoxDecoration(
-        borderRadius: BorderRadius.all(Radius.circular(MySpaces.s10)),
+        borderRadius: BorderRadius.all(Radius.circular(10)),
         color: Color(0XFF310D6F),
       ),
       child: Column(
         children: [
           Row(
-            spacing: MySpaces.s10,
+            spacing: 10,
             children: List.generate(
               filterTitles.length,
               (index) => Expanded(
@@ -67,13 +67,13 @@ class _TimeRankingState extends State<TimeRanking> {
               ),
             ),
           ),
-          MySpaces.s22.gapHeight,
+          22.h.gapHeight,
           if(selectedIndex != 0) ...{
             RankingTime(
               filterTitles: filterTitles,
               selectedIndex: selectedIndex,
             ),
-            MySpaces.s12.gapHeight,
+            12.h.gapHeight,
           },
           Expanded(
             child: RankingScrollbar(
@@ -81,9 +81,9 @@ class _TimeRankingState extends State<TimeRanking> {
               child: ListView.separated(
                 controller: scrollController,
                 itemCount: 10,
-                padding: const EdgeInsetsDirectional.only(end: MySpaces.s14),
+                padding: const EdgeInsetsDirectional.only(end: 14),
                 itemBuilder: (context, index) => const RankingWidget(),
-                separatorBuilder: (context, index) => MySpaces.s10.gapHeight,
+                separatorBuilder: (context, index) => 10.h.gapHeight,
               ),
             ),
           ),