diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 5dcec36..864f99c 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -30,11 +30,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) + 2 CFBundleSignature ???? CFBundleVersion - $(FLUTTER_BUILD_NUMBER) + 1.01 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/lib/controller/home/captin/home_captain_controller.dart b/lib/controller/home/captin/home_captain_controller.dart index a603858..867fd31 100644 --- a/lib/controller/home/captin/home_captain_controller.dart +++ b/lib/controller/home/captin/home_captain_controller.dart @@ -1,3 +1,4 @@ +import 'package:flutter_sms/flutter_sms.dart'; import 'package:get/get.dart'; import 'package:ride/constant/box_name.dart'; import 'dart:async'; @@ -6,7 +7,6 @@ import '../../../constant/links.dart'; import '../../../main.dart'; import '../../functions/crud.dart'; import '../../functions/location_controller.dart'; -import 'map_driver_controller.dart'; class HomeCaptainController extends GetxController { bool isActive = false; @@ -62,6 +62,14 @@ class HomeCaptainController extends GetxController { super.onInit(); } + void sendSMSToRecipents(String message, List recipents) async { + String _result = await sendSMS(message: message, recipients: recipents) + .catchError((onError) { + print(onError); + }); + print(_result); + } + @override void dispose() { activeTimer?.cancel(); diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 3cb1e0a..7e2a5f5 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -79,7 +79,7 @@ class MapPassengerController extends GetxController { bool rideTimerBegin = false; double progressTimerRideBegin = 0; int remainingTimeTimerRideBegin = 60; - late String stringRemainingTimeRideBegin; + String stringRemainingTimeRideBegin = ''; void onChangedPassengerCount(int newValue) { selectedPassengerCount = newValue; diff --git a/lib/controller/rate/rate_conroller.dart b/lib/controller/rate/rate_conroller.dart index 52c074d..2c472ed 100644 --- a/lib/controller/rate/rate_conroller.dart +++ b/lib/controller/rate/rate_conroller.dart @@ -10,6 +10,8 @@ import 'package:ride/views/home/Captin/home_captin.dart'; import 'package:ride/views/home/map_page.dart'; import 'package:ride/views/widgets/elevated_btn.dart'; +import '../home/captin/home_captain_controller.dart'; + class RateController extends GetxController { double selectedRateItemId = -1; TextEditingController comment = TextEditingController(); @@ -31,6 +33,8 @@ class RateController extends GetxController { } void addRateToPassenger() async { + HomeCaptainController homeCaptainController = + Get.find(); if (selectedRateItemId < 1) { Get.defaultDialog( title: 'You Should choose rate figure'.tr, @@ -46,6 +50,7 @@ class RateController extends GetxController { 'comment': comment.text, }); Get.offAll(const HomeCaptain()); + homeCaptainController.isActive = true; } } diff --git a/lib/views/home/Captin/home_captin.dart b/lib/views/home/Captin/home_captin.dart index 7a934d3..28e7a21 100644 --- a/lib/views/home/Captin/home_captin.dart +++ b/lib/views/home/Captin/home_captin.dart @@ -119,6 +119,12 @@ class HomeCaptain extends StatelessWidget { 'Total Duration: ${homeCaptainController.calculateTotalDuration()} seconds', style: const TextStyle(fontSize: 20), ), + TextButton( + onPressed: () { + homeCaptainController.sendSMSToRecipents( + 'hi from Sefer', ['+962798583052']); + }, + child: const Text('send msg')), ], ), ), diff --git a/lib/views/orderCaptin/driver_map_page.dart b/lib/views/orderCaptin/driver_map_page.dart index f7d3a4f..e7d8354 100644 --- a/lib/views/orderCaptin/driver_map_page.dart +++ b/lib/views/orderCaptin/driver_map_page.dart @@ -10,8 +10,8 @@ import '../../constant/style.dart'; import '../../controller/functions/location_controller.dart'; import '../home/map_widget.dart/passenger_info_window.dart'; -class PassengerLocationDirection extends StatelessWidget { - PassengerLocationDirection({super.key}); +class PassengerLocationMapPage extends StatelessWidget { + PassengerLocationMapPage({super.key}); final LocationController locationController = Get.put(LocationController()); @override Widget build(BuildContext context) { diff --git a/lib/views/orderCaptin/order_request_page.dart b/lib/views/orderCaptin/order_request_page.dart index 2c8eafe..980999a 100644 --- a/lib/views/orderCaptin/order_request_page.dart +++ b/lib/views/orderCaptin/order_request_page.dart @@ -181,16 +181,16 @@ class OrderRequestPage extends StatelessWidget { box.read(BoxName.tokenDriver).toString(), ]; // print(bodyToPassenger); - FirebaseMessagesController() - .sendNotificationToPassengerToken( - 'Apply Ride', - arguments['DriverList'][9].toString(), - arguments['DriverList'][9].toString(), - // box.read(BoxName.tokenDriver).toString(), - bodyToPassenger, - ); + // FirebaseMessagesController() + // .sendNotificationToPassengerToken( + // 'Apply Ride', + // arguments['DriverList'][9].toString(), + // arguments['DriverList'][9].toString(), + // // box.read(BoxName.tokenDriver).toString(), + // bodyToPassenger, + // ); Get.back(); - Get.to(() => PassengerLocationDirection(), arguments: { + Get.to(() => PassengerLocationMapPage(), arguments: { 'passengerLocation': myList[0].toString(), 'Duration': myList[4].toString(), 'Distance': myList[5].toString(), diff --git a/pubspec.lock b/pubspec.lock index 836c2da..9553356 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -326,6 +326,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" + flutter_sms: + dependency: "direct main" + description: + name: flutter_sms + sha256: "2fe5f584f02596343557eeca56348f9b82413fefe83a423fab880cdbdf54d8d8" + url: "https://pub.dev" + source: hosted + version: "2.3.3" flutter_spinkit: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 73f18a9..1f7128c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,6 +37,7 @@ dependencies: flutter_launcher_icons: ^0.13.1 crypto: ^3.0.3 flutter_rating_bar: ^4.0.1 + flutter_sms: ^2.3.3 dev_dependencies: