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

8-17/1

Browse Source
This commit is contained in:
Hamza-Ayed
2023-08-17 17:07:27 +03:00
parent ceced0735c
commit 6635a46933
11 changed files with 418 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/constant/box_name.dart
View File

@@ -2,6 +2,7 @@ class BoxName {
static const String driverID = "driverID";
static const String lang = "lang";
static const String passwoerd = "passwoerd";
static const String agreeTerms = "agreeTerms";
static const String pasengerID = "pasengerID";
static const String phone = "phone";

1
lib/controller/auth/login_controller.dart
View File

@@ -64,6 +64,7 @@ class LoginController extends GetxController {
box.write(BoxName.pasengerID, jsonDecoeded['data'][0]['id']);
box.write(BoxName.email, jsonDecoeded['data'][0]['email']);
box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
saveData(BoxName.passwoerd, passwordController.text);
Get.offAll(() => MapPage());
isloading = false;
update();

6
lib/controller/auth/register_controller.dart
View File

@@ -62,9 +62,9 @@ class RegisterController extends GetxController {
'token': verfyCode.text,
});
// if (jsondecod['status'] == 'success') {
Get.offAll(() => const MapPage());
// }
if (jsonDecode(res)['status'] == 'success') {
Get.offAll(() => const MapPage());
}
}
void register() async {

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

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

22
lib/controller/home/map_page_controller.dart
View File

@@ -29,25 +29,34 @@ class MapController extends GetxController {
final List<LatLng> carsLocationByPassenger = [];
BitmapDescriptor markerIcon = BitmapDescriptor.defaultMarker;
BitmapDescriptor carIcon = BitmapDescriptor.defaultMarker;
double height = 200;
double height = 150;
final location = Location();
late LocationData currentLocation;
double heightMenu = 0;
double heightPickerContainer = 90;
double mainBottomMenuMap = Get.height * .2;
bool heightMenuBool = false;
bool isPickerShown = false;
bool isButtomSheetShown = false;
bool mapType = false;
bool isMainBottomMenuMap = true;
double heightButtomSheetShown = 240;
late final LatLng southwest;
late final LatLng northeast;
List<CarLocationModel> carLocations = <CarLocationModel>[];
// final mainBottomMenuMap = GlobalKey<AnimatedContainer>();
void changeButtomSheetShown() {
isButtomSheetShown = !isButtomSheetShown;
heightButtomSheetShown = isButtomSheetShown == true ? 240 : 0;
update();
}
void changeMapType() {
mapType = !mapType;
// heightButtomSheetShown = isButtomSheetShown == true ? 240 : 0;
update();
}
void getDrawerMenu() {
heightMenuBool = !heightMenuBool;
heightMenu = heightMenuBool == true ? 100 : 0;
@@ -65,12 +74,19 @@ class MapController extends GetxController {
update();
}
void changeMainBottomMenuMap() {
isMainBottomMenuMap = !isMainBottomMenuMap;
mainBottomMenuMap =
isMainBottomMenuMap == true ? Get.height * .2 : Get.height * .66;
update();
}
changeHeight() {
if (places.isEmpty) {
height = 0;
update();
}
height = 200;
height = 150;
update();
}

3
lib/main.dart
View File

@@ -41,8 +41,9 @@ void main() async {
FirebasMessagesController().getToken();
await FirebasMessagesController().getTokens();
FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
FirebasMessagesController().getNotificationSettings();
FirebasMessagesController().requestPermission();
FirebasMessagesController().getNotificationSettings();
runApp(const MyApp());
}

17
lib/views/home/map_page.dart
View File

@@ -7,6 +7,7 @@ import 'package:ride/views/widgets/mycircular.dart';
import '../../controller/home/menu_controller.dart';
import 'map_widget.dart/buttom_sheet_map_show.dart';
import 'map_widget.dart/main_bottom_Menu_map.dart';
import 'map_widget.dart/map_menu_widget.dart';
import 'map_widget.dart/menu_map_page.dart';
import 'map_widget.dart/picker_animation_container.dart';
@@ -123,7 +124,8 @@ class MapPage extends StatelessWidget {
// center: controller.mylocation,
// radius: 2000)
// },
mapType: MapType.normal,
mapType:
controller.mapType ? MapType.satellite : MapType.normal,
myLocationButtonEnabled: true,
indoorViewEnabled: true,
trafficEnabled: false,
@@ -138,8 +140,21 @@ class MapPage extends StatelessWidget {
// liteModeEnabled: true,
),
),
GetBuilder<MapController>(
builder: (controller) => Positioned(
top: 80,
left: 6,
child: IconButton(
onPressed: () => controller.changeMapType(),
icon: const Icon(
Icons.satellite_alt,
size: 35,
),
)),
),
const PickerIconOnMap(),
PickerAnimtionContainerFormPlaces(),
// MainBottomMenuMap(),
const MapMenuWidget(),
const MenuIconMapPageWidget(),
buttomSheetMapPage()

253
lib/views/home/map_widget.dart/form_search_places.dart
View File

@@ -1,147 +1,144 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/table_names.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import '../../../constant/colors.dart';
import '../../../constant/style.dart';
import '../../../controller/home/map_page_controller.dart';
import '../../../main.dart';
import '../../../models/db_sql.dart';
GetBuilder<MapController> formSearchPlaces() {
// DbSql sql = DbSql.instance;
return GetBuilder<MapController>(
builder: (controller) => Positioned(
top: 5,
// width: Get.width * .8,
left: 50,
right: 0,
child: Column(
children: [
Container(
height: controller.places.isNotEmpty ? controller.height : 0,
color: AppColor.secondaryColor,
child: ListView.builder(
itemCount: controller.places.length,
itemBuilder: (BuildContext context, int index) {
var res = controller.places[index];
return InkWell(
onTap: () {
controller.changeHeight();
Get.defaultDialog(
title: 'Are You sure to ride to ${res['name']}',
middleText: '',
onConfirm: () {
controller.clearpolyline();
controller.getMap(
'${controller.mylocation.latitude.toString()},${controller.mylocation.longitude.toString()}',
"${res['geometry']['location']['lat']},${res['geometry']['location']['lng']}");
controller.places = [];
controller.placeController.clear();
Get.back();
controller.bottomSheet();
// Get.back();
},
);
builder: (controller) => Column(
children: [
Padding(
padding: const EdgeInsets.all(16),
child: Container(
decoration:
const BoxDecoration(color: AppColor.secondaryColor),
child: TextField(
decoration: InputDecoration(
suffixIcon: const Icon(Icons.search),
hintText: 'Type here Place',
hintMaxLines: 1,
prefixIcon: IconButton(
onPressed: () {
controller.placeController.clear();
controller.clearPlaces();
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Column(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Column(
children: [
Image.network(
res['icon'],
width: 20,
),
IconButton(
onPressed: () async {
await sql.insertData({
'latitude': res['geometry']
['location']['lat'],
'longitude': res['geometry']
['location']['lng'],
'name': res['name'].toString(),
'rate': res['rating'].toString(),
}, TableName.placesFavorite);
},
icon: const Icon(Icons.favorite_border),
),
],
),
Column(
children: [
Text(
res['name'].toString(),
style: AppStyle.title,
),
Text(
res['vicinity'].toString(),
style: AppStyle.subtitle,
),
],
),
Column(
children: [
Text(
'rate',
style: AppStyle.subtitle,
),
Text(
res['rating'].toString(),
style: AppStyle.subtitle,
),
],
),
],
),
const Divider(
thickness: 1,
)
],
),
),
);
},
),
),
Padding(
padding: const EdgeInsets.all(16),
child: Container(
decoration:
const BoxDecoration(color: AppColor.secondaryColor),
child: TextField(
decoration: InputDecoration(
suffixIcon: const Icon(Icons.search),
hintText: 'Type here Place',
hintMaxLines: 1,
prefixIcon: IconButton(
onPressed: () {
controller.placeController.clear();
controller.clearPlaces();
},
icon: Icon(
Icons.clear,
color: Colors.red[300],
),
icon: Icon(
Icons.clear,
color: Colors.red[300],
),
),
controller: controller.placeController,
onChanged: (value) {
if (controller.placeController.text.length > 5) {
controller.getPlaces();
controller.changeHeight();
}
},
// onEditingComplete: () => controller.changeHeight(),
),
controller: controller.placeController,
onChanged: (value) {
if (controller.placeController.text.length > 5) {
controller.getPlaces();
controller.changeHeight();
}
},
// onEditingComplete: () => controller.changeHeight(),
),
)
],
),
),
),
Container(
height: controller.places.isNotEmpty ? controller.height : 0,
color: AppColor.secondaryColor,
child: ListView.builder(
itemCount: controller.places.length,
itemBuilder: (BuildContext context, int index) {
var res = controller.places[index];
return InkWell(
onTap: () {
controller.changeHeight();
Get.defaultDialog(
title: 'Are You sure to ride to ${res['name']}',
middleText: '',
confirm: MyElevatedButton(
title: 'Confirm'.tr,
onPressed: () {
controller.clearpolyline();
controller.getMap(
'${controller.mylocation.latitude.toString()},${controller.mylocation.longitude.toString()}',
"${res['geometry']['location']['lat']},${res['geometry']['location']['lng']}");
controller.places = [];
controller.placeController.clear();
Get.back();
controller.changeButtomSheetShown();
controller.bottomSheet();
controller.changeMainBottomMenuMap();
}),
);
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
children: [
Image.network(
res['icon'],
width: 20,
),
IconButton(
onPressed: () async {
await sql.insertData({
'latitude': res['geometry']
['location']['lat'],
'longitude': res['geometry']
['location']['lng'],
'name': res['name'].toString(),
'rate': res['rating'].toString(),
}, TableName.placesFavorite);
},
icon: const Icon(Icons.favorite_border),
),
],
),
Column(
children: [
Text(
res['name'].toString(),
style: AppStyle.title,
),
Text(
res['vicinity'].toString(),
style: AppStyle.subtitle,
),
],
),
Column(
children: [
Text(
'rate',
style: AppStyle.subtitle,
),
Text(
res['rating'].toString(),
style: AppStyle.subtitle,
),
],
),
],
),
const Divider(
thickness: 1,
)
],
),
),
);
},
),
)
],
));
}

196
lib/views/home/map_widget.dart/main_bottom_Menu_map.dart Normal file
View File

@@ -0,0 +1,196 @@
import 'package:animated_text_kit/animated_text_kit.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/box_name.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/controller/home/map_page_controller.dart';
import 'package:ride/main.dart';
import 'package:ride/views/home/map_widget.dart/form_search_places.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import '../../../constant/colors.dart';
import '../../../constant/table_names.dart';
class MainBottomMenuMap extends StatelessWidget {
const MainBottomMenuMap({super.key});
@override
Widget build(BuildContext context) {
Get.put(MapController());
return GetBuilder<MapController>(
builder: (controller) => Positioned(
bottom: 3,
left: 5,
right: 5,
child: AnimatedContainer(
duration: const Duration(milliseconds: 400),
height: controller.mainBottomMenuMap,
decoration: const BoxDecoration(
boxShadow: [
BoxShadow(
color: AppColor.accentColor, offset: Offset(2, 2)),
BoxShadow(
color: AppColor.accentColor, offset: Offset(-2, -2))
],
color: AppColor.secondaryColor,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(15),
topRight: Radius.circular(15),
)),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.all(15),
child: Container(
width: Get.width * .8,
height: Get.height * .1,
decoration: const BoxDecoration(
boxShadow: [
BoxShadow(
color: AppColor.accentColor,
blurRadius: 5,
offset: Offset(2, 4)),
BoxShadow(
color: AppColor.accentColor,
blurRadius: 5,
offset: Offset(-2, -2))
],
color: AppColor.secondaryColor,
borderRadius: BorderRadius.all(
Radius.elliptical(15, 30),
),
),
child: DefaultTextStyle(
style: AppStyle.title,
child: Center(
child: AnimatedTextKit(
animatedTexts: [
ScaleAnimatedText(
'Where to ${box.read(BoxName.name)}'),
WavyAnimatedText(
'Where to ${box.read(BoxName.name)}'),
FlickerAnimatedText(
'Where to ${box.read(BoxName.name)}'),
WavyAnimatedText(
'Where to ${box.read(BoxName.name)}'),
],
isRepeatingAnimation: true,
onTap: () {
print("Tap Event");
controller.changeMainBottomMenuMap();
},
),
),
)),
),
controller.isMainBottomMenuMap
? FavioratePlacesDialogu()
: const SizedBox(),
controller.isMainBottomMenuMap
? const SizedBox()
: Text('From : Current Location',style: AppStyle.subtitle,),
controller.isMainBottomMenuMap
? const SizedBox()
: formSearchPlaces()
],
),
),
));
}
}
class FavioratePlacesDialogu extends StatelessWidget {
FavioratePlacesDialogu({
super.key,
});
final controller = MapController();
@override
Widget build(BuildContext context) {
return DefaultTextStyle(
style: AppStyle.title,
child: Center(
child: AnimatedTextKit(
animatedTexts: [
TypewriterAnimatedText('Favorite Places'.tr),
ScaleAnimatedText(
'Favorite Places'.tr,
),
TyperAnimatedText(
'Favorite Places'.tr,
),
],
isRepeatingAnimation: true,
onTap: () async {
List favoritePlaces =
await sql.getAllData(TableName.placesFavorite);
print(favoritePlaces);
Get.defaultDialog(
title: 'Favorite Places'.tr,
content: SizedBox(
width: Get.width * .8,
height: 300,
child: favoritePlaces.isEmpty
? Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(
Icons.hourglass_empty_rounded,
size: 99,
color: AppColor.primaryColor,
),
Text(
'You Dont Have Any places yet !'.tr,
style: AppStyle.title,
),
],
),
)
: ListView.builder(
itemCount: favoritePlaces.length,
itemBuilder: (BuildContext context, int index) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
TextButton(
onPressed: () async {
await controller.getMap(
'${controller.mylocation.latitude},${controller.mylocation.longitude}',
'${favoritePlaces[index]['latitude']},${favoritePlaces[index]['longitude']}',
);
controller.changePickerShown();
controller.changeButtomSheetShown();
controller.bottomSheet();
Get.back();
},
child: Text(
favoritePlaces[index]['name'],
style: AppStyle.title,
),
),
IconButton(
onPressed: () async {
await sql.deleteData(TableName.placesFavorite,
favoritePlaces[index]['id']);
Get.back();
Get.snackbar('Deleted ',
'You are Delete ${favoritePlaces[index]['name']} from your list',
backgroundColor: AppColor.accentColor);
},
icon: const Icon(Icons.favorite_outlined),
),
],
);
},
),
),
cancel: MyElevatedButton(
title: 'Back'.tr, onPressed: () => Get.back()),
);
},
),
),
);
}
}

72
lib/views/home/map_widget.dart/picker_animation_container.dart
View File

@@ -25,9 +25,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
right: 5,
child: AnimatedContainer(
duration: const Duration(milliseconds: 300),
height: controller.places.isNotEmpty
? 300
: controller.heightPickerContainer,
height: controller.heightPickerContainer,
decoration: const BoxDecoration(
boxShadow: [
BoxShadow(
@@ -41,7 +39,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
topRight: Radius.circular(15),
)),
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
controller.isPickerShown
? const SizedBox()
@@ -50,6 +48,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
style: AppStyle.title,
),
Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
const SizedBox(
height: 5,
@@ -61,7 +60,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
controller.changeHeight();
},
child: Container(
height: 4,
height: 7,
width: Get.width * .3,
decoration: BoxDecoration(
color: AppColor.accentColor,
@@ -76,7 +75,7 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
? InkWell(
onTap: () {},
child: formSearchPlaces(),
)
)
: Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
@@ -85,12 +84,10 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
onPressed: () {
controller.changePickerShown();
},
child: Builder(builder: (context) {
return Text(
"Pick your destination from Map".tr,
style: AppStyle.subtitle,
);
}),
child: Text(
"Pick your destination from Map".tr,
style: AppStyle.subtitle,
),
),
TextButton(
onPressed: () async {
@@ -181,37 +178,38 @@ class PickerAnimtionContainerFormPlaces extends StatelessWidget {
},
),
),
onCancel: () {},
);
},
child: Builder(builder: (context) {
return Text(
"Go To Favorite Places".tr,
style: AppStyle.subtitle,
);
}),
child: Text(
"Go To Favorite Places".tr,
style: AppStyle.subtitle,
),
),
],
)
),
if (controller.isPickerShown &&
controller.places.isEmpty)
MyElevatedButton(
title: 'Go to this Target',
onPressed: () async {
await controller.getMap(
'${controller.mylocation.latitude},${controller.mylocation.longitude}',
'${controller.newMylocation.latitude},${controller.newMylocation.longitude}',
);
controller.changePickerShown();
controller.changeButtomSheetShown();
controller.bottomSheet();
// await sql
// .getAllData(TableName.placesFavorite)
// .then((value) => print(value));
},
),
if (controller.isPickerShown &&
controller.places.isEmpty)
const SizedBox(),
],
),
if (controller.isPickerShown && controller.places.isEmpty)
MyElevatedButton(
title: 'Go to this Target',
onPressed: () async {
await controller.getMap(
'${controller.mylocation.latitude},${controller.mylocation.longitude}',
'${controller.newMylocation.latitude},${controller.newMylocation.longitude}',
);
controller.changePickerShown();
controller.changeButtomSheetShown();
controller.bottomSheet();
// await sql
// .getAllData(TableName.placesFavorite)
// .then((value) => print(value));
},
),
if (controller.isPickerShown && controller.places.isEmpty)
const SizedBox(),
],
),
),

30
pubspec.lock
View File

@@ -69,10 +69,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.17.2"
convert:
dependency: transitive
description:
@@ -508,18 +508,18 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.5.0"
meta:
dependency: transitive
description:
@@ -641,10 +641,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
sqflite:
dependency: "direct main"
description:
@@ -713,10 +713,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.6.0"
timezone:
dependency: transitive
description:
@@ -805,6 +805,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
win32:
dependency: transitive
description:
@@ -830,5 +838,5 @@ packages:
source: hosted
version: "6.3.0"
sdks:
dart: ">=3.0.5 <4.0.0"
dart: ">=3.1.0-185.0.dev <4.0.0"
flutter: ">=3.10.0"