diff --git a/lib/constant/colors.dart b/lib/constant/colors.dart index 1fbb03f..977d1b7 100644 --- a/lib/constant/colors.dart +++ b/lib/constant/colors.dart @@ -1,31 +1,28 @@ import 'package:flutter/material.dart'; 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, 231, 84, 84); // Google Green - static const Color backgroundColor = - Color(0xFFF5F5F5); // Light grey background + static const Color primaryColor = Color(0xFF1DA1F2); + static const Color writeColor = Color(0xFF333333); + static const Color secondaryColor = Colors.white; + static const Color accentColor = Colors.grey; + static const Color greyColor = Colors.grey; + static const Color twitterColor = Color(0xFF1DA1F2); // Twitter blue + static const Color redColor = Color(0xFFEA4335); // Google Red static const Color greenColor = Color(0xFF34A853); // Google Green - static const Color blueColor = Color(0xFF4285F4); // Google Blue + static const Color blueColor = Color(0xFF1DA1F2); // Google Blue static const Color yellowColor = Color(0xFFFBBC05); // Google Yellow static Color deepPurpleAccent = const Color.fromARGB(255, 123, 76, 254).withOpacity(0.3); - static const Color greyColor = - Color(0xFF9E9E9E); // Light grey for text and dividers - static const Color darkGreyColor = - Color(0xFF333333); // Dark grey for headings // For dynamic elements like gradients static List gradientStartEnd = [ - const Color(0xFFD81F26), // Start with primary color - const Color(0xFFEF5350), // End with a slightly darker shade + const Color(0xFF1DA1F2), // Start with primary color + const Color(0xFF0C7ABF), // End with a slightly darker shade of Twitter blue ]; static List secondaryGradientStartEnd = [ - const Color(0xFF34A853), // Start with green - const Color(0xFF4CAF50), // End with a slightly darker shade of green + const Color(0xFF1DA1F2), // Start with Twitter blue + const Color(0xFF0C7ABF), // End with a slightly darker shade of Twitter blue ]; } diff --git a/lib/constant/style.dart b/lib/constant/style.dart index 3477e82..db32766 100644 --- a/lib/constant/style.dart +++ b/lib/constant/style.dart @@ -15,28 +15,28 @@ class AppStyle { static TextStyle headTitle2 = TextStyle( fontWeight: FontWeight.bold, fontSize: 26, - color: AppColor.primaryColor, + color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : GoogleFonts.josefinSans().fontFamily); static TextStyle title = TextStyle( fontWeight: FontWeight.normal, fontSize: box.read(BoxName.lang) == 'ar' ? 14 : 16, - color: AppColor.primaryColor, + color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : GoogleFonts.josefinSans().fontFamily); static TextStyle subtitle = TextStyle( fontWeight: FontWeight.bold, fontSize: 13, - color: AppColor.primaryColor, + color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? 'mohanad' : GoogleFonts.josefinSans().fontFamily); static TextStyle number = const TextStyle( fontWeight: FontWeight.bold, fontSize: 14, - color: AppColor.primaryColor, + color: AppColor.writeColor, fontFamily: 'digit'); static BoxDecoration boxDecoration = const BoxDecoration( diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index b438d33..83df9ff 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -76,7 +76,7 @@ class MapDriverController extends GetxController { bool isRideFinished = false; bool isRideStarted = false; bool isPriceWindow = false; - double passengerInfoWindowHeight = Get.height * .35; + double passengerInfoWindowHeight = Get.height * .38; double driverEndPage = 100; double progress = 0; double progressToPassenger = 0; diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index 99fe580..a65fbf1 100644 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -4,8 +4,9 @@ class MyTranslation extends Translations { @override Map> get keys => { "ar": { + "No data yet!": "ccc", "fromBudget": "من الميزانية", - "You must restart the app to change the language.": + "You must restart the app to change the language.": "يجب إعادة تشغيل التطبيق لتغيير اللغة", "hours before trying again.": "ساعة قبل المحاولة مرة أخرى", "Transaction failed": "فشل المعاملة", diff --git a/lib/views/home/Captin/home_captain/drawer_captain.dart b/lib/views/home/Captin/home_captain/drawer_captain.dart index 0608946..d3d0b5a 100644 --- a/lib/views/home/Captin/home_captain/drawer_captain.dart +++ b/lib/views/home/Captin/home_captain/drawer_captain.dart @@ -134,7 +134,7 @@ class UserAccountHeader extends StatelessWidget { children: [ Text( box.read(BoxName.nameDriver).toString(), - style: AppStyle.title.copyWith(color: AppColor.backgroundColor), + style: AppStyle.title.copyWith(color: AppColor.secondaryColor), ), const Spacer(), Column( @@ -172,7 +172,7 @@ class UserAccountHeader extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 10), child: Text( box.read(BoxName.emailDriver), - style: AppStyle.title.copyWith(color: AppColor.backgroundColor), + style: AppStyle.title.copyWith(color: AppColor.secondaryColor), ), ), currentAccountPicture: diff --git a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart index 4d3b044..1ad3ff2 100644 --- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart +++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart @@ -174,18 +174,20 @@ GetBuilder driverEndRideBar() { children: [ SizedBox( width: Get.width * .9, - child: LinearProgressIndicator( - backgroundColor: AppColor.accentColor, - color: mapDriverController - .remainingTimeTimerRideBegin < - 60 - ? AppColor.redColor - : AppColor.greenColor, - minHeight: 25, - borderRadius: BorderRadius.circular(6), - value: mapDriverController - .progressTimerRideBegin - .toDouble(), + child: Center( + child: LinearProgressIndicator( + backgroundColor: AppColor.greyColor, + color: mapDriverController + .remainingTimeTimerRideBegin < + 60 + ? AppColor.redColor + : AppColor.greenColor, + minHeight: 25, + borderRadius: BorderRadius.circular(6), + value: mapDriverController + .progressTimerRideBegin + .toDouble(), + ), ), ), Center( diff --git a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart index 734f9aa..01aa0a1 100644 --- a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart +++ b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart @@ -31,13 +31,13 @@ class PassengerInfoWindow extends StatelessWidget { // left: 8, child: AnimatedContainer( duration: const Duration(milliseconds: 300), - height: controller.passengerInfoWindowHeight, + height: Get.height * .4, width: Get.width, decoration: AppStyle.boxDecoration1, child: Padding( padding: const EdgeInsets.all(8.0), child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ DefaultTextStyle( @@ -197,7 +197,7 @@ class PassengerInfoWindow extends StatelessWidget { 60 ? AppColor.redColor : AppColor.greenColor, - minHeight: 35, + minHeight: 25, borderRadius: BorderRadius.circular(15), value: controller.progressToPassenger .toDouble(), @@ -304,13 +304,13 @@ class PassengerInfoWindow extends StatelessWidget { children: [ LinearProgressIndicator( backgroundColor: - AppColor.accentColor, + AppColor.greyColor, color: controller .remainingTimeInPassengerLocatioWait < 60 ? AppColor.redColor : AppColor.greenColor, - minHeight: 50, + minHeight: 25, borderRadius: BorderRadius.circular( 15),