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; rogainingCounted.value = true;
chekcs = 0; chekcs = 0;
isInCheckin.value = false; isInCheckin.value = false;
Get.back();
}); });
} else { } else {
skipGps = false; skipGps = false;

103
lib/widgets/bottom_sheet_new.dart
View File

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