From 044e5595c2dc13f72c2add9cb9ee094b1d7b8cc5 Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Fri, 3 Mar 2023 17:45:03 +0530 Subject: [PATCH] update finish and check point message --- lib/pages/camera/camera_page.dart | 9 +++++++-- lib/pages/destination/destination_controller.dart | 4 ++-- lib/utils/string_values.dart | 2 ++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/pages/camera/camera_page.dart b/lib/pages/camera/camera_page.dart index e46cc07..c36badd 100644 --- a/lib/pages/camera/camera_page.dart +++ b/lib/pages/camera/camera_page.dart @@ -3,12 +3,14 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; +import 'package:rogapp/model/destination.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 { - CameraPage({Key? key}) : super(key: key); + Destination? destination; + CameraPage({Key? key, this.destination}) : super(key: key); DestinationController destinationController = Get.find(); IndexController indexController = Get.find(); @@ -133,7 +135,10 @@ class CameraPage extends StatelessWidget { appBar: destinationController.is_in_rog.value && destinationController.rogaining_counted.value == true ? AppBar( - title: Text("finishing_rogaining".tr) + title: destination!.cp == -1 ? + Text("finishing_rogaining".tr) + : + Text("cp_pls_take_photo".tr) , leading: IconButton( icon: Text("cancel".tr), diff --git a/lib/pages/destination/destination_controller.dart b/lib/pages/destination/destination_controller.dart index 270713c..c26b32a 100644 --- a/lib/pages/destination/destination_controller.dart +++ b/lib/pages/destination/destination_controller.dart @@ -221,7 +221,7 @@ class DestinationController extends GetxController { is_in_checkin.value = true; photos.clear(); showModalBottomSheet(context: Get.context!, isScrollControlled: true, - builder:((context) => CameraPage()) + builder:((context) => CameraPage(destination: d,)) ).whenComplete((){ skip_gps = false; rogaining_counted.value =true; @@ -267,7 +267,7 @@ class DestinationController extends GetxController { is_at_goal.value = true; photos.clear(); showModalBottomSheet(context: Get.context!, isScrollControlled: true, - builder:((context) => CameraPage()) + builder:((context) => CameraPage(destination: d,)) ).whenComplete((){ skip_gps = false; chekcs = 0; diff --git a/lib/utils/string_values.dart b/lib/utils/string_values.dart index d3bb4fe..58d5114 100644 --- a/lib/utils/string_values.dart +++ b/lib/utils/string_values.dart @@ -53,6 +53,7 @@ class StringValues extends Translations{ 'sight_seeing': 'Sight seeing', 'rogaining' : 'Rogaining', 'finishing_rogaining' : 'Finishing Rogaining', + 'cp_pls_take_photo' : "CP please take a photo", 'take_photo of the clock' : 'Take photo of the clock', 'finish_goal': 'finish Goal', 'goal_saved': "Goal Saved", @@ -126,6 +127,7 @@ class StringValues extends Translations{ 'sight_seeing': '観光', 'rogaining' : 'ロゲイニング', 'finishing_rogaining' : 'ロゲイニングを終えて', + 'cp_pls_take_photo' : "CPです。撮影してください。", 'take_photo of the clock' : '時計の写真を撮る', 'finish_goal': 'フィニッシュゴール', 'goal_saved': "目標を保存しました",