diff --git a/android/app/build.gradle b/android/app/build.gradle
index a24c25d..498582f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -32,7 +32,7 @@ def keystorePropertiesFile = rootProject.file('key.properties')
android {
namespace "com.mobileapp.store.ride"
- compileSdkVersion 34
+ compileSdkVersion 33
ndkVersion flutter.ndkVersion
compileOptions {
@@ -54,7 +54,7 @@ android {
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 23
- targetSdkVersion flutter.targetSdkVersion
+ targetSdkVersion 33
versionCode 40
versionName '1.5.40'
// manifestPlaceholders = [mapsApiKey: 'android/app/src/main/AndroidManifest.xml']
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b667beb..87d5256 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -9,9 +9,10 @@
-
+
+
diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
index 843b118..4a25ec9 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
index 7733536..6c53777 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
index 239ad3d..54f2de6 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
index 8351f49..c3949e8 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
index 2c5fd48..117b646 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ
diff --git a/assets/images/logo.png b/assets/images/logo.png
index 19f52d2..af75351 100644
Binary files a/assets/images/logo.png and b/assets/images/logo.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png
index 319af06..81e61d9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/102.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/102.png
index 467eea3..44b004f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/102.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/102.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png
index 605cd22..ce3acdc 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png
index ecc9574..75782ba 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png
index b742152..652cdb8 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png
index f2f146a..b7e822e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png
index 89f097d..8797eb1 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png
index 0749ee9..2b98107 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png
index ee86a79..8d206a9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png
index bbfe7ac..7f2d793 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/172.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/172.png
index aba3953..24b11a7 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/172.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/172.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png
index 4b5fb2f..85715e7 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/196.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/196.png
index 816169d..e830fae 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/196.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/196.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png
index 549dc62..5455ed8 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/216.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/216.png
index 0f05c0c..d08dd03 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/216.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/216.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png
index 4bf3dd7..3247b7a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
index 070b3f3..5a62dbb 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png
index 4e554cf..abe5b9d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
index 1e3ca89..d4d04d3 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png
index d0ef255..e907afa 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png
index 70d117d..d525b54 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png
index 97f0a4b..a426b0d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png
index 2af2158..2384564 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png
index e2b3633..dbdfb33 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
index fb5798d..f3c1d69 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
index 876575c..019901c 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png
index b1b7dcb..28c6f7a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png
index 31eb17f..2701ca7 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png
index 4b60d66..c03c64d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png
index d77bf4e..31a998f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
index ca0b355..f7bccec 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
index 2120a42..afd6e7a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png
index 97568ff..0368964 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png
index 0fc5c69..b2d83c9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png differ
diff --git a/lib/controller/auth/google_sign.dart b/lib/controller/auth/google_sign.dart
index 806aef6..b46f940 100644
--- a/lib/controller/auth/google_sign.dart
+++ b/lib/controller/auth/google_sign.dart
@@ -38,7 +38,7 @@ class GoogleSignInHelper {
if (googleUser != null) {
await _handleSignUp(googleUser);
// if (box.read(BoxName.countryCode) == 'Egypt') {
- await Get.put(LoginController()).loginFromSignInGoogle(
+ await Get.put(LoginController()).loginUsingCredentials(
box.read(BoxName.passengerID).toString(),
box.read(BoxName.email).toString(),
);
diff --git a/lib/controller/auth/login_controller.dart b/lib/controller/auth/login_controller.dart
index d06d422..cfbfeea 100644
--- a/lib/controller/auth/login_controller.dart
+++ b/lib/controller/auth/login_controller.dart
@@ -40,7 +40,7 @@ class LoginController extends GetxController {
update();
}
- loginFromSignInGoogle(String passengerID, email) async {
+ loginUsingCredentials(String passengerID, email) async {
isloading = true;
update();
var res =
diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart
index 114f418..ea36440 100644
--- a/lib/controller/firebase/firbase_messge.dart
+++ b/lib/controller/firebase/firbase_messge.dart
@@ -5,7 +5,6 @@ import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
-import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/controller/functions/toast.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
@@ -125,6 +124,9 @@ class FirebaseMessagesController extends GetxController {
var myList = jsonDecode(passengerList) as List;
driverID = myList[0].toString();
Get.find().driverToken = myList[2].toString();
+ Get.find().statusRide == 'Apply';
+ Get.find().isSearchingWindow == false;
+ Get.find().update();
NotificationController().showNotification(
'Apply Order'.tr, 'Driver Applied the Ride for You'.tr, 'order1');
// driverAppliedTripSnakBar();
diff --git a/lib/controller/home/home_page_controller.dart b/lib/controller/home/home_page_controller.dart
index 21edec3..de2510c 100644
--- a/lib/controller/home/home_page_controller.dart
+++ b/lib/controller/home/home_page_controller.dart
@@ -4,7 +4,7 @@ import '../../constant/box_name.dart';
import '../../main.dart';
class HomePageController extends GetxController {
- late bool isVibrate = true;
+ late bool isVibrate = box.read(BoxName.isvibrate) ?? true;
void changeVibrateOption(bool value) {
isVibrate = box.read(BoxName.isvibrate) ?? true;
diff --git a/lib/controller/home/splash_screen_controlle.dart b/lib/controller/home/splash_screen_controlle.dart
index 6ef933a..3f81b29 100644
--- a/lib/controller/home/splash_screen_controlle.dart
+++ b/lib/controller/home/splash_screen_controlle.dart
@@ -7,8 +7,6 @@ import 'package:SEFER/views/auth/login_page.dart';
import '../../constant/box_name.dart';
import '../../main.dart';
import '../../onbording_page.dart';
-import '../../views/home/map_page_passenger.dart';
-import '../auth/google_sign.dart';
import '../auth/login_controller.dart';
class SplashScreenController extends GetxController
@@ -52,7 +50,7 @@ class SplashScreenController extends GetxController
box.read(BoxName.phone) != null &&
box.read(BoxName.isVerified) == '1'
// ? Get.off(() => const MapPagePassenger())
- ? await Get.put(LoginController()).loginFromSignInGoogle(
+ ? await Get.put(LoginController()).loginUsingCredentials(
box.read(BoxName.passengerID).toString(),
box.read(BoxName.email).toString(),
)
diff --git a/lib/controller/payment/paymob/paymob_wallet.dart b/lib/controller/payment/paymob/paymob_wallet.dart
index 1c95682..b80f39e 100644
--- a/lib/controller/payment/paymob/paymob_wallet.dart
+++ b/lib/controller/payment/paymob/paymob_wallet.dart
@@ -142,7 +142,9 @@ class PaymobPaymentWallet {
}) async {
final Map data = {
"source": {
- "identifier": "01010101010", // Replace with actual source identifier
+ "identifier": box
+ .read(BoxName.phone)
+ .toString(), // Replace with actual source identifier
"subtype": "WALLET",
},
"payment_token": paymentToken,
diff --git a/lib/views/auth/login_page.dart b/lib/views/auth/login_page.dart
index 969c05d..61cf9f7 100644
--- a/lib/views/auth/login_page.dart
+++ b/lib/views/auth/login_page.dart
@@ -1,5 +1,7 @@
import 'dart:io';
+import 'package:SEFER/controller/home/map_passenger_controller.dart';
+import 'package:SEFER/views/widgets/my_dialog.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
@@ -86,8 +88,13 @@ class LoginPage extends StatelessWidget {
if (user != null) {
box.write(BoxName.passengerID, user.uid);
box.write(BoxName.email, user.email);
- await GoogleSignInHelper
- .signInFromLogin();
+ await Get.put(LoginController())
+ .loginUsingCredentials(
+ box
+ .read(BoxName.passengerID)
+ .toString(),
+ box.read(BoxName.email).toString(),
+ );
// Navigate to another screen or perform other actions
} else {}
},
@@ -265,7 +272,7 @@ class LoginPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Text(
- 'We use location to get accurate and nearest driver for you'
+ 'We use your precise location to find the nearest available driver and provide accurate pickup and dropoff information. You can manage this in Settings.'
.tr,
textAlign: TextAlign.center,
style: AppStyle.title,
@@ -273,7 +280,19 @@ class LoginPage extends StatelessWidget {
MyElevatedButton(
title: 'Next'.tr,
onPressed: () async {
+ // if (box.read(BoxName.locationPermission) != 'true') {
+ // Get.put(MyDialog()).getDialog(
+ // 'Location Permission is requiered for find drivers'
+ // .tr,
+ // 'You can just manage your account!'.tr, () {
+ // Get.back();
+ // Get.to(() {
+ // PassengerProfilePage();
+ // });
+ // });
+ // } else {
await controller.getLocationPermission();
+ // }
},
kolor: AppColor.greenColor,
)
diff --git a/lib/views/home/map_widget.dart/searching_captain_window.dart b/lib/views/home/map_widget.dart/searching_captain_window.dart
index cf3e7be..e9d5342 100644
--- a/lib/views/home/map_widget.dart/searching_captain_window.dart
+++ b/lib/views/home/map_widget.dart/searching_captain_window.dart
@@ -37,7 +37,7 @@ class SearchingCaptainWindow extends StatelessWidget {
),
Text(
"We are searching for the nearest driver to you".tr,
- style: AppStyle.headTitle2,
+ style: AppStyle.title,
),
Text(
'please wait till driver accept your order'.tr,
@@ -192,18 +192,26 @@ Widget _buildTimer(MapPassengerController mapPassengerController) {
return Stack(
children: [
- Center(
- child: CircularProgressIndicator(
- value: progress, // Use calculated progress
- color: AppColor.blueColor,
- backgroundColor: AppColor.yellowColor,
+ SizedBox(
+ height: 35,
+ width: 35,
+ child: Center(
+ child: CircularProgressIndicator(
+ value: progress, // Use calculated progress
+ color: AppColor.blueColor,
+ backgroundColor: AppColor.yellowColor,
+ ),
),
),
- Center(
- child: Text(
- '${snapshot.data} ', // Display elapsed time
- style: AppStyle.title.copyWith(
- color: AppColor.greenColor), // Adjust color for timer
+ SizedBox(
+ height: 35,
+ width: 35,
+ child: Center(
+ child: Text(
+ '${snapshot.data} ', // Display elapsed time
+ style: AppStyle.title.copyWith(
+ color: AppColor.greenColor), // Adjust color for timer
+ ),
),
)
],
diff --git a/lib/views/widgets/elevated_btn.dart b/lib/views/widgets/elevated_btn.dart
index f840c1f..f89014c 100644
--- a/lib/views/widgets/elevated_btn.dart
+++ b/lib/views/widgets/elevated_btn.dart
@@ -23,7 +23,7 @@ class MyElevatedButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
- final bool vibrate = box.read(BoxName.isvibrate) ?? true;
+ bool vibrate = box.read(BoxName.isvibrate) ?? true;
return ElevatedButton(
style: ElevatedButton.styleFrom(
@@ -33,7 +33,7 @@ class MyElevatedButton extends StatelessWidget {
),
),
onPressed: () async {
- if (vibrate) {
+ if (vibrate == true) {
if (Platform.isIOS) {
HapticFeedback.selectionClick();
} else {
diff --git a/lib/views/widgets/my_dialog.dart b/lib/views/widgets/my_dialog.dart
new file mode 100644
index 0000000..5fb23b7
--- /dev/null
+++ b/lib/views/widgets/my_dialog.dart
@@ -0,0 +1,43 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import '../../constant/colors.dart';
+import '../../constant/style.dart';
+import '../../controller/functions/tts.dart';
+import 'elevated_btn.dart';
+
+class MyDialog extends GetxController {
+ void getDialog(String title, String? midTitle, VoidCallback onPressed) {
+ final textToSpeechController = Get.put(TextToSpeechController());
+ Get.defaultDialog(
+ title: title,
+ titleStyle: AppStyle.title,
+ middleTextStyle: AppStyle.title,
+ content: Column(
+ children: [
+ IconButton(
+ onPressed: () async {
+ await textToSpeechController.speakText(title ?? midTitle!);
+ },
+ icon: const Icon(Icons.headphones)),
+ Text(
+ midTitle!,
+ style: AppStyle.title,
+ )
+ ],
+ ),
+ confirm: MyElevatedButton(
+ title: 'Ok'.tr,
+ onPressed: onPressed,
+ kolor: AppColor.greenColor,
+ ),
+ cancel: MyElevatedButton(
+ title: 'Cancel',
+ kolor: AppColor.redColor,
+ onPressed: () {
+ Get.back();
+ }));
+ }
+}
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
index becc1d8..73fde98 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
index f2e0df8..667453c 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
index 12b1592..8ff4eca 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
index 5bf40cb..91baaa6 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
index 963243f..7f3915e 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
index d0f81cd..e3dc401 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
index 5dbb34c..2ccdea3 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ
diff --git a/pubspec.lock b/pubspec.lock
index afeb4be..89f17aa 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -41,6 +41,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.2.2"
+ archive:
+ dependency: transitive
+ description:
+ name: archive
+ sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.6.1"
args:
dependency: transitive
description:
@@ -193,6 +201,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.7.4"
+ cli_util:
+ dependency: transitive
+ description:
+ name: cli_util
+ sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.4.1"
clock:
dependency: transitive
description:
@@ -470,6 +486,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.2.7"
+ flutter_launcher_icons:
+ dependency: "direct main"
+ description:
+ name: flutter_launcher_icons
+ sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.13.1"
flutter_lints:
dependency: "direct dev"
description:
@@ -928,6 +952,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
+ image:
+ dependency: transitive
+ description:
+ name: image
+ sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+ url: "https://pub.dev"
+ source: hosted
+ version: "4.2.0"
image_cropper:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 5d4bc44..1ac0380 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,12 +1,11 @@
name: SEFER
description: A new Flutter project.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+publish_to: "none" # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1
environment:
- sdk: '>=3.0.5 <4.0.0'
-
+ sdk: ">=3.0.5 <4.0.0"
dependencies:
flutter:
@@ -14,7 +13,7 @@ dependencies:
cupertino_icons: ^1.0.2
firebase_messaging: ^14.6.7
firebase_core: ^2.15.0
- flutter_local_notifications: ^16.2.0
+ flutter_local_notifications: ^16.2.0
google_maps_flutter: ^2.5.0
sqflite: ^2.3.0
path: ^1.8.3
@@ -30,25 +29,25 @@ dependencies:
geolocator: ^10.0.0
flutter_paypal: ^0.2.0
google_fonts: ^4.0.4
- # flutter_launcher_icons: ^0.13.1
+ flutter_launcher_icons: #^0.13.1
flutter_rating_bar: ^4.0.1
flutter_font_icons: ^2.2.5
image_picker: ^1.0.4
flutter_stripe: ^9.5.0+1
-# camera: ^0.10.5+5 #to be remove
+ # camera: ^0.10.5+5 #to be remove
flutter_widget_from_html: ^0.14.6
local_auth: ^2.1.7
-# image: ^4.1.3 #to be remove
+ # image: ^4.1.3 #to be remove
image_cropper: ^4.0.1
envied: ^0.5.2
-# cached_network_image: ^3.3.0
+ # cached_network_image: ^3.3.0
calendar_builder: ^0.0.6
agora_rtc_engine: ^6.2.6
flutter_tts: ^3.8.5
permission_handler: ^11.3.0
-# google_generative_ai: ^0.0.1-dev
+ # google_generative_ai: ^0.0.1-dev
vibration: ^1.8.4
- wakelock_plus:
+ wakelock_plus:
record: ^5.0.5
dio: ^5.4.3+1
webview_flutter: ^4.7.0
@@ -58,9 +57,6 @@ dependencies:
sign_in_with_apple: ^6.1.0
firebase_auth: ^4.19.6
-
-
-
dev_dependencies:
flutter_test:
sdk: flutter
@@ -68,23 +64,23 @@ dev_dependencies:
envied_generator: ^0.5.2
build_runner: ^2.4.6
-#flutter_launcher_icons:
-# android: "launcher_icon"
-# ios: true
-# image_path: "assets/images/logo.png"
-# min_sdk_android: 21
-# web:
-# generate: true
-# image_path: "assets/images/logo.png"
-# background_color: "#hexcode"
-# theme_color: "#hexcode"
-# windows:
-# generate: true
-# image_path: "assets/images/logo.png"
-# icon_size: 48
-# macos:
-# generate: true
-# image_path: "assets/images/logo.png"
+flutter_launcher_icons:
+ android: "launcher_icon"
+ ios: true
+ image_path: "assets/images/logo.png"
+ min_sdk_android: 21
+ web:
+ generate: true
+ image_path: "assets/images/logo.png"
+ background_color: "#hexcode"
+ theme_color: "#hexcode"
+ windows:
+ generate: true
+ image_path: "assets/images/logo.png"
+ icon_size: 48
+ macos:
+ generate: true
+ image_path: "assets/images/logo.png"
flutter:
uses-material-design: true
@@ -103,4 +99,4 @@ flutter:
- asset: assets/fonts/josefin.ttf
- family: digit
fonts:
- - asset: assets/fonts/digit.ttf
\ No newline at end of file
+ - asset: assets/fonts/digit.ttf
diff --git a/web/favicon.png b/web/favicon.png
index 12b1592..8ff4eca 100644
Binary files a/web/favicon.png and b/web/favicon.png differ
diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png
index 107e543..117b646 100644
Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ
diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png
index d0f81cd..e3dc401 100644
Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ
diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png
index 107e543..117b646 100644
Binary files a/web/icons/Icon-maskable-192.png and b/web/icons/Icon-maskable-192.png differ
diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png
index d0f81cd..e3dc401 100644
Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ
diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico
index b1ca20c..54228f6 100644
Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ