diff --git a/android/app/build.gradle b/android/app/build.gradle
index 840a559..99ca3b2 100644
--- a/android/app/build.gradle
+++ b/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
- versionName '1.4.93'
+ versionCode 29
+ versionName '1.4.94'
// manifestPlaceholders = [mapsApiKey: 'android/app/src/main/AndroidManifest.xml']
}
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index e5e8a83..23ae651 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -37,11 +37,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 22
+ 23
CFBundleSignature
????
CFBundleVersion
- 1.42
+ 1.43
FirebaseAppDelegateProxyEnabled
NO
GMSApiKey
diff --git a/lib/constant/colors.dart b/lib/constant/colors.dart
index 0f666de..1fbb03f 100644
--- a/lib/constant/colors.dart
+++ b/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
diff --git a/lib/constant/style.dart b/lib/constant/style.dart
index ba9bbfe..3477e82 100644
--- a/lib/constant/style.dart
+++ b/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,
- fontSize: 14,
+ fontWeight: FontWeight.normal,
+ 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,
- offset: Offset(-3, -3),
- blurRadius: 0,
- spreadRadius: 0,
- blurStyle: BlurStyle.outer),
+ color: AppColor.accentColor, blurRadius: 5, offset: Offset(2, 4)),
BoxShadow(
- color: AppColor.accentColor,
- offset: Offset(3, 3),
- blurRadius: 0,
- spreadRadius: 0,
- blurStyle: BlurStyle.outer)
- ]);
+ color: AppColor.accentColor, blurRadius: 5, offset: Offset(-2, -2))
+ ],
+ color: AppColor.secondaryColor,
+ borderRadius: BorderRadius.all(
+ Radius.elliptical(15, 30),
+ ));
static BoxDecoration boxDecoration1 = const BoxDecoration(
boxShadow: [
BoxShadow(
diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart
index 2684baa..659bfe8 100644
--- a/lib/controller/local/translations.dart
+++ b/lib/controller/local/translations.dart
@@ -4,6 +4,8 @@ class MyTranslation extends Translations {
@override
Map> get keys => {
"ar": {
+ "You must restart the app to change the language.":
+ "يجب إعادة تشغيل التطبيق لتغيير اللغة",
"joined": "انضم",
"Driver joined the channel": "السائق انضم للقناة",
"Driver left the channel": "السائق غادر القناة",
diff --git a/pubspec.lock b/pubspec.lock
index 4791acf..6b78d17 100644
--- a/pubspec.lock
+++ b/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:
diff --git a/pubspec.yaml b/pubspec.yaml
index 001bf7c..5d4bc44 100644
--- a/pubspec.yaml
+++ b/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