diff --git a/siro_rider/lib/constant/style.dart b/siro_rider/lib/constant/style.dart index 12d89b24..48ce4393 100644 --- a/siro_rider/lib/constant/style.dart +++ b/siro_rider/lib/constant/style.dart @@ -7,7 +7,7 @@ import 'colors.dart'; class AppStyle { static TextStyle get headTitle => TextStyle( fontWeight: FontWeight.bold, - fontSize: 36, + fontSize: box.read(BoxName.lang) == 'ar' ? 36 : 28, color: AppColor.accentColor, fontFamily: box.read(BoxName.lang) == 'ar' // ?GoogleFonts.markaziText().fontFamily @@ -15,21 +15,21 @@ class AppStyle { : GoogleFonts.inter().fontFamily); static TextStyle get headTitle2 => TextStyle( fontWeight: FontWeight.bold, - fontSize: 24, + fontSize: box.read(BoxName.lang) == 'ar' ? 24 : 20, color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? GoogleFonts.markaziText().fontFamily : GoogleFonts.inter().fontFamily); static TextStyle get title => TextStyle( fontWeight: FontWeight.normal, - fontSize: 16, + fontSize: box.read(BoxName.lang) == 'ar' ? 16 : 14, color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? GoogleFonts.markaziText().fontFamily : GoogleFonts.inter().fontFamily); static TextStyle get subtitle => TextStyle( fontWeight: FontWeight.bold, - fontSize: 12, + fontSize: box.read(BoxName.lang) == 'ar' ? 12 : 11, color: AppColor.writeColor, fontFamily: box.read(BoxName.lang) == 'ar' ? GoogleFonts.markaziText().fontFamily @@ -41,34 +41,34 @@ class AppStyle { fontFamily: 'digit'); static BoxDecoration get boxDecoration => BoxDecoration( - boxShadow: [ - BoxShadow( - color: AppColor.accentColor.withOpacity(0.3), - blurRadius: 5, - offset: const Offset(2, 4)), - BoxShadow( - color: AppColor.accentColor.withOpacity(0.1), - blurRadius: 5, - offset: const Offset(-2, -2)) - ], - color: AppColor.secondaryColor, - borderRadius: const BorderRadius.all( - Radius.elliptical(15, 30), - )); + boxShadow: [ + BoxShadow( + color: AppColor.accentColor.withOpacity(0.3), + blurRadius: 5, + offset: const Offset(2, 4)), + BoxShadow( + color: AppColor.accentColor.withOpacity(0.1), + blurRadius: 5, + offset: const Offset(-2, -2)) + ], + color: AppColor.secondaryColor, + borderRadius: const BorderRadius.all( + Radius.elliptical(15, 30), + )); static BoxDecoration get boxDecoration1 => BoxDecoration( - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.05), - blurRadius: 10, - offset: const Offset(0, 4)), - BoxShadow( - color: AppColor.primaryColor.withOpacity(0.02), - blurRadius: 5, - offset: const Offset(-2, -2)) - ], - color: AppColor.secondaryColor, - borderRadius: const BorderRadius.all( - Radius.elliptical(15, 30), - ), - ); + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.05), + blurRadius: 10, + offset: const Offset(0, 4)), + BoxShadow( + color: AppColor.primaryColor.withOpacity(0.02), + blurRadius: 5, + offset: const Offset(-2, -2)) + ], + color: AppColor.secondaryColor, + borderRadius: const BorderRadius.all( + Radius.elliptical(15, 30), + ), + ); } diff --git a/siro_rider/lib/views/home/map_page_passenger.dart b/siro_rider/lib/views/home/map_page_passenger.dart index 185c3e8a..38829b5b 100644 --- a/siro_rider/lib/views/home/map_page_passenger.dart +++ b/siro_rider/lib/views/home/map_page_passenger.dart @@ -84,7 +84,6 @@ class MapPagePassenger extends StatelessWidget { const VipRideBeginPassenger(), const RideFromStartApp(), PointsPageForRider(), - ], ), ), @@ -162,8 +161,7 @@ class CancelRidePageShow extends StatelessWidget { return showCancelButton ? Positioned( - right: box.read(BoxName.lang) == 'ar' ? 10 : null, - left: box.read(BoxName.lang) != 'ar' ? 10 : null, + right: 10, top: Get.height * .013, child: GestureDetector( onTap: () { diff --git a/siro_rider/lib/views/home/map_widget.dart/payment_method_page.dart b/siro_rider/lib/views/home/map_widget.dart/payment_method_page.dart index f853a6b0..75ee4824 100644 --- a/siro_rider/lib/views/home/map_widget.dart/payment_method_page.dart +++ b/siro_rider/lib/views/home/map_widget.dart/payment_method_page.dart @@ -165,9 +165,13 @@ class MyCreditCardWidget extends StatelessWidget { ), SizedBox( width: Get.width * .25, - child: Text( - 'Card Number'.tr, - style: AppStyle.title, + child: FittedBox( + fit: BoxFit.scaleDown, + alignment: AlignmentDirectional.centerStart, + child: Text( + 'Card Number'.tr, + style: AppStyle.title, + ), ), ), SizedBox( @@ -210,9 +214,13 @@ class MyCreditCardWidget extends StatelessWidget { ), SizedBox( width: Get.width * .25, - child: Text( - 'Holder Name', - style: AppStyle.title, + child: FittedBox( + fit: BoxFit.scaleDown, + alignment: AlignmentDirectional.centerStart, + child: Text( + 'Holder Name'.tr, + style: AppStyle.title, + ), ), ), SizedBox( @@ -257,9 +265,13 @@ class MyCreditCardWidget extends StatelessWidget { children: [ SizedBox( width: Get.width * .2, - child: Text( - 'Expiry Date', - style: AppStyle.subtitle, + child: FittedBox( + fit: BoxFit.scaleDown, + alignment: AlignmentDirectional.centerStart, + child: Text( + 'Expiry Date'.tr, + style: AppStyle.subtitle, + ), ), ), SizedBox( @@ -300,9 +312,13 @@ class MyCreditCardWidget extends StatelessWidget { children: [ SizedBox( width: Get.width * .2, - child: Text( - 'CVV Code', - style: AppStyle.subtitle, + child: FittedBox( + fit: BoxFit.scaleDown, + alignment: AlignmentDirectional.centerStart, + child: Text( + 'CVV Code'.tr, + style: AppStyle.subtitle, + ), ), ), SizedBox(