From 69cab6b60b8de7855eac2a6a7cca51fffab054ea Mon Sep 17 00:00:00 2001 From: Juki-shiba Date: Wed, 16 Apr 2025 13:07:46 +0530 Subject: [PATCH] bug fixfor arabic --- .../auth_verification/terms&conditions.dart | 231 +++++++++++++++--- 1 file changed, 192 insertions(+), 39 deletions(-) diff --git a/lib/presentation/Screens/auth_verification/terms&conditions.dart b/lib/presentation/Screens/auth_verification/terms&conditions.dart index 150c2b2f..75de14cb 100644 --- a/lib/presentation/Screens/auth_verification/terms&conditions.dart +++ b/lib/presentation/Screens/auth_verification/terms&conditions.dart @@ -16,10 +16,19 @@ class TermsOfUse extends StatelessWidget { Widget build(BuildContext context) { return Theme( data: ThemeData( - fontFamily: 'Roboto', // Set default font family for this page + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), // Set default font family for this page textTheme: TextTheme( - bodyMedium: TextStyle(fontSize: 16, color:Color(0xFF898C81),), - bodyLarge: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: 'Roboto',fontWeight: FontWeight.w500), + bodyMedium: TextStyle(fontSize: 16, color:Color(0xFF898C81),fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + bodyLarge: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),fontWeight: FontWeight.w500), ), ), child: Scaffold( @@ -36,6 +45,10 @@ class TermsOfUse extends StatelessWidget { 'الشروط والأحكام', ), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:22, color: Colors.black87, fontWeight: FontWeight.w600, @@ -68,6 +81,10 @@ class TermsOfUse extends StatelessWidget { , 'مؤسسة المشاع الإبداعي نَسْبُ الـمُصنَّف 4.0 رخصة عمومية دولية'), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:20, color: Color(0xFF414042), fontWeight: FontWeight.w600, @@ -81,9 +98,12 @@ class TermsOfUse extends StatelessWidget { 'يخضع المحتوى والبيانات المتاحة من خلال UAE.Stat', ), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize: 16, color: Color(0xFF898C81), - fontFamily: 'Roboto', height: 1.4, ), children: [ @@ -95,7 +115,10 @@ class TermsOfUse extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w500, color: Color(0xFF414042), - fontFamily: 'Roboto', + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ), ), TextSpan( @@ -105,7 +128,10 @@ class TermsOfUse extends StatelessWidget { ), style: TextStyle( color: Color(0xFF414042), // No bold - fontFamily: 'Roboto', + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ), ), TextSpan( @@ -124,6 +150,10 @@ class TermsOfUse extends StatelessWidget { '1.الشروط والأحكام', ), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:20, color: Colors.black87, fontWeight: FontWeight.w600, @@ -133,7 +163,10 @@ class TermsOfUse extends StatelessWidget { SizedBox(height: 5), Text( context.translate('You are free to:', 'يُسمح لك بـ:'), - style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: 'Roboto',fontWeight: FontWeight.w500), + style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),fontWeight: FontWeight.w500), ), Padding(padding: EdgeInsets.only(left: 10,top: 5, bottom: 7), child: Column( @@ -149,14 +182,20 @@ class TermsOfUse extends StatelessWidget { Expanded( child: RichText( text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('Share –', 'المشاركة – '), style: TextStyle( fontWeight: FontWeight.w500, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan(text:context.translate(' Copy and redistribute the material in any medium or format.', 'نسخ وإعادة توزيع المحتوى بأي وسيلة أو صيغة.', @@ -179,14 +218,20 @@ class TermsOfUse extends StatelessWidget { Expanded( child: RichText( text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text:context.translate( 'Adapt –', 'التعديل – '), style: TextStyle( fontWeight: FontWeight.w500, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan(text:context.translate( 'Remix, transform, and build upon the material for any purpose, even commercially.', 'إعادة مزج، تعديل، أو البناء على المحتوى لأي غرض، بما في ذلك الأغراض التجارية.'), @@ -210,6 +255,10 @@ class TermsOfUse extends StatelessWidget { , '2.شروط الترخيص',), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:20, color: Color(0xFF414042), fontWeight: FontWeight.w600, @@ -217,7 +266,10 @@ class TermsOfUse extends StatelessWidget { SizedBox(height: 5), Text( context.translate('Under the following terms:', 'وفقًا للشروط التالية:'), - style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: 'Roboto',fontWeight: FontWeight.w500), + style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),fontWeight: FontWeight.w500), ), SizedBox(height: 5), Padding(padding: EdgeInsets.only(left: 10,top: 5, bottom: 7), @@ -234,13 +286,19 @@ class TermsOfUse extends StatelessWidget { Expanded( child: RichText( text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('Attribution –',' نَسْب المُصنَّف'), style: TextStyle( fontWeight: FontWeight.w500, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -266,13 +324,19 @@ class TermsOfUse extends StatelessWidget { Expanded( child: RichText( text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('No additional restrictions – ','عدم فرض قيود إضافية – '), style: TextStyle( fontWeight: FontWeight.w500, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -296,6 +360,10 @@ class TermsOfUse extends StatelessWidget { , '3.نطاق الترخيص',), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:20, color: Color(0xFF414042), fontWeight: FontWeight.w600, @@ -303,7 +371,10 @@ class TermsOfUse extends StatelessWidget { SizedBox(height: 5), Text( context.translate('The Licensor grants you:', 'يمنحك المرخِّص:'), - style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: 'Roboto',fontWeight: FontWeight.w400), + style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),fontWeight: FontWeight.w400), ), SizedBox(height: 5), Padding(padding: EdgeInsets.only(left: 10,top: 5, bottom: 7), @@ -312,7 +383,10 @@ class TermsOfUse extends StatelessWidget { Text( context.translate('A worldwide, royalty-free, non-exclusive, irrevocable license to:', 'ترخيصًا عالميًا، خاليًا من الإتاوات، غير حصري، وغير قابل للإلغاء لـ:'), - style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: 'Roboto',fontWeight: FontWeight.w400), + style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),fontWeight: FontWeight.w400), ), Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -325,13 +399,19 @@ class TermsOfUse extends StatelessWidget { Expanded( child: RichText( text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('Reproduce and share ','نسخ ومشاركة '), style: TextStyle( fontWeight: FontWeight.w400, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -357,13 +437,19 @@ class TermsOfUse extends StatelessWidget { Expanded( child: RichText( text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('Modify and create ','تعديل وإنشاء '), style: TextStyle( fontWeight: FontWeight.w400, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -382,7 +468,10 @@ class TermsOfUse extends StatelessWidget { ), Text(context.translate('This license applies to all media formats, including future technologies.', 'ينطبق هذا الترخيص على جميع الوسائط والصيغ، بما في ذلك التقنيات المستقبلية.',), - style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: 'Roboto',fontWeight: FontWeight.w400), + style: TextStyle(fontSize: 16, color:Color(0xFF414042), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),fontWeight: FontWeight.w400), ), SizedBox(height: 8), Text( @@ -391,6 +480,10 @@ class TermsOfUse extends StatelessWidget { , '4.القيود والمصادقة',), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:20, color: Color(0xFF414042), fontWeight: FontWeight.w600, @@ -410,13 +503,19 @@ class TermsOfUse extends StatelessWidget { Expanded( child: RichText( text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('No Endorsement – ','عدم المصادقة – '), style: TextStyle( fontWeight: FontWeight.w500, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -442,13 +541,19 @@ class TermsOfUse extends StatelessWidget { Expanded( child: RichText( text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('No Patent or Trademark Rights – ','التجارية – '), style: TextStyle( fontWeight: FontWeight.w500, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -473,6 +578,10 @@ class TermsOfUse extends StatelessWidget { , '5.إخلاء المسؤولية',), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:20, color: Color(0xFF414042), fontWeight: FontWeight.w600, @@ -493,13 +602,19 @@ class TermsOfUse extends StatelessWidget { child: RichText( text: TextSpan( text: context.translate('The content is provided ','دون أي ضمانات '), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('"as is" ', '"كما هو" '), style: TextStyle( fontWeight: FontWeight.w400, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -526,13 +641,19 @@ class TermsOfUse extends StatelessWidget { child: RichText( text: TextSpan( text: context.translate('The Licensor is ','دون أي ضمانات '), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('not responsible ', 'أي مسؤولية '), style: TextStyle( fontWeight: FontWeight.w400, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -557,6 +678,10 @@ class TermsOfUse extends StatelessWidget { , '7.إنهاء الترخيص',), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:20, color: Color(0xFF414042), fontWeight: FontWeight.w600, @@ -577,13 +702,19 @@ class TermsOfUse extends StatelessWidget { child: RichText( text: TextSpan( text: context.translate('If you ','إذا '), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('violate the license terms ', 'انتهكت شروط الترخيص، '), style: TextStyle( fontWeight: FontWeight.w400, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -610,13 +741,19 @@ class TermsOfUse extends StatelessWidget { child: RichText( text: TextSpan( text: context.translate('Rights may be reinstated ','يمكن استعادة الحقوق '), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('if the violation is corrected within 30 days.', 'إذا تم تصحيح الانتهاك خلال 30 يومًا. '), style: TextStyle( fontWeight: FontWeight.w400, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), ], @@ -635,6 +772,10 @@ class TermsOfUse extends StatelessWidget { , '7.شروط إضافية',), style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize:20, color: Color(0xFF414042), fontWeight: FontWeight.w600, @@ -655,13 +796,19 @@ class TermsOfUse extends StatelessWidget { child: RichText( text: TextSpan( text: context.translate('The Licensor is not bound by ','لا يكون المرخِّص ملزمًا '), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('any additional terms ', 'بأي شروط إضافية '), style: TextStyle( fontWeight: FontWeight.w400, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate( @@ -688,13 +835,19 @@ class TermsOfUse extends StatelessWidget { child: RichText( text: TextSpan( text: context.translate('If any provision is ','لا يكون المرخِّص ملزمًا '), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: 'Roboto'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), children: [ TextSpan(text: context.translate('unenforceable,', 'أي شرط غير قابل للتنفيذ، '), style: TextStyle( fontWeight: FontWeight.w400, color: Color(0xFF414042), - fontFamily: 'Roboto' + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ),), TextSpan( text: context.translate(