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

removed distance to checkin

Browse Source
This commit is contained in:
Mohamed Nouffer
2023-11-24 12:08:02 +05:30
parent d8fd352a62
commit 9c66dffe69
2 changed files with 46 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/drawer/drawer_page.dart
View File

@ -137,12 +137,8 @@ class DrawerPage extends StatelessWidget {
onTap: () { onTap: () {
String token = indexController.currentUser[0]['token']; String token = indexController.currentUser[0]['token'];
AuthService.deleteUser(token).then((value) { AuthService.deleteUser(token).then((value) {
if (value.isNotEmpty) {
indexController.logout();
Get.toNamed(AppPages.TRAVEL);
Get.snackbar("ユーザーデータを削除する", Get.snackbar("ユーザーデータを削除する",
"データを削除するためにユーザーの同意が設定されています アプリとサーバーでユーザーデータが削除されました"); "データを削除するためにユーザーの同意が設定されています アプリとサーバーでユーザーデータが削除されました");
}
}); });
}, },
) )

24
lib/widgets/bottom_sheet_new.dart
View File

@ -604,15 +604,10 @@ class BottomSheetNew extends GetView<BottomSheetController> {
), ),
// forced start / checkin // forced start / checkin
Obx( Obx(() => ElevatedButton(
() => distanceToDest <=
destinationController
.getForcedChckinDistance(destination)
? ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context) backgroundColor:
.colorScheme Theme.of(context).colorScheme.secondary),
.secondary),
onPressed: () async { onPressed: () async {
//print("~~~~ manual checkin button ~~~~"); //print("~~~~ manual checkin button ~~~~");
if (destination.cp == -1 && if (destination.cp == -1 &&
@ -621,8 +616,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
destinationController destinationController
.rogainingCounted.value == .rogainingCounted.value ==
false) { false) {
destinationController.isInRog.value = destinationController.isInRog.value = true;
true;
destinationController.addToRogaining( destinationController.addToRogaining(
destinationController.currentLat, destinationController.currentLat,
destinationController.currentLon, destinationController.currentLon,
@ -642,15 +636,13 @@ class BottomSheetNew extends GetView<BottomSheetController> {
}, },
child: Text( child: Text(
destination.cp == -1 && destination.cp == -1 &&
destinationController destinationController.isInRog.value ==
.isInRog.value ==
false && false &&
destinationController destinationController
.rogainingCounted.value == .rogainingCounted.value ==
false false
? "ロゲ開始" ? "ロゲ開始"
: destinationController : destinationController.isInRog.value ==
.isInRog.value ==
true && true &&
destination.cp == -1 destination.cp == -1
? "ゲーム中" ? "ゲーム中"
@ -660,9 +652,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.onSecondary))) .onSecondary))))
: Container(),
)
// ElevatedButton( // ElevatedButton(
// onPressed: () {}, child: const Text("ゲーム中")), // onPressed: () {}, child: const Text("ゲーム中")),
], ],