drawer update

android/app/build.gradle

@@ -15,12 +15,12 @@ if (localPropertiesFile.exists()) {
 
 def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
 if (flutterVersionCode == null) {
-    flutterVersionCode = "14"
+    flutterVersionCode = "16"
 }
 
 def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = "1.0.13"
+    flutterVersionName = "1.0.15"
 }
 
 def keystorePropertiesFile = rootProject.file("key.properties")

assets/icons/uae_numbers/share.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.9999 4V8C6.42494 9.028 3.97994 14.788 2.99994 20C2.96294 20.206 8.38394 14.038 12.9999 14V18L20.9999 11L12.9999 4Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

lib/infrastructure/services/img_asset_paths/icons/uae_numbers_asset_path.dart

@@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
 
 abstract class UaeNumbersAssetPath {
   static const _basePath = 'assets/icons/uae_numbers';
-  static const bookmarksUae = '$_basePath/bookmarks.png';
+  // static const bookmarksUae = '$_basePath/bookmarks.png';
-  static const bookmarksSelectedUae = '$_basePath/bookmarksSelectedUae.png';
+  // static const bookmarksSelectedUae = '$_basePath/bookmarksSelectedUae.png';
-  static const shareUae = '$_basePath/share.png';
+  // static const shareUae = '$_basePath/share.png';
+  static const share = '$_basePath/share.svg';
   static const filterUae = '$_basePath/filters.png'; 
 }

lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart

@@ -288,7 +288,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
         final encodedTitle = Uri.encodeComponent(title);
 
         // Pass mainTopic and title as query parameters
-        context.go(
+        context.push(
             '/chartScreen/$data_set?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle');
         // context.go('/chartScreen/$data_set');
       },

lib/presentation/Screens/auth_verification/create_new_pw.dart

@@ -14,7 +14,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../../config/my_theme.dart';
 
-class CreateNewPw extends StatefulWidget {
+class CreateNewPw extends ConsumerStatefulWidget {
   final String userId;
   final String email;
   final String? keyParam;
@@ -22,10 +22,10 @@ class CreateNewPw extends StatefulWidget {
   const CreateNewPw({Key? key, required this.userId, required this.email, required this.keyParam});
 
   @override
-  State<CreateNewPw> createState() => _CreateNewPwState();
+  ConsumerState<CreateNewPw> createState() => _CreateNewPwState();
 }
 
-class _CreateNewPwState extends State<CreateNewPw> {
+class _CreateNewPwState extends ConsumerState<CreateNewPw> {
   final _pb = PocketBase('https://pb.venbait.in');
   final _formKey = GlobalKey<FormState>();
   bool _obscureOldPassword = true;
@@ -188,9 +188,10 @@ class _CreateNewPwState extends State<CreateNewPw> {
   }
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext contextx) {
     double screenHeight = MediaQuery.of(context).size.height;
     double screenWidth = MediaQuery.of(context).size.width;
+    final passwordLocale = ref.watch(localeProvider);
 
     return Scaffold(
       backgroundColor: Colors.white,
@@ -198,13 +199,14 @@ class _CreateNewPwState extends State<CreateNewPw> {
         child: SafeArea(
           child: _isPasswordUpdated
               ? _buildSuccessContent(screenHeight, screenWidth)
-              : _buildPasswordForm(screenHeight, screenWidth),
+              : _buildPasswordForm(ref,screenHeight, screenWidth),
         ),
       ),
     );
   }
 
-  Widget _buildPasswordForm(double screenHeight, double screenWidth) {
+  Widget _buildPasswordForm(WidgetRef ref ,double screenHeight, double screenWidth) {
+    final passwordLocale = ref.watch(localeProvider);
     return Form(
       key: _formKey,
       child: Padding(
@@ -231,7 +233,7 @@ class _CreateNewPwState extends State<CreateNewPw> {
                     child: Icon(
                       // Icons.close,
                       Icons.arrow_back_ios,
-                      size: 28, // Icon size
+                      size: 24, // Icon size
                       color: Colors.black, // Icon color
                     ),
                   ),
@@ -259,7 +261,10 @@ class _CreateNewPwState extends State<CreateNewPw> {
               // "Create New Password",
               AppLocalizations.of(context)!.create_new_password,
               style: TextStyle(
-                fontSize: 26,
+                fontSize: passwordLocale?.languageCode ==
+                    'ar'
+                    ? 24
+                    :26,
                 fontWeight: FontWeight.w300,
               ),
             ),
@@ -269,12 +274,18 @@ class _CreateNewPwState extends State<CreateNewPw> {
           TextSpan(
             children: [
               TextSpan(
-                text: 'Your New Password Must Be Different\n',
+                text: context.translate('Your New Password Must Be Different\n','يجب أن تكون كلمة المرور الجديدة مختلفة\n',),
-                style: TextStyle(fontSize: 15,fontWeight: FontWeight.w700, color: Color(0xFF898C81)),
+                style: TextStyle(fontSize: passwordLocale?.languageCode ==
+                    'ar'
+                    ? 14
+                    :15,fontWeight: FontWeight.w700, color: Color(0xFF898C81)),
               ),
               TextSpan(
-                text: 'from Previously Used Password',
+                text: context.translate('from Previously Used Password','عن كلمة المرور المستخدمة سابقًا'),
-                style: TextStyle(fontSize: 15, color: Color(0xFF898C81), fontWeight: FontWeight.w700),
+                style: TextStyle(fontSize: passwordLocale?.languageCode ==
+                    'ar'
+                    ? 14
+                    :15, color: Color(0xFF898C81), fontWeight: FontWeight.w700),
               ),
             ],
           ),
@@ -590,7 +601,10 @@ class _CreateNewPwState extends State<CreateNewPw> {
                   children: [
                     Text(
                     AppLocalizations.of(context)!.save,
-                      style: TextStyle(fontSize: 18, color: Colors.white),
+                      style: TextStyle(fontSize: passwordLocale?.languageCode ==
+                          'ar'
+                          ? 14
+                          :18, color: Colors.white),
                     ),
                     SizedBox(width: 2),
                     Icon(

lib/presentation/Screens/auth_verification/privacy_policy.dart

@@ -17,6 +17,7 @@ class PrivacyPolicy extends StatelessWidget {
       ),
       child: Scaffold(
         appBar: AppBar(
+          scrolledUnderElevation: 0,
           title:Text(context.translate(
             'Privacy Policy',
             'الشروط والأحكام',

lib/presentation/Screens/auth_verification/terms&conditions.dart

@@ -17,6 +17,7 @@ class TermsOfUse extends StatelessWidget {
       ),
       child: Scaffold(
         appBar: AppBar(
+          scrolledUnderElevation: 0,
           title:Text(context.translate(
             'Terms & Conditions',
             'الشروط والأحكام',

lib/presentation/Screens/charts/screens/chart_screen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:pocketbase/pocketbase.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -2038,16 +2039,17 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
                                       //       color: Colors.white),
                                       // ),
                                       // const SizedBox(width: 5),
-                                      Image.asset(
+                                      // Image.asset(
-                                        isBookmarked
+                                      //   isBookmarked
-                                            ? UaeNumbersAssetPath
+                                      //       ? UaeNumbersAssetPath
-                                            .bookmarksSelectedUae // Filled bookmark image
+                                      //       .bookmarksSelectedUae // Filled bookmark image
-                                            : UaeNumbersAssetPath
+                                      //       : UaeNumbersAssetPath
-                                            .bookmarksUae, // Default bookmark image
+                                      //       .bookmarksUae, // Default bookmark image
-                                        // color: Colors.white,
+                                      //   // color: Colors.white,
-                                        width: 24,
+                                      //   width: 24,
-                                        height: 24,
+                                      //   height: 24,
-                                      ),
+                                      // ),
+                                      Icon(Icons.bookmarks_rounded, color:isBookmarked ? Colors.black:Colors.white ,),
                                     ],
                                   ),
                                 ),
@@ -2069,18 +2071,24 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
                                 SizedBox(width: 5),
                                 Stack(
                                   children: [
-                                    Image.asset(
+                                    // Image.asset(
-                                      UaeNumbersAssetPath.shareUae,
+                                    //   UaeNumbersAssetPath.shareUae,
-                                      color: Colors.white,  // Outline color
+                                    //   color: Colors.white,  // Outline color
-                                      width: 24,  // Slightly larger
+                                    //   width: 24,  // Slightly larger
-                                      height: 24,
+                                    //   height: 24,
-                                    ),
+                                    // ),
-                                    Image.asset(
+                                    // Image.asset(
-                                      UaeNumbersAssetPath.shareUae,
+                                    //   UaeNumbersAssetPath.shareUae,
-                                      color: Colors.white,
+                                    //   color: Colors.white,
+                                    //   width: 24,
+                                    //   height: 24,
+                                    // ),
+                                  SvgPicture.asset(
+                                    UaeNumbersAssetPath.share,
+                                  semanticsLabel: 'share',
                                       width: 24,
                                       height: 24,
-                                    ),
+                                ),
                                   ],
                                 )
                               ],

lib/presentation/Screens/charts/widgets/chart_widget.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 // import 'package:syncfusion_flutter_charts/charts.dart';
 
@@ -259,16 +260,24 @@ class ChartWidget extends StatelessWidget {
                 },
               ),
             ),
-            SizedBox(height: 20),
+            SizedBox(height: 25),
-            Padding(
+
-              padding:
+            Flexible(
-                  const EdgeInsets.all(8.0), // Add spacing around indicators
+              child: SingleChildScrollView(
+                scrollDirection: Axis.vertical,
+                child: Container(
+                  constraints: BoxConstraints(minHeight: 5), // Allow dynamic height
+                  child: Padding(
+                    padding: const EdgeInsets.only(left: 8.0 ,right: 8.0,bottom: 8.0,top:20.0),
               child: Wrap(
                 spacing: 12,
                 runSpacing: 8,
                 children: generateIndicators(chartData, chartData['group_by']),
               ),
             ),
+             ),
+              ),
+            ),
           ],
         );
       case 'fl_stacked_bar':
@@ -912,19 +921,27 @@ class ChartWidget extends StatelessWidget {
                         return Padding(
                           padding: const EdgeInsets.only(top: 8.0),
                           child: Transform.rotate(
-                            angle: -45 *
+                            angle: -1.58,
-                                (3.1415927 / 180), // Rotating by -45 degrees
+                            // angle: -45 *
+                            //     (3.1415927 / 180), // Rotating by -45 degrees
                             alignment: Alignment.center,
-                            child: Text(
+                           child: Center(
-                              xAxisData[value.toInt()],
+                              child: SizedBox(
-                              style: TextStyle(fontSize: 12),
+                                width: 100,
+                                child: Text(
+                                    xAxisData[value.toInt()],
+                                  style: const TextStyle(fontSize: 12),
+                                  softWrap: true,
+                                  maxLines: 2,
+                                ),
+                              ),
                             ),
                           ),
                         );
                       }
                       return Container();
                     },
-                    reservedSize: 60,
+                    reservedSize: 85,
                   ),
                 ),
                 topTitles: AxisTitles(
@@ -979,6 +996,16 @@ class ChartWidget extends StatelessWidget {
           } else if (chartData['dataset'] == 'labour_force') {
             crop = item['ObsKey']['GENDER'];
             cropType = item['ObsKey'][groupByKey];
+            }  else if (chartData['dataset'] ==  'clinics') {
+
+            if (kDebugMode) {
+              print('forclinics');
+              print('ObsKey: ${item['ObsKey']}');
+              // print('NR_TYPE: ${item['ObsKey']?['NR_TYPE']}');
+            }
+
+            crop = item['ObsKey']['MEASURE'];
+            cropType = item['ObsKey'][groupByKey];
           } else {
             crop = item['ObsKey']['CROP'];
             cropType = item['ObsKey'][groupByKey];
@@ -1169,7 +1196,52 @@ class ChartWidget extends StatelessWidget {
           if (chartData['dataset'] == 'natural_reserves') {
             crop = item['ObsKey']['NR_TYPE'];
             cropType = item['ObsKey'][groupByKey];
-          } else {
+          }
+          else if(chartData['dataset'] == 'gdp')
+          {
+            print("ForGDP");
+            if (kDebugMode) {
+
+              print('ObsKey: ${item['ObsKey']}');
+              // print('NR_TYPE: ${item['ObsKey']?['NR_TYPE']}');
+            }
+            crop = item['ObsKey']['BOP_ITEM'];
+
+            cropType = item['ObsKey'][groupByKey];
+          }  else if(chartData['dataset'] == 'air_transport')
+          {
+            print("Forair_transport");
+            if (kDebugMode) {
+
+              print('ObsKey: ${item['ObsKey']}');
+              // print('NR_TYPE: ${item['ObsKey']?['NR_TYPE']}');
+            }
+            crop = item['ObsKey']['MEASURE'];
+
+            cropType = item['ObsKey'][groupByKey];
+          }  else if(chartData['dataset'] == 'import')
+          {
+            print("Forimport");
+            if (kDebugMode) {
+
+              print('ObsKey: ${item['ObsKey']}');
+              // print('NR_TYPE: ${item['ObsKey']?['NR_TYPE']}');
+            }
+            crop = item['ObsKey']['COUNTRY'];
+
+            cropType = item['ObsKey'][groupByKey];
+          }
+          else if(chartData['dataset'] == 'gdpq')
+          {
+            print("ForGDPq");
+            if (kDebugMode) {
+              print('ObsKey: ${item['ObsKey']}');
+            }
+            crop = item['ObsKey']['MEASURE'];
+            // crop = item['ObsKey']['TIME_PERIOD'];
+            cropType = item['ObsKey'][groupByKey];
+          }
+          else {
             crop = item['ObsKey']['CROP'];
             cropType = item['ObsKey'][groupByKey];
           }
@@ -1184,6 +1256,18 @@ class ChartWidget extends StatelessWidget {
 
         int rotationTurns = 1;
         print('Grouped Crops: $groupedCrops');
+
+        int numberOfBars = groupedCrops.length; // Number of grouped sets (bar groups)
+        double barHeight = 40.0; // Height per individual bar
+        double barSpacing = 30.0; // Space between bar sets
+        double minHeight = 300.0; // Minimum chart height
+        double maxHeight = 1000.0; // Maximum chart height
+
+// Calculate total height dynamically
+        double chartHeight = ((numberOfBars * barHeight) + ((numberOfBars - 1) * barSpacing))
+            .clamp(minHeight, maxHeight);
+
+
         return Column(children: [
           Text(
             chartData['chart_heading'] ?? '', // Chart title from data
@@ -1196,6 +1280,13 @@ class ChartWidget extends StatelessWidget {
           SizedBox(height: 10),
           // Chart
           Expanded(
+             child: SingleChildScrollView(
+              scrollDirection: Axis.vertical,
+              child: SingleChildScrollView(
+                scrollDirection: Axis.horizontal,
+            child:SizedBox(
+              width: 1000,
+              height: chartHeight,
             child: BarChart(
               BarChartData(
                 maxY: 400000,
@@ -1347,7 +1438,9 @@ class ChartWidget extends StatelessWidget {
                 alignment: BarChartAlignment.spaceAround,
               ),
             ),
-          )
+         ),
+            ),
+          )),
           // Expanded(
           //   child: Stack(
           //     children:[
@@ -2013,7 +2106,12 @@ class ChartWidget extends StatelessWidget {
         ];
         final barColor;
         if (chartData['dataset'] == 'general_education' ||
-            chartData['dataset'] == 'higher_education') {
+            chartData['dataset'] == 'higher_education' ||
+            chartData['dataset'] == 'air_transport' ||
+            chartData['dataset'] == 'labour_force' ||
+            chartData['dataset'] == 'gdp'
+        ) {
+          
           barColor = uniqueColorsForTwo[colorIndex % uniqueColorsForTwo.length];
           colorIndex++;
         } else {

lib/presentation/Screens/profilepage.dart

@@ -5,6 +5,7 @@ import 'package:external_repos/external_repos.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:http/http.dart' as http;
 import 'package:image_picker/image_picker.dart';
@@ -15,6 +16,8 @@ import 'package:uae_stat/config/my_theme.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
 import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon_asset_path.dart';
+import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
+import 'package:uae_stat/presentation/components/my_toggle.dart';
 import 'package:uae_stat/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -22,15 +25,15 @@ import '../components/my_bottom_nav_bar.dart';
 import 'auth_verification/changepassword.dart';
 import 'demo_home.dart';
 
-class ProfileScreen extends StatefulWidget {
+class ProfileScreen extends ConsumerStatefulWidget {
   final String userId; // Add this field to hold the user ID
 
   const ProfileScreen({Key? key, required this.userId}) : super(key: key);
   @override
-  State<ProfileScreen> createState() => _ProfileScreenState();
+  ConsumerState<ProfileScreen> createState() => _ProfileScreenState();
 }
 
-class _ProfileScreenState extends State<ProfileScreen> {
+class _ProfileScreenState extends ConsumerState<ProfileScreen> {
   final _pb = PocketBase('https://pb.venbait.in');
   // final _pb = PocketBase('http://127.0.0.1:8090');
 
@@ -461,6 +464,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
       },
       child: Scaffold(
         appBar: AppBar(
+          scrolledUnderElevation: 0,
           backgroundColor: Colors.white,
           elevation: 0,
           leading: IconButton(
@@ -473,6 +477,23 @@ class _ProfileScreenState extends State<ProfileScreen> {
             AppLocalizations.of(context)!.my_profile,
             style: TextStyle(color: Color(0xFF985400)),
           ),
+          actions: [
+            Consumer(
+              builder: (context, ref, _) {
+                final locale = ref.watch(localeProvider); // Current locale
+                return MyToggle(
+                  isOn: locale?.languageCode == 'en',
+                  knobTextWhenOn: 'ع',
+                  knobTextWhenOff: 'EN',
+                  pathColorWhenOn: Colors.grey.shade300,
+                  pathColorWhenOff: Colors.grey.shade300,
+                  onTap: () {
+                    ref.read(localeProvider.notifier).toggleLocale();
+                  },
+                );
+              },
+            ),
+          ],
           // actions: [
           //   TextButton(
           //     onPressed: () {
@@ -788,74 +809,86 @@ class _ProfileScreenState extends State<ProfileScreen> {
                           ),
                         ),
                         Expanded(
-                          child: Column(
+                          child: Padding(
-                            mainAxisAlignment: MainAxisAlignment.start,
+                            padding: const EdgeInsets.only(
-                            crossAxisAlignment: CrossAxisAlignment.start,
+                                top: 14.0,),
-                            children: [
+                            child: Text.rich(
-                              SizedBox(
+                              TextSpan(
-                                height: 10,
+                                text: AppLocalizations.of(
-                              ),
+                                    context)!
-                              Text.rich(
+                                    .agree,
-                                TextSpan(
+                                // text: 'I agree to ',
-                                  text: AppLocalizations.of(context)!.agree,
+                                style: TextStyle(
-                                  style: TextStyle(color: Color(0xFF898C81)),
+                                  fontWeight: FontWeight.w500,
-                                  children: [
+                                  fontSize: 14,
-                                    TextSpan(
+                                  color: Color(
-                                      recognizer:TapGestureRecognizer()
+                                    0xFF898C81,), // Change to your desired color
-                                        ..onTap = () => context.push('/terms&conditions'),
-                                      text: AppLocalizations.of(
-                                        context,
-                                      )!
-                                          .terms_conditions,
-                                      style: TextStyle(
-                                        color: Color(0xFF985400),
-                                        // decoration: TextDecoration.underline,
-                                        fontWeight: FontWeight
-                                            .w600, // Makes the text bold
-                                        decorationColor: Color(0xFF985400),
-                                        decorationThickness: 1,
-                                      ),
-                                    ),
-                                    TextSpan(
-                                      text: AppLocalizations.of(
-                                        context,
-                                      )!
-                                          .t_and,
-                                      style: TextStyle(color: Color(0xFF898C81)),
-                                    ),
-                                    TextSpan(
-                                      recognizer: TapGestureRecognizer()
-                                        ..onTap = () => context.push('/privacy_policy'),
-
-                                      text: AppLocalizations.of(
-                                        context,
-                                      )!
-                                          .privacy_policy,
-                                      style: TextStyle(
-                                        color: Color(0xFF985400),
-                                        // decoration: TextDecoration.underline,
-                                        fontWeight: FontWeight
-                                            .w600, // Makes the text bold
-                                        decorationColor: Color(0xFF985400),
-                                        decorationThickness: 1,
-                                      ),
-
-                                    ),
-                                    TextSpan(
-                                      text: AppLocalizations.of(
-                                        context,
-                                      )!
-                                          .conditions,
-                                      style: TextStyle(color: Color(0xFF898C81)),
-                                    ),
-                                  ],
                                 ),
-                                textAlign: TextAlign.start,
+                                children: [
-                                maxLines: 2,
+                                  TextSpan(
-                                overflow: TextOverflow.visible,
+                                    recognizer:TapGestureRecognizer()
-                                softWrap: true,
+                                      ..onTap = () => context.push('/terms&conditions'),
+                                    text: AppLocalizations.of(
+                                        context)!
+                                        .terms_conditions,
+                                    // text: 'Terms & Conditions',
+                                    style: TextStyle(
+                                        fontSize: 14,
+                                        fontWeight:
+                                        FontWeight.bold,
+                                        color:
+                                        Color(0xFF985400),
+                                        // Makes the text bold
+                                        // decoration:
+                                        //     TextDecoration.underline,
+                                        decorationColor:
+                                        Color(0xFF985400),
+                                        decorationThickness:
+                                        1),
+                                  ),
+                                  TextSpan(
+                                    text: AppLocalizations.of(
+                                        context)!
+                                        .t_and,
+                                    style: TextStyle(
+                                      color: Color(
+                                          0xFF898C81), // Change to your desired color
+                                    ),
+                                  ),
+                                  TextSpan(
+                                    recognizer: TapGestureRecognizer()
+                                      ..onTap = () => context.push('/privacy_policy'),
+                                    text: AppLocalizations.of(
+                                        context)!
+                                        .privacy_policy,
+                                    style: TextStyle(
+                                        fontWeight:
+                                        FontWeight.bold,
+                                        fontSize: 14,
+                                        fontFamily: 'Roboto',
+                                        color:
+                                        Color(0xFF985400),
+                                        // decoration:
+                                        //     TextDecoration.underline,
+                                        decorationColor:
+                                        Color(0xFF648CBA),
+                                        decorationThickness:
+                                        1),
+                                  ),
+                                  TextSpan(
+                                    text: AppLocalizations.of(
+                                        context)!
+                                        .conditions,
+                                    style: TextStyle(
+                                      fontWeight: FontWeight.w500,
+                                      fontSize:  14,
+                                      color: Color(
+                                          0xFF898C81), // Change to your desired color
+                                    ),
+                                  ),
+                                ],
                               ),
-                            ],
+                            ),
                           ),
                         ),
                       ],

lib/presentation/routes/auth_routes/login_route.dart

@@ -449,8 +449,8 @@ class LoginRoute extends HookConsumerWidget {
                     'Roboto',
                     'Roboto',
                   ),
-                  fontSize: locale?.languageCode == 'ar' ? 14: 18,
+                  fontSize: locale?.languageCode == 'ar' ? 12: 18,
-                  fontWeight: FontWeight.bold,
+                  fontWeight: FontWeight.w500,
                 )
             ),
             6.horizontalSpace,

lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart

@@ -1266,7 +1266,7 @@ class InfoCard extends StatelessWidget {
 
     return GestureDetector(
       onTap: () {
-        context.go(
+        context.push(
             '/chartScreen/$dataset?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey');
       },
       child: Container(

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/AboutFCSC.dart

@@ -16,6 +16,7 @@ class aboutFCSC extends StatelessWidget {
     );
     return BaseScaffold(
       showDivider: true,
+      showBackButton: true,
       dividerColor: Colors.grey[300],
       appbarColor: Colors.white,
       bottomColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/getStarted.dart

@@ -23,6 +23,7 @@ class GetStarted extends StatelessWidget {
       ),
       child: BaseScaffold(
         showDivider: true,
+        showBackButton: true,
         dividerColor: Colors.grey[300],
         appbarColor: Colors.white,
         bottomColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/AppFeatures.dart

@@ -21,6 +21,7 @@ class AppFeatures extends StatelessWidget {
       ),
       child: BaseScaffold(
         showDivider: true,
+        showBackButton: true,
         bottomColor: Colors.white,
         dividerColor: Colors.grey[300],
         appbarColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/ChangeMyPassword.dart

@@ -21,6 +21,7 @@ class ChangeMyPassword extends StatelessWidget {
       ),
       child: BaseScaffold(
         showDivider: true,
+        showBackButton: true,
         bottomColor: Colors.white,
         dividerColor: Colors.grey[300],
         appbarColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart

@@ -21,6 +21,7 @@ class EditMyProfile extends StatelessWidget {
       ),
       child: BaseScaffold(
         showDivider: true,
+        showBackButton: true,
         bottomColor: Colors.white,
         dividerColor: Colors.grey[300],
         appbarColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/howUseTheApp.dart

@@ -21,6 +21,7 @@ class HowUseTheApp extends StatelessWidget {
       ),
       child: BaseScaffold(
         showDivider: true,
+        showBackButton: true,
         dividerColor: Colors.grey[300],
         appbarColor: Colors.white,
         bottomColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/purpose.dart

@@ -24,6 +24,7 @@ class Purpose extends StatelessWidget {
       ),
       child: BaseScaffold(
         showDivider: true,
+        showBackButton: true,
         dividerColor: Colors.grey[300],
         appbarColor: Colors.white,
         bottomColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/stayUpdate.dart

@@ -24,6 +24,7 @@ class StayUpdate extends StatelessWidget {
       ),
       child: BaseScaffold(
         showDivider: true,
+        showBackButton: true,
         dividerColor: Colors.grey[300],
         appbarColor: Colors.white,
         bottomColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/useTheApp.dart

@@ -21,6 +21,7 @@ class WhoUseTheApp extends StatelessWidget {
       ),
       child: BaseScaffold(
         showDivider: true,
+        showBackButton: true,
         dividerColor: Colors.grey[300],
         appbarColor: Colors.white,
         bottomColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/aboutApp.dart

@@ -16,6 +16,7 @@ class aboutTheApp extends StatelessWidget {
     );
     return BaseScaffold(
       showDivider: true,
+      showBackButton: true,
       bottomColor: Colors.white,
       dividerColor: Colors.grey[300],
       appbarColor: Colors.white,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/faq_page.dart

@@ -20,6 +20,7 @@ class _FAQPageState extends State<FAQPage> {
   Widget build(BuildContext context) {
     return BaseScaffold(
       dividerColor: Colors.grey[300],
+      showBackButton: true,
       appbarColor: Colors.white,
       bottomColor: Colors.white,
       mycenterTitle: true,

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/features.dart

@@ -17,6 +17,7 @@ class UsingFeatures extends StatelessWidget {
     );
     return BaseScaffold(
       showDivider: true,
+      showBackButton: true,
       dividerColor: Colors.grey[300],
       bottomColor: Colors.white,
       appbarColor: Colors.white,

lib/presentation/routes/drawer_routes/custom_drawer_routes.dart

@@ -661,15 +661,12 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
         leadingWidth: widget.showBackButton ? mywidth * 0.25 : null,
         bottom: widget.showDivider
             ? PreferredSize(
-          preferredSize: Size.fromHeight(1), // Height of the line
+                preferredSize: Size.fromHeight(1), // Height of the line
-          child: Container(
+                child: Container(
-            color: widget.dividerColor, // Line color
+                  color: widget.dividerColor, // Line color
-            width: MediaQuery.of(context).size.width, // Ensures full width
+                  height: 1, // Line thickness
-            height: 1, // Line thickness
+                ),
-            margin: EdgeInsets.zero, // Ensure no extra margins
+              )
-            padding: EdgeInsets.zero, // Remove padding if any
-          ),
-        )
             : null,
 
         // bottom: widget.showDivider
@@ -712,14 +709,15 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
                   child: IconButton(
                     padding: EdgeInsets.zero,
                     constraints: BoxConstraints(),
-                    color: Colors.white,
+                    color: widget.colorChange ? Colors.white : Colors.black,
                     icon: const Icon(Icons.arrow_back_ios_new, size: 24),
                     onPressed: () {
-                      if ((widget.navBackArrow as Text).data  == 'home') {
+                      // if ((widget.navBackArrow as Text).data  == 'home') {
-                        context.go('/myhomepage');
+                      //   context.go('/myhomepage');
-                      } else {
+                      // } else {
-                        context.go('/uaenumbers');
+                      //   context.go('/uaenumbers');
-                      }
+                      // }
+                      context.pop();
                     },
                   ),
                 ),

pubspec.lock

@@ -568,7 +568,7 @@ packages:
     source: hosted
     version: "0.7.0"
   flutter_svg:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: flutter_svg
       sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b

pubspec.yaml

@@ -1,7 +1,7 @@
 name: uae_stat
 description: "View statistics about the UAE from the Federal Center for Statistics and Competitiveness."
 publish_to: "none"
-version: 1.0.13+14
+version: 1.0.15+16
 
 environment:
   sdk: ">=3.2.3 <4.0.0"
@@ -64,6 +64,7 @@ dependencies:
   connectivity_plus: ^6.1.2
   tutorial_coach_mark: ^1.2.12
   package_info_plus: ^8.2.0
+  flutter_svg: ^2.0.17
 
 dependency_overrides:
   fading_edge_scrollview: ^4.1.1
@@ -137,6 +138,7 @@ flutter:
     - assets/icons/misc/group.png
     - assets/icons/misc/search.png
 
+
   fonts:
     - family: Segoe
       fonts: