diff --git a/lib/core/utils/screen_size.dart b/lib/core/utils/screen_size.dart index b7dcfd0..b0292ae 100644 --- a/lib/core/utils/screen_size.dart +++ b/lib/core/utils/screen_size.dart @@ -9,5 +9,5 @@ extension ScreenSize on BuildContext { extension AdaptiveSize on int { double get w => Get.context!.widthScreen * this / 375; double get h => Get.context!.heightScreen * this / 812; - double get sp => MediaQuery.textScalerOf(Get.context!).scale(toDouble()); + // double get sp => MediaQuery.textScalerOf(Get.context!).scale(toDouble()); } diff --git a/lib/core/widgets/app_bar/widgets/app_bar_add_widget.dart b/lib/core/widgets/app_bar/widgets/app_bar_add_widget.dart index abaf337..fc73ae8 100644 --- a/lib/core/widgets/app_bar/widgets/app_bar_add_widget.dart +++ b/lib/core/widgets/app_bar/widgets/app_bar_add_widget.dart @@ -46,7 +46,7 @@ class AppBarAddWidget extends StatelessWidget { maxLines: 1, textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, - style: Lexend.bold.copyWith(fontSize: 12.sp), + style: Lexend.bold.copyWith(fontSize: 12), ), ), MyContainer( diff --git a/lib/core/widgets/app_bar/widgets/app_bar_gradient_title.dart b/lib/core/widgets/app_bar/widgets/app_bar_gradient_title.dart index 8703c31..0588b94 100644 --- a/lib/core/widgets/app_bar/widgets/app_bar_gradient_title.dart +++ b/lib/core/widgets/app_bar/widgets/app_bar_gradient_title.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:shia_game_flutter/core/utils/screen_size.dart'; import 'package:shia_game_flutter/core/widgets/text/gradient_text.dart'; class AppBarGradientTitle extends StatelessWidget { @@ -15,7 +14,7 @@ class AppBarGradientTitle extends StatelessWidget { return GradientText( text: title, color: const Color(0XFFCAA8FF), - fontSize: 22.sp, + fontSize: 22, shadowColor: const Color(0XFF3E1381), offset: const Offset(0, 1.69), blurRadius: 0.84, diff --git a/lib/core/widgets/bottom_nav_bar/bottom_nav_bar.dart b/lib/core/widgets/bottom_nav_bar/bottom_nav_bar.dart index 36d0c04..8cdd675 100644 --- a/lib/core/widgets/bottom_nav_bar/bottom_nav_bar.dart +++ b/lib/core/widgets/bottom_nav_bar/bottom_nav_bar.dart @@ -27,8 +27,8 @@ class BottomNavBar extends GetView { backgroundColor: Colors.transparent, elevation: 0, type: BottomNavigationBarType.fixed, - unselectedFontSize: 11.sp, - selectedFontSize: 11.sp, + unselectedFontSize: 11, + selectedFontSize: 11, unselectedLabelStyle: Lexend.bold, selectedLabelStyle: Lexend.bold, showSelectedLabels: false, diff --git a/lib/core/widgets/bottom_nav_bar/styles/bottom_nav_bar_item.dart b/lib/core/widgets/bottom_nav_bar/styles/bottom_nav_bar_item.dart index a29dddc..a7c5a56 100644 --- a/lib/core/widgets/bottom_nav_bar/styles/bottom_nav_bar_item.dart +++ b/lib/core/widgets/bottom_nav_bar/styles/bottom_nav_bar_item.dart @@ -17,7 +17,7 @@ class BottomNavBarItem extends StatelessWidget { MyImage(asset: bottomNavEntity.icon ?? ''), Text( bottomNavEntity.title ?? '', - style: Lexend.bold.copyWith(fontSize: 11.sp), + style: Lexend.bold.copyWith(fontSize: 11), ), ], ); diff --git a/lib/core/widgets/bottom_nav_bar/styles/bottom_nav_bar_profile_item.dart b/lib/core/widgets/bottom_nav_bar/styles/bottom_nav_bar_profile_item.dart index 7acb67a..afd0586 100644 --- a/lib/core/widgets/bottom_nav_bar/styles/bottom_nav_bar_profile_item.dart +++ b/lib/core/widgets/bottom_nav_bar/styles/bottom_nav_bar_profile_item.dart @@ -29,7 +29,7 @@ class BottomNavBarProfileItem extends StatelessWidget { ), Text( bottomNavEntity.title ?? '', - style: Lexend.bold.copyWith(fontSize: 11.sp), + style: Lexend.bold.copyWith(fontSize: 11), ), ], ); diff --git a/lib/core/widgets/button/styles/active_style.dart b/lib/core/widgets/button/styles/active_style.dart index da6cfb3..8841ede 100644 --- a/lib/core/widgets/button/styles/active_style.dart +++ b/lib/core/widgets/button/styles/active_style.dart @@ -45,7 +45,7 @@ class ActiveStyle extends StatelessWidget { ], shadowColor: const Color(0xFF0A1F0F), offset: const Offset(0, 1.69), - fontSize: fontSize ?? 12.sp, + fontSize: fontSize ?? 12, ), if (icon != null) ...{ 6.w.gapWidth, diff --git a/lib/core/widgets/button/styles/default_style.dart b/lib/core/widgets/button/styles/default_style.dart index 196144d..bc1191b 100644 --- a/lib/core/widgets/button/styles/default_style.dart +++ b/lib/core/widgets/button/styles/default_style.dart @@ -39,7 +39,7 @@ class DefaultStyle extends StatelessWidget { color: const Color(0XFF9C8CC2), shadowColor: const Color(0xFF1B0D31), offset: const Offset(0, 1.69), - fontSize: fontSize ?? 12.sp, + fontSize: fontSize ?? 12, ), if (icon != null) ...{ 6.w.gapWidth, diff --git a/lib/core/widgets/input/my_input.dart b/lib/core/widgets/input/my_input.dart index f238ec6..713fe3c 100644 --- a/lib/core/widgets/input/my_input.dart +++ b/lib/core/widgets/input/my_input.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.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 MyInput extends StatelessWidget { const MyInput({ @@ -48,7 +47,7 @@ class MyInput extends StatelessWidget { if (labelText != null && labelText!.isNotEmpty) Text( labelText ?? '', - style: Lexend.bold.copyWith(fontSize: 12.sp), + style: Lexend.bold.copyWith(fontSize: 12), ), TextFormField( controller: controller, @@ -63,7 +62,7 @@ class MyInput extends StatelessWidget { readOnly: readOnly ?? false, maxLines: maxLines, minLines: minLines, - style: Lexend.extraBold.copyWith(fontSize: 12.sp), + style: Lexend.extraBold.copyWith(fontSize: 12), cursorColor: context.primaryColor, decoration: InputDecoration( contentPadding: const EdgeInsets.all(14), @@ -78,7 +77,7 @@ class MyInput extends StatelessWidget { fillColor: const Color(0XFF000000).withValues(alpha: 0.2), filled: true, hintText: hintText, - hintStyle: Lexend.extraBold.copyWith(fontSize: 12.sp), + hintStyle: Lexend.extraBold.copyWith(fontSize: 12), ), onTapOutside: (event) { FocusManager.instance.primaryFocus?.unfocus(); diff --git a/lib/core/widgets/loading/my_linear_loading.dart b/lib/core/widgets/loading/my_linear_loading.dart index 514b177..d0b7bac 100644 --- a/lib/core/widgets/loading/my_linear_loading.dart +++ b/lib/core/widgets/loading/my_linear_loading.dart @@ -16,7 +16,7 @@ class MyLinearLoading extends StatelessWidget { children: [ Text( context.translate.loading, - style: Lexend.regular.copyWith(fontSize: 12.sp), + style: Lexend.regular.copyWith(fontSize: 12), ), Container( width: 188.w, diff --git a/lib/core/widgets/text/gradient_text.dart b/lib/core/widgets/text/gradient_text.dart index f8cc5fc..c0c7c8f 100644 --- a/lib/core/widgets/text/gradient_text.dart +++ b/lib/core/widgets/text/gradient_text.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.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 GradientText extends StatelessWidget { const GradientText({ @@ -51,7 +50,7 @@ class GradientText extends StatelessWidget { textAlign: textAlign, maxLines: 1, style: textStyle ?? Lexend.extraBold.copyWith( - fontSize: fontSize ?? 14.sp, + fontSize: fontSize ?? 14, shadows: [ BoxShadow( color: shadowColor, diff --git a/lib/features/awards/presentation/ui/widgets/award_widget.dart b/lib/features/awards/presentation/ui/widgets/award_widget.dart index 04daf4c..b90baaa 100644 --- a/lib/features/awards/presentation/ui/widgets/award_widget.dart +++ b/lib/features/awards/presentation/ui/widgets/award_widget.dart @@ -129,12 +129,12 @@ class _AwardWidgetState extends State { children: [ Text( context.translate.first_place, - style: Lexend.extraBold.copyWith(fontSize: 14.sp), + style: Lexend.extraBold.copyWith(fontSize: 14), ), GradientText( text: '1ST Week (May 2024)', textStyle: Lexend.semiBold.copyWith( - fontSize: 10.sp, + fontSize: 10, shadows: [ const BoxShadow( color: Color(0XFF3E1381), @@ -167,7 +167,7 @@ class _AwardWidgetState extends State { text: context.translate.battle_league_awards, color: const Color(0XFFCAA8FF), textStyle: Lexend.medium.copyWith( - fontSize: 10.sp, + fontSize: 10, shadows: [ const BoxShadow( color: Color(0XFF3E1381), diff --git a/lib/features/battle_league/first_part/presentation/ui/battle_league_finding_page.dart b/lib/features/battle_league/first_part/presentation/ui/battle_league_finding_page.dart index 3e61da9..1a35752 100644 --- a/lib/features/battle_league/first_part/presentation/ui/battle_league_finding_page.dart +++ b/lib/features/battle_league/first_part/presentation/ui/battle_league_finding_page.dart @@ -48,7 +48,7 @@ class BattleLeagueFindingPage extends GetView { bottom: 0, child: Text( context.translate.finding_player, - style: Lexend.semiBold.copyWith(fontSize: 20.sp), + style: Lexend.semiBold.copyWith(fontSize: 20), ), ), ], @@ -58,12 +58,12 @@ class BattleLeagueFindingPage extends GetView { Column _description(BuildContext context) { return Column( children: [ - Text('،،', style: Lexend.black.copyWith(fontSize: 84.sp, height: 1)), + Text('،،', style: Lexend.black.copyWith(fontSize: 84, height: 1)), Text( context.translate.find_hint, textAlign: TextAlign.center, style: Lexend.regular.copyWith( - fontSize: 14.sp, + fontSize: 14, color: const Color(0XFFC9B7E8), ), ), diff --git a/lib/features/battle_league/first_part/presentation/ui/battle_league_topic_page.dart b/lib/features/battle_league/first_part/presentation/ui/battle_league_topic_page.dart index 755ed82..acbb722 100644 --- a/lib/features/battle_league/first_part/presentation/ui/battle_league_topic_page.dart +++ b/lib/features/battle_league/first_part/presentation/ui/battle_league_topic_page.dart @@ -47,12 +47,12 @@ class BattleLeagueTopicPage extends GetView { return Text.rich( TextSpan( text: '${context.translate.choose} ', - style: Lexend.regular.copyWith(fontSize: 12.sp), + style: Lexend.regular.copyWith(fontSize: 12), children: [ TextSpan( text: '${context.translate.three_topics} ', style: Lexend.regular.copyWith( - fontSize: 12.sp, + fontSize: 12, color: const Color(0xFF9858FF), ), ), @@ -60,7 +60,7 @@ class BattleLeagueTopicPage extends GetView { TextSpan( text: '${context.translate.random.toLowerCase()} ', style: Lexend.regular.copyWith( - fontSize: 12.sp, + fontSize: 12, color: const Color(0xFF9858FF), ), ), diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_golden_button.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_golden_button.dart index cbdd417..85e7239 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_golden_button.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_golden_button.dart @@ -38,7 +38,7 @@ class BattleGoldenButton extends StatelessWidget { ), child: GradientText( text: title, - fontSize: 22.sp, + fontSize: 22, color: const Color(0xFFF5D69F), offset: const Offset(0, 1.04), blurRadius: 0.52, diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_grey_button.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_grey_button.dart index b683bd9..8dd5225 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_grey_button.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_grey_button.dart @@ -48,7 +48,7 @@ class BattleGreyButton extends StatelessWidget { ), Text( label ?? '', - style: Lexend.medium.copyWith(fontSize: 12.sp), + style: Lexend.medium.copyWith(fontSize: 12), ), ], ), diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_purple_button.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_purple_button.dart index 1b71eca..1d1f967 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_purple_button.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/button/battle_purple_button.dart @@ -31,7 +31,7 @@ class BattlePurpleButton extends StatelessWidget { ), child: GradientText( text: label, - fontSize: 22.sp, + fontSize: 22, color: const Color(0xFFE1E1E1), offset: const Offset(0, 1.04), blurRadius: 1.9, diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/founded_page/founded_avatar.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/founded_page/founded_avatar.dart index f08115e..69f5f8a 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/founded_page/founded_avatar.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/founded_page/founded_avatar.dart @@ -39,7 +39,7 @@ class FoundedAvatar extends StatelessWidget { child: Text( '2,567', style: Lexend.semiBold.copyWith( - fontSize: 12.sp, + fontSize: 12, color: const Color(0XFF784AC0), ), ), @@ -48,13 +48,13 @@ class FoundedAvatar extends StatelessWidget { ], ), 16.h.gapHeight, - Text('Jack William', style: Lexend.bold.copyWith(fontSize: 16.sp)), + Text('Jack William', style: Lexend.bold.copyWith(fontSize: 16)), Row( mainAxisSize: MainAxisSize.min, spacing: 10, children: [ const MyImage(asset: MyAssets.iconIran), - Text('Iran', style: Lexend.medium.copyWith(fontSize: 14.sp)), + Text('Iran', style: Lexend.medium.copyWith(fontSize: 14)), ], ), ], diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/battle_league_tab_bar.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/battle_league_tab_bar.dart index 735ae59..4403509 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/battle_league_tab_bar.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/battle_league_tab_bar.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.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({ @@ -31,7 +30,7 @@ class BattleLeagueTabBar extends StatelessWidget { indicatorSize: TabBarIndicatorSize.tab, labelColor: context.primaryColor, unselectedLabelColor: const Color(0XFF897AB8), - labelStyle: Lexend.semiBold.copyWith(fontSize: 14.sp), + labelStyle: Lexend.semiBold.copyWith(fontSize: 14), dividerHeight: 0, ), ); diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/filter_ranking_button.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/filter_ranking_button.dart index 3d8c84d..a3ddc4c 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/filter_ranking_button.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/filter_ranking_button.dart @@ -1,7 +1,6 @@ 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_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 { @@ -33,7 +32,7 @@ class FilterRankingButton extends StatelessWidget { child: Text( title ?? '', style: Lexend.semiBold.copyWith( - fontSize: 12.sp, + fontSize: 12, color: select ? MyColors.white : const Color(0XFFBCA1EA), ), ), diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/my_ranking_widget.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/my_ranking_widget.dart index ad22103..301800b 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/my_ranking_widget.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/my_ranking_widget.dart @@ -14,20 +14,20 @@ class MyRankingWidget extends StatelessWidget { height: 48.h, child: Row( children: [ - Text('1', style: Lexend.extraBold.copyWith(fontSize: 12.sp)), + Text('1', style: Lexend.extraBold.copyWith(fontSize: 12)), 20.w.gapWidth, const MyImage(asset: MyAssets.sampleAvatar, size: 20), 6.w.gapWidth, Expanded( child: Text( 'Amirreza', - style: Lexend.medium.copyWith(fontSize: 12.sp), + style: Lexend.medium.copyWith(fontSize: 12), ), ), 6.w.gapWidth, const MyImage(asset: MyAssets.iconRank), 6.w.gapWidth, - Text('1234', style: Lexend.black.copyWith(fontSize: 12.sp)), + Text('1234', style: Lexend.black.copyWith(fontSize: 12)), ], ), ); diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_region.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_region.dart index e584ca8..ea3de64 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_region.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_region.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.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}); @@ -17,7 +16,7 @@ class RankingRegion extends StatelessWidget { color: Color(0xFF8249E2), ), Text.rich( - style: Lexend.medium.copyWith(fontSize: 12.sp), + style: Lexend.medium.copyWith(fontSize: 12), TextSpan( text: '${context.translate.region}: ', style: const TextStyle(color: Color(0xFF8249E2)), diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_time.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_time.dart index d5bc86a..2daa935 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_time.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_time.dart @@ -22,14 +22,14 @@ class RankingTime extends StatelessWidget { Text( '1ST ${filterTitles[selectedIndex]}', style: Lexend.black.copyWith( - fontSize: 14.sp, + fontSize: 14, ), ), 8.w.gapWidth, Text( '(May 2024)', style: Lexend.medium.copyWith( - fontSize: 10.sp, + fontSize: 10, ), ), const Spacer(), diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_widget.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_widget.dart index d570455..5ad5976 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_widget.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/main_page/ranking_widget.dart @@ -20,20 +20,20 @@ class RankingWidget extends StatelessWidget { child: Row( children: [ 10.w.gapWidth, - Text('1', style: Lexend.extraBold.copyWith(fontSize: 12.sp)), + Text('1', style: Lexend.extraBold.copyWith(fontSize: 12)), 20.w.gapWidth, const MyImage(asset: MyAssets.sampleAvatar, size: 20), 6.w.gapWidth, Expanded( child: Text( 'Amirreza', - style: Lexend.medium.copyWith(fontSize: 12.sp), + style: Lexend.medium.copyWith(fontSize: 12), ), ), 6.w.gapWidth, const MyImage(asset: MyAssets.iconRank), 6.w.gapWidth, - Text('1234', style: Lexend.black.copyWith(fontSize: 12.sp)), + Text('1234', style: Lexend.black.copyWith(fontSize: 12)), 30.w.gapWidth, ], ), diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/rank_title.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/rank_title.dart index 6f8feb7..a3a73a1 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/rank_title.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/rank_title.dart @@ -29,14 +29,14 @@ class RankTitle extends StatelessWidget { '${context.translate.quiz_league} (june) | ${context.translate.your_place} (1,569)', textAlign: TextAlign.center, maxLines: 1, - style: Lexend.semiBold.copyWith(fontSize: 12.sp), + style: Lexend.semiBold.copyWith(fontSize: 12), ), ), ), 15.w.gapWidth, const MyImage(asset: MyAssets.iconRank), 4.w.gapWidth, - Text('265', style: Lexend.bold.copyWith(fontSize: 12.sp)), + Text('265', style: Lexend.bold.copyWith(fontSize: 12)), ], ), ); diff --git a/lib/features/battle_league/first_part/presentation/ui/widgets/topic_page/topic_widget.dart b/lib/features/battle_league/first_part/presentation/ui/widgets/topic_page/topic_widget.dart index c2a88b6..5147c91 100644 --- a/lib/features/battle_league/first_part/presentation/ui/widgets/topic_page/topic_widget.dart +++ b/lib/features/battle_league/first_part/presentation/ui/widgets/topic_page/topic_widget.dart @@ -55,7 +55,7 @@ class TopicWidget extends StatelessWidget { ), Text( label ?? '', - style: Lexend.medium.copyWith(fontSize: 12.sp), + style: Lexend.medium.copyWith(fontSize: 12), ), ], ), diff --git a/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/battle_league_question_avatar.dart b/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/battle_league_question_avatar.dart index e8a32a7..bef7a18 100644 --- a/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/battle_league_question_avatar.dart +++ b/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/battle_league_question_avatar.dart @@ -35,7 +35,7 @@ class BattleLeagueQuestionAvatar extends StatelessWidget { ), ], ), - Text('Jack William', style: Lexend.bold.copyWith(fontSize: 10.sp)), + Text('Jack William', style: Lexend.bold.copyWith(fontSize: 10)), ], ); } diff --git a/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/question_board.dart b/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/question_board.dart index 1d9c398..a1555a4 100644 --- a/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/question_board.dart +++ b/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/question_board.dart @@ -16,11 +16,11 @@ class QuestionBoard extends StatelessWidget { const BattleLeagueQuestionAvatar(), Column( children: [ - Text('6 - 4', style: Lexend.bold.copyWith(fontSize: 30.sp)), + Text('6 - 4', style: Lexend.bold.copyWith(fontSize: 30)), Text( 'Question 5', style: Lexend.regular.copyWith( - fontSize: 10.sp, + fontSize: 10, color: const Color(0XFF9273C0), ), ), diff --git a/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/question_timer_ready_widget.dart b/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/question_timer_ready_widget.dart index 4979219..51156fa 100644 --- a/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/question_timer_ready_widget.dart +++ b/lib/features/battle_league/question_part/bl_question/presentation/ui/widgets/question_timer_ready_widget.dart @@ -23,7 +23,7 @@ class QuestionTimerReadyWidget extends StatelessWidget { child: Text( '5', style: Lexend.extraBold.copyWith( - fontSize: 48.sp, + fontSize: 48, color: const Color(0XFFF3EBFF), ), ), @@ -35,7 +35,7 @@ class QuestionTimerReadyWidget extends StatelessWidget { begin: AlignmentDirectional.topStart, end: AlignmentDirectional.bottomEnd, gradientColor: [const Color(0XFFE0CCFF), const Color(0XFF7860A1)], - textStyle: Lexend.semiBold.copyWith(fontSize: 16.sp), + textStyle: Lexend.semiBold.copyWith(fontSize: 16), ), ], ); diff --git a/lib/features/home/presentation/pages/widgets/home_battle_cast.dart b/lib/features/home/presentation/pages/widgets/home_battle_cast.dart index b52d82d..e1d7d96 100644 --- a/lib/features/home/presentation/pages/widgets/home_battle_cast.dart +++ b/lib/features/home/presentation/pages/widgets/home_battle_cast.dart @@ -52,7 +52,7 @@ class HomeBattleCast extends StatelessWidget { offset: const Offset(0, 1.04), blurRadius: 0.52, shadowColor: const Color(0xFF3C38C4), - fontSize: 22.sp, + fontSize: 22, ), 10.h.gapHeight, Container( @@ -73,7 +73,7 @@ class HomeBattleCast extends StatelessWidget { 'Sheikh.Sadra VS Ali Masoudi (online) - Sheikh.Sadra number tow VS Ali Masoudi tabar (tomorrow)', maxLines: 1, style: Lexend.semiBold.copyWith( - fontSize: 8.sp, + fontSize: 8, color: const Color(0XFFB6B3FF), ), ), @@ -99,7 +99,7 @@ class HomeBattleCast extends StatelessWidget { child: Text( '2 New', style: Lexend.extraBold.copyWith( - fontSize: 11.sp, + fontSize: 11, ), ), ), diff --git a/lib/features/home/presentation/pages/widgets/home_battle_league.dart b/lib/features/home/presentation/pages/widgets/home_battle_league.dart index 0681cf4..f5b1dd4 100644 --- a/lib/features/home/presentation/pages/widgets/home_battle_league.dart +++ b/lib/features/home/presentation/pages/widgets/home_battle_league.dart @@ -48,12 +48,12 @@ class HomeBattleLeague extends StatelessWidget { shadowColor: const Color(0xFF3E1381), blurRadius: 0.84, offset: const Offset(0, 1.69), - fontSize: 22.sp, + fontSize: 22, ), Text( context.translate.answer_win, style: Lexend.medium.copyWith( - fontSize: 10.sp, + fontSize: 10, color: const Color(0XFFA183D2), ), ), diff --git a/lib/features/home/presentation/pages/widgets/home_custom_widget.dart b/lib/features/home/presentation/pages/widgets/home_custom_widget.dart index 497af5a..a345e6f 100644 --- a/lib/features/home/presentation/pages/widgets/home_custom_widget.dart +++ b/lib/features/home/presentation/pages/widgets/home_custom_widget.dart @@ -69,14 +69,14 @@ class HomeCustomWidget extends StatelessWidget { TextSpan( text: firstText, style: Lexend.semiBold.copyWith( - fontSize: 8.sp, + fontSize: 8, color: CustomWidgetType.firstTextColor[type], ), ), TextSpan( text: ' $secondText', style: Lexend.semiBold.copyWith( - fontSize: 8.sp, + fontSize: 8, color: CustomWidgetType.secondTextColor[type], ), ), diff --git a/lib/features/home/presentation/pages/widgets/home_membership.dart b/lib/features/home/presentation/pages/widgets/home_membership.dart index 126f32d..6a6fd29 100644 --- a/lib/features/home/presentation/pages/widgets/home_membership.dart +++ b/lib/features/home/presentation/pages/widgets/home_membership.dart @@ -42,14 +42,14 @@ class HomeMembership extends StatelessWidget { Text( context.translate.pro_membership, style: Lexend.semiBold.copyWith( - fontSize: 12.sp, + fontSize: 12, color: const Color(0XFFFCC230), ), ), const Spacer(), const MyImage(asset: MyAssets.iconClock), 6.w.gapWidth, - Text('125d 4h', style: Lexend.semiBold.copyWith(fontSize: 12.sp)), + Text('125d 4h', style: Lexend.semiBold.copyWith(fontSize: 12)), ], ), ); diff --git a/lib/features/profile/presentation/ui/widgets/profile_delete_account.dart b/lib/features/profile/presentation/ui/widgets/profile_delete_account.dart index 6a15d4a..0863e86 100644 --- a/lib/features/profile/presentation/ui/widgets/profile_delete_account.dart +++ b/lib/features/profile/presentation/ui/widgets/profile_delete_account.dart @@ -31,7 +31,7 @@ class ProfileDeleteAccount extends StatelessWidget { child: Text( context.translate.delete_account, maxLines: 1, - style: Lexend.semiBold.copyWith(fontSize: 14.sp, color: const Color(0XFF5F5F88)), + style: Lexend.semiBold.copyWith(fontSize: 14, color: const Color(0XFF5F5F88)), ), ), ); diff --git a/lib/features/profile/presentation/ui/widgets/profile_logout.dart b/lib/features/profile/presentation/ui/widgets/profile_logout.dart index 490faf0..a4f39cd 100644 --- a/lib/features/profile/presentation/ui/widgets/profile_logout.dart +++ b/lib/features/profile/presentation/ui/widgets/profile_logout.dart @@ -28,7 +28,7 @@ class ProfileLogout extends StatelessWidget { FittedBox( child: Text( context.translate.logout, - style: Lexend.semiBold.copyWith(fontSize: 14.sp), + style: Lexend.semiBold.copyWith(fontSize: 14), ), ), ], diff --git a/lib/features/shop/presentation/ui/widgets/shop_item/styles/book_style.dart b/lib/features/shop/presentation/ui/widgets/shop_item/styles/book_style.dart index 9337166..e173324 100644 --- a/lib/features/shop/presentation/ui/widgets/shop_item/styles/book_style.dart +++ b/lib/features/shop/presentation/ui/widgets/shop_item/styles/book_style.dart @@ -41,7 +41,7 @@ class BookStyle extends StatelessWidget { maxLines: 2, overflow: TextOverflow.ellipsis, style: Lexend.semiBold.copyWith( - fontSize: 10.sp, + fontSize: 10, ), ), ), @@ -49,7 +49,7 @@ class BookStyle extends StatelessWidget { MyGradientButton( onTap: () {}, title: context.translate.select, - fontSize: 20.sp, + fontSize: 20, ), ], ); diff --git a/lib/features/shop/presentation/ui/widgets/shop_item/styles/boost_style.dart b/lib/features/shop/presentation/ui/widgets/shop_item/styles/boost_style.dart index f325db9..05bc34f 100644 --- a/lib/features/shop/presentation/ui/widgets/shop_item/styles/boost_style.dart +++ b/lib/features/shop/presentation/ui/widgets/shop_item/styles/boost_style.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:shia_game_flutter/common_ui/resources/my_assets.dart'; import 'package:shia_game_flutter/core/utils/number_format.dart'; -import 'package:shia_game_flutter/core/utils/screen_size.dart'; import 'package:shia_game_flutter/core/widgets/button/my_gradient_button.dart'; import 'package:shia_game_flutter/core/widgets/image/my_image.dart'; import 'package:shia_game_flutter/core/widgets/text/gradient_text.dart'; @@ -18,7 +17,7 @@ class BoostStyle extends StatelessWidget { children: [ GradientText( text: '${shop.number} ${shop.title}', - fontSize: 18.sp, + fontSize: 18, color: const Color(0XFF9C8CC2), shadowColor: const Color(0XFF1B0D31), offset: const Offset(0, 1.69), @@ -33,7 +32,7 @@ class BoostStyle extends StatelessWidget { MyGradientButton( onTap: () {}, title: '${shop.price?.priceFormat}', - fontSize: 20.sp, + fontSize: 20, icon: const MyImage(asset: MyAssets.gem), ), ], diff --git a/lib/features/shop/presentation/ui/widgets/shop_item/styles/character_style.dart b/lib/features/shop/presentation/ui/widgets/shop_item/styles/character_style.dart index 4384eb1..f80c42e 100644 --- a/lib/features/shop/presentation/ui/widgets/shop_item/styles/character_style.dart +++ b/lib/features/shop/presentation/ui/widgets/shop_item/styles/character_style.dart @@ -100,7 +100,7 @@ class CharacterStyle extends StatelessWidget { ? context.translate.select : '${shop.price?.priceFormat}', icon: shop.isBuy == true ? null : const MyImage(asset: MyAssets.gem), - fontSize: 20.sp, + fontSize: 20, type: shop.isActive == true ? MyButtonType.activeType : MyButtonType.defaultType, diff --git a/lib/features/shop/presentation/ui/widgets/shop_item/styles/gem_style.dart b/lib/features/shop/presentation/ui/widgets/shop_item/styles/gem_style.dart index 2b208eb..2aea527 100644 --- a/lib/features/shop/presentation/ui/widgets/shop_item/styles/gem_style.dart +++ b/lib/features/shop/presentation/ui/widgets/shop_item/styles/gem_style.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:shia_game_flutter/core/utils/number_format.dart'; -import 'package:shia_game_flutter/core/utils/screen_size.dart'; import 'package:shia_game_flutter/core/widgets/button/my_gradient_button.dart'; import 'package:shia_game_flutter/core/widgets/image/my_image.dart'; import 'package:shia_game_flutter/core/widgets/text/gradient_text.dart'; @@ -17,7 +16,7 @@ class GemStyle extends StatelessWidget { children: [ GradientText( text: '${shop.number} ${shop.title}', - fontSize: 18.sp, + fontSize: 18, color: const Color(0XFF9C8CC2), shadowColor: const Color(0XFF1B0D31), offset: const Offset(0, 1.69), @@ -31,7 +30,7 @@ class GemStyle extends StatelessWidget { MyGradientButton( onTap: () {}, title: '\$ ${shop.price?.priceFormat}', - fontSize: 20.sp, + fontSize: 20, ), ], ); diff --git a/lib/features/shop/presentation/ui/widgets/shop_item/styles/pro_membership_style.dart b/lib/features/shop/presentation/ui/widgets/shop_item/styles/pro_membership_style.dart index e633325..76c04b8 100644 --- a/lib/features/shop/presentation/ui/widgets/shop_item/styles/pro_membership_style.dart +++ b/lib/features/shop/presentation/ui/widgets/shop_item/styles/pro_membership_style.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:shia_game_flutter/core/utils/number_format.dart'; -import 'package:shia_game_flutter/core/utils/screen_size.dart'; import 'package:shia_game_flutter/core/widgets/button/my_gradient_button.dart'; import 'package:shia_game_flutter/core/widgets/image/my_image.dart'; import 'package:shia_game_flutter/core/widgets/text/gradient_text.dart'; @@ -18,7 +17,7 @@ class ProMembershipStyle extends StatelessWidget { children: [ GradientText( text: '${shop.number} ${shop.title}', - fontSize: 18.sp, + fontSize: 18, color: const Color(0XFF9C8CC2), shadowColor: const Color(0XFF1B0D31), offset: const Offset(0, 1.69), @@ -31,7 +30,7 @@ class ProMembershipStyle extends StatelessWidget { MyGradientButton( onTap: () {}, title: '\$ ${shop.price?.priceFormat}', - fontSize: 20.sp, + fontSize: 20, ), ], ); diff --git a/lib/features/shop/presentation/ui/widgets/shop_package_entity.dart b/lib/features/shop/presentation/ui/widgets/shop_package_entity.dart index 17e4997..93d3e93 100644 --- a/lib/features/shop/presentation/ui/widgets/shop_package_entity.dart +++ b/lib/features/shop/presentation/ui/widgets/shop_package_entity.dart @@ -44,7 +44,7 @@ class ShopPackageWidget extends StatelessWidget { shadowColor: const Color(0XFF3E1381), offset: const Offset(0, 1.69), blurRadius: 0.84, - fontSize: 22.sp, + fontSize: 22, ), ), const PositionedDirectional(