This commit is contained in:
Hamza-Ayed
2023-08-28 19:13:50 +03:00
parent 63770619d6
commit 069ab52a83
63 changed files with 621 additions and 104 deletions

View File

@@ -21,8 +21,8 @@ class CRUD {
'Basic ${base64Encode(utf8.encode(AppCredintials.basicAuthCredentials))}',
},
);
// print("--------------" + response.body.toString());
// print("--------------" + payload.toString());
print("--------------" + response.request.toString());
print("--------------" + payload.toString());
if (response.statusCode == 200) {
var jsonData = jsonDecode(response.body);
if (jsonData['status'] == 'success') {

View File

@@ -0,0 +1,35 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/colors.dart';
import 'package:ride/constant/style.dart';
class Toast {
static void show(BuildContext context, String message, Color color) {
final snackBar = SnackBar(
clipBehavior: Clip.antiAliasWithSaveLayer,
backgroundColor: color,
elevation: 3,
content: Text(
message,
style: AppStyle.title.copyWith(color: AppColor.secondaryColor),
),
behavior: SnackBarBehavior.floating,
animation: const AlwaysStoppedAnimation(1.0),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0), // Custom border radius
),
width: Get.width * .8,
// shape: const StadiumBorder(
// side: BorderSide(
// color: AppColor.secondaryColor,
// width: 1.0,
// style: BorderStyle.solid,
// )),
duration: const Duration(seconds: 2),
);
ScaffoldMessenger.of(context).showSnackBar(
snackBar,
);
}
}

View File

@@ -11,6 +11,7 @@ import 'package:ride/constant/box_name.dart';
import 'package:ride/constant/credential.dart';
import 'package:ride/constant/links.dart';
import 'package:ride/controller/functions/crud.dart';
import 'package:ride/controller/functions/secure_storage.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import '../../main.dart';
import '../../models/model/locations.dart';
@@ -55,6 +56,13 @@ class MapController extends GetxController {
var dataCarsLocationByPassenger;
CarLocation? nearestCar;
late Timer markerReloadingTimer;
int selectedPassengerCount = 1;
void onChangedPassengerCount(int newValue) {
selectedPassengerCount = newValue;
update();
}
// final mainBottomMenuMap = GlobalKey<AnimatedContainer>();
void changeButtomSheetShown() {
isButtomSheetShown = !isButtomSheetShown;
@@ -110,6 +118,7 @@ class MapController extends GetxController {
changeConfirmRide() {
rideConfirm = true;
print('rideConfirm= $rideConfirm');
//TODO add ride and get ride id and details
update();
}
@@ -403,7 +412,7 @@ class MapController extends GetxController {
// longitude: double.parse(carLocation['longitude']),
// );
// }
isloading = true;
update();
// Make API request to get exact distance and duration
String apiUrl =
@@ -426,6 +435,7 @@ class MapController extends GetxController {
latitude: double.parse(carLocation['latitude']),
longitude: double.parse(carLocation['longitude']),
);
isloading = false;
update();
}
}
@@ -701,7 +711,7 @@ class MapController extends GetxController {
}
List<LatLng> polylineCoordinate = [];
String? cardNumber;
@override
void onInit() async {
await getLocation();
@@ -710,7 +720,7 @@ class MapController extends GetxController {
addCustomPicker();
addCustomCarIcon();
startMarkerReloading();
cardNumber = await SecureStorage().readData(BoxName.cardNumber);
super.onInit();
}
}
@@ -719,8 +729,8 @@ class CarLocation {
final int id;
final double latitude;
final double longitude;
double distance;
double duration;
final double distance;
final double duration;
CarLocation({
required this.id,

View File

@@ -86,7 +86,10 @@ class MyTranslation extends Translations {
"هل ترغب في الانتقال إلى هذا الموقع",
"MyLocation": "موقعي",
"my location": "موقعي",
"Target": "هدف"
"Target": "هدف",
/////
///
// 'Saved Sucssefully':
},
"tr": {
"Choose Language": "Dil Seçin",

View File

@@ -0,0 +1,59 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../constant/box_name.dart';
import '../../constant/links.dart';
import '../../main.dart';
import '../functions/crud.dart';
class PaymentController extends GetxController {
bool isloading = false;
bool isWalletCheced = false;
bool isCashCheced = false;
final formKey = GlobalKey<FormState>();
final promo = TextEditingController();
getPassengerWallet() async {
isloading = true;
update();
if (box.read(BoxName.passengerWalletDetails) == null) {
await CRUD().get(link: AppLink.getWalletByPassenger, payload: {
'passenger_id': box.read(BoxName.pasengerID)
}).then((value) {
final total = jsonDecode(value)['message'];
box.write(BoxName.passengerWalletDetails, total);
});
isloading = false;
update();
print('from empty');
print(box.read(BoxName.passengerWalletDetails));
} else {
box.read(BoxName.passengerWalletDetails);
update();
print('from full');
print(box.read(BoxName.passengerWalletDetails));
}
}
void onChangedPymentethodWallet(bool? value) {
isWalletCheced = !isWalletCheced;
isWalletCheced ? isCashCheced = false : isCashCheced = true;
update();
}
void onChangedPymentethodCash(bool? value) {
isCashCheced = !isCashCheced;
isCashCheced ? isWalletCheced = false : isWalletCheced = true;
update();
}
@override
void onInit() {
getPassengerWallet();
super.onInit();
}
}