chart ui changes

android/app/build.gradle

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

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

@@ -5,4 +5,5 @@ abstract class UaeNumbersAssetPath {
   static const bookmarksUae = '$_basePath/bookmarks.png';
   static const bookmarksSelectedUae = '$_basePath/bookmarksSelectedUae.png';
   static const shareUae = '$_basePath/share.png';
+  static const filterUae = '$_basePath/filters.png'; 
 }

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

@@ -117,11 +117,19 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
               decoration: InputDecoration(
                 hintText: "Search",
                 hintStyle: TextStyle(color: Color(0xFF898C81)),
-                prefixIcon: Image.asset(
+
-                  MiscIconAssetPath.search,
+
-                  // width: 15,
+                prefixIcon: Image(
-                  // height: 10,
+                  image: ExactAssetImage(MiscIconAssetPath.search),
+                  width: 24,
+                  height: 24,
                 ),
+
+
+                // prefixIcon: Image.asset(
+              //     MiscIconAssetPath.search,
+              //     // fit: BoxFit.contain,
+              //   ),
                 border: InputBorder.none,
                 contentPadding:
                     EdgeInsets.symmetric(vertical: 8.0, horizontal: 18.0),

lib/presentation/Screens/charts/services/api_service.dart

@@ -34,7 +34,8 @@ class ApiService {
             nonChartData.add(item);
           }
         }
-
+        final Map<String, dynamic> chartScreenData = jsonData['screen_heading_and_color'];
+        
         // Save original data for reset
         // originalChartsData = List.from(isChartData); // Store original data
         // originalCardData = List.from(nonChartData); // Store original data
@@ -43,7 +44,8 @@ class ApiService {
         return {
           'isChartData': isChartData,
           'nonChartData': nonChartData,
-          'filterData': jsonData['new_filter_data']
+          'filterData': jsonData['new_filter_data'],
+          'chartScreenData' :chartScreenData
           // 'filterData': jsonData['filter_data']
           // 'originalChartsData': originalChartsData,
           // 'originalCardData': originalCardData,
@@ -161,4 +163,4 @@ class ApiService {
       return '$amount';
     }
   }
-}
+}

lib/presentation/Screens/profilepage.dart

@@ -233,7 +233,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
               confirmButtonStyle: ButtonStyle(
                 backgroundColor: WidgetStateProperty.all(Color(0xFFAA8E83)), // OK button background color
                 foregroundColor: WidgetStateProperty.all(Colors.white), // OK button text color
-                minimumSize: WidgetStateProperty.all(Size(150, 50)),
+                // minimumSize: WidgetStateProperty.all(Size(150, 50)),
+                minimumSize: WidgetStateProperty.all(Size(100, 40)),
                 shape: WidgetStateProperty.all(RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(12.0), // Rounded corners
                 )),
@@ -241,7 +242,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
               cancelButtonStyle: ButtonStyle(
                 // backgroundColor: WidgetStateProperty.all(Colors.white), // Cancel button background color
                 foregroundColor: WidgetStateProperty.all(Color(0xFFAA8E83)), // Cancel button text color
-                minimumSize: WidgetStateProperty.all(Size(150, 50)),
+                // minimumSize: WidgetStateProperty.all(Size(150, 50)),
+                minimumSize: WidgetStateProperty.all(Size(100, 40)),
                 shape: WidgetStateProperty.all(RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(12.0), // Rounded corners
                   side: const BorderSide(color: Color(0xFFAA8E83), width: 2), // Outline color

lib/presentation/routes/drawer_routes/custom_drawer_routes.dart

@@ -689,12 +689,14 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
         leading: Stack(
           children: [
             if (widget.showBackButton == true)
-              Positioned(
+        Align(
-                top: 10,
+        alignment: Alignment.centerLeft,
-                left: 18,
+        child: Padding(
+          padding: EdgeInsets.only(left: 8),
+
                 child: IconButton(
                   color: Colors.white,
-                  icon: const Icon(Icons.arrow_back_ios_new),
+                  icon: const Icon(Icons.arrow_back_ios_new, size: 26),
                   onPressed: () {
                    if ((widget.navBackArrow as Text).data  == 'home') {
                       context.go('/myhomepage');
@@ -703,10 +705,12 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
                     }
                   },
                 ),
-              ),
+              ),),
-            Positioned(
+
-              top: 8,
+      Align(
-              right: 4,
+        alignment: Alignment.centerRight,
+        child: Padding(
+          padding: EdgeInsets.only(right: 10),
               child: Builder(
                 builder: (BuildContext context) {
                   return IconButton(
@@ -719,9 +723,11 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
                   );
                 },
               ),
-            ),
+            ),),
           ],
         ),
+
+
       ),
       drawer: Drawer(
           backgroundColor: Colors.white,
@@ -1017,4 +1023,4 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
         break;
     }
   }
-}
+}

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.12+13
+version: 1.0.13+14
 
 environment:
   sdk: ">=3.2.3 <4.0.0"
@@ -114,6 +114,7 @@ flutter:
     - assets/splash_screen/
     - assets/icons/uae_numbers/bookmarks.png
     - assets/icons/uae_numbers/bookmarksSelectedUae.png
+    - assets/icons/uae_numbers/filters.png
     - assets/icons/uae_numbers/share.png
     - assets/icons/misc/vector.png
     - assets/icons/misc/visible_on.png