nouffer/rog_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update for get listview update

Browse Source
This commit is contained in:
Mohamed Nouffer
2022-06-29 18:25:19 +05:30
parent 7b9d029bb0
commit 4db26e5490
61 changed files with 121 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
lib/pages/destination/destination_controller.dart
View File

@ -21,6 +21,7 @@ class DestinationController extends GetxController {
late LocationSettings locationSettings;
var destinationCount = 0.obs;
List<dynamic> destinations = <dynamic>[].obs;
List<Map<String, dynamic>> destination_index_data = <Map<String, dynamic>>[].obs;
@ -101,58 +102,57 @@ class DestinationController extends GetxController {
@override
void onInit() {
super.onInit();
PopulateDestinations();
print("------ in iniit");
if (defaultTargetPlatform == TargetPlatform.android) {
locationSettings = AndroidSettings(
accuracy: LocationAccuracy.high,
distanceFilter: 30,
forceLocationManager: true,
intervalDuration: const Duration(seconds: 10),
//(Optional) Set foreground notification config to keep the app alive
//when going to the background
foregroundNotificationConfig: const ForegroundNotificationConfig(
notificationText:
"Example app will continue to receive your location even when you aren't using it",
notificationTitle: "Running in Background",
enableWakeLock: true,
)
);
} else if (defaultTargetPlatform == TargetPlatform.iOS || defaultTargetPlatform == TargetPlatform.macOS) {
locationSettings = AppleSettings(
accuracy: LocationAccuracy.high,
activityType: ActivityType.fitness,
distanceFilter: 1,
pauseLocationUpdatesAutomatically: false,
// Only set to true if our app will be started up in the background.
showBackgroundLocationIndicator: true
);
} else {
locationSettings = LocationSettings(
accuracy: LocationAccuracy.high,
distanceFilter: 30,
);
}
// if (defaultTargetPlatform == TargetPlatform.android) {
// locationSettings = AndroidSettings(
// accuracy: LocationAccuracy.high,
// distanceFilter: 30,
// forceLocationManager: true,
// intervalDuration: const Duration(seconds: 10),
// //(Optional) Set foreground notification config to keep the app alive
// //when going to the background
// foregroundNotificationConfig: const ForegroundNotificationConfig(
// notificationText:
// "Example app will continue to receive your location even when you aren't using it",
// notificationTitle: "Running in Background",
// enableWakeLock: true,
// )
// );
// } else if (defaultTargetPlatform == TargetPlatform.iOS || defaultTargetPlatform == TargetPlatform.macOS) {
// locationSettings = AppleSettings(
// accuracy: LocationAccuracy.high,
// activityType: ActivityType.fitness,
// distanceFilter: 1,
// pauseLocationUpdatesAutomatically: false,
// // Only set to true if our app will be started up in the background.
// showBackgroundLocationIndicator: true
// );
// } else {
// locationSettings = LocationSettings(
// accuracy: LocationAccuracy.high,
// distanceFilter: 30,
// );
// }
StreamSubscription<Position> positionStream = Geolocator.getPositionStream(locationSettings: locationSettings).listen(
(Position? position) {
if(isSelected[0]){
String user_id = indexController.currentUser[0]["user"]["id"].toString();
TrackingService.addTrack(user_id, position!.latitude, position.longitude).then((val){
//checkForCheckin(position!.latitude, position.longitude);
});
// StreamSubscription<Position> positionStream = Geolocator.getPositionStream(locationSettings: locationSettings).listen(
// (Position? position) {
// if(isSelected[0]){
// String user_id = indexController.currentUser[0]["user"]["id"].toString();
// TrackingService.addTrack(user_id, position!.latitude, position.longitude).then((val){
// //checkForCheckin(position!.latitude, position.longitude);
// });
}
print(position == null ? 'Unknown' : 'current position is ${position.latitude.toString()}, ${position.longitude.toString()}');
});
// }
// print(position == null ? 'Unknown' : 'current position is ${position.latitude.toString()}, ${position.longitude.toString()}');
// });
super.onInit();
}
void deleteDestination(int index){
@ -165,18 +165,20 @@ class DestinationController extends GetxController {
}
void PopulateDestinations(){
print("--------- populsting destinations -----------");
if(indexController.currentUser.isNotEmpty){
int user_id = indexController.currentUser[0]["user"]["id"];
print(user_id);
DestinationService.getDestinations(user_id).then((value){
destinations.clear();
destinations = value;
destinationCount.value = 0;
destinationCount.value = destinations.length;
MatrixService.getDestinations(value).then((mat){
print(mat);
matrix = mat;
destinations.clear();
destinations = value;
});
//var val = value[2]["location"]["id"];

1
lib/pages/destination/destination_page.dart
View File

@ -49,6 +49,7 @@ class _DestinationPageState extends State<DestinationPage> {
@override
void initState() {
destinationController.context = context;
destinationController.PopulateDestinations();
super.initState();
}

29
lib/pages/index/index_controller.dart
View File

@ -164,7 +164,15 @@ void login(String email, String password, BuildContext context){
Get.toNamed(AppPages.INITIAL);
}else{
is_loading.value = false;
Get.snackbar("Failed", "User login failed, please try again.");
Get.snackbar(
"Failed",
"User login failed, please try again.",
icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
snackPosition: SnackPosition.TOP,
duration: Duration(milliseconds: 800),
backgroundColor: Colors.yellow,
//icon:Image(image:AssetImage("assets/images/dora.png"))
);
}
});
@ -181,7 +189,15 @@ void login(String email, String password, BuildContext context){
Get.toNamed(AppPages.INITIAL);
}else{
is_loading.value = false;
Get.snackbar("Failed", "User registration failed, please try again.");
Get.snackbar(
"Failed",
"User registration failed, please try again.",
icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
snackPosition: SnackPosition.TOP,
duration: Duration(milliseconds: 800),
backgroundColor: Colors.yellow,
//icon:Image(image:AssetImage("assets/images/dora.png"))
);
}
});
}
@ -331,6 +347,8 @@ void login(String email, String password, BuildContext context){
void loadLocationsBound(){
String cat = currentCat.isNotEmpty ? currentCat[0] : "";
LatLngBounds bounds = mapController!.bounds!;
currentBound.clear();
currentBound.add(bounds);
//print(currentCat);
if(bounds.southEast != null && bounds.southWest != null && bounds.northEast != null && bounds.southEast != null ){
LocationService.loadLocationsBound(bounds.southWest!.latitude, bounds.southWest!.longitude, bounds.northWest.latitude, bounds.northWest.longitude, bounds.northEast!.latitude, bounds.northEast!.longitude, bounds.southEast.latitude, bounds.southEast.longitude, cat).then((value){
@ -338,20 +356,21 @@ void login(String email, String password, BuildContext context){
if(value == null){
return;
}
locations.clear();
if(value != null && value.collection.isEmpty){
Get.snackbar(
"Too many Points",
"please zoom in",
icon: Icon(Icons.person, color: Colors.white),
snackPosition: SnackPosition.BOTTOM,
icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
snackPosition: SnackPosition.TOP,
duration: Duration(milliseconds: 800),
backgroundColor: Colors.yellow,
//icon:Image(image:AssetImage("assets/images/dora.png"))
);
//Get.showSnackbar(GetSnackBar(message: "Too many points, please zoom in",));
}
if(value != null && value.collection.isNotEmpty){
//print("---- added---");
locations.clear();
locations.add(value);
loadCatsv2();
}

10
lib/pages/login/login_page.dart
View File

@ -89,7 +89,15 @@ class LoginPage extends StatelessWidget {
height:60,
onPressed: (){
if(emailController.text.isEmpty || passwordController.text.isEmpty){
Get.snackbar("No values", "Email and password required");
Get.snackbar(
"No values",
"Email and password required",
icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
snackPosition: SnackPosition.TOP,
duration: Duration(milliseconds: 800),
backgroundColor: Colors.yellow,
//icon:Image(image:AssetImage("assets/images/dora.png"))
);
return;
}
indexController.is_loading.value = true;

20
lib/pages/register/register_page.dart
View File

@ -82,10 +82,26 @@ class RegisterPage extends StatelessWidget {
height:60,
onPressed: (){
if(passwordController.text != confirmPasswordController.text){
Get.snackbar("No match", "Passwords does not match");
Get.snackbar(
"No match",
"Passwords does not match",
icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
snackPosition: SnackPosition.TOP,
duration: Duration(milliseconds: 800),
backgroundColor: Colors.yellow,
//icon:Image(image:AssetImage("assets/images/dora.png"))
);
}
if(emailController.text.isEmpty || passwordController.text.isEmpty){
Get.snackbar("No values", "Email and password required");
Get.snackbar(
"No values",
"Email and password required",
icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
snackPosition: SnackPosition.TOP,
duration: Duration(milliseconds: 800),
backgroundColor: Colors.yellow,
//icon:Image(image:AssetImage("assets/images/dora.png"))
);
return;
}
indexController.is_loading.value = true;

2
lib/services/action_service.dart
View File

@ -11,6 +11,7 @@ class ActionService{
String server_url = ConstValues.currentServer();
String url = "${server_url}/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}";
//String url = "http://localhost:8100/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}";
print("url is ------ ${url}");
final http.Response response = await http.get(
Uri.parse(url),
headers: <String, String>{
@ -29,6 +30,7 @@ class ActionService{
List<dynamic> cats = [];
String server_url = ConstValues.currentServer();
String url = '${server_url}/api/useraction/?user_id=${user_id}&location_id=${location_id}';
print("url is ------ ${url}");
//String url = 'http://localhost:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}';
final response = await http.get(Uri.parse(url),
headers: <String, String>{

2
lib/utils/const.dart
View File

@ -7,6 +7,6 @@ class ConstValues{
static const dev_ip_server = "http://192.168.8.100:8100";
static String currentServer(){
return server_uri;
return dev_ip_server;
}
}

23
lib/widgets/destination_widget.dart
View File

@ -58,7 +58,6 @@ class DestinationWidget extends StatelessWidget {
//print(element["index"]);
int action_id = destinationController.destinations[element["index"]]["id"] as int;
destinationController.makeOrder(action_id, (element["index"] as int) - 1, "up");
});
}
@ -67,7 +66,6 @@ class DestinationWidget extends StatelessWidget {
//print(element["index"]);
int action_id = destinationController.destinations[element["index"]]["id"] as int;
destinationController.makeOrder(action_id, (element["index"] as int) + 1, "up");
});
}
@ -90,7 +88,8 @@ class DestinationWidget extends StatelessWidget {
Padding(
padding: const EdgeInsets.only(top:45.0),
child: ListView.builder(
itemCount: destinationController.destinations.length,
itemCount: destinationController.destinationCount.value,
//itemCount: destinationController.destinations.length,
// onReorder: (int oldIndex, int newIndex){
// int action_id = destinationController.destinations[oldIndex]["id"] as int;
// //print(action_id);
@ -165,13 +164,17 @@ class DestinationWidget extends StatelessWidget {
),
),
),
startChild: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Text(destinationController.matrix["rows"][0]["elements"][index]["distance"]["text"].toString()),
Text(destinationController.matrix["rows"][0]["elements"][index]["duration"]["text"].toString())
],
),
startChild:
destinationController.matrix["rows"] != null ?
Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Text(destinationController.matrix["rows"][0]["elements"][index]["distance"]["text"].toString()),
Text(destinationController.matrix["rows"][0]["elements"][index]["duration"]["text"].toString())
],
):
Container()
,
);
}

5
lib/widgets/map_widget.dart
View File

@ -161,14 +161,15 @@ class MapWidget extends StatelessWidget {
print("lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
return Marker(
anchorPos: AnchorPos.align(AnchorAlign.center),
height: 70.0,
width: 70.0,
height: 22.0,
width: 22.0,
point: LatLng(p.geoSerie!.geoPoints[0].latitude, p.geoSerie!.geoPoints[0].longitude),
builder: (ctx) => Icon(Icons.pin_drop),
// builder: (ctx) => i.properties!["category"] != null ?
// ImageIcon(
// AssetImage("assets/images/${i.properties!["category"]}.png"),
// color: Color(0xFF3A5A98),
// size:12.0,
// )
// : Icon(Icons.pin_drop),