BASE: Update Icons & Name Of The App.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
// Flutter Packages
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
|
||||
/// A [Widget] to show when there is no data to display.
|
||||
class EmptyScreen extends StatelessWidget {
|
||||
@@ -10,8 +10,6 @@ class EmptyScreen extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Center(
|
||||
child: Text('Nothing found here...'.tr()),
|
||||
);
|
||||
return Center(child: Text('Nothing found here...'.tr()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'dart:convert';
|
||||
import 'package:customer/widget/osm_map/place_model.dart';
|
||||
import 'package:flutter_map/flutter_map.dart';
|
||||
import 'package:geolocator/geolocator.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:http/http.dart' as http;
|
||||
import '../../utils/utils.dart';
|
||||
import 'package:latlong2/latlong.dart';
|
||||
@@ -20,11 +20,15 @@ class OSMMapController extends GetxController {
|
||||
}
|
||||
|
||||
final url = Uri.parse(
|
||||
'https://nominatim.openstreetmap.org/search?q=$query&format=json&addressdetails=1&limit=10');
|
||||
'https://nominatim.openstreetmap.org/search?q=$query&format=json&addressdetails=1&limit=10',
|
||||
);
|
||||
|
||||
final response = await http.get(url, headers: {
|
||||
'User-Agent': 'FlutterMapApp/1.0 (menil.siddhiinfosoft@gmail.com)',
|
||||
});
|
||||
final response = await http.get(
|
||||
url,
|
||||
headers: {
|
||||
'User-Agent': 'FlutterMapApp/1.0 (menil.siddhiinfosoft@gmail.com)',
|
||||
},
|
||||
);
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = json.decode(response.body);
|
||||
@@ -52,11 +56,15 @@ class OSMMapController extends GetxController {
|
||||
|
||||
Future<String> _getAddressFromLatLng(LatLng coords) async {
|
||||
final url = Uri.parse(
|
||||
'https://nominatim.openstreetmap.org/reverse?lat=${coords.latitude}&lon=${coords.longitude}&format=json');
|
||||
'https://nominatim.openstreetmap.org/reverse?lat=${coords.latitude}&lon=${coords.longitude}&format=json',
|
||||
);
|
||||
|
||||
final response = await http.get(url, headers: {
|
||||
'User-Agent': 'FlutterMapApp/1.0 (menil.siddhiinfosoft@gmail.com)',
|
||||
});
|
||||
final response = await http.get(
|
||||
url,
|
||||
headers: {
|
||||
'User-Agent': 'FlutterMapApp/1.0 (menil.siddhiinfosoft@gmail.com)',
|
||||
},
|
||||
);
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = json.decode(response.body);
|
||||
@@ -79,10 +87,13 @@ class OSMMapController extends GetxController {
|
||||
|
||||
Future<void> getCurrentLocation() async {
|
||||
Position? location = await Utils.getCurrentLocation();
|
||||
LatLng latlng =
|
||||
LatLng(location?.latitude ?? 0.0, location?.longitude ?? 0.0);
|
||||
LatLng latlng = LatLng(
|
||||
location?.latitude ?? 0.0,
|
||||
location?.longitude ?? 0.0,
|
||||
);
|
||||
addLatLngOnly(
|
||||
LatLng(location?.latitude ?? 0.0, location?.longitude ?? 0.0));
|
||||
LatLng(location?.latitude ?? 0.0, location?.longitude ?? 0.0),
|
||||
);
|
||||
mapController.move(latlng, mapController.camera.zoom);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_map/flutter_map.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:latlong2/latlong.dart';
|
||||
import '../../controllers/theme_controller.dart';
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:geolocator/geolocator.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import '../themes/app_them_data.dart';
|
||||
import '../themes/round_button_fill.dart';
|
||||
|
||||
@@ -21,10 +21,15 @@ class PermissionDialog extends StatelessWidget {
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(Icons.add_location_alt_rounded, color: Theme.of(context).primaryColor, size: 100),
|
||||
Icon(
|
||||
Icons.add_location_alt_rounded,
|
||||
color: Theme.of(context).primaryColor,
|
||||
size: 100,
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
Text(
|
||||
'You denied location permission forever. Please allow location permission from your app settings and receive more accurate delivery.'.tr(),
|
||||
'You denied location permission forever. Please allow location permission from your app settings and receive more accurate delivery.'
|
||||
.tr(),
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(fontSize: 18),
|
||||
),
|
||||
@@ -34,7 +39,13 @@ class PermissionDialog extends StatelessWidget {
|
||||
Expanded(
|
||||
child: TextButton(
|
||||
style: TextButton.styleFrom(
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30), side: BorderSide(width: 2, color: Theme.of(context).primaryColor)),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(30),
|
||||
side: BorderSide(
|
||||
width: 2,
|
||||
color: Theme.of(context).primaryColor,
|
||||
),
|
||||
),
|
||||
minimumSize: const Size(1, 50),
|
||||
),
|
||||
child: Text('close'.tr()),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:customer/widget/place_picker/selected_location_model.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:geolocator/geolocator.dart';
|
||||
import 'package:geocoding/geocoding.dart';
|
||||
@@ -34,11 +34,15 @@ class LocationController extends GetxController {
|
||||
|
||||
Future<void> getCurrentLocation() async {
|
||||
try {
|
||||
Position position = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high);
|
||||
Position position = await Geolocator.getCurrentPosition(
|
||||
desiredAccuracy: LocationAccuracy.high,
|
||||
);
|
||||
selectedLocation.value = LatLng(position.latitude, position.longitude);
|
||||
|
||||
if (mapController != null) {
|
||||
mapController!.animateCamera(CameraUpdate.newLatLngZoom(selectedLocation.value!, 15));
|
||||
mapController!.animateCamera(
|
||||
CameraUpdate.newLatLngZoom(selectedLocation.value!, 15),
|
||||
);
|
||||
}
|
||||
|
||||
await getAddressFromLatLng(selectedLocation.value!);
|
||||
@@ -49,11 +53,15 @@ class LocationController extends GetxController {
|
||||
|
||||
Future<void> getAddressFromLatLng(LatLng latLng) async {
|
||||
try {
|
||||
List<Placemark> placemarks = await placemarkFromCoordinates(latLng.latitude, latLng.longitude);
|
||||
List<Placemark> placemarks = await placemarkFromCoordinates(
|
||||
latLng.latitude,
|
||||
latLng.longitude,
|
||||
);
|
||||
if (placemarks.isNotEmpty) {
|
||||
Placemark place = placemarks.first;
|
||||
selectedPlaceAddress.value = place;
|
||||
address.value = "${place.street}, ${place.locality}, ${place.administrativeArea}, ${place.country}";
|
||||
address.value =
|
||||
"${place.street}, ${place.locality}, ${place.administrativeArea}, ${place.country}";
|
||||
} else {
|
||||
address.value = "Address not found";
|
||||
}
|
||||
@@ -71,7 +79,10 @@ class LocationController extends GetxController {
|
||||
try {
|
||||
List<Location> locations = await locationFromAddress(zipCode);
|
||||
if (locations.isNotEmpty) {
|
||||
selectedLocation.value = LatLng(locations.first.latitude, locations.first.longitude);
|
||||
selectedLocation.value = LatLng(
|
||||
locations.first.latitude,
|
||||
locations.first.longitude,
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
print("Error getting coordinates for ZIP code: $e");
|
||||
@@ -80,7 +91,10 @@ class LocationController extends GetxController {
|
||||
|
||||
void confirmLocation() {
|
||||
if (selectedLocation.value != null) {
|
||||
SelectedLocationModel selectedLocationModel = SelectedLocationModel(address: selectedPlaceAddress.value, latLng: selectedLocation.value);
|
||||
SelectedLocationModel selectedLocationModel = SelectedLocationModel(
|
||||
address: selectedPlaceAddress.value,
|
||||
latLng: selectedLocation.value,
|
||||
);
|
||||
Get.back(result: selectedLocationModel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_google_places_hoc081098/flutter_google_places_hoc081098.dart';
|
||||
import 'package:flutter_google_places_hoc081098/google_maps_webservice_places.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
|
||||
final GoogleMapsPlaces _places = GoogleMapsPlaces(apiKey: Constant.mapAPIKey);
|
||||
|
||||
@@ -4,8 +4,6 @@ import 'dart:ui' as ui;
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
|
||||
import 'package:get/get_utils/src/extensions/internacionalization.dart';
|
||||
|
||||
import '../controller/story_controller.dart';
|
||||
import '../utils.dart';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user