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

12/14/1

Browse Source
This commit is contained in:
Hamza-Ayed
2023-12-14 23:09:46 +03:00
parent 2ff52420ce
commit c2fd1187d0
19 changed files with 523 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
lib/views/auth/captin/login_captin.dart
View File

@@ -1,18 +1,11 @@
import 'dart:convert';
import 'package:animated_text_kit/animated_text_kit.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
import 'package:get/get.dart';
import 'package:ride/controller/functions/llama_ai.dart';
import 'package:ride/env/env.dart';
import '../../../constant/api_key.dart';
import '../../../constant/box_name.dart';
import '../../../constant/char_map.dart';
import '../../../constant/colors.dart';
import '../../../constant/credential.dart';
import '../../../constant/info.dart';
import '../../../constant/style.dart';
import '../../../controller/auth/captin/login_captin_controller.dart';
@@ -197,62 +190,62 @@ class LoginCaptin extends StatelessWidget {
displayFullTextOnTap: true,
stopPauseOnTap: true,
),
IconButton(
onPressed: () async {
// String v =
// await storage.read(key: BoxName.serverAPI) ?? '';
// print(v);
// sql.deleteAllData(TableName.faceDetectTimes);
AC credentials = AC();
// String apiKey = AK.secretKey;
// // // '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';
// credentials.gAK();
// String? apiKeyf =
// await storage.read(key: BoxName.chatGPTkey);
// print(apiKeyf);
// String convertedString = credentials.c(apiKey, s);
// String convertedStrings = credentials.c(apiKey, s);
// print('Converted String s: $convertedStrings');
// String convertedStringC =
// credentials.c(convertedStrings, c);
// print('v: $v');
// 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH'
// 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH'
String convertedStringN = credentials.c(
credentials.c(
credentials.c(
'0vQRyaYYDWpsv73A5CZOknseK7S2sgwE', cs),
cC),
cn);
print('Converted v: $convertedStringN');
// //
// String retrievedStringN =
// credentials.r(convertedStringN, n);
// print('Retrieved String: $retrievedStringN');
// String retrievedStringC =
// credentials.r(retrievedStringN, c);
// print('Retrieved String: $retrievedStringC');
// IconButton(
// onPressed: () async {
// // String v =
// // await storage.read(key: BoxName.serverAPI) ?? '';
// // print(v);
// // sql.deleteAllData(TableName.faceDetectTimes);
// AC credentials = AC();
// // String apiKey = AK.secretKey;
// // // // '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';
// // credentials.gAK();
// // String? apiKeyf =
// // await storage.read(key: BoxName.chatGPTkey);
// // print(apiKeyf);
// // String convertedString = credentials.c(apiKey, s);
// // String convertedStrings = credentials.c(apiKey, s);
// // print('Converted String s: $convertedStrings');
// // String convertedStringC =
// // credentials.c(convertedStrings, c);
// // print('v: $v');
// // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH'
// // 'AAAAinYllCo:APA91bF1shTpzSsSxqbfY6c60D8zs1ZsdIsl9ix6nl7GDdjCqWPRK0G0ub5SqFdb1jDpQDvQPxGg-697MWLo0sy3oYImBwBLObyhk0GjtNzyr0PbE3hI-pOvhf8Vp1xgUgBmofbZYXkH'
// String convertedStringN = credentials.c(
// credentials.c(
// credentials.c(
// '0vQRyaYYDWpsv73A5CZOknseK7S2sgwE', cs),
// cC),
// cn);
// print('Converted v: $convertedStringN');
// // //
// // String retrievedStringN =
// // credentials.r(convertedStringN, n);
// // print('Retrieved String: $retrievedStringN');
// // String retrievedStringC =
// // credentials.r(retrievedStringN, c);
// // print('Retrieved String: $retrievedStringC');
String retrievedStringS = credentials.r(
credentials.r(
credentials.r(convertedStringN, cn), cC),
cs);
print('Retrieved String: $retrievedStringS');
// String retrievedStringS = credentials.r(
// credentials.r(
// credentials.r(convertedStringN, cn), cC),
// cs);
// print('Retrieved String: $retrievedStringS');
// if (retrievedStringS == apiKey) {
// print('same');
// }
// print(' AK is ' + AK.chatGPTkey); //
// // if (retrievedStringS == apiKey) {
// // print('same');
// // }
// // print(' AK is ' + AK.chatGPTkey); //
// print(' ENV is ' + Env.chatGPTkey); //
// // print('storage is ' + v); //
// print('storage is ' + apiKeyf!); //
},
icon: const Icon(
Icons.close,
color: AppColor.blueColor,
),
),
// // print(' ENV is ' + Env.chatGPTkey); //
// // // print('storage is ' + v); //
// // print('storage is ' + apiKeyf!); //
// },
// icon: const Icon(
// Icons.close,
// color: AppColor.blueColor,
// ),
// ),
],
),
)

28
lib/views/auth/captin/logout_captain.dart
View File

@@ -1,5 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/colors.dart';
import 'package:ride/controller/functions/log_out.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import 'package:ride/views/widgets/my_scafold.dart';
class LogoutCaptain extends StatelessWidget {
@@ -9,7 +12,30 @@ class LogoutCaptain extends StatelessWidget {
Widget build(BuildContext context) {
return MyScafolld(
title: 'Log Out Page'.tr,
body: [],
body: [
Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
MyElevatedButton(
title: 'Log Off'.tr,
onPressed: () {
LogOut().logOutCaptain();
}),
const SizedBox(
height: 30,
),
MyElevatedButton(
title: 'Delete My Account'.tr,
onPressed: () {
LogOut().deletecaptainAccount();
},
kolor: AppColor.redColor,
),
],
),
)
],
isleading: true,
);
}

36
lib/views/auth/register_page.dart
View File

@@ -257,22 +257,26 @@ class RegisterPage extends StatelessWidget {
),
),
),
DropdownButton(
value: controller.gender,
items: [
DropdownMenuItem(
value: 'Male'.tr,
child: Text('Male'.tr),
),
DropdownMenuItem(
value: 'Female'.tr,
child: Text('Female'.tr),
),
],
onChanged: (value) {
controller.changeGender(value!);
},
)
// DropdownButton(
// value: controller.gender,
// items: [
// DropdownMenuItem(
// value: 'Male'.tr,
// child: Text('Male'.tr),
// ),
// DropdownMenuItem(
// value: 'Female'.tr,
// child: Text('Female'.tr),
// ),
// DropdownMenuItem(
// value: '--'.tr,
// child: Text('--'.tr),
// ),
// ],
// onChanged: (value) {
// controller.changeGender(value!);
// },
// )
],
),
MyElevatedButton(

28
lib/views/home/Captin/settings_captain.dart
View File

@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/views/lang/languages.dart';
import 'package:ride/views/widgets/my_scafold.dart';
class SettingsCaptain extends StatelessWidget {
@@ -9,7 +11,31 @@ class SettingsCaptain extends StatelessWidget {
Widget build(BuildContext context) {
return MyScafolld(
title: 'Settings'.tr,
body: [],
body: [
ListView(
children: <Widget>[
ListTile(
leading: const Icon(Icons.language),
title: Text(
'Language',
style: AppStyle.headtitle2,
),
onTap: () => Get.to(const Language()),
),
// ListTile(
// leading: const Icon(Icons.notifications),
// title: const Text('Notifications'),
// onTap: () =>
// Navigator.pushNamed(context, '/notification-settings'),
// ),
// ListTile(
// leading: const Icon(Icons.account_circle),
// title: const Text('Account'),
// onTap: () => Navigator.pushNamed(context, '/account-settings'),
// ),
],
),
],
isleading: true,
);
}

2
lib/views/home/profile/passenger_profile_page.dart
View File

@@ -192,7 +192,7 @@ class PassengerProfilePage extends StatelessWidget {
child: MyElevatedButton(
title: 'Sign Out'.tr,
onPressed: () {
LogOut().logOut();
LogOut().logOutPassenger();
}),
),
Positioned(

2
lib/views/notification/notification_captain.dart
View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/controller/auth/captin/notification_captain_controller.dart';
import 'package:ride/controller/notification/notification_captain_controller.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import 'package:ride/views/widgets/my_scafold.dart';
import 'package:ride/views/widgets/mycircular.dart';

81
lib/views/notification/notification_page.dart
View File

@@ -3,35 +3,80 @@ import 'package:get/get.dart';
import 'package:ride/constant/colors.dart';
import 'package:ride/constant/style.dart';
import '../../constant/box_name.dart';
import '../../main.dart';
import '../../controller/notification/passenger_notification_controller.dart';
import '../widgets/elevated_btn.dart';
import '../widgets/my_scafold.dart';
import '../widgets/mycircular.dart';
class NotificationPage extends StatelessWidget {
const NotificationPage({super.key});
@override
Widget build(BuildContext context) {
Get.put(PassengerNotificationController());
return MyScafolld(
isleading: true,
title: 'Notifications',
action: IconButton(
onPressed: () async {
print(box.read(BoxName.tokenFCM).toString());
// await CRUD().post(link: AppLink.addTokens, payload: {
// 'token': box.read(BoxName.tokenFCM).toString(),
// 'passengerID': box.read(BoxName.pasengerID).toString()
// }).then((value) => print('cccc'));
},
icon: const Icon(
Icons.add,
color: AppColor.primaryColor,
),
),
body: [
Container(
decoration: AppStyle.boxDecoration,
),
GetBuilder<PassengerNotificationController>(
builder: (notificationCaptainController) =>
notificationCaptainController.isloading
? const MyCircularProgressIndicator()
: SafeArea(
child: ListView.builder(
itemCount: notificationCaptainController
.notificationData['message'].length,
itemBuilder: (BuildContext context, int index) {
if (notificationCaptainController
.notificationData['message'] ==
"No notification data found") {
Get.defaultDialog();
}
var res = notificationCaptainController
.notificationData['message'][index];
return Card(
elevation: 4,
color: res['isShown'] == 'true'
? AppColor.secondaryColor.withOpacity(.5)
: AppColor.secondaryColor.withOpacity(.9),
child: ListTile(
onTap: () {
Get.defaultDialog(
title: res['title'],
titleStyle: AppStyle.title,
content: SizedBox(
width: Get.width * .8,
// height: Get.height * .4,
child: Text(
res['body'],
style: AppStyle.title,
),
),
confirm: MyElevatedButton(
title: 'Ok',
onPressed: () {
notificationCaptainController
.updateNotification(
res['id'].toString());
}));
},
leading: res['isShown'] == 'true'
? const Icon(
Icons.notifications_off_outlined)
: const Icon(Icons.notifications_active),
title: Text(
res['title'],
style: AppStyle.title,
),
subtitle: Text(
res['body'],
style: AppStyle.subtitle,
),
),
);
},
),
))
],
);
}

5
lib/views/widgets/my_scafold.dart
View File

@@ -9,7 +9,10 @@ class MyScafolld extends StatelessWidget {
super.key,
required this.title,
required this.body,
this.action = const Icon(Icons.clear),
this.action = const Icon(
Icons.clear,
color: AppColor.secondaryColor,
),
required this.isleading,
});

2
lib/views/widgets/my_textField.dart
View File

@@ -41,7 +41,7 @@ class MyTextForm extends StatelessWidget {
hintText: hint.tr,
),
validator: (value) {
if (value!.isEmpty || value.length != 10) {
if (value!.isEmpty) {
return 'Please enter $label.'.tr;
}
return null;