fix display text issue
This commit is contained in:
@ -223,9 +223,9 @@ class CameraPage extends StatelessWidget {
|
|||||||
appBar: destinationController.is_in_rog.value &&
|
appBar: destinationController.is_in_rog.value &&
|
||||||
destinationController.rogaining_counted.value == true
|
destinationController.rogaining_counted.value == true
|
||||||
? AppBar(
|
? AppBar(
|
||||||
title: destination!.cp == -1
|
title: destination.cp == -1
|
||||||
? Text("finishing_rogaining".tr)
|
? Text("finishing_rogaining".tr)
|
||||||
: Text("${destination!.sub_loc_id} : ${destination!.name}".tr),
|
: Text("${destination.sub_loc_id} : ${destination.name}"),
|
||||||
leading: IconButton(
|
leading: IconButton(
|
||||||
icon: Text("cancel".tr),
|
icon: Text("cancel".tr),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
@ -240,7 +240,7 @@ class CameraPage extends StatelessWidget {
|
|||||||
centerTitle: true,
|
centerTitle: true,
|
||||||
)
|
)
|
||||||
: AppBar(
|
: AppBar(
|
||||||
title: const Text("チェックポイント"),
|
title: Text("${destination.sub_loc_id} : ${destination.name}"),
|
||||||
),
|
),
|
||||||
body: Column(
|
body: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||||
|
|||||||
@ -86,6 +86,7 @@ class DestinationController extends GetxController {
|
|||||||
|
|
||||||
return Destination(
|
return Destination(
|
||||||
name: fs.properties!["location_name"],
|
name: fs.properties!["location_name"],
|
||||||
|
sub_loc_id: fs.properties!["sub_loc_id"],
|
||||||
address: fs.properties!["address"],
|
address: fs.properties!["address"],
|
||||||
phone: fs.properties!["phone"],
|
phone: fs.properties!["phone"],
|
||||||
email: fs.properties!["email"],
|
email: fs.properties!["email"],
|
||||||
|
|||||||
@ -50,7 +50,9 @@ class MapWidget extends StatelessWidget {
|
|||||||
context: context,
|
context: context,
|
||||||
isScrollControlled: true,
|
isScrollControlled: true,
|
||||||
isDismissible: true,
|
isDismissible: true,
|
||||||
builder: ((context) => BottomSheetNew(destination: des,))
|
builder: ((context) => BottomSheetNew(
|
||||||
|
destination: des,
|
||||||
|
))
|
||||||
//builder:((context) => BottomSheetWidget())
|
//builder:((context) => BottomSheetWidget())
|
||||||
).whenComplete(() {
|
).whenComplete(() {
|
||||||
destinationController.skip_gps = false;
|
destinationController.skip_gps = false;
|
||||||
@ -178,7 +180,20 @@ class MapWidget extends StatelessWidget {
|
|||||||
)
|
)
|
||||||
: Container(),
|
: Container(),
|
||||||
),
|
),
|
||||||
CurrentLocationLayer(),
|
CurrentLocationLayer(
|
||||||
|
followOnLocationUpdate: FollowOnLocationUpdate.once,
|
||||||
|
turnOnHeadingUpdate: TurnOnHeadingUpdate.never,
|
||||||
|
style: const LocationMarkerStyle(
|
||||||
|
marker: DefaultLocationMarker(
|
||||||
|
child: Icon(
|
||||||
|
Icons.navigation,
|
||||||
|
color: Colors.yellowAccent,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
markerSize: Size(27, 27),
|
||||||
|
markerDirection: MarkerDirection.heading,
|
||||||
|
),
|
||||||
|
),
|
||||||
indexController.locations.isNotEmpty &&
|
indexController.locations.isNotEmpty &&
|
||||||
indexController.locations[0].collection.isNotEmpty
|
indexController.locations[0].collection.isNotEmpty
|
||||||
? MarkerLayer(
|
? MarkerLayer(
|
||||||
|
|||||||
Reference in New Issue
Block a user