From b3f0e8ad844b7e016d64706d8383205550162451 Mon Sep 17 00:00:00 2001 From: AmirrezaChegini Date: Sat, 8 Nov 2025 11:13:36 +0330 Subject: [PATCH] fix: app bar --- lib/core/widgets/app_bar/my_app_bar.dart | 4 ++-- lib/core/widgets/app_bar/widgets/app_bar_action.dart | 7 +++---- lib/core/widgets/app_bar/widgets/app_bar_add_widget.dart | 9 ++++----- .../widgets/app_bar/widgets/app_bar_back_button.dart | 7 +++---- .../widgets/app_bar/widgets/app_bar_gradient_title.dart | 3 ++- lib/core/widgets/app_bar/widgets/app_bar_info.dart | 7 +++---- lib/core/widgets/text/gradient_text.dart | 5 +++-- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/lib/core/widgets/app_bar/my_app_bar.dart b/lib/core/widgets/app_bar/my_app_bar.dart index 784fa36..e47116b 100644 --- a/lib/core/widgets/app_bar/my_app_bar.dart +++ b/lib/core/widgets/app_bar/my_app_bar.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:shia_game_flutter/common_ui/resources/my_spaces.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'; class MyAppBar extends StatelessWidget implements PreferredSizeWidget { @@ -35,7 +35,7 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget { return AppBar( backgroundColor: backgroundColor, centerTitle: true, - titleSpacing: MySpaces.s30, + titleSpacing: 30.w, scrolledUnderElevation: 0, title: AppBarType.title( title: title, diff --git a/lib/core/widgets/app_bar/widgets/app_bar_action.dart b/lib/core/widgets/app_bar/widgets/app_bar_action.dart index 493e601..e42d3a0 100644 --- a/lib/core/widgets/app_bar/widgets/app_bar_action.dart +++ b/lib/core/widgets/app_bar/widgets/app_bar_action.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/core/widgets/container/my_container.dart'; import 'package:shia_game_flutter/core/widgets/image/my_image.dart'; @@ -13,9 +12,9 @@ class AppBarAction extends StatelessWidget { Widget build(BuildContext context) { return MyContainer( onTap: onTap, - width: MySpaces.s32, - height: MySpaces.s32, - padding: const EdgeInsets.all(MySpaces.s6), + width: 32, + height: 32, + padding: const EdgeInsets.all(6), boxShape: BoxShape.circle, borderColor: const Color(0XFF6D2ADA), gradient: const LinearGradient( 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 a7392de..504012b 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 @@ -1,9 +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/common_ui/theme/my_theme.dart'; +import 'package:shia_game_flutter/core/utils/screen_size.dart'; import 'package:shia_game_flutter/core/widgets/container/my_container.dart'; import 'package:shia_game_flutter/core/widgets/image/my_image.dart'; @@ -34,8 +33,8 @@ class AppBarAddWidget extends StatelessWidget { colors: gradientColors, ), padding: const EdgeInsetsDirectional.only( - start: MySpaces.s8, - end: MySpaces.s4, + start: 8, + end: 4, ), color: context.backgroundColor, child: Row( @@ -47,7 +46,7 @@ class AppBarAddWidget extends StatelessWidget { maxLines: 1, textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, - style: Lexend.bold.copyWith(fontSize: 12), + style: Lexend.bold.copyWith(fontSize: 12.sp), ), ), MyContainer( diff --git a/lib/core/widgets/app_bar/widgets/app_bar_back_button.dart b/lib/core/widgets/app_bar/widgets/app_bar_back_button.dart index 939a50e..0e0cb97 100644 --- a/lib/core/widgets/app_bar/widgets/app_bar_back_button.dart +++ b/lib/core/widgets/app_bar/widgets/app_bar_back_button.dart @@ -1,6 +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/common_ui/theme/my_theme.dart'; import 'package:shia_game_flutter/core/widgets/container/my_container.dart'; @@ -13,14 +12,14 @@ class AppBarBackButton extends StatelessWidget { Widget build(BuildContext context) { return MyContainer( onTap: () => Get.back(), - height: MySpaces.s32, - width: MySpaces.s32, + height: 32, + width: 32, borderRadius: const BorderRadius.all(Radius.circular(12)), color: context.primaryColor.withValues(alpha: 0.1), child: Icon( Icons.arrow_back_ios_new_rounded, color: context.primaryColor, - size: MySpaces.s18, + size: 18, ), ); } 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 0588b94..8703c31 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,4 +1,5 @@ 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 { @@ -14,7 +15,7 @@ class AppBarGradientTitle extends StatelessWidget { return GradientText( text: title, color: const Color(0XFFCAA8FF), - fontSize: 22, + fontSize: 22.sp, shadowColor: const Color(0XFF3E1381), offset: const Offset(0, 1.69), blurRadius: 0.84, diff --git a/lib/core/widgets/app_bar/widgets/app_bar_info.dart b/lib/core/widgets/app_bar/widgets/app_bar_info.dart index 893f4ec..07ee1fd 100644 --- a/lib/core/widgets/app_bar/widgets/app_bar_info.dart +++ b/lib/core/widgets/app_bar/widgets/app_bar_info.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/theme/my_theme.dart'; import 'package:shia_game_flutter/core/widgets/container/my_container.dart'; @@ -15,14 +14,14 @@ class AppBarInfo extends StatelessWidget { Widget build(BuildContext context) { return MyContainer( onTap: onTap, - height: MySpaces.s32, - width: MySpaces.s32, + height: 32, + width: 32, borderRadius: const BorderRadius.all(Radius.circular(12)), color: context.primaryColor.withValues(alpha: 0.1), child: Icon( Icons.info_outline_rounded, color: context.primaryColor, - size: MySpaces.s20, + size: 20, ), ); } diff --git a/lib/core/widgets/text/gradient_text.dart b/lib/core/widgets/text/gradient_text.dart index c5be681..8d8b2f6 100644 --- a/lib/core/widgets/text/gradient_text.dart +++ b/lib/core/widgets/text/gradient_text.dart @@ -1,6 +1,7 @@ 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({ @@ -8,7 +9,7 @@ class GradientText extends StatelessWidget { this.text, this.color = const Color(0xFFFFFFFF), this.gradientColor, - this.fontSize = 14, + this.fontSize, this.shadowColor = const Color(0xFF000000), this.blurRadius = 0, this.spreadRadius = 0, @@ -46,7 +47,7 @@ class GradientText extends StatelessWidget { textAlign: textAlign, maxLines: 1, style: textStyle ?? Lexend.extraBold.copyWith( - fontSize: fontSize, + fontSize: fontSize ?? 14.sp, shadows: [ BoxShadow( color: shadowColor,