6/1/2

android/app/build.gradle

@@ -55,8 +55,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 22
         targetSdkVersion flutter.targetSdkVersion
-        versionCode 28
+        versionCode 29
-        versionName '1.4.93'
+        versionName '1.4.94'
         // manifestPlaceholders = [mapsApiKey: 'android/app/src/main/AndroidManifest.xml']
     }
 

ios/Runner/Info.plist

@@ -37,11 +37,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>22</string>
+	<string>23</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.42</string>
+	<string>1.43</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<string>NO</string>
 	<key>GMSApiKey</key>

lib/constant/colors.dart

@@ -4,7 +4,7 @@ class AppColor {
   static const Color primaryColor = Colors.black; // Slightly softer red
   static const Color secondaryColor = Color.fromARGB(255, 255, 255, 255);
   static const Color accentColor =
-      Color.fromARGB(255, 185, 169, 169); // Google Green
+      Color.fromARGB(255, 231, 84, 84); // Google Green
   static const Color backgroundColor =
       Color(0xFFF5F5F5); // Light grey background
   static const Color redColor = Color(0xFFEA4335); // Google Red

lib/constant/style.dart

@@ -1,6 +1,7 @@
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/main.dart';
 import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'colors.dart';
 
 class AppStyle {
@@ -8,22 +9,30 @@ class AppStyle {
       fontWeight: FontWeight.bold,
       fontSize: 40,
       color: AppColor.accentColor,
-      fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : 'josefin');
+      fontFamily: box.read(BoxName.lang) == 'ar'
+          ? 'mohanad'
+          : GoogleFonts.josefinSans().fontFamily);
   static TextStyle headTitle2 = TextStyle(
       fontWeight: FontWeight.bold,
       fontSize: 26,
       color: AppColor.primaryColor,
-      fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : 'josefin');
+      fontFamily: box.read(BoxName.lang) == 'ar'
+          ? 'mohanad'
+          : GoogleFonts.josefinSans().fontFamily);
   static TextStyle title = TextStyle(
-      fontWeight: FontWeight.bold,
+      fontWeight: FontWeight.normal,
-      fontSize: 14,
+      fontSize: box.read(BoxName.lang) == 'ar' ? 14 : 16,
       color: AppColor.primaryColor,
-      fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : 'josefin');
+      fontFamily: box.read(BoxName.lang) == 'ar'
+          ? 'mohanad'
+          : GoogleFonts.josefinSans().fontFamily);
   static TextStyle subtitle = TextStyle(
       fontWeight: FontWeight.bold,
       fontSize: 13,
       color: AppColor.primaryColor,
-      fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : 'josefin');
+      fontFamily: box.read(BoxName.lang) == 'ar'
+          ? 'mohanad'
+          : GoogleFonts.josefinSans().fontFamily);
   static TextStyle number = const TextStyle(
       fontWeight: FontWeight.bold,
       fontSize: 14,
@@ -31,22 +40,16 @@ class AppStyle {
       fontFamily: 'digit');
 
   static BoxDecoration boxDecoration = const BoxDecoration(
-      borderRadius: BorderRadius.all(Radius.circular(12)),
-      color: AppColor.secondaryColor,
       boxShadow: [
         BoxShadow(
-            color: AppColor.accentColor,
+            color: AppColor.accentColor, blurRadius: 5, offset: Offset(2, 4)),
-            offset: Offset(-3, -3),
-            blurRadius: 0,
-            spreadRadius: 0,
-            blurStyle: BlurStyle.outer),
         BoxShadow(
-            color: AppColor.accentColor,
+            color: AppColor.accentColor, blurRadius: 5, offset: Offset(-2, -2))
-            offset: Offset(3, 3),
+      ],
-            blurRadius: 0,
+      color: AppColor.secondaryColor,
-            spreadRadius: 0,
+      borderRadius: BorderRadius.all(
-            blurStyle: BlurStyle.outer)
+        Radius.elliptical(15, 30),
-      ]);
+      ));
   static BoxDecoration boxDecoration1 = const BoxDecoration(
     boxShadow: [
       BoxShadow(

lib/controller/local/translations.dart

@@ -4,6 +4,8 @@ class MyTranslation extends Translations {
   @override
   Map<String, Map<String, String>> get keys => {
         "ar": {
+          "You must restart the app to change the language.":
+              "يجب إعادة تشغيل التطبيق لتغيير اللغة",
           "joined": "انضم",
           "Driver joined the channel": "السائق انضم للقناة",
           "Driver left the channel": "السائق غادر القناة",

pubspec.lock

@@ -768,6 +768,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  google_fonts:
+    dependency: "direct main"
+    description:
+      name: google_fonts
+      sha256: "6b6f10f0ce3c42f6552d1c70d2c28d764cf22bb487f50f66cca31dcd5194f4d6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.4"
   google_identity_services_web:
     dependency: transitive
     description:

pubspec.yaml

@@ -29,7 +29,8 @@ dependencies:
   flutter_secure_storage: ^9.0.0
   geolocator: ^10.0.0
   flutter_paypal: ^0.2.0
-#  flutter_launcher_icons: ^0.13.1
+  google_fonts: ^4.0.4
+  #  flutter_launcher_icons: ^0.13.1
   flutter_rating_bar: ^4.0.1
   flutter_font_icons: ^2.2.5
   image_picker: ^1.0.4