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

integrated with previous

Browse Source
This commit is contained in:
Mohamed Nouffer
2023-06-09 15:55:59 +05:30
parent a358f65853
commit 2cd685b65e
23 changed files with 1950 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pages/camera/camera_page.dart
View File

@ -4,12 +4,13 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
import 'package:rogapp/model/destination.dart';
import 'package:rogapp/model/location_response.dart';
import 'package:rogapp/pages/destination/destination_controller.dart';
import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/services/external_service.dart';
class CameraPage extends StatelessWidget {
Destination? destination;
Feature? destination;
CameraPage({Key? key, this.destination}) : super(key: key);
DestinationController destinationController = Get.find<DestinationController>();
IndexController indexController = Get.find<IndexController>();
@ -135,7 +136,7 @@ class CameraPage extends StatelessWidget {
appBar:
destinationController.is_in_rog.value && destinationController.rogaining_counted.value == true ?
AppBar(
title: destination!.cp == -1 ?
title: destination!.properties!.cp == -1 ?
Text("finishing_rogaining".tr)
:
Text("cp_pls_take_photo".tr)

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

@ -221,14 +221,14 @@ class DestinationController extends GetxController {
chekcs = 3;
is_in_checkin.value = true;
photos.clear();
showModalBottomSheet(context: Get.context!, isScrollControlled: true,
builder:((context) => CameraPage(destination: d,))
).whenComplete((){
skip_gps = false;
rogaining_counted.value =true;
chekcs = 0;
is_in_checkin.value = false;
});
// showModalBottomSheet(context: Get.context!, isScrollControlled: true,
// builder:((context) => CameraPage(destination: d,))
// ).whenComplete((){
// skip_gps = false;
// rogaining_counted.value =true;
// chekcs = 0;
// is_in_checkin.value = false;
// });
}
else if(is_in_rog.value == true && d.cp != -1){
chekcs = 4;
@ -267,13 +267,13 @@ class DestinationController extends GetxController {
chekcs = 5;
is_at_goal.value = true;
photos.clear();
showModalBottomSheet(context: Get.context!, isScrollControlled: true,
builder:((context) => CameraPage(destination: d,))
).whenComplete((){
skip_gps = false;
chekcs = 0;
is_at_goal.value = false;
});
// showModalBottomSheet(context: Get.context!, isScrollControlled: true,
// builder:((context) => CameraPage(destination: d,))
// ).whenComplete((){
// skip_gps = false;
// chekcs = 0;
// is_at_goal.value = false;
// });
}
else if(is_in_rog.value == false && indexController.rog_mode == 1 && DateTime.now().difference(last_goal_at).inHours >= 24){
//start

2
lib/pages/destination_map/destination_map_page.dart
View File

@ -91,7 +91,7 @@ class DestinationMapPage extends StatelessWidget {
),
),
),
Container( color: Colors.yellow, child: Text(TextUtils.getDisplayText(d), style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),)),
//Container( color: Colors.yellow, child: Text(TextUtils.getDisplayText(d), style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),)),
],
),
);