diff --git a/assets/svg/button_tablet.svg b/assets/svg/button_tablet.svg new file mode 100644 index 0000000..4a7184a --- /dev/null +++ b/assets/svg/button_tablet.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/common_ui/resources/my_assets.dart b/lib/common_ui/resources/my_assets.dart index 27dc537..842bcd7 100644 --- a/lib/common_ui/resources/my_assets.dart +++ b/lib/common_ui/resources/my_assets.dart @@ -33,6 +33,7 @@ class MyAssets { static const String musicOff = 'assets/svg/music_off.svg'; static const String musicOn = 'assets/svg/music_on.svg'; static const String button = 'assets/svg/button.svg'; + static const String buttonTablet = 'assets/svg/button_tablet.svg'; static const String button2 = 'assets/svg/button_2.svg'; static const String button3 = 'assets/svg/button_3.svg'; static const String theme = 'assets/svg/theme.svg'; diff --git a/lib/common_ui/resources/my_text_style.dart b/lib/common_ui/resources/my_text_style.dart index adf33c2..7cd4376 100644 --- a/lib/common_ui/resources/my_text_style.dart +++ b/lib/common_ui/resources/my_text_style.dart @@ -1,149 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; -class DinoKids { - static const DinoKids _i = DinoKids._internal(); - const DinoKids._internal(); - factory DinoKids() => _i; - - static const String fontFamily = 'DinoKids'; - - /// Regular - static const TextStyle regular17 = TextStyle( - fontFamily: fontFamily, - fontSize: 17, - fontWeight: FontWeight.w400, - ); - static const TextStyle regular26 = TextStyle( - fontFamily: fontFamily, - fontSize: 26, - fontWeight: FontWeight.w400, - ); - static const TextStyle regular35 = TextStyle( - fontFamily: fontFamily, - fontSize: 35, - fontWeight: FontWeight.w400, - ); - static const TextStyle regular40 = TextStyle( - fontFamily: fontFamily, - fontSize: 40, - fontWeight: FontWeight.w400, - ); - static const TextStyle regular45 = TextStyle( - fontFamily: fontFamily, - fontSize: 45, - fontWeight: FontWeight.w400, - ); - - static const TextStyle regular = TextStyle( - fontFamily: fontFamily, - fontWeight: FontWeight.w400, - ); -} - -class Marhey { - static const Marhey _i = Marhey._internal(); - const Marhey._internal(); - factory Marhey() => _i; - - static const String fontFamily = 'Marhey'; - - /// Medium - static const TextStyle medium12 = TextStyle( - fontFamily: fontFamily, - fontSize: 12, - fontWeight: FontWeight.w500, - ); - static const TextStyle medium14 = TextStyle( - fontFamily: fontFamily, - fontSize: 14, - fontWeight: FontWeight.w500, - ); - static const TextStyle medium16 = TextStyle( - fontFamily: fontFamily, - fontSize: 16, - fontWeight: FontWeight.w500, - ); - static const TextStyle medium22 = TextStyle( - fontFamily: fontFamily, - fontSize: 22, - fontWeight: FontWeight.w500, - ); - - /// Semi Bold - static const TextStyle semiBold17 = TextStyle( - fontFamily: fontFamily, - fontSize: 17, - fontWeight: FontWeight.w600, - ); - static const TextStyle semiBold18 = TextStyle( - fontFamily: fontFamily, - fontSize: 18, - fontWeight: FontWeight.w600, - ); - static const TextStyle semiBold22 = TextStyle( - fontFamily: fontFamily, - fontSize: 22, - fontWeight: FontWeight.w600, - ); - - /// Bold - static const TextStyle bold12 = TextStyle( - fontFamily: fontFamily, - fontSize: 12, - fontWeight: FontWeight.w700, - ); - static const TextStyle bold14 = TextStyle( - fontFamily: fontFamily, - fontSize: 14, - fontWeight: FontWeight.w700, - ); - static const TextStyle bold26 = TextStyle( - fontFamily: fontFamily, - fontSize: 26, - fontWeight: FontWeight.w700, - ); - - static const TextStyle semiBold = TextStyle( - fontFamily: fontFamily, - fontWeight: FontWeight.w600, - ); - - static const TextStyle bold = TextStyle( - fontFamily: fontFamily, - fontWeight: FontWeight.w700, - ); -} - -class Baloo2 { - static const Baloo2 _i = Baloo2._internal(); - const Baloo2._internal(); - factory Baloo2() => _i; - - static const String fontFamily = 'Baloo_2'; - - static const TextStyle medium = TextStyle( - fontFamily: fontFamily, - fontWeight: FontWeight.w500, - ); - - static const TextStyle semiBold = TextStyle( - fontFamily: fontFamily, - fontWeight: FontWeight.w600, - ); - - static const TextStyle bold = TextStyle( - fontFamily: fontFamily, - fontWeight: FontWeight.w700, - ); - - static const TextStyle extraBold = TextStyle( - fontFamily: fontFamily, - fontWeight: FontWeight.w800, - ); -} - - class MYTextStyle { static const MYTextStyle _i = MYTextStyle._internal(); const MYTextStyle._internal(); diff --git a/lib/core/widgets/about_us_dialog/about_us_dialog.dart b/lib/core/widgets/about_us_dialog/about_us_dialog.dart index 51c1db3..ab9ccbb 100644 --- a/lib/core/widgets/about_us_dialog/about_us_dialog.dart +++ b/lib/core/widgets/about_us_dialog/about_us_dialog.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/utils/set_platform_size.dart'; import 'package:hadi_hoda_flutter/core/widgets/about_us_dialog/styles/background.dart'; @@ -46,15 +45,9 @@ class AboutUsDialog extends StatelessWidget { children: [ Text( context.translate.about_us, - style: Marhey.semiBold22.copyWith( - color: Color(0XFF322386), - ), ), Text( context.translate.about_us_desc, - style: Marhey.medium16.copyWith( - color: Color(0XFF494178), - ), ), MyImage( image: MyAssets.newHorizon, diff --git a/lib/core/widgets/answer_box/styles/picture_box.dart b/lib/core/widgets/answer_box/styles/picture_box.dart index b7ee0c6..b452bbe 100644 --- a/lib/core/widgets/answer_box/styles/picture_box.dart +++ b/lib/core/widgets/answer_box/styles/picture_box.dart @@ -2,9 +2,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/question/presentation/ui/widgets/black_white_effect.dart'; @@ -74,9 +72,6 @@ class AnswerPictureBox extends StatelessWidget { ), child: Text( '$index', - style: Marhey.semiBold17.copyWith( - color: MyColors.white, - ), ), ), ), diff --git a/lib/core/widgets/answer_box/styles/text_box.dart b/lib/core/widgets/answer_box/styles/text_box.dart index b94ea0d..82087fc 100644 --- a/lib/core/widgets/answer_box/styles/text_box.dart +++ b/lib/core/widgets/answer_box/styles/text_box.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; class AnswerTextBox extends StatelessWidget { const AnswerTextBox({super.key, required this.text}); @@ -26,9 +25,6 @@ class AnswerTextBox extends StatelessWidget { child: Text( text, textAlign: TextAlign.center, - style: Marhey.bold14.copyWith( - color: Color(0XFF322386), - ), ), ), ); diff --git a/lib/core/widgets/button/my_blue_button.dart b/lib/core/widgets/button/my_blue_button.dart new file mode 100644 index 0000000..709a036 --- /dev/null +++ b/lib/core/widgets/button/my_blue_button.dart @@ -0,0 +1,49 @@ +import 'package:flutter/material.dart'; +import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; +import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; +import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; +import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; +import 'package:hadi_hoda_flutter/core/utils/set_platform_size.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; + +class MyBlueButton extends StatelessWidget { + const MyBlueButton({ + super.key, + this.onTap, + this.title, + }); + + final VoidCallback? onTap; + final String? title; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: onTap, + highlightColor: MyColors.transparent, + splashColor: MyColors.transparent, + child: Stack( + alignment: Alignment.center, + children: [ + MyImage(image: + setSize( + context: context, + mobile: MyAssets.button, + tablet: MyAssets.buttonTablet, + ) ?? + '', + ), + PositionedDirectional( + top: setSize(context: context, mobile: MySpaces.s10, tablet: MySpaces.s20), + child: Text( + title ?? '', + style: MYTextStyle.button1.copyWith( + color: Color(0XFF1D6EFF), + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/core/widgets/button/my_button.dart b/lib/core/widgets/button/my_button.dart index a399435..cadc2d7 100644 --- a/lib/core/widgets/button/my_button.dart +++ b/lib/core/widgets/button/my_button.dart @@ -37,7 +37,7 @@ class MyButton extends StatelessWidget { top: MySpaces.s2, child: Text( title ?? '', - style: DinoKids.regular45.copyWith( + style: MYTextStyle.button1.copyWith( color: ButtonType.textColor[type], ), ), diff --git a/lib/core/widgets/error/error_state.dart b/lib/core/widgets/error/error_state.dart index e23542d..680f52f 100644 --- a/lib/core/widgets/error/error_state.dart +++ b/lib/core/widgets/error/error_state.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/gap.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; @@ -19,14 +18,12 @@ class ErrorState extends StatelessWidget { Spacer(), Text( context.translate.lost_connection, - style: DinoKids.regular45.copyWith(color: MyColors.white), ), MyImage(image: MyAssets.error), MySpaces.s40.gapHeight, Text( context.translate.connected_to_internet, textAlign: TextAlign.center, - style: Marhey.medium12.copyWith(color: MyColors.white), ), Spacer(), SizedBox( @@ -44,9 +41,6 @@ class ErrorState extends StatelessWidget { top: MySpaces.s8, child: Text( context.translate.try_again, - style: DinoKids.regular35.copyWith( - color: Color(0XFF1D6EFF), - ), ), ), ], diff --git a/lib/core/widgets/hadith_dialog/hadith_dialog.dart b/lib/core/widgets/hadith_dialog/hadith_dialog.dart index 56d1257..9e195b3 100644 --- a/lib/core/widgets/hadith_dialog/hadith_dialog.dart +++ b/lib/core/widgets/hadith_dialog/hadith_dialog.dart @@ -5,7 +5,6 @@ import 'package:go_router/go_router.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/set_platform_size.dart'; import 'package:hadi_hoda_flutter/core/widgets/about_us_dialog/styles/background.dart'; import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; @@ -58,9 +57,6 @@ class HadithDialog extends StatelessWidget { ), itemBuilder: (context, index) => Text( hadith[index].hadithText ?? '', - style: Marhey.medium14.copyWith( - color: Color(0XFF494178), - ), ), ), ), diff --git a/lib/core/widgets/showcase/question_showcase.dart b/lib/core/widgets/showcase/question_showcase.dart index 03be7c0..9db8bd5 100644 --- a/lib/core/widgets/showcase/question_showcase.dart +++ b/lib/core/widgets/showcase/question_showcase.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/screen_size.dart'; import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:showcaseview/showcaseview.dart'; @@ -28,9 +27,6 @@ class QuestionShowcase extends StatelessWidget { disableMovingAnimation: true, textColor: MyColors.white, descriptionTextAlign: TextAlign.center, - descTextStyle: Marhey.bold12.copyWith( - color: MyColors.white, - ), disableScaleAnimation: true, tooltipPadding: EdgeInsets.only(top: 60), floatingActionWidget: FloatingActionWidget( diff --git a/lib/features/download/presentation/ui/download_page.dart b/lib/features/download/presentation/ui/download_page.dart index 4d6d1ba..00e056d 100644 --- a/lib/features/download/presentation/ui/download_page.dart +++ b/lib/features/download/presentation/ui/download_page.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/status/base_status.dart'; import 'package:hadi_hoda_flutter/core/utils/convert_size.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; @@ -89,18 +87,12 @@ class DownloadPage extends StatelessWidget { children: [ Text( context.translate.please_wait, - style: Marhey.medium22.copyWith( - color: MyColors.white, - ), ), StreamBuilder( initialData: DownloadEntity(), stream: context.read().loadingStream, builder: (context, snapshot) => Text( '${context.translate.downloading_data} (${snapshot.data?.count.toMB ?? 0.0}mb / ${snapshot.data?.total.toMB ?? 0.0}mb)', - style: Marhey.medium12.copyWith( - color: MyColors.white, - ), ), ), ], diff --git a/lib/features/download/presentation/ui/widgets/download_loading_widget.dart b/lib/features/download/presentation/ui/widgets/download_loading_widget.dart index ab69553..e742a55 100644 --- a/lib/features/download/presentation/ui/widgets/download_loading_widget.dart +++ b/lib/features/download/presentation/ui/widgets/download_loading_widget.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/features/download/domain/entities/download_entity.dart'; @@ -73,9 +72,6 @@ class DownloadLoadingWidget extends StatelessWidget { child: Center( child: Text( '${snapshot.data?.percent?.toInt() ?? 0}%', - style: DinoKids.regular17.copyWith( - color: Color(0XFF6E83A8), - ), ), ), ), diff --git a/lib/features/language/presentation/ui/language_page.dart b/lib/features/language/presentation/ui/language_page.dart index 957f1bc..345b972 100644 --- a/lib/features/language/presentation/ui/language_page.dart +++ b/lib/features/language/presentation/ui/language_page.dart @@ -6,11 +6,13 @@ import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/utils/screen_size.dart'; -import 'package:hadi_hoda_flutter/core/widgets/button/my_button.dart'; +import 'package:hadi_hoda_flutter/core/utils/set_platform_size.dart'; +import 'package:hadi_hoda_flutter/core/widgets/button/my_blue_button.dart'; import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/language/presentation/bloc/language_bloc.dart'; import 'package:hadi_hoda_flutter/features/language/presentation/bloc/language_event.dart'; import 'package:hadi_hoda_flutter/features/language/presentation/bloc/language_state.dart'; +import 'package:hadi_hoda_flutter/features/language/presentation/ui/widgets/language_widget.dart'; class LanguagePage extends StatelessWidget { const LanguagePage({super.key}); @@ -39,10 +41,10 @@ class LanguagePage extends StatelessWidget { ), child: Padding( padding: EdgeInsets.only( - left: 60, - right: 60, - bottom: MediaQuery.viewPaddingOf(context).bottom + MySpaces.s16, - top: MediaQuery.viewPaddingOf(context).bottom + 50, + left: setSize(context: context, mobile: 60, tablet: 0.3.w) ?? 0, + right: setSize(context: context, mobile: 60, tablet: 0.3.w) ?? 0, + bottom: MySpaces.s40, + top: 100, ), child: Column( children: [_title(context), _list(context), _btn(context)], @@ -60,7 +62,7 @@ class LanguagePage extends StatelessWidget { MyImage(image: MyAssets.lang, size: 28), Text( context.translate.select_language, - style: Marhey.semiBold22.copyWith(color: Color(0XFF847AC4)), + style: MYTextStyle.titr0.copyWith(color: Color(0XFF847AC4)), ), ], ); @@ -74,60 +76,22 @@ class LanguagePage extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: List.generate( context.read().languages.length, - (index) => BlocBuilder( - buildWhen: (previous, current) => - previous.selectedLang.code != current.selectedLang.code, - builder: (context, state) { - final LanguageBloc languageBloc = context.read(); - return ListTile( - selected: state.selectedLang.code == - languageBloc.languages[index].code, - onTap: () { - languageBloc.add( - ChangeLanguageEvent(languageBloc.languages[index])); - }, - title: Text(context.read().languages[index].title ?? ''), - titleTextStyle: Marhey.medium16.copyWith( - color: MyColors.white, - ), - contentPadding: EdgeInsets.symmetric( - vertical: MySpaces.s12, - horizontal: 30, - ), - minVerticalPadding: 0, - minTileHeight: 0, - minLeadingWidth: 0, - horizontalTitleGap: MySpaces.s12, - leading: state.selectedLang.code == - languageBloc.languages[index].code ? Container( - height: 17, - width: 17, - padding: EdgeInsets.all(3), - decoration: BoxDecoration( - shape: BoxShape.circle, - border: Border.all( - width: 1, - color: Color(0XFF3CFF3C), - ), - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF48D336), - Color(0XFF2D7C23), - ], - ), - ), - child: MyImage(image: MyAssets.doneRounded), - ) : SizedBox(height: 17, width: 17), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.all(Radius.circular(12)), - ), - selectedTileColor: MyColors.white.withValues(alpha: 0.2), - selectedColor: MyColors.white, - ); - } - ), + (index) => + BlocBuilder( + buildWhen: (previous, current) => + previous.selectedLang.code != current.selectedLang.code, + builder: (context, state) { + final LanguageBloc languageBloc = context.read(); + return LanguageWidget( + selected: state.selectedLang.code == + languageBloc.languages[index].code, + onTap: () { + languageBloc.add(ChangeLanguageEvent(languageBloc.languages[index])); + }, + title: context.read().languages[index].title, + ); + } + ), ), ), ), @@ -135,7 +99,7 @@ class LanguagePage extends StatelessWidget { } Widget _btn(BuildContext context) { - return MyButton( + return MyBlueButton( onTap: () => context.read().add(SaveLevelsEvent()), title: context.translate.select, ); diff --git a/lib/features/language/presentation/ui/widgets/language_widget.dart b/lib/features/language/presentation/ui/widgets/language_widget.dart new file mode 100644 index 0000000..1725b68 --- /dev/null +++ b/lib/features/language/presentation/ui/widgets/language_widget.dart @@ -0,0 +1,54 @@ +import 'package:flutter/material.dart'; +import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; +import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; +import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; +import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; + +class LanguageWidget extends StatelessWidget { + const LanguageWidget({super.key, this.selected, this.onTap, this.title}); + + final bool? selected; + final VoidCallback? onTap; + final String? title; + + @override + Widget build(BuildContext context) { + return ListTile( + selected: selected ?? false, + onTap: onTap, + title: Text(title ?? ''), + titleTextStyle: MYTextStyle.titr1, + contentPadding: EdgeInsets.symmetric( + vertical: MySpaces.s12, + horizontal: 30, + ), + minVerticalPadding: 0, + minTileHeight: 0, + minLeadingWidth: 0, + horizontalTitleGap: MySpaces.s12, + leading: selected ?? false + ? Container( + height: 17, + width: 17, + padding: EdgeInsets.all(3), + decoration: BoxDecoration( + shape: BoxShape.circle, + border: Border.all(width: 1, color: Color(0XFF3CFF3C)), + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [Color(0XFF48D336), Color(0XFF2D7C23)], + ), + ), + child: MyImage(image: MyAssets.doneRounded), + ) + : SizedBox(height: 17, width: 17), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(12)), + ), + selectedTileColor: MyColors.white.withValues(alpha: 0.2), + selectedColor: MyColors.white, + ); + } +} diff --git a/lib/features/level/presentation/ui/widgets/hint_level_widget.dart b/lib/features/level/presentation/ui/widgets/hint_level_widget.dart index 4c0c474..d32c310 100644 --- a/lib/features/level/presentation/ui/widgets/hint_level_widget.dart +++ b/lib/features/level/presentation/ui/widgets/hint_level_widget.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/utils/screen_size.dart'; import 'package:hadi_hoda_flutter/core/widgets/answer_box/styles/text_box.dart'; @@ -42,18 +41,11 @@ class HintLevelWidget extends StatelessWidget { children: [ Text( '${context.translate.step} ${level.order ?? 0}', - style: Marhey.bold14.copyWith( - color: Color(0xFFD8490B), - ), ), Text( level.title ?? '', maxLines: 3, overflow: TextOverflow.ellipsis, - style: Marhey.semiBold18.copyWith( - color: Color(0xFF322386), - height: 1, - ), ), ], ), diff --git a/lib/features/level/presentation/ui/widgets/level_widget.dart b/lib/features/level/presentation/ui/widgets/level_widget.dart index c92a669..70d049d 100644 --- a/lib/features/level/presentation/ui/widgets/level_widget.dart +++ b/lib/features/level/presentation/ui/widgets/level_widget.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart'; @@ -42,16 +40,6 @@ class LevelWidget extends StatelessWidget { MyImage(image: LevelType.image[type] ?? MyAssets.level, size: 46), Text( '${level.order}', - style: DinoKids.regular26.copyWith( - color: MyColors.white, - shadows: [ - Shadow( - color: Color(0XFF5B5B5B), - blurRadius: 2.86, - offset: Offset(0, 2), - ), - ], - ), ), if(level.id == chooseLevel?.id) Positioned( diff --git a/lib/features/question/presentation/ui/question_page.dart b/lib/features/question/presentation/ui/question_page.dart index 34b97ec..85685f3 100644 --- a/lib/features/question/presentation/ui/question_page.dart +++ b/lib/features/question/presentation/ui/question_page.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/gap.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/utils/screen_size.dart'; @@ -97,9 +95,6 @@ class QuestionPage extends StatelessWidget { previous.levelEntity?.id != current.levelEntity?.id, builder: (context, state) => Text( '${context.translate.step} ${state.levelEntity?.order ?? 1}', - style: Marhey.bold14.copyWith( - color: MyColors.white, - ), ), ), Spacer(), diff --git a/lib/features/question/presentation/ui/screens/diamond_screen.dart b/lib/features/question/presentation/ui/screens/diamond_screen.dart index 66e02a9..f4dbe48 100644 --- a/lib/features/question/presentation/ui/screens/diamond_screen.dart +++ b/lib/features/question/presentation/ui/screens/diamond_screen.dart @@ -5,7 +5,6 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/gap.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/utils/screen_size.dart'; @@ -48,7 +47,6 @@ class DiamondScreen extends StatelessWidget { Text _title(BuildContext context) { return Text( context.translate.you_win, - style: Marhey.semiBold22.copyWith(color: MyColors.white), ); } @@ -115,8 +113,6 @@ class DiamondScreen extends StatelessWidget { ).createShader(bounds), child: Text( context.translate.you_got_diamond, - style: Marhey - .bold26, // The color here will be overridden by the ShaderMask ), ); } @@ -147,9 +143,6 @@ class DiamondScreen extends StatelessWidget { top: 10, child: Text( context.translate.view_map, - style: DinoKids.regular35.copyWith( - color: Color(0XFFD93D16), - ), ), ), ], diff --git a/lib/features/question/presentation/ui/screens/question_screen.dart b/lib/features/question/presentation/ui/screens/question_screen.dart index 7f4d6d1..abb6a76 100644 --- a/lib/features/question/presentation/ui/screens/question_screen.dart +++ b/lib/features/question/presentation/ui/screens/question_screen.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/gap.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/widgets/answer_box/answer_box.dart'; @@ -41,16 +39,6 @@ class QuestionScreen extends StatelessWidget { previous.currentQuestion?.id != current.currentQuestion?.id, builder: (context, state) => Text( '${context.translate.question} ${state.currentQuestion?.order ?? 1} / ${(state.levelEntity?.questions?.length ?? 0) - 1}', - style: Marhey.medium12.copyWith( - color: MyColors.white.withValues(alpha: 0.5), - shadows: [ - Shadow( - offset: Offset(0, 1), - blurRadius: 1, - color: Color(0xFF000000).withValues(alpha: 0.25), - ), - ], - ), ), ), BlocBuilder( @@ -59,16 +47,6 @@ class QuestionScreen extends StatelessWidget { builder: (context, state) => Text( state.currentQuestion?.title ?? '', textAlign: TextAlign.center, - style: Marhey.semiBold22.copyWith( - color: MyColors.white, - shadows: [ - Shadow( - offset: Offset(0, 1), - blurRadius: 1, - color: Color(0xFF000000).withValues(alpha: 0.25), - ), - ], - ), ), ), ], diff --git a/lib/features/question/presentation/ui/widgets/left_blob.dart b/lib/features/question/presentation/ui/widgets/left_blob.dart index 3f53a61..59b17fa 100644 --- a/lib/features/question/presentation/ui/widgets/left_blob.dart +++ b/lib/features/question/presentation/ui/widgets/left_blob.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; @@ -16,9 +15,6 @@ class LeftBlob extends StatelessWidget { Text( context.translate.wrong_answer, textAlign: TextAlign.center, - style: Marhey.medium12.copyWith( - color: Color(0XFFB5AEEE), - ), ), ], ); diff --git a/lib/features/question/presentation/ui/widgets/right_blob.dart b/lib/features/question/presentation/ui/widgets/right_blob.dart index 168395b..6d96a00 100644 --- a/lib/features/question/presentation/ui/widgets/right_blob.dart +++ b/lib/features/question/presentation/ui/widgets/right_blob.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; -import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; @@ -16,9 +15,6 @@ class RightBlob extends StatelessWidget { Text( context.translate.be_cureful, textAlign: TextAlign.center, - style: Marhey.medium12.copyWith( - color: Color(0XFFB5AEEE), - ), ), ], );