19

2026-05-01 01:43:59 +03:00
parent cdda136006
commit 5fc160e374
25 changed files with 1526 additions and 1856 deletions
--- a/lib/constant/colors.dart
+++ b/lib/constant/colors.dart
@@ -1,14 +1,46 @@
 import 'package:flutter/material.dart';

+import 'package:flutter/material.dart';
+
 class AppColor {
-  static const Color primaryColor = Colors.black;
-  static const Color secondaryColor = Colors.white;
-  static const Color accentColor = Colors.grey;
-  static const Color redColor = Color(0xFFEA4335); // Google Red
-  static const Color greenColor = Color(0xFF34A853); // Google Green
-  static const Color blueColor =
-      Color.fromARGB(255, 66, 135, 246); // Google Blue
-  static const Color yellowColor = Color(0xFFFBBC05); // Google Yellow
-  static Color deepPurpleAccent =
-      const Color.fromARGB(255, 123, 76, 254).withOpacity(0.3);
+  // --- Core Design Tokens ---
+  
+  // Background & Surfaces
+  static const Color bg = Color(0xFF0A0A0B);
+  static const Color surface = Color(0xFF161618);
+  static const Color surfaceElevated = Color(0xFF222225);
+  static const Color surfaceGlass = Color(0xCC161618);
+  
+  // Accents & Branding
+  static const Color accent = Color(0xFF6366F1); // Indigo / Violet
+  static const Color accentSoft = Color(0x266366F1); // 15% Opacity
+  static const Color accentBorder = Color(0x4D6366F1); // 30% Opacity
+  static const Color glow = Color(0xFF818CF8);
+  
+  // Semantic / State Colors
+  static const Color danger = Color(0xFFEF4444);
+  static const Color dangerSoft = Color(0x26EF4444);
+  static const Color success = Color(0xFF10B981);
+  static const Color successSoft = Color(0x2610B981);
+  static const Color warning = Color(0xFFF59E0B);
+  static const Color info = Color(0xFF3B82F6);
+  
+  // Text & Content
+  static const Color textPrimary = Color(0xFFF3F4F6);
+  static const Color textSecondary = Color(0xFF9CA3AF);
+  static const Color textMuted = Color(0xFF6B7280);
+  
+  // UI Elements
+  static const Color divider = Color(0xFF2D2D30);
+  static const Color cardShadow = Color(0x66000000);
+
+  // --- Legacy Mappings (for temporary compatibility) ---
+  static const Color primaryColor = bg;
+  static const Color secondaryColor = textPrimary;
+  static const Color accentColor = accent;
+  static const Color redColor = danger;
+  static const Color greenColor = success;
+  static const Color blueColor = info;
+  static const Color yellowColor = warning;
 }
+
--- a/lib/constant/credential.dart
+++ b/lib/constant/credential.dart
@@ -11,7 +11,7 @@ class AC {
  gAK() async {
    if (box.read(BoxName.apiKeyRun).toString() != 'run') {
      var res = await CRUD().get(link: AppLink.getApiKey, payload: {});
-      var decod = jsonDecode(res);
+      var decod = res is String ? jsonDecode(res) : res;
      print(decod);
      Map<String, dynamic> jsonData = {};
      for (var i = 0; i < decod['message'].length; i++) {
--- a/lib/constant/links.dart
+++ b/lib/constant/links.dart
@@ -11,7 +11,15 @@ class AppLink {
  // static final String endPoint = box.read(BoxName.serverChosen);
  // static final String server = Env.seferCairoServer;

-  static final String server = 'https://api.intaleq.xyz/intaleq_v1';
+  static final String server = 'https://api.intaleq.xyz/intaleq_v3';
+  static final String endPoint = 'https://api.intaleq.xyz/intaleq_v3';
+  static final String syria = 'https://syria.intaleq.xyz/intaleq';
+  static String paymentServer = 'https://walletintaleq.intaleq.xyz/v1/main';
+  static String locationServer = 'https://location.intaleq.xyz/intaleq/ride/location';
+  static String locationServerSide = 'https://location.intaleq.xyz/intaleq/ride/location';
+  static String mapSaasRoute = 'https://map-saas.intaleqapp.com/api/maps/route';
+  static String mapSaasPlaces = 'https://map-saas.intaleqapp.com/api/geocoding/places';
+  static const String routeApiBaseUrl = "https://routesjo.intaleq.xyz/route/v1/driving";
  static String loginJwtDriver =
      "https://api.intaleq.xyz/intaleq/loginAdmin.php";
 //=============================
@@ -35,6 +43,7 @@ class AppLink {

  static String test = "$server/test.php";
  static String loginWalletAdmin = "$seferPaymentServer/loginWalletAdmin.php";
+  static String loginWalletAdminV3 = "$server/Admin/auth/loginWallet.php";
  //===============firebase==========================
  static String getTokens = "$server/ride/firebase/get.php";
  static String getInvoices = "$server/Admin/adminUser/invoice_total.php";
@@ -209,7 +218,7 @@ class AppLink {
  static String uploadEgypt = "$server/uploadEgypt.php";

  //==================certifcate==========
-  static String location = '$server/ride/location';
+  static String location = locationServer;
  static String getCarsLocationByPassenger = "$location/get.php";
  static String getFemalDriverLocationByPassenger =
      "$location/getFemalDriver.php";
@@ -277,6 +286,7 @@ class AppLink {
      "$server/auth/syria/driver/driver_details.php";
  static String deleteCaptain = "$server/Admin/driver/deleteCaptain.php";
  static String addAdminUser = "$server/Admin/adminUser/add.php";
+  static String addStaff = "$server/Admin/Staff/add.php";
  static String getdashbord = "$server/Admin/dashbord.php";
  static String getEmployee = "$server/Admin/employee/get.php";
  static String getBestDriver = "$server/Admin/driver/getBestDriver.php";
--- a/lib/constant/style.dart
+++ b/lib/constant/style.dart
@@ -6,59 +6,81 @@ import 'box_name.dart';
 import 'colors.dart';

 class AppStyle {
-  static TextStyle headTitle = const TextStyle(
-    fontWeight: FontWeight.bold,
-    fontSize: 40,
-    color: AppColor.accentColor,
-  );
-  static TextStyle headTitle2 = const TextStyle(
-    fontWeight: FontWeight.bold,
-    fontSize: 26,
-    color: AppColor.primaryColor,
-  );
-  static TextStyle title = const TextStyle(
-    fontWeight: FontWeight.bold,
-    fontSize: 16,
-    color: AppColor.primaryColor,
-  );
-  static TextStyle subtitle = const TextStyle(
-    fontWeight: FontWeight.bold,
-    fontSize: 13,
-    color: AppColor.primaryColor,
-  );
-  static TextStyle number = const TextStyle(
-    fontWeight: FontWeight.bold,
-    fontSize: 14,
-    color: AppColor.primaryColor,
+  // --- Typography ---
+  
+  static TextStyle display = GoogleFonts.inter(
+    fontWeight: FontWeight.w800,
+    fontSize: 32,
+    color: AppColor.textPrimary,
+    letterSpacing: -1,
  );

-  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),
-        BoxShadow(
-            color: AppColor.accentColor,
-            offset: Offset(3, 3),
-            blurRadius: 0,
-            spreadRadius: 0,
-            blurStyle: BlurStyle.outer)
-      ]);
-  static BoxDecoration boxDecoration1 = const BoxDecoration(
-    boxShadow: [
-      BoxShadow(
-          color: AppColor.accentColor, blurRadius: 5, offset: Offset(2, 4)),
-      BoxShadow(
-          color: AppColor.accentColor, blurRadius: 5, offset: Offset(-2, -2))
-    ],
-    color: AppColor.secondaryColor,
-    borderRadius: BorderRadius.all(
-      Radius.elliptical(15, 30),
-    ),
+  static TextStyle headTitle = GoogleFonts.cairo(
+    fontWeight: FontWeight.bold,
+    fontSize: 24,
+    color: AppColor.textPrimary,
  );
+
+  static TextStyle title = GoogleFonts.inter(
+    fontWeight: FontWeight.w600,
+    fontSize: 16,
+    color: AppColor.textPrimary,
+  );
+
+  static TextStyle subtitle = GoogleFonts.inter(
+    fontWeight: FontWeight.w500,
+    fontSize: 14,
+    color: AppColor.textSecondary,
+  );
+
+  static TextStyle body = GoogleFonts.inter(
+    fontWeight: FontWeight.normal,
+    fontSize: 14,
+    color: AppColor.textPrimary,
+  );
+
+  static TextStyle caption = GoogleFonts.inter(
+    fontWeight: FontWeight.w400,
+    fontSize: 12,
+    color: AppColor.textMuted,
+  );
+
+  static TextStyle number = GoogleFonts.jetBrainsMono(
+    fontWeight: FontWeight.bold,
+    fontSize: 15,
+    color: AppColor.accent,
+  );
+
+  // --- Decorations ---
+
+  static BoxDecoration cardDecoration = BoxDecoration(
+    color: AppColor.surface,
+    borderRadius: BorderRadius.circular(16),
+    border: Border.all(color: AppColor.divider, width: 1),
+    boxShadow: const [
+      BoxShadow(
+        color: AppColor.cardShadow,
+        blurRadius: 20,
+        offset: Offset(0, 8),
+      ),
+    ],
+  );
+
+  static BoxDecoration elevatedCard = BoxDecoration(
+    color: AppColor.surfaceElevated,
+    borderRadius: BorderRadius.circular(20),
+    border: Border.all(color: AppColor.accentBorder, width: 1),
+  );
+
+  static BoxDecoration glassDecoration = BoxDecoration(
+    color: AppColor.surfaceGlass,
+    borderRadius: BorderRadius.circular(24),
+    border: Border.all(color: AppColor.divider, width: 1),
+  );
+
+  // --- Legacy Mappings ---
+  static TextStyle headTitle2 = headTitle;
+  static BoxDecoration boxDecoration = cardDecoration;
+  static BoxDecoration boxDecoration1 = elevatedCard;
 }
+