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

8-24/1

Browse Source
This commit is contained in:
Hamza-Ayed
2023-08-24 18:29:47 +03:00
parent c1869d2725
commit 63770619d6
48 changed files with 400 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,9 @@ class MapPage extends StatelessWidget {
'${argument.latitude.toString()},${argument.longitude.toString()}');
Get.back();
controller.changeButtomSheetShown();
controller.bottomSheet();
controller.showBottomSheet1();
//
},
);
},
@@ -69,6 +70,7 @@ class MapPage extends StatelessWidget {
for (var carLocation
in controller.carsLocationByPassenger)
Marker(
// anchor: const Offset(4, 4),
position: carLocation,
icon: controller.carIcon,
markerId: MarkerId(carLocation.toString())),
@@ -149,7 +151,10 @@ class MapPage extends StatelessWidget {
top: 80,
left: 6,
child: IconButton(
onPressed: () => controller.changeMapType(),
onPressed: () {
controller.changeMapType();
controller.reloadMarkers();
},
icon: const Icon(
Icons.satellite_alt,
size: 35,
@@ -158,7 +163,7 @@ class MapPage extends StatelessWidget {
),
const PickerIconOnMap(),
// PickerAnimtionContainerFormPlaces(),
MainBottomMenuMap(),
const MainBottomMenuMap(),
const MapMenuWidget(),
const MenuIconMapPageWidget(),
buttomSheetMapPage(),
@@ -178,8 +183,8 @@ class MapPage extends StatelessWidget {
),
))
: const SizedBox()),
CashConfirmPageShown(),
PaymentMethodPage()
const CashConfirmPageShown(),
const PaymentMethodPage()
],
),
);

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

@@ -63,15 +63,16 @@ GetBuilder<MapController> formSearchPlaces() {
title: 'Confirm'.tr,
onPressed: () {
controller.clearpolyline();
controller.data = [];
controller.getMap(
'${controller.mylocation.latitude.toString()},${controller.mylocation.longitude.toString()}',
"${res['geometry']['location']['lat']},${res['geometry']['location']['lng']}");
controller.places = [];
controller.placeController.clear();
controller.showBottomSheet1();
Get.back();
controller.changeButtomSheetShown();
controller.bottomSheet();
controller.showBottomSheet1();
controller.changeMainBottomMenuMap();
}),
);

64
lib/views/home/map_widget.dart/main_bottom_Menu_map.dart
View File

@@ -61,31 +61,43 @@ class MainBottomMenuMap extends StatelessWidget {
Radius.elliptical(15, 30),
),
),
child: DefaultTextStyle(
style: AppStyle.title,
child: Center(
child: AnimatedTextKit(
animatedTexts: [
ScaleAnimatedText(
'${'Where to'.tr} ${box.read(BoxName.name)}'),
WavyAnimatedText(
'${'Where to'.tr} ${box.read(BoxName.name)}'),
FlickerAnimatedText(
'${'Where to'.tr} ${box.read(BoxName.name)}'),
WavyAnimatedText(
'${'Where to'.tr} ${box.read(BoxName.name)}'),
],
isRepeatingAnimation: true,
onTap: () {
print("Tap Event");
controller.changeMainBottomMenuMap();
},
child: GestureDetector(
onTap: () => controller.changeMainBottomMenuMap(),
child: DefaultTextStyle(
style: AppStyle.title,
child: Center(
child: Column(
children: [
SizedBox(
height: 30,
child: AnimatedTextKit(
animatedTexts: [
ScaleAnimatedText(
'${'Where to'.tr} ${box.read(BoxName.name)}'),
// WavyAnimatedText(
// '${'Where to'.tr} ${box.read(BoxName.name)}'),
// FlickerAnimatedText(
// '${'Where to'.tr} ${box.read(BoxName.name)}'),
// WavyAnimatedText(
// '${'Where to'.tr} ${box.read(BoxName.name)}'),
],
isRepeatingAnimation: true,
onTap: () {
print("Tap Event");
},
),
),
Text('Nearst Car for you about '.tr +
controller.nearestCar!.duration
.toString())
],
),
),
),
)),
),
controller.isMainBottomMenuMap
? FavioratePlacesDialogu()
? const FavioratePlacesDialogu()
: const SizedBox(),
controller.isMainBottomMenuMap
? const SizedBox()
@@ -121,9 +133,9 @@ class FavioratePlacesDialogu extends StatelessWidget {
ScaleAnimatedText(
'Favorite Places'.tr,
),
TyperAnimatedText(
'Favorite Places'.tr,
),
// TyperAnimatedText(
// 'Favorite Places'.tr,
// ),
],
isRepeatingAnimation: true,
onTap: () async {
@@ -165,10 +177,10 @@ class FavioratePlacesDialogu extends StatelessWidget {
'${controller.mylocation.latitude},${controller.mylocation.longitude}',
'${favoritePlaces[index]['latitude']},${favoritePlaces[index]['longitude']}',
);
controller.changePickerShown();
controller.changeButtomSheetShown();
controller.bottomSheet();
// controller.changePickerShown();
controller.showBottomSheet1();
Get.back();
controller.showBottomSheet1();
},
child: Text(
favoritePlaces[index]['name'],