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

fixed details screen checkin

Browse Source
This commit is contained in:
Mohamed Nouffer
2023-11-22 12:58:29 +05:30
parent 8a1e5b1ca8
commit 4e4cfda40b
2 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,6 +485,7 @@ class DestinationController extends GetxController {
rogainingCounted.value = true;
chekcs = 0;
isInCheckin.value = false;
Get.back();
});
} else {
skipGps = false;

103
lib/widgets/bottom_sheet_new.dart
View File

@ -600,51 +600,64 @@ class BottomSheetNew extends GetView<BottomSheetController> {
),
// forced start / checkin
distanceToDest <=
destinationController
.getForcedChckinDistance(destination) &&
destinationController.isInRog.value == false &&
// destinationController.isInCheckin.value ==
// true &&
destinationController.rogainingCounted.value ==
false
? ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context)
.colorScheme
.secondary),
onPressed: () async {
//print("~~~~ manual checkin button ~~~~");
if (destination.cp == -1) {
destinationController.isInRog.value = true;
destinationController.addToRogaining(
destinationController.currentLat,
destinationController.currentLon,
destination.location_id!);
saveGameState();
ExternalService()
.startRogaining()
.then((value) => Get.back());
} else {
await destinationController
.callforCheckin(destination);
}
},
child: Text(
destinationController
.festuretoDestination(
indexController
.currentFeature[0])
.cp ==
-1
? "ロゲ開始"
: "チェックイン",
style: TextStyle(
color: Theme.of(context)
.colorScheme
.onSecondary)))
: ElevatedButton(
onPressed: () {}, child: const Text("ゲーム中")),
Obx(
() => distanceToDest <=
destinationController
.getForcedChckinDistance(destination)
? ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context)
.colorScheme
.secondary),
onPressed: () async {
//print("~~~~ manual checkin button ~~~~");
if (destination.cp == -1 &&
destinationController.isInRog.value ==
false &&
destinationController
.rogainingCounted.value ==
false) {
destinationController.isInRog.value =
true;
destinationController.addToRogaining(
destinationController.currentLat,
destinationController.currentLon,
destination.location_id!);
saveGameState();
ExternalService()
.startRogaining()
.then((value) => Get.back());
} else {
Get.back();
await destinationController
.callforCheckin(destination);
}
},
child: Text(
destination.cp == -1 &&
destinationController
.isInRog.value ==
false &&
destinationController
.rogainingCounted.value ==
false
? "ロゲ開始"
: destinationController
.isInRog.value ==
true &&
destination.cp == -1
? "ゲーム中"
: isAlreadyCheckedIn == true
? "ゲーム中"
: "チェックイン",
style: TextStyle(
color: Theme.of(context)
.colorScheme
.onSecondary)))
: Container(),
)
// ElevatedButton(
// onPressed: () {}, child: const Text("ゲーム中")),
],
),
Row(