diff --git a/packages/core/lib/core.dart b/packages/core/lib/core.dart index 1539941..624f706 100644 --- a/packages/core/lib/core.dart +++ b/packages/core/lib/core.dart @@ -13,7 +13,6 @@ export 'package:flutter_rating_bar/flutter_rating_bar.dart'; export 'package:flutter_screenutil/flutter_screenutil.dart'; export 'package:flutter_secure_storage/flutter_secure_storage.dart'; export 'package:flutter_slidable/flutter_slidable.dart'; -export 'package:font_awesome_flutter/font_awesome_flutter.dart'; //freezed export 'package:freezed_annotation/freezed_annotation.dart'; export 'package:geolocator/geolocator.dart'; diff --git a/packages/core/pubspec.lock b/packages/core/pubspec.lock index 936d0e5..e70dda0 100644 --- a/packages/core/pubspec.lock +++ b/packages/core/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: "direct main" description: name: android_intent_plus - sha256: dfc1fd3a577205ae8f11e990fb4ece8c90cceabbee56fcf48e463ecf0bd6aae3 + sha256: "2329378af63f49b985cb2e110ac784d08374f1e2b1984be77ba9325b1c8cce11" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.3.1" animated_stack_widget: dependency: transitive description: @@ -185,6 +185,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + connectivity_plus: + dependency: "direct main" + description: + name: connectivity_plus + sha256: b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec + url: "https://pub.dev" + source: hosted + version: "6.1.5" + connectivity_plus_platform_interface: + dependency: transitive + description: + name: connectivity_plus_platform_interface + sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204" + url: "https://pub.dev" + source: hosted + version: "2.0.1" convert: dependency: transitive description: @@ -269,10 +285,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9" + sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9 url: "https://pub.dev" source: hosted - version: "5.8.0+1" + version: "5.9.0" dio_web_adapter: dependency: transitive description: @@ -517,14 +533,6 @@ packages: description: flutter source: sdk version: "0.0.0" - font_awesome_flutter: - dependency: "direct main" - description: - name: font_awesome_flutter - sha256: d3a89184101baec7f4600d58840a764d2ef760fe1c5a20ef9e6b0e9b24a07a3a - url: "https://pub.dev" - source: hosted - version: "10.8.0" freezed: dependency: "direct dev" description: @@ -625,10 +633,10 @@ packages: dependency: "direct main" description: name: get_it - sha256: f126a3e286b7f5b578bf436d5592968706c4c1de28a228b870ce375d9f743103 + sha256: a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b url: "https://pub.dev" source: hosted - version: "8.0.3" + version: "8.2.0" get_test: dependency: "direct dev" description: @@ -1005,6 +1013,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + nm: + dependency: transitive + description: + name: nm + sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254" + url: "https://pub.dev" + source: hosted + version: "0.5.0" package_config: dependency: transitive description: @@ -1017,18 +1033,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191" + sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.3.1" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" + sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" path: dependency: transitive description: diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index 90dd599..1c24c3c 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: #utils device_info_plus: ^11.5.0 - package_info_plus: ^8.3.0 + package_info_plus: ^8.3.1 ##image_picker image_picker: ^1.1.2 @@ -42,7 +42,7 @@ dependencies: #SVG flutter_svg: ^2.2.0 - font_awesome_flutter: ^10.8.0 + #Shimmer shimmer: ^3.0.0 @@ -54,7 +54,7 @@ dependencies: get: ^4.7.2 ##Di - get_it: ^8.0.3 + get_it: ^8.2.0 #other permission_handler: ^12.0.1 @@ -65,7 +65,7 @@ dependencies: intl: ^0.20.2 #INITENT - android_intent_plus: ^5.3.0 + android_intent_plus: ^5.3.1 #Map flutter_map: ^7.0.0 @@ -75,7 +75,8 @@ dependencies: latlong2: ^0.9.1 geolocator: ^14.0.2 #network - dio: ^5.8.0+1 + dio: ^5.9.0 + connectivity_plus: ^6.1.5 #networkLogger pretty_dio_logger: ^1.4.0 diff --git a/packages/inspection/lib/presentation/pages/location_details/view.dart b/packages/inspection/lib/presentation/pages/location_details/view.dart index 559508c..5d9792a 100644 --- a/packages/inspection/lib/presentation/pages/location_details/view.dart +++ b/packages/inspection/lib/presentation/pages/location_details/view.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/presentation/utils/color_utils.dart'; @@ -69,7 +70,7 @@ class LocationDetailsPage extends GetView { children: [ Expanded( child: ROutlinedElevatedIcon( - icon: FaIcon(FontAwesomeIcons.calendar), + icon: Icon(CupertinoIcons.calendar), onPressed:() async { Jalali? picked = await showPersianDatePicker( @@ -91,7 +92,7 @@ class LocationDetailsPage extends GetView { ), Expanded( child: ROutlinedElevatedIcon( - icon: FaIcon(FontAwesomeIcons.calendar), + icon: Icon(CupertinoIcons.calendar), onPressed: () async { Jalali? picked = await showPersianDatePicker( diff --git a/packages/livestock/lib/presentation/page/map/widget/map_widget/view.dart b/packages/livestock/lib/presentation/page/map/widget/map_widget/view.dart index 30c7a42..75eb4b7 100644 --- a/packages/livestock/lib/presentation/page/map/widget/map_widget/view.dart +++ b/packages/livestock/lib/presentation/page/map/widget/map_widget/view.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_livestock/presentation/routes/app_pages.dart'; @@ -182,7 +183,7 @@ class MapWidget extends GetView { ignoreSafeArea: false, ); }, - icon: FaIcon(FontAwesomeIcons.locationPin, color: AppColor.error), + icon: Icon(CupertinoIcons.location_solid, color: AppColor.error), ), ), )