Hamza/driver_tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11/20/7

Browse Source
This commit is contained in:
Hamza-Ayed
2023-11-20 18:29:28 +03:00
parent fd53287694
commit 1cdd0652fa
9 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/AndroidManifest.xml
View File

@@ -16,7 +16,7 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<meta-data android:name="com.google.android.geo.API_KEY" android:value="GOOGLE_MAPS_API_KEY"/>
<meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyCyfwRXTwSTLOFQSQgN5p7QZgGJVZnEKq0"/>
<meta-data android:name="com.google.firebase.messaging.default_notification_channel_id" android:value="@string/default_notification_channel_id"/>
<meta-data android:name="com.android.application.versionCode" android:value="1"/>
<!-- Don't delete the meta-data below.

1
android/gradle.properties
View File

@@ -1,4 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
GOOGLE_MAPS_API_KEY=AIzaSyCyfwRXTwSTLOFQSQgN5p7QZgGJVZnEKq0

21
lib/constant/api_key.dart Normal file
View File

@@ -0,0 +1,21 @@
import '../env/env.dart';
import 'char_map.dart';
import 'credential.dart';
class AK {
static final String publishableKey = AC().r(Env.stripePublishableKe, charMap);
static final String secretKey = AC().r(Env.secretKey, charMap);
static final String basicAuthCredentials =
AC().r(Env.basicAuthCredentials, charMap);
static final String accountSIDTwillo = AC().r(Env.accountSIDTwillo, charMap);
static final String serverAPI = AC().r(Env.serverAPI, charMap);
static final String mapAPIKEY = AC().r(Env.mapAPIKEY, charMap);
static final String twilloRecoveryCode =
AC().r(Env.twilloRecoveryCode, charMap);
static final String authTokenTwillo = AC().r(Env.authTokenTwillo, charMap);
static final String chatGPTkey = AC().r(Env.chatGPTkey, charMap);
static final String transactionCloude =
AC().r(Env.transactionCloude, charMap);
static final String visionApi = AC().r(Env.visionApi, charMap);
static final String chatGPTkeySefer = AC().r(Env.chatGPTkeySefer, charMap);
}

1
lib/constant/credential.dart
View File

@@ -4,6 +4,7 @@ import 'package:ride/constant/links.dart';
import 'package:ride/controller/functions/crud.dart';
import 'package:ride/main.dart';
import '../env/env.dart';
import 'box_name.dart';
import 'char_map.dart';

11
lib/controller/firebase/firbase_messge.dart
View File

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import '../../constant/api_key.dart';
import '../../constant/box_name.dart';
import '../../constant/colors.dart';
import '../../constant/links.dart';
@@ -70,7 +71,7 @@ class FirebaseMessagesController extends GetxController {
Uri.parse(AppLink.getTokens),
headers: {
'Authorization':
'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
},
body: {},
);
@@ -406,7 +407,7 @@ class FirebaseMessagesController extends GetxController {
.post(Uri.parse('https://fcm.googleapis.com/fcm/send'),
headers: <String, String>{
'Content-Type': 'application/json',
'Authorization': 'key=${Env.serverAPI}'
'Authorization': 'key=${AK.serverAPI}'
},
body: jsonEncode({
'notification': <String, dynamic>{
@@ -464,7 +465,7 @@ class FirebaseMessagesController extends GetxController {
Uri.parse('https://fcm.googleapis.com/fcm/send'),
headers: <String, String>{
'Content-Type': 'application/json',
'Authorization': 'key=${Env.serverAPI}'
'Authorization': 'key=${AK.serverAPI}'
},
body: jsonEncode({
'notification': <String, dynamic>{
@@ -501,7 +502,7 @@ class FirebaseMessagesController extends GetxController {
Uri.parse('https://fcm.googleapis.com/fcm/send'),
headers: <String, String>{
'Content-Type': 'application/json',
'Authorization': 'key=${Env.serverAPI}'
'Authorization': 'key=${AK.serverAPI}'
},
body: jsonEncode({
'notification': <String, dynamic>{
@@ -540,7 +541,7 @@ class FirebaseMessagesController extends GetxController {
Uri.parse('https://fcm.googleapis.com/fcm/send'),
headers: <String, String>{
'Content-Type': 'application/json',
'Authorization': 'key=${Env.serverAPI}'
'Authorization': 'key=${AK.serverAPI}'
},
body: jsonEncode({
'notification': <String, dynamic>{

16
lib/controller/functions/crud.dart
View File

@@ -2,10 +2,8 @@ import 'dart:convert';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
import '../../constant/api_key.dart';
import '../../constant/box_name.dart';
import '../../constant/char_map.dart';
import '../../constant/credential.dart';
import '../../env/env.dart';
import '../../main.dart';
class CRUD {
@@ -24,7 +22,7 @@ class CRUD {
headers: {
"Content-Type": "application/x-www-form-urlencoded",
'Authorization':
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
// 'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
},
);
@@ -55,7 +53,7 @@ class CRUD {
body: payload,
headers: {
"Content-Type": "application/x-www-form-urlencoded",
'Authorization': 'Bearer ${AC().r(Env.secretKey, charMap)}',
'Authorization': 'Bearer ${AK.secretKey}',
},
);
@@ -77,7 +75,7 @@ class CRUD {
headers: {
"Content-Type": "application/x-www-form-urlencoded",
'Authorization':
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
},
);
print(response.request);
@@ -112,7 +110,7 @@ class CRUD {
headers: {
"Content-Type": "application/x-www-form-urlencoded",
'Authorization':
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
},
);
print(response.request);
@@ -169,7 +167,7 @@ class CRUD {
body: json.encode(data),
headers: {
'Authorization':
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
},
);
return json.decode(response.body);
@@ -186,7 +184,7 @@ class CRUD {
url,
headers: {
'Authorization':
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
},
);
return json.decode(response.body);

3
lib/controller/home/captin/map_driver_controller.dart
View File

@@ -13,6 +13,7 @@ import 'package:ride/main.dart';
import 'package:ride/views/Rate/rate_passenger.dart';
import 'package:ride/views/home/Captin/home_captin.dart';
import '../../../constant/api_key.dart';
import '../../../constant/credential.dart';
import '../../../constant/links.dart';
import '../../functions/crud.dart';
@@ -316,7 +317,7 @@ class MapDriverController extends GetxController {
update();
var url =
('${AppLink.googleMapsLink}directions/json?&language=en&avoid=tolls|ferries&destination=$destination&origin=$origin&key=${mapAPIKEY}');
('${AppLink.googleMapsLink}directions/json?&language=en&avoid=tolls|ferries&destination=$destination&origin=$origin&key=${AK.mapAPIKEY}');
var response = await CRUD().getGoogleApi(link: url, payload: {});
data = response['routes'][0]['legs'];

9
lib/controller/home/map_passenger_controller.dart
View File

@@ -15,6 +15,7 @@ import 'package:ride/controller/functions/secure_storage.dart';
import 'package:ride/controller/payment/payment_controller.dart';
import 'package:ride/views/Rate/rate_captain.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import '../../constant/api_key.dart';
import '../../main.dart';
import '../../models/model/locations.dart';
import '../functions/launch.dart';
@@ -597,8 +598,8 @@ class MapPassengerController extends GetxController {
Future getPlaces() async {
var url =
// '${AppLink.googleMapsLink}place/nearbysearch/json?location=${mylocation.longitude}&radius=25000&language=ar&keyword=&key=${placeController.text}${mapAPIKEY}';
'${AppLink.googleMapsLink}place/nearbysearch/json?keyword=${placeController.text}&location=${myLocation.latitude},${myLocation.longitude}&radius=50000&language=ar&key=${mapAPIKEY.toString()}';
// '${AppLink.googleMapsLink}place/nearbysearch/json?location=${mylocation.longitude}&radius=25000&language=ar&keyword=&key=${placeController.text}${AK.mapAPIKEY}';
'${AppLink.googleMapsLink}place/nearbysearch/json?keyword=${placeController.text}&location=${myLocation.latitude},${myLocation.longitude}&radius=50000&language=ar&key=${AK.mapAPIKEY.toString()}';
var response = await CRUD().getGoogleApi(link: url, payload: {});
@@ -812,7 +813,7 @@ class MapPassengerController extends GetxController {
update();
// Make API request to get exact distance and duration
String apiUrl =
'${AppLink.googleMapsLink}distancematrix/json?destinations=${carLocation['latitude']},${carLocation['longitude']}&origins=${myLocation.latitude},${myLocation.longitude}&units=metric&key=${mapAPIKEY}';
'${AppLink.googleMapsLink}distancematrix/json?destinations=${carLocation['latitude']},${carLocation['longitude']}&origins=${myLocation.latitude},${myLocation.longitude}&units=metric&key=${AK.mapAPIKEY}';
var response = await CRUD().getGoogleApi(link: apiUrl, payload: {});
if (response['status'] == "OK") {
var data = response;
@@ -873,7 +874,7 @@ class MapPassengerController extends GetxController {
// print(carsLocationByPassenger);
var url =
('${AppLink.googleMapsLink}directions/json?&language=en&avoid=tolls|ferries&destination=$destination&origin=$origin&key=${mapAPIKEY}');
('${AppLink.googleMapsLink}directions/json?&language=en&avoid=tolls|ferries&destination=$destination&origin=$origin&key=${AK.mapAPIKEY}');
var response = await CRUD().getGoogleApi(link: url, payload: {});
data = response['routes'][0]['legs'];

5
lib/main.dart
View File

@@ -9,13 +9,12 @@ import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:flutter/services.dart';
import 'constant/char_map.dart';
import 'constant/api_key.dart';
import 'constant/credential.dart';
import 'constant/info.dart';
import 'controller/firebase/firbase_messge.dart';
import 'controller/local/local_controller.dart';
import 'controller/local/translations.dart';
import 'env/env.dart';
import 'firebase_options.dart';
import 'models/db_sql.dart';
import 'splash_screen_page.dart';
@@ -37,7 +36,7 @@ void main() async {
await GetStorage.init();
await AC().gAK();
Stripe.publishableKey = AC().r(Env.stripePublishableKe, charMap);
Stripe.publishableKey = AK.publishableKey;
//StripeKey.publishableKey;
if (Platform.isAndroid || Platform.isIOS) {