fix: font from google fonts -> assets

lib/common_ui/resources/my_text_style.dart

@@ -1,28 +1,70 @@
 import 'package:flutter/material.dart';
 
-class MyTextStyle {
-  static const MyTextStyle _i = MyTextStyle._internal();
-  const MyTextStyle._internal();
-  factory MyTextStyle() => _i;
+class DinoKids {
+  static const DinoKids _i = DinoKids._internal();
+  const DinoKids._internal();
+  factory DinoKids() => _i;
 
   static const String fontFamily = 'dinokids';
 
-  static const TextStyle normal26 = TextStyle(
-      fontFamily: fontFamily,
-      fontSize: 26,
-      fontWeight: FontWeight.w400,
-      shadows: [
-        Shadow(
-          color: Color(0XFF5B5B5B),
-          blurRadius: 2.86,
-          offset: Offset(0, 2),
-        ),
-      ]
-  );
-
-  static const TextStyle normal17 = TextStyle(
-      fontFamily: fontFamily,
-      fontSize: 17,
-      fontWeight: FontWeight.w400,
+  /// 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,
+  );
+}
+
+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 medium16 = TextStyle(
+    fontFamily: fontFamily,
+    fontSize: 16,
+    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,
   );
 }

lib/core/widgets/about_us_dialog/about_us_dialog.dart

@@ -2,8 +2,8 @@ import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:google_fonts/google_fonts.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/common_ui/theme/my_theme.dart';
 import 'package:hadi_hoda_flutter/core/utils/check_platform.dart';
 import 'package:hadi_hoda_flutter/core/utils/my_image.dart';
@@ -46,26 +46,14 @@ class AboutUsDialog extends StatelessWidget {
                     children: [
                       Text(
                         context.translate.about_us,
-                        style: GoogleFonts.marhey(
+                        style: Marhey.semiBold22.copyWith(
                           color: Color(0XFF322386),
-                          fontSize: checkSize(
-                            context: context,
-                            mobile: 22,
-                            tablet: 30,
-                          ),
-                          fontWeight: FontWeight.w600,
                         ),
                       ),
                       Text(
                         context.translate.about_us_desc,
-                        style: GoogleFonts.marhey(
+                        style: Marhey.medium16.copyWith(
                           color: Color(0XFF494178),
-                          fontSize: checkSize(
-                            context: context,
-                            mobile: 16,
-                            tablet: 21,
-                          ),
-                          fontWeight: FontWeight.w500,
                         ),
                       ),
                       MyImage(

lib/core/widgets/answer_box/answer_box.dart

@@ -3,7 +3,6 @@ import 'package:hadi_hoda_flutter/core/utils/storage_path.dart';
 import 'package:hadi_hoda_flutter/core/widgets/answer_box/styles/picture_box.dart';
 import 'package:hadi_hoda_flutter/core/widgets/answer_box/styles/text_box.dart';
 import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart';
-import 'package:path_provider/path_provider.dart';
 
 class AnswerBox extends StatelessWidget {
   const AnswerBox({super.key, required this.answer,this.selected, this.onTap, required this.index});

lib/core/widgets/answer_box/styles/picture_box.dart

@@ -1,11 +1,9 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.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/common_ui/theme/my_theme.dart';
-import 'package:hadi_hoda_flutter/core/utils/my_image.dart';
 
 class AnswerPictureBox extends StatelessWidget {
   const AnswerPictureBox({super.key, required this.selected, required this.image, required this.index});
@@ -50,9 +48,7 @@ class AnswerPictureBox extends StatelessWidget {
                   ),
                   child: Text(
                     '$index',
-                    style: GoogleFonts.marhey(
-                      fontSize: 17,
-                      fontWeight: FontWeight.w600,
+                    style: Marhey.semiBold17.copyWith(
                       color: context.primaryColor,
                     ),
                   ),

lib/core/widgets/answer_box/styles/text_box.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.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,10 +26,8 @@ class AnswerTextBox extends StatelessWidget {
         child: Text(
           text,
           textAlign: TextAlign.center,
-          style: GoogleFonts.marhey(
-            fontSize: 14,
-            fontWeight: FontWeight.w700,
-            color: Color(0XFF322386)
+          style: Marhey.bold14.copyWith(
+            color: Color(0XFF322386),
           ),
         ),
       ),

lib/core/widgets/showcase/question_showcase.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.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/common_ui/theme/my_theme.dart';
 import 'package:hadi_hoda_flutter/core/utils/my_image.dart';
 import 'package:hadi_hoda_flutter/core/utils/screen_size.dart';
@@ -28,9 +28,7 @@ class QuestionShowcase extends StatelessWidget {
       disableMovingAnimation: true,
       textColor: context.primaryColor,
       descriptionTextAlign: TextAlign.center,
-      descTextStyle: GoogleFonts.marhey(
-        fontSize: 12,
-        fontWeight: FontWeight.w700,
+      descTextStyle: Marhey.bold12.copyWith(
         color: context.primaryColor,
       ),
       disableScaleAnimation: true,

lib/features/intro/presentation/ui/widgets/intro_loading_widget.dart

@@ -74,7 +74,7 @@ class IntroLoadingWidget extends StatelessWidget {
                   child: Center(
                     child: Text(
                       '${snapshot.data?.toInt() ?? 0}%',
-                      style: MyTextStyle.normal17.copyWith(
+                      style: DinoKids.regular17.copyWith(
                         color: Color(0XFF6E83A8),
                       ),
                     ),

lib/features/level/presentation/ui/level_page.dart

@@ -6,7 +6,6 @@ import 'package:hadi_hoda_flutter/core/utils/my_image.dart';
 import 'package:hadi_hoda_flutter/core/utils/screen_size.dart';
 import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart';
 import 'package:hadi_hoda_flutter/features/level/presentation/bloc/level_bloc.dart';
-import 'package:hadi_hoda_flutter/features/level/presentation/bloc/level_event.dart';
 import 'package:hadi_hoda_flutter/features/level/presentation/bloc/level_state.dart';
 import 'package:hadi_hoda_flutter/features/level/presentation/ui/widgets/bottom_path.dart';
 import 'package:hadi_hoda_flutter/features/level/presentation/ui/widgets/hint_level_widget.dart';

lib/features/level/presentation/ui/widgets/hint_level_widget.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.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_image.dart';
 import 'package:hadi_hoda_flutter/core/utils/screen_size.dart';
 import 'package:hadi_hoda_flutter/core/widgets/answer_box/styles/text_box.dart';
@@ -37,9 +37,7 @@ class HintLevelWidget extends StatelessWidget {
                 children: [
                   Text(
                     'Step ${level.order ?? 0}',
-                    style: GoogleFonts.marhey(
-                      fontSize: 14,
-                      fontWeight: FontWeight.w700,
+                    style: Marhey.bold14.copyWith(
                       color: Color(0xFFD8490B),
                     ),
                   ),
@@ -47,9 +45,7 @@ class HintLevelWidget extends StatelessWidget {
                     level.title ?? '',
                     maxLines: 3,
                     overflow: TextOverflow.ellipsis,
-                    style: GoogleFonts.marhey(
-                      fontSize: 18,
-                      fontWeight: FontWeight.w600,
+                    style: Marhey.semiBold18.copyWith(
                       color: Color(0xFF322386),
                       height: 1,
                     ),

lib/features/level/presentation/ui/widgets/level_widget.dart

@@ -42,7 +42,16 @@ class LevelWidget extends StatelessWidget {
           MyImage(image: LevelType.image[type] ?? MyAssets.level, size: 46),
           Text(
             '$index',
-            style: MyTextStyle.normal26.copyWith(color: context.primaryColor),
+            style: DinoKids.regular26.copyWith(
+              color: context.primaryColor,
+              shadows: [
+                Shadow(
+                  color: Color(0XFF5B5B5B),
+                  blurRadius: 2.86,
+                  offset: Offset(0, 2),
+                ),
+              ],
+            ),
           ),
           if(type == LevelType.current)
             Positioned(

lib/features/question/presentation/bloc/question_bloc.dart

@@ -3,7 +3,6 @@ import 'package:bloc/bloc.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:hadi_hoda_flutter/core/params/question_params.dart';
 import 'package:hadi_hoda_flutter/core/status/base_status.dart';
-import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart';
 import 'package:hadi_hoda_flutter/features/question/domain/usecases/get_level_usecase.dart';
 import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_event.dart';
 import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_state.dart';

lib/features/question/presentation/ui/question_page.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:google_fonts/google_fonts.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/common_ui/theme/my_theme.dart';
 import 'package:hadi_hoda_flutter/core/utils/gap.dart';
 import 'package:hadi_hoda_flutter/core/utils/my_image.dart';
 import 'package:hadi_hoda_flutter/core/utils/my_localization.dart';
@@ -80,10 +81,8 @@ class QuestionPage extends StatelessWidget {
         BlocBuilder<QuestionBloc, QuestionState>(
           builder: (context, state) => Text(
             state.levelEntity?.title ?? '',
-            style: GoogleFonts.marhey(
-              fontSize: 14,
-              fontWeight: FontWeight.w700,
-              color: Colors.white,
+            style: Marhey.bold14.copyWith(
+              color: context.primaryColor,
             ),
           ),
         ),
@@ -109,10 +108,8 @@ class QuestionPage extends StatelessWidget {
         BlocBuilder<QuestionBloc, QuestionState>(
           builder: (context, state) => Text(
             'Question ${state.currentStep} / ${state.levelEntity?.questions?.length ?? 0}',
-            style: GoogleFonts.marhey(
-              fontSize: 12,
-              fontWeight: FontWeight.w500,
-              color: Colors.white.withValues(alpha: 0.5),
+            style: Marhey.medium12.copyWith(
+              color: context.primaryColor.withValues(alpha: 0.5),
               shadows: [
                 Shadow(
                   offset: Offset(0, 1),
@@ -127,10 +124,8 @@ class QuestionPage extends StatelessWidget {
           builder: (context, state) =>  Text(
             state.levelEntity?.questions?[state.currentStep].title ?? '',
            textAlign: TextAlign.center,
-            style: GoogleFonts.marhey(
-              fontSize: 22,
-              fontWeight: FontWeight.w600,
-              color: Colors.white,
+            style: Marhey.medium12.copyWith(
+              color: context.primaryColor,
               shadows: [
                 Shadow(
                   offset: Offset(0, 1),

lib/features/question/presentation/ui/widgets/left_blob.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.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_image.dart';
 
 class LeftBlob extends StatelessWidget {
@@ -15,9 +15,7 @@ class LeftBlob extends StatelessWidget {
         Text(
           'Your answer\nwas not correct.',
           textAlign: TextAlign.center,
-          style: GoogleFonts.marhey(
-            fontSize: 12,
-            fontWeight: FontWeight.w500,
+          style: Marhey.medium12.copyWith(
             color: Color(0XFFB5AEEE),
           ),
         ),

lib/features/question/presentation/ui/widgets/right_blob.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.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_image.dart';
 
 class RightBlob extends StatelessWidget {
@@ -15,9 +15,7 @@ class RightBlob extends StatelessWidget {
         Text(
           'Be more\ncareful.',
           textAlign: TextAlign.center,
-          style: GoogleFonts.marhey(
-            fontSize: 12,
-            fontWeight: FontWeight.w500,
+          style: Marhey.medium12.copyWith(
             color: Color(0XFFB5AEEE),
           ),
         ),

pubspec.lock

@@ -333,14 +333,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "16.2.4"
-  google_fonts:
-    dependency: "direct main"
-    description:
-      name: google_fonts
-      sha256: "517b20870220c48752eafa0ba1a797a092fb22df0d89535fd9991e86ee2cdd9c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.3.2"
   graphs:
     dependency: transitive
     description:

pubspec.yaml

@@ -20,7 +20,6 @@ dependencies:
   flutter_svg: ^2.2.1
   get_it: ^8.2.0
   go_router: ^16.1.0
-  google_fonts: ^6.3.2
   hive: ^2.2.3
   intl: ^0.20.2
   path_drawing: ^1.0.1
@@ -41,14 +40,31 @@ flutter:
   generate: true
 
   assets:
-    - assets/audio/
-    - assets/data/
     - assets/fonts/
     - assets/images/
-    - assets/json/
 
 
   fonts:
     - family: dinokids
       fonts:
-        - asset: assets/fonts/dinokids.ttf
+        - asset: assets/fonts/dinokids.ttf
+    - family: marhey
+      fonts:
+        - asset: assets/fonts/Marhey-Light.ttf
+          weight: 100
+        - asset: assets/fonts/Marhey-Light.ttf
+          weight: 200
+        - asset: assets/fonts/Marhey-Light.ttf
+          weight: 300
+        - asset: assets/fonts/Marhey-Regular.ttf
+          weight: 400
+        - asset: assets/fonts/Marhey-Medium.ttf
+          weight: 500
+        - asset: assets/fonts/Marhey-SemiBold.ttf
+          weight: 600
+        - asset: assets/fonts/Marhey-Bold.ttf
+          weight: 700
+        - asset: assets/fonts/Marhey-Bold.ttf
+          weight: 800
+        - asset: assets/fonts/Marhey-Bold.ttf
+          weight: 900