From 49c84195d12db4cc4834dfdbd36211b5aac2237c Mon Sep 17 00:00:00 2001 From: bestonemitRam Date: Fri, 25 Apr 2025 19:02:09 +0530 Subject: [PATCH] fixed ui after feedback --- .../flutter_build/dart_plugin_registrant.dart | 452 ------------------ .dart_tool/package_config.json | 32 +- .dart_tool/package_config_subset | 44 +- .dart_tool/version | 2 +- .flutter-plugins | 4 +- .flutter-plugins-dependencies | 2 +- .../_composite.stamp | 1 - .../gen_dart_plugin_registrant.stamp | 1 - .../gen_localizations.stamp | 1 - lib/src/ui/bestdeal/bestdeal_screen.dart | 302 +++++------- .../fruitvegidetail/fruit_veggie_detail.dart | 81 +--- lib/src/ui/home/home_screen.dart | 14 +- lib/src/ui/profilepage/profile_screen.dart | 5 +- pubspec.lock | 40 +- pubspec.yaml | 2 +- 15 files changed, 205 insertions(+), 778 deletions(-) delete mode 100644 .dart_tool/flutter_build/dart_plugin_registrant.dart delete mode 100644 build/1cd05ff6f2b20584594304ccc763bad3/_composite.stamp delete mode 100644 build/1cd05ff6f2b20584594304ccc763bad3/gen_dart_plugin_registrant.stamp delete mode 100644 build/1cd05ff6f2b20584594304ccc763bad3/gen_localizations.stamp diff --git a/.dart_tool/flutter_build/dart_plugin_registrant.dart b/.dart_tool/flutter_build/dart_plugin_registrant.dart deleted file mode 100644 index bc0a157..0000000 --- a/.dart_tool/flutter_build/dart_plugin_registrant.dart +++ /dev/null @@ -1,452 +0,0 @@ -// -// Generated file. Do not edit. -// This file is generated from template in file `flutter_tools/lib/src/flutter_plugins.dart`. -// - -// @dart = 3.4 - -import 'dart:io'; // flutter_ignore: dart_io_import. -import 'package:flutter_inappwebview_android/flutter_inappwebview_android.dart'; -import 'package:flutter_local_notifications/flutter_local_notifications.dart'; -import 'package:geocoding_android/geocoding_android.dart'; -import 'package:geolocator_android/geolocator_android.dart'; -import 'package:google_maps_flutter_android/google_maps_flutter_android.dart'; -import 'package:image_picker_android/image_picker_android.dart'; -import 'package:path_provider_android/path_provider_android.dart'; -import 'package:shared_preferences_android/shared_preferences_android.dart'; -import 'package:sqflite/sqflite.dart'; -import 'package:url_launcher_android/url_launcher_android.dart'; -import 'package:flutter_inappwebview_ios/flutter_inappwebview_ios.dart'; -import 'package:flutter_local_notifications/flutter_local_notifications.dart'; -import 'package:geocoding_ios/geocoding_ios.dart'; -import 'package:geolocator_apple/geolocator_apple.dart'; -import 'package:google_maps_flutter_ios/google_maps_flutter_ios.dart'; -import 'package:image_picker_ios/image_picker_ios.dart'; -import 'package:path_provider_foundation/path_provider_foundation.dart'; -import 'package:shared_preferences_foundation/shared_preferences_foundation.dart'; -import 'package:sqflite/sqflite.dart'; -import 'package:url_launcher_ios/url_launcher_ios.dart'; -import 'package:connectivity_plus/connectivity_plus.dart'; -import 'package:file_selector_linux/file_selector_linux.dart'; -import 'package:flutter_local_notifications_linux/flutter_local_notifications_linux.dart'; -import 'package:image_picker_linux/image_picker_linux.dart'; -import 'package:package_info_plus/package_info_plus.dart'; -import 'package:path_provider_linux/path_provider_linux.dart'; -import 'package:shared_preferences_linux/shared_preferences_linux.dart'; -import 'package:url_launcher_linux/url_launcher_linux.dart'; -import 'package:file_selector_macos/file_selector_macos.dart'; -import 'package:flutter_inappwebview_macos/flutter_inappwebview_macos.dart'; -import 'package:flutter_local_notifications/flutter_local_notifications.dart'; -import 'package:geolocator_apple/geolocator_apple.dart'; -import 'package:image_picker_macos/image_picker_macos.dart'; -import 'package:path_provider_foundation/path_provider_foundation.dart'; -import 'package:shared_preferences_foundation/shared_preferences_foundation.dart'; -import 'package:sqflite/sqflite.dart'; -import 'package:url_launcher_macos/url_launcher_macos.dart'; -import 'package:file_selector_windows/file_selector_windows.dart'; -import 'package:image_picker_windows/image_picker_windows.dart'; -import 'package:package_info_plus/package_info_plus.dart'; -import 'package:path_provider_windows/path_provider_windows.dart'; -import 'package:shared_preferences_windows/shared_preferences_windows.dart'; -import 'package:url_launcher_windows/url_launcher_windows.dart'; - -@pragma('vm:entry-point') -class _PluginRegistrant { - - @pragma('vm:entry-point') - static void register() { - if (Platform.isAndroid) { - try { - AndroidInAppWebViewPlatform.registerWith(); - } catch (err) { - print( - '`flutter_inappwebview_android` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - AndroidFlutterLocalNotificationsPlugin.registerWith(); - } catch (err) { - print( - '`flutter_local_notifications` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - GeocodingAndroid.registerWith(); - } catch (err) { - print( - '`geocoding_android` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - GeolocatorAndroid.registerWith(); - } catch (err) { - print( - '`geolocator_android` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - GoogleMapsFlutterAndroid.registerWith(); - } catch (err) { - print( - '`google_maps_flutter_android` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - ImagePickerAndroid.registerWith(); - } catch (err) { - print( - '`image_picker_android` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - PathProviderAndroid.registerWith(); - } catch (err) { - print( - '`path_provider_android` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - SharedPreferencesAndroid.registerWith(); - } catch (err) { - print( - '`shared_preferences_android` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - SqflitePlugin.registerWith(); - } catch (err) { - print( - '`sqflite` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - UrlLauncherAndroid.registerWith(); - } catch (err) { - print( - '`url_launcher_android` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - } else if (Platform.isIOS) { - try { - IOSInAppWebViewPlatform.registerWith(); - } catch (err) { - print( - '`flutter_inappwebview_ios` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - IOSFlutterLocalNotificationsPlugin.registerWith(); - } catch (err) { - print( - '`flutter_local_notifications` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - GeocodingIOS.registerWith(); - } catch (err) { - print( - '`geocoding_ios` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - GeolocatorApple.registerWith(); - } catch (err) { - print( - '`geolocator_apple` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - GoogleMapsFlutterIOS.registerWith(); - } catch (err) { - print( - '`google_maps_flutter_ios` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - ImagePickerIOS.registerWith(); - } catch (err) { - print( - '`image_picker_ios` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - PathProviderFoundation.registerWith(); - } catch (err) { - print( - '`path_provider_foundation` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - SharedPreferencesFoundation.registerWith(); - } catch (err) { - print( - '`shared_preferences_foundation` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - SqflitePlugin.registerWith(); - } catch (err) { - print( - '`sqflite` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - UrlLauncherIOS.registerWith(); - } catch (err) { - print( - '`url_launcher_ios` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - } else if (Platform.isLinux) { - try { - ConnectivityPlusLinuxPlugin.registerWith(); - } catch (err) { - print( - '`connectivity_plus` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - FileSelectorLinux.registerWith(); - } catch (err) { - print( - '`file_selector_linux` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - LinuxFlutterLocalNotificationsPlugin.registerWith(); - } catch (err) { - print( - '`flutter_local_notifications_linux` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - ImagePickerLinux.registerWith(); - } catch (err) { - print( - '`image_picker_linux` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - PackageInfoPlusLinuxPlugin.registerWith(); - } catch (err) { - print( - '`package_info_plus` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - PathProviderLinux.registerWith(); - } catch (err) { - print( - '`path_provider_linux` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - SharedPreferencesLinux.registerWith(); - } catch (err) { - print( - '`shared_preferences_linux` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - UrlLauncherLinux.registerWith(); - } catch (err) { - print( - '`url_launcher_linux` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - } else if (Platform.isMacOS) { - try { - FileSelectorMacOS.registerWith(); - } catch (err) { - print( - '`file_selector_macos` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - MacOSInAppWebViewPlatform.registerWith(); - } catch (err) { - print( - '`flutter_inappwebview_macos` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - MacOSFlutterLocalNotificationsPlugin.registerWith(); - } catch (err) { - print( - '`flutter_local_notifications` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - GeolocatorApple.registerWith(); - } catch (err) { - print( - '`geolocator_apple` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - ImagePickerMacOS.registerWith(); - } catch (err) { - print( - '`image_picker_macos` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - PathProviderFoundation.registerWith(); - } catch (err) { - print( - '`path_provider_foundation` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - SharedPreferencesFoundation.registerWith(); - } catch (err) { - print( - '`shared_preferences_foundation` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - SqflitePlugin.registerWith(); - } catch (err) { - print( - '`sqflite` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - UrlLauncherMacOS.registerWith(); - } catch (err) { - print( - '`url_launcher_macos` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - } else if (Platform.isWindows) { - try { - FileSelectorWindows.registerWith(); - } catch (err) { - print( - '`file_selector_windows` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - ImagePickerWindows.registerWith(); - } catch (err) { - print( - '`image_picker_windows` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - PackageInfoPlusWindowsPlugin.registerWith(); - } catch (err) { - print( - '`package_info_plus` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - PathProviderWindows.registerWith(); - } catch (err) { - print( - '`path_provider_windows` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - SharedPreferencesWindows.registerWith(); - } catch (err) { - print( - '`shared_preferences_windows` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - try { - UrlLauncherWindows.registerWith(); - } catch (err) { - print( - '`url_launcher_windows` threw an error: $err. ' - 'The app may not function as expected until you remove this plugin from pubspec.yaml' - ); - } - - } - } -} diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index f2ed9a1..80df61e 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -627,13 +627,13 @@ }, { "name": "leak_tracker", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker-10.0.4", "packageUri": "lib/", "languageVersion": "3.2" }, { "name": "leak_tracker_flutter_testing", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.3", "packageUri": "lib/", "languageVersion": "3.2" }, @@ -669,7 +669,7 @@ }, { "name": "material_color_utilities", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0", "packageUri": "lib/", "languageVersion": "2.17" }, @@ -681,7 +681,7 @@ }, { "name": "meta", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/meta-1.15.0", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/meta-1.12.0", "packageUri": "lib/", "languageVersion": "2.12" }, @@ -783,15 +783,15 @@ }, { "name": "permission_handler", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler-11.4.0", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler-11.3.1", "packageUri": "lib/", - "languageVersion": "3.5" + "languageVersion": "2.15" }, { "name": "permission_handler_android", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.1.0", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.13", "packageUri": "lib/", - "languageVersion": "3.5" + "languageVersion": "2.15" }, { "name": "permission_handler_apple", @@ -807,9 +807,9 @@ }, { "name": "permission_handler_platform_interface", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_platform_interface-4.3.0", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_platform_interface-4.2.3", "packageUri": "lib/", - "languageVersion": "3.5" + "languageVersion": "2.14" }, { "name": "permission_handler_windows", @@ -987,9 +987,9 @@ }, { "name": "test_api", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/test_api-0.7.2", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/test_api-0.7.0", "packageUri": "lib/", - "languageVersion": "3.2" + "languageVersion": "3.0" }, { "name": "timezone", @@ -1083,7 +1083,7 @@ }, { "name": "vm_service", - "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/vm_service-14.2.5", + "rootUri": "file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/vm_service-14.2.1", "packageUri": "lib/", "languageVersion": "3.3" }, @@ -1118,10 +1118,10 @@ "languageVersion": "3.4" } ], - "generated": "2025-04-24T13:17:45.508137Z", + "generated": "2025-04-25T13:31:45.113044Z", "generator": "pub", - "generatorVersion": "3.5.1", + "generatorVersion": "3.4.0", "flutterRoot": "file:///Users/rajeevsingh/Documents/allSoftwares/flutter", - "flutterVersion": "3.24.1", + "flutterVersion": "3.22.0", "pubCache": "file:///Users/rajeevsingh/.pub-cache" } diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset index 7833c0f..a30c07c 100644 --- a/.dart_tool/package_config_subset +++ b/.dart_tool/package_config_subset @@ -404,12 +404,12 @@ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/json_annotation-4.9.0/ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/json_annotation-4.9.0/lib/ leak_tracker 3.2 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5/lib/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker-10.0.4/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker-10.0.4/lib/ leak_tracker_flutter_testing 3.2 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5/lib/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.3/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.3/lib/ leak_tracker_testing 3.2 file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/ @@ -432,16 +432,16 @@ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/matcher-0.12.16+1/ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/matcher-0.12.16+1/lib/ material_color_utilities 2.17 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/lib/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0/lib/ material_design_icons_flutter 2.12 file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/material_design_icons_flutter-7.0.7296/ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/material_design_icons_flutter-7.0.7296/lib/ meta 2.12 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/meta-1.15.0/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/meta-1.15.0/lib/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/meta-1.12.0/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/meta-1.12.0/lib/ mime 3.2 file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/mime-2.0.0/ @@ -507,13 +507,13 @@ path_provider_windows file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/lib/ permission_handler -3.5 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler-11.4.0/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler-11.4.0/lib/ +2.15 +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler-11.3.1/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler-11.3.1/lib/ permission_handler_android -3.5 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.1.0/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.1.0/lib/ +2.15 +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.13/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.13/lib/ permission_handler_apple 2.18 file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.7/ @@ -523,9 +523,9 @@ permission_handler_html file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+5/ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+5/lib/ permission_handler_platform_interface -3.5 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_platform_interface-4.3.0/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_platform_interface-4.3.0/lib/ +2.14 +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_platform_interface-4.2.3/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_platform_interface-4.2.3/lib/ permission_handler_windows 2.12 file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/ @@ -639,9 +639,9 @@ term_glyph file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib/ test_api -3.2 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/test_api-0.7.2/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/test_api-0.7.2/lib/ +3.0 +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/test_api-0.7.0/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/test_api-0.7.0/lib/ timezone 2.19 file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/timezone-0.9.4/ @@ -704,8 +704,8 @@ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/vector_math-2.1.4/ file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/ vm_service 3.3 -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/vm_service-14.2.5/ -file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/vm_service-14.2.5/lib/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/vm_service-14.2.1/ +file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/vm_service-14.2.1/lib/ web 3.4 file:///Users/rajeevsingh/.pub-cache/hosted/pub.dev/web-1.1.0/ diff --git a/.dart_tool/version b/.dart_tool/version index 52525de..8912835 100644 --- a/.dart_tool/version +++ b/.dart_tool/version @@ -1 +1 @@ -3.24.1 \ No newline at end of file +3.22.0 \ No newline at end of file diff --git a/.flutter-plugins b/.flutter-plugins index 3299839..d43f656 100644 --- a/.flutter-plugins +++ b/.flutter-plugins @@ -42,8 +42,8 @@ path_provider_android=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider path_provider_foundation=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/ path_provider_linux=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/ path_provider_windows=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/ -permission_handler=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler-11.4.0/ -permission_handler_android=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.1.0/ +permission_handler=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler-11.3.1/ +permission_handler_android=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.13/ permission_handler_apple=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.7/ permission_handler_html=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+5/ permission_handler_windows=/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/ diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index df4d385..b676276 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":true,"dependencies":[]},{"name":"firebase_core","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core-3.13.0/","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_messaging-15.2.5/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_inappwebview_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_inappwebview_ios-1.0.13/","native_build":true,"dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_local_notifications-18.0.1/","native_build":true,"dependencies":[]},{"name":"fluttertoast","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/fluttertoast-8.2.11/","native_build":true,"dependencies":[]},{"name":"geocoding_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geocoding_ios-3.0.1/","native_build":true,"dependencies":[]},{"name":"geolocator_apple","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_apple-2.3.8+1/","native_build":true,"dependencies":[]},{"name":"google_maps_flutter_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/google_maps_flutter_ios-2.13.2/","native_build":true,"dependencies":[]},{"name":"image_picker_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.12+2/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"permission_handler_apple","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.7/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.4/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"sqflite","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/sqflite-2.3.3+1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_ios-6.3.2/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":true,"dependencies":[]},{"name":"firebase_core","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core-3.13.0/","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_messaging-15.2.5/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_inappwebview_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_inappwebview_android-1.0.13/","native_build":true,"dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_local_notifications-18.0.1/","native_build":true,"dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.22/","native_build":true,"dependencies":[]},{"name":"fluttertoast","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/fluttertoast-8.2.11/","native_build":true,"dependencies":[]},{"name":"geocoding_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geocoding_android-3.3.1/","native_build":true,"dependencies":[]},{"name":"geolocator_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_android-4.6.1/","native_build":true,"dependencies":[]},{"name":"google_api_headers","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/google_api_headers-1.6.0/","native_build":true,"dependencies":["package_info_plus"]},{"name":"google_maps_flutter_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/google_maps_flutter_android-2.14.7/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"image_picker_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_android-0.8.12+12/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_android-2.2.10/","native_build":true,"dependencies":[]},{"name":"permission_handler_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.1.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_android-2.3.2/","native_build":true,"dependencies":[]},{"name":"sqflite","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/sqflite-2.3.3+1/","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":true,"dependencies":[]},{"name":"file_selector_macos","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.4+2/","native_build":true,"dependencies":[]},{"name":"firebase_core","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core-3.13.0/","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_messaging-15.2.5/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_inappwebview_macos","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_inappwebview_macos-1.0.11/","native_build":true,"dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_local_notifications-18.0.1/","native_build":true,"dependencies":[]},{"name":"geolocator_apple","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_apple-2.3.8+1/","native_build":true,"dependencies":[]},{"name":"image_picker_macos","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.1+2/","native_build":false,"dependencies":["file_selector_macos"]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.4/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"sqflite","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/sqflite-2.3.3+1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.2/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":false,"dependencies":[]},{"name":"file_selector_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.3+2/","native_build":true,"dependencies":[]},{"name":"flutter_local_notifications_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_local_notifications_linux-5.0.0/","native_build":false,"dependencies":[]},{"name":"image_picker_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.1+1/","native_build":false,"dependencies":["file_selector_linux"]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.1/","native_build":true,"dependencies":[]}],"windows":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":true,"dependencies":[]},{"name":"file_selector_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.3+3/","native_build":true,"dependencies":[]},{"name":"firebase_core","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core-3.13.0/","native_build":true,"dependencies":[]},{"name":"geolocator_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_windows-0.2.3/","native_build":true,"dependencies":[]},{"name":"image_picker_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.1+1/","native_build":false,"dependencies":["file_selector_windows"]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":false,"dependencies":[]},{"name":"path_provider_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[]},{"name":"permission_handler_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.4/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","dependencies":[]},{"name":"firebase_core_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core_web-2.22.0/","dependencies":[]},{"name":"firebase_messaging_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_messaging_web-3.10.5/","dependencies":["firebase_core_web"]},{"name":"flutter_inappwebview_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_inappwebview_web-1.0.8/","dependencies":[]},{"name":"fluttertoast","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/fluttertoast-8.2.11/","dependencies":[]},{"name":"geolocator_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_web-4.1.1/","dependencies":[]},{"name":"google_maps_flutter_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/google_maps_flutter_web-0.5.10/","dependencies":[]},{"name":"image_picker_for_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_for_web-3.0.6/","dependencies":[]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","dependencies":[]},{"name":"permission_handler_html","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+5/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.2/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_web-2.3.3/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"file_selector_linux","dependencies":[]},{"name":"file_selector_macos","dependencies":[]},{"name":"file_selector_windows","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_messaging","dependencies":["firebase_core","firebase_messaging_web"]},{"name":"firebase_messaging_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"flutter_inappwebview","dependencies":["flutter_inappwebview_android","flutter_inappwebview_ios","flutter_inappwebview_macos","flutter_inappwebview_web"]},{"name":"flutter_inappwebview_android","dependencies":[]},{"name":"flutter_inappwebview_ios","dependencies":[]},{"name":"flutter_inappwebview_macos","dependencies":[]},{"name":"flutter_inappwebview_web","dependencies":[]},{"name":"flutter_local_notifications","dependencies":["flutter_local_notifications_linux"]},{"name":"flutter_local_notifications_linux","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"geocoding","dependencies":["geocoding_android","geocoding_ios"]},{"name":"geocoding_android","dependencies":[]},{"name":"geocoding_ios","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_android","geolocator_apple","geolocator_web","geolocator_windows"]},{"name":"geolocator_android","dependencies":[]},{"name":"geolocator_apple","dependencies":[]},{"name":"geolocator_web","dependencies":[]},{"name":"geolocator_windows","dependencies":[]},{"name":"google_api_headers","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","dependencies":["google_maps_flutter_android","google_maps_flutter_ios","google_maps_flutter_web"]},{"name":"google_maps_flutter_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_maps_flutter_ios","dependencies":[]},{"name":"google_maps_flutter_web","dependencies":[]},{"name":"image_picker","dependencies":["image_picker_android","image_picker_for_web","image_picker_ios","image_picker_linux","image_picker_macos","image_picker_windows"]},{"name":"image_picker_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"image_picker_ios","dependencies":[]},{"name":"image_picker_linux","dependencies":["file_selector_linux"]},{"name":"image_picker_macos","dependencies":["file_selector_macos"]},{"name":"image_picker_windows","dependencies":["file_selector_windows"]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_html","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_html","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sqflite","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2025-04-24 18:47:45.893430","version":"3.24.1","swift_package_manager_enabled":false} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":true,"dependencies":[]},{"name":"firebase_core","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core-3.13.0/","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_messaging-15.2.5/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_inappwebview_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_inappwebview_ios-1.0.13/","native_build":true,"dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_local_notifications-18.0.1/","native_build":true,"dependencies":[]},{"name":"fluttertoast","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/fluttertoast-8.2.11/","native_build":true,"dependencies":[]},{"name":"geocoding_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geocoding_ios-3.0.1/","native_build":true,"dependencies":[]},{"name":"geolocator_apple","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_apple-2.3.8+1/","native_build":true,"dependencies":[]},{"name":"google_maps_flutter_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/google_maps_flutter_ios-2.13.2/","native_build":true,"dependencies":[]},{"name":"image_picker_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.12+2/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"permission_handler_apple","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.7/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.4/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"sqflite","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/sqflite-2.3.3+1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_ios-6.3.2/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":true,"dependencies":[]},{"name":"firebase_core","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core-3.13.0/","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_messaging-15.2.5/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_inappwebview_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_inappwebview_android-1.0.13/","native_build":true,"dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_local_notifications-18.0.1/","native_build":true,"dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.22/","native_build":true,"dependencies":[]},{"name":"fluttertoast","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/fluttertoast-8.2.11/","native_build":true,"dependencies":[]},{"name":"geocoding_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geocoding_android-3.3.1/","native_build":true,"dependencies":[]},{"name":"geolocator_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_android-4.6.1/","native_build":true,"dependencies":[]},{"name":"google_api_headers","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/google_api_headers-1.6.0/","native_build":true,"dependencies":["package_info_plus"]},{"name":"google_maps_flutter_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/google_maps_flutter_android-2.14.7/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"image_picker_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_android-0.8.12+12/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_android-2.2.10/","native_build":true,"dependencies":[]},{"name":"permission_handler_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.13/","native_build":true,"dependencies":[]},{"name":"shared_preferences_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_android-2.3.2/","native_build":true,"dependencies":[]},{"name":"sqflite","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/sqflite-2.3.3+1/","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.9/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":true,"dependencies":[]},{"name":"file_selector_macos","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.4+2/","native_build":true,"dependencies":[]},{"name":"firebase_core","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core-3.13.0/","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_messaging-15.2.5/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_inappwebview_macos","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_inappwebview_macos-1.0.11/","native_build":true,"dependencies":[]},{"name":"flutter_local_notifications","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_local_notifications-18.0.1/","native_build":true,"dependencies":[]},{"name":"geolocator_apple","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_apple-2.3.8+1/","native_build":true,"dependencies":[]},{"name":"image_picker_macos","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.1+2/","native_build":false,"dependencies":["file_selector_macos"]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.4/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"sqflite","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/sqflite-2.3.3+1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.2/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":false,"dependencies":[]},{"name":"file_selector_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.3+2/","native_build":true,"dependencies":[]},{"name":"flutter_local_notifications_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_local_notifications_linux-5.0.0/","native_build":false,"dependencies":[]},{"name":"image_picker_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.1+1/","native_build":false,"dependencies":["file_selector_linux"]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.1/","native_build":true,"dependencies":[]}],"windows":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","native_build":true,"dependencies":[]},{"name":"file_selector_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.3+3/","native_build":true,"dependencies":[]},{"name":"firebase_core","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core-3.13.0/","native_build":true,"dependencies":[]},{"name":"geolocator_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_windows-0.2.3/","native_build":true,"dependencies":[]},{"name":"image_picker_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.1+1/","native_build":false,"dependencies":["file_selector_windows"]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","native_build":false,"dependencies":[]},{"name":"path_provider_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[]},{"name":"permission_handler_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.4/","native_build":true,"dependencies":[]}],"web":[{"name":"connectivity_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.3/","dependencies":[]},{"name":"firebase_core_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_core_web-2.22.0/","dependencies":[]},{"name":"firebase_messaging_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/firebase_messaging_web-3.10.5/","dependencies":["firebase_core_web"]},{"name":"flutter_inappwebview_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/flutter_inappwebview_web-1.0.8/","dependencies":[]},{"name":"fluttertoast","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/fluttertoast-8.2.11/","dependencies":[]},{"name":"geolocator_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/geolocator_web-4.1.1/","dependencies":[]},{"name":"google_maps_flutter_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/google_maps_flutter_web-0.5.10/","dependencies":[]},{"name":"image_picker_for_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/image_picker_for_web-3.0.6/","dependencies":[]},{"name":"package_info_plus","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/package_info_plus-4.2.0/","dependencies":[]},{"name":"permission_handler_html","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+5/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.2/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/rajeevsingh/.pub-cache/hosted/pub.dev/url_launcher_web-2.3.3/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"file_selector_linux","dependencies":[]},{"name":"file_selector_macos","dependencies":[]},{"name":"file_selector_windows","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_messaging","dependencies":["firebase_core","firebase_messaging_web"]},{"name":"firebase_messaging_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"flutter_inappwebview","dependencies":["flutter_inappwebview_android","flutter_inappwebview_ios","flutter_inappwebview_macos","flutter_inappwebview_web"]},{"name":"flutter_inappwebview_android","dependencies":[]},{"name":"flutter_inappwebview_ios","dependencies":[]},{"name":"flutter_inappwebview_macos","dependencies":[]},{"name":"flutter_inappwebview_web","dependencies":[]},{"name":"flutter_local_notifications","dependencies":["flutter_local_notifications_linux"]},{"name":"flutter_local_notifications_linux","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"geocoding","dependencies":["geocoding_android","geocoding_ios"]},{"name":"geocoding_android","dependencies":[]},{"name":"geocoding_ios","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_android","geolocator_apple","geolocator_web","geolocator_windows"]},{"name":"geolocator_android","dependencies":[]},{"name":"geolocator_apple","dependencies":[]},{"name":"geolocator_web","dependencies":[]},{"name":"geolocator_windows","dependencies":[]},{"name":"google_api_headers","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","dependencies":["google_maps_flutter_android","google_maps_flutter_ios","google_maps_flutter_web"]},{"name":"google_maps_flutter_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_maps_flutter_ios","dependencies":[]},{"name":"google_maps_flutter_web","dependencies":[]},{"name":"image_picker","dependencies":["image_picker_android","image_picker_for_web","image_picker_ios","image_picker_linux","image_picker_macos","image_picker_windows"]},{"name":"image_picker_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"image_picker_ios","dependencies":[]},{"name":"image_picker_linux","dependencies":["file_selector_linux"]},{"name":"image_picker_macos","dependencies":["file_selector_macos"]},{"name":"image_picker_windows","dependencies":["file_selector_windows"]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_html","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_html","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sqflite","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2025-04-25 19:01:45.427031","version":"3.22.0"} \ No newline at end of file diff --git a/build/1cd05ff6f2b20584594304ccc763bad3/_composite.stamp b/build/1cd05ff6f2b20584594304ccc763bad3/_composite.stamp deleted file mode 100644 index 1b2d28c..0000000 --- a/build/1cd05ff6f2b20584594304ccc763bad3/_composite.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":[],"outputs":[]} \ No newline at end of file diff --git a/build/1cd05ff6f2b20584594304ccc763bad3/gen_dart_plugin_registrant.stamp b/build/1cd05ff6f2b20584594304ccc763bad3/gen_dart_plugin_registrant.stamp deleted file mode 100644 index cb2e241..0000000 --- a/build/1cd05ff6f2b20584594304ccc763bad3/gen_dart_plugin_registrant.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":["/Users/rajeevsingh/Documents/FlutterProject/Testing/groceryApp/.dart_tool/package_config_subset"],"outputs":["/Users/rajeevsingh/Documents/FlutterProject/Testing/groceryApp/.dart_tool/flutter_build/dart_plugin_registrant.dart"]} \ No newline at end of file diff --git a/build/1cd05ff6f2b20584594304ccc763bad3/gen_localizations.stamp b/build/1cd05ff6f2b20584594304ccc763bad3/gen_localizations.stamp deleted file mode 100644 index 1b2d28c..0000000 --- a/build/1cd05ff6f2b20584594304ccc763bad3/gen_localizations.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":[],"outputs":[]} \ No newline at end of file diff --git a/lib/src/ui/bestdeal/bestdeal_screen.dart b/lib/src/ui/bestdeal/bestdeal_screen.dart index 4b12a45..8d25278 100644 --- a/lib/src/ui/bestdeal/bestdeal_screen.dart +++ b/lib/src/ui/bestdeal/bestdeal_screen.dart @@ -15,8 +15,7 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart import 'package:provider/provider.dart'; import 'package:shimmer/shimmer.dart'; -class BestDealScreen extends StatefulWidget - { +class BestDealScreen extends StatefulWidget { const BestDealScreen({super.key}); @override State createState() => _BestDealScreenState(); @@ -26,8 +25,7 @@ class _BestDealScreenState extends State { bool _isSearching = false; TextEditingController _searchController = TextEditingController(); @override - void initState() - { + void initState() { Provider.of(context, listen: false) .getBestDealProduct(context, ''); super.initState(); @@ -56,6 +54,8 @@ class _BestDealScreenState extends State { width: 20, child: InkWell( onTap: () { + Provider.of(context, listen: false) + .getBestDealProduct(context, ''); Navigator.of(context).pop(); }, child: SvgPicture.asset( @@ -69,15 +69,13 @@ class _BestDealScreenState extends State { title: _isSearching ? TextField( controller: _searchController, - autofocus: true, // Focus on search field when opened - decoration: InputDecoration( + autofocus: true, + decoration: const InputDecoration( hintText: "Search...", border: InputBorder.none, ), style: TextStyle(fontSize: 18), - onChanged: (query) { - // You can call a search function here - }, + onChanged: (query) {}, ) : const Text( "Best Deal", @@ -87,7 +85,7 @@ class _BestDealScreenState extends State { ), ), actions: [ - if (_isSearching) // Show search icon only when searching + if (_isSearching) InkWell( onTap: () { Provider.of(context, listen: false) @@ -106,6 +104,8 @@ class _BestDealScreenState extends State { setState(() { _isSearching = !_isSearching; if (!_isSearching) { + Provider.of(context, listen: false) + .getBestDealProduct(context, ''); _searchController.clear(); // Clear search when closed } }); @@ -290,7 +290,7 @@ class _BestDealScreenState extends State { gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, childAspectRatio: MediaQuery.of(context).size.width / - (MediaQuery.of(context).size.height / 1.5), + (MediaQuery.of(context).size.height / 1.3), crossAxisSpacing: 10, mainAxisSpacing: 10, ), @@ -319,78 +319,89 @@ class _BestDealScreenState extends State { ), ], ), + padding: const EdgeInsets.all(8), child: Column( + mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - height: MediaQuery.of(context).size.height * 0.15, - // width: MediaQuery.of(context).size.width * - // 0.4, // Dynamic width - decoration: BoxDecoration( - color: APPCOLOR.bgGrey, - borderRadius: BorderRadius.circular(15), - ), - child: Stack( - //alignment: Alignment.center, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Center( - child: AppNetworkImage( - imageUrl: - bestdealproduct.productImages?.first.url ?? - "", - backGroundColor: Colors.transparent, - radius: 10, + Container( + height: MediaQuery.of(context).size.height * 0.19, + decoration: BoxDecoration( + color: APPCOLOR.bgGrey, + borderRadius: BorderRadius.circular(15), + ), + child: Stack( + children: [ + Center( + child: AppNetworkImage( + imageUrl: bestdealproduct + .productImages?.first.url ?? + "", + backGroundColor: Colors.transparent, + radius: 10, + ), + ), + Positioned( + right: 1, + bottom: 0, + child: Container( + width: 40, + height: 40, + decoration: BoxDecoration( + color: Colors.red, + borderRadius: + BorderRadius.circular(100), + ), + child: Center( + child: Text( + "${calculateDiscountPercentage(double.parse(bestdealproduct.basePrice), double.parse(bestdealproduct.discountPrice))}% \nOFF", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontSize: 12), + ), + ), + ), + ) + ], ), ), - Positioned( - right: 1, - bottom: 0, - child: Container( - width: 50, - height: 50, - decoration: BoxDecoration( - color: Colors.red, - borderRadius: BorderRadius.circular(100), - ), - child: Center( - child: Text( - "${calculateDiscountPercentage(double.parse(bestdealproduct.basePrice), double.parse(bestdealproduct.discountPrice))}% \nOFF", - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.white, fontSize: 12)), - ), + Text( + bestdealproduct.name ?? "", + textAlign: TextAlign.left, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: context.customMedium( + APPCOLOR.balck1A1A1A, 16), + ), + Text( + bestdealproduct.unit ?? "", + textAlign: TextAlign.left, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: context.customMedium( + Colors.grey.withOpacity(0.8), + 12, + ), + ), + if (bestdealproduct.quantity > 0) + Text( + "In Stock", + style: TextStyle( + color: Colors.green, fontSize: 14), ), - ) ], ), ), - SizedBox( - height: MediaQuery.of(context).size.height * 0.005), - Text( - bestdealproduct.name ?? "", - textAlign: TextAlign.left, - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: context.customMedium(APPCOLOR.balck1A1A1A, 16), - ), - Text( - bestdealproduct.unit ?? "", - textAlign: TextAlign.left, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: context.customMedium( - Colors.grey.withOpacity(0.8), - 12, - ), - ), - if (bestdealproduct!.quantity > 0) - Text("In Stock ", - style: - TextStyle(color: Colors.green, fontSize: 14)), - Spacer(), + SizedBox(height: 8), Row( children: [ Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( "₹${bestdealproduct.discountPrice ?? ""} ", @@ -416,52 +427,46 @@ class _BestDealScreenState extends State { ], ), Spacer(), - Align( - alignment: Alignment.centerRight, - child: GestureDetector( - onTap: () async { - if (await SharedPrefUtils.getToken() != null) { - await provider.addToWithCart( - context, - bestdealproduct.id!, - bestdealproduct, - bestdealproduct.productImages?.first.url); - } else { - context.push(MyRoutes.SIGNUP); - } - }, - child: Container( - height: - MediaQuery.of(context).size.height * 0.035, - width: MediaQuery.of(context).size.width * 0.1, - decoration: BoxDecoration( - color: APPCOLOR.lightGreen, - borderRadius: BorderRadius.circular(5), - ), - child: Center( - child: provider - .isLoading[bestdealproduct.id] ?? - false - ? Padding( - padding: const EdgeInsets.all(8.0), - child: Container( - height: 10, - width: 10, - child: CircularProgressIndicator( - color: Colors.white, - strokeWidth: 2), + GestureDetector( + onTap: () async { + if (await SharedPrefUtils.getToken() != null) { + await provider.addToWithCart( + context, + bestdealproduct.id!, + bestdealproduct, + bestdealproduct.productImages?.first.url, + ); + } else { + context.push(MyRoutes.SIGNUP); + } + }, + child: Container( + height: + MediaQuery.of(context).size.height * 0.035, + width: MediaQuery.of(context).size.width * 0.1, + decoration: BoxDecoration( + color: APPCOLOR.lightGreen, + borderRadius: BorderRadius.circular(5), + ), + child: Center( + child: provider.isLoading[bestdealproduct.id] ?? + false + ? Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + height: 10, + width: 10, + child: CircularProgressIndicator( + color: Colors.white, + strokeWidth: 2, ), - ) - : Text( - // provider.cartItems - // .contains(bestdealproduct.id) - // ? 'Added' - // : - 'Add', - style: context.customRegular( - Colors.white, 12), ), - ), + ) + : Text( + 'Add', + style: context.customRegular( + Colors.white, 12), + ), ), ), ), @@ -474,75 +479,6 @@ class _BestDealScreenState extends State { }, ), ); - - // Padding( - // padding: const EdgeInsets.all(15), - // child: GridView.builder( - // itemCount: provider.bestdeal.length, - // gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - // crossAxisCount: 2, - // childAspectRatio: MediaQuery.of(context).size.width / - // (MediaQuery.of(context).size.height / 1.5), - // crossAxisSpacing: 10, - // mainAxisSpacing: 10, - // ), - // itemBuilder: (context, index) { - // var bestdealproduct = provider.bestdeal[index]; - // return InkWell( - // onTap: () { - // context.push(MyRoutes.PRODUCTDETAILS, - // extra: bestdealproduct.id); - // }, - // child: Container( - // decoration: BoxDecoration( - // color: Colors.white, - // borderRadius: BorderRadius.circular(15), - // ), - // child: Padding( - // padding: const EdgeInsets.all(5), - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Container( - // height: MediaQuery.of(context).size.height * 0.15, - // width: MediaQuery.of(context).size.width * 0.4, - // decoration: BoxDecoration( - // color: APPCOLOR.bgGrey, - // borderRadius: BorderRadius.circular(15), - // ), - // child: AppNetworkImage( - // height: MediaQuery.of(context).size.height * 0.13, - // width: MediaQuery.of(context).size.width * 0.35, - // imageUrl: - // bestdealproduct.productImages?.first.url ?? "", - // backGroundColor: Colors.transparent, - // ), - // ), - // SizedBox(height: 8), - // Text(bestdealproduct.name ?? ""), - // Text(bestdealproduct.unit ?? ""), - // Text(bestdealproduct.quantity > 0 - // ? "In Stock" - // : "Out of Stock"), - // Row( - // children: [ - // Text("₹${bestdealproduct.discountPrice ?? ""}"), - // Text( - // "₹${bestdealproduct.basePrice ?? ""}", - // style: TextStyle( - // decoration: TextDecoration.lineThrough, - // ), - // ), - // ], - // ), - // ], - // ), - // ), - // ), - // ); - // }, - // ), - // ); } }); } diff --git a/lib/src/ui/fruitvegidetail/fruit_veggie_detail.dart b/lib/src/ui/fruitvegidetail/fruit_veggie_detail.dart index fbd8e2c..fce9a17 100644 --- a/lib/src/ui/fruitvegidetail/fruit_veggie_detail.dart +++ b/lib/src/ui/fruitvegidetail/fruit_veggie_detail.dart @@ -162,7 +162,7 @@ class _FruitVeggieDetailState extends State { padding: const EdgeInsets.only(left: 40), child: DataNotFound( imagePath: 'assets/images/cart.jpg', - message: "Product not abailable ", + message: "", width: 220.w, height: 250.h, ), @@ -175,7 +175,7 @@ class _FruitVeggieDetailState extends State { child: LayoutBuilder( builder: (context, constraints) { final itemWidth = (constraints.maxWidth - 20) / 2; - final itemHeight = itemWidth * 1.5; + final itemHeight = itemWidth * 1.7; return GridView.builder( controller: _scrollController, @@ -221,7 +221,7 @@ class _FruitVeggieDetailState extends State { children: [ Container( height: itemWidth * - 0.7, // Adjust height for image container + 0.9, // Adjust height for image container // width: itemWidth, decoration: BoxDecoration( color: APPCOLOR.bgGrey, @@ -236,15 +236,17 @@ class _FruitVeggieDetailState extends State { "https://5.imimg.com/data5/SELLER/Default/2024/2/385126988/OL/DA/VW/8627346/1l-fortune-sunflower-oil.jpg", backGroundColor: Colors.transparent, radius: 10, + boxFit:BoxFit.fill + ), Positioned( right: 1, bottom: 0, child: Container( - height: 50, - width: 50, + height: 35, + width: 35, padding: EdgeInsets.symmetric( - horizontal: 10, vertical: 10), + horizontal: 1, vertical: 1), decoration: BoxDecoration( color: Colors.red, borderRadius: @@ -252,75 +254,16 @@ class _FruitVeggieDetailState extends State { ), child: Center( child: Text( - "${calculateDiscountPercentage(double.parse(product.basePrice), double.parse(product!.discountPrice))}% \nOFF", + "${calculateDiscountPercentage(double.parse(product.basePrice), double.parse(product!.discountPrice))}%\nOFF", textAlign: TextAlign.center, style: TextStyle( color: Colors.white, - fontSize: 12)), + fontWeight:FontWeight.bold, + fontSize: 10)), ), ), ) - // Positioned( - // right: 5, - // top: 5, - // child: InkWell( - // onTap: () async { - // if (await SharedPrefUtils.getToken() != - // null) { - // if (product.isInWishlist) { - // Fluttertoast.showToast( - // msg: "Item already added!", - // toastLength: Toast.LENGTH_SHORT, - // gravity: ToastGravity.BOTTOM, - // backgroundColor: Colors.green, - // textColor: Colors.white, - // fontSize: 14.0, - // ); - // } else { - // //product.isInWishlist=ture; - // provider - // .toggleWishlist1(product.id!); - // } - // } else { - // context.push(MyRoutes.LOGIN); - // } - // }, - // child: Icon( - // product.isInWishlist - // ? Icons.favorite - // : Icons.favorite_border, - // color: product.isInWishlist - // ? Colors.red - // : Colors.grey, - // ), - // ), - // ), - - // Positioned( - // right: 5, - // top: 5, - // child: InkWell( - // onTap: () async { - // if (await SharedPrefUtils - // .getToken() != - // null) { - // provider.toggleWishlist( - // context, product.id!); - // } else { - // context.push(MyRoutes.SIGNUP); - // } - // }, - // child: Icon( - // provider.wishlist.contains(product.id) - // ? Icons.favorite - // : Icons.favorite_border, - // color: provider.wishlist - // .contains(product.id) - // ? Colors.red - // : Colors.grey, - // ), - // ), - // ), + ], ), ), diff --git a/lib/src/ui/home/home_screen.dart b/lib/src/ui/home/home_screen.dart index a132922..d31c9f2 100644 --- a/lib/src/ui/home/home_screen.dart +++ b/lib/src/ui/home/home_screen.dart @@ -368,7 +368,7 @@ class _HomeScreenState extends State { height: 300.h, )) : SizedBox( - height: MediaQuery.of(context).size.height * 0.28, + height: MediaQuery.of(context).size.height * 0.3, child: ListView.builder( itemCount: provider.bestdeal.length, scrollDirection: Axis.horizontal, @@ -402,7 +402,7 @@ class _HomeScreenState extends State { Center( child: Container( height: MediaQuery.of(context).size.height * - 0.12, + 0.17, decoration: BoxDecoration( color: APPCOLOR.bgGrey, borderRadius: BorderRadius.circular(15), @@ -418,10 +418,10 @@ class _HomeScreenState extends State { ), Positioned( right: 0, - bottom: 5, + bottom: 0, child: Container( - width: 50, - height: 50, + width: 40, + height: 40, decoration: BoxDecoration( color: Colors.red, borderRadius: @@ -618,7 +618,7 @@ class _HomeScreenState extends State { top: 15, left: 15, child: SizedBox( - width: 170, + width: 150, child: Text( banner.altText ?? "Special Event", style: context.customExtraBold( @@ -662,7 +662,7 @@ class _HomeScreenState extends State { imageUrl: banner.imageUrl ?? 'https://e7.pngegg.com/pngimages/742/816/png-clipart-coca-cola-can-illustration-coca-cola-soft-drink-surge-pepsi-coke-sweetness-cola-thumbnail.png', backGroundColor: Colors.transparent, - // boxFit: BoxFit.contain, + //boxFit: BoxFit.contain, ), ), ), diff --git a/lib/src/ui/profilepage/profile_screen.dart b/lib/src/ui/profilepage/profile_screen.dart index 0708b70..1a26de1 100644 --- a/lib/src/ui/profilepage/profile_screen.dart +++ b/lib/src/ui/profilepage/profile_screen.dart @@ -65,7 +65,8 @@ class _ProfileScreenState extends State { } @override - Widget build(BuildContext context) { + Widget build(BuildContext context) + { return Scaffold( body: NestedScrollView( headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) { @@ -398,4 +399,6 @@ class _ProfileScreenState extends State { }, ); } + + } diff --git a/pubspec.lock b/pubspec.lock index d5b4879..c982a3c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -828,18 +828,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: @@ -884,10 +884,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.8.0" material_design_icons_flutter: dependency: "direct main" description: @@ -900,10 +900,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.12.0" mime: dependency: transitive description: @@ -1036,18 +1036,18 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849" + sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" url: "https://pub.dev" source: hosted - version: "11.4.0" + version: "11.3.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc + sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1" url: "https://pub.dev" source: hosted - version: "12.1.0" + version: "12.0.13" permission_handler_apple: dependency: transitive description: @@ -1068,10 +1068,10 @@ packages: dependency: transitive description: name: permission_handler_platform_interface - sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878 + sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9 url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.2.3" permission_handler_windows: dependency: transitive description: @@ -1305,10 +1305,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.0" timezone: dependency: transitive description: @@ -1433,10 +1433,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.1" web: dependency: transitive description: @@ -1470,5 +1470,5 @@ packages: source: hosted version: "6.5.0" sdks: - dart: ">=3.5.0 <4.0.0" - flutter: ">=3.24.0" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 213de94..f26fb6a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: '>=3.4.4 <4.0.0' + sdk: '>=3.4.0 <4.0.0' dependencies: flutter: