Destination controller から Location controller へGPS信号シミュレーションを変更
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
import 'dart:ffi';
|
||||
import 'dart:math';
|
||||
//import 'dart:ffi';
|
||||
//import 'dart:math';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
@ -7,13 +7,14 @@ 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/DatabaseService.dart';
|
||||
import 'package:rogapp/utils/database_helper.dart';
|
||||
//import 'package:rogapp/utils/database_helper.dart';
|
||||
import 'package:rogapp/widgets/GameState/CheckinState.dart';
|
||||
import 'package:rogapp/widgets/GameState/ConnectionStatus.dart';
|
||||
import 'package:rogapp/widgets/GameState/DashboardWidget.dart';
|
||||
//import 'package:rogapp/widgets/GameState/DashboardWidget.dart';
|
||||
import 'package:rogapp/widgets/GameState/game_on_off.dart';
|
||||
import 'package:rogapp/widgets/GameState/Colors.dart';
|
||||
//import 'package:rogapp/widgets/GameState/Colors.dart';
|
||||
import 'package:rogapp/widgets/gps_status.dart';
|
||||
import 'package:rogapp/utils/location_controller.dart';
|
||||
|
||||
class GameStateManager {
|
||||
static final GameStateManager _instance = GameStateManager._internal();
|
||||
@ -24,8 +25,8 @@ class GameStateManager {
|
||||
|
||||
GameStateManager._internal();
|
||||
|
||||
List<String> _logs = [];
|
||||
List<VoidCallback> _listeners = [];
|
||||
final List<String> _logs = [];
|
||||
final List<VoidCallback> _listeners = [];
|
||||
|
||||
List<String> get logs => _logs;
|
||||
|
||||
@ -103,9 +104,10 @@ class _GameStateWidgetState extends State<GameStateWidget> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final DatabaseService dbService = DatabaseService();
|
||||
//final LocationController locationController = Get.find<LocationController>();
|
||||
return Container(
|
||||
width: MediaQuery.of(context).size.width,
|
||||
decoration: BoxDecoration(color: Colors.black12),
|
||||
decoration: const BoxDecoration(color: Colors.black12),
|
||||
child: GestureDetector(
|
||||
onTap: toggleExpanded,
|
||||
child: AnimatedContainer(
|
||||
@ -117,15 +119,15 @@ class _GameStateWidgetState extends State<GameStateWidget> {
|
||||
// Top bar with clear button
|
||||
if (isExpanded)
|
||||
Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 10.0),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10.0),
|
||||
color: Colors.blueGrey, // Adjust color as needed
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Text('ゲームステータス', style: TextStyle(color: Colors.white)),
|
||||
const Text('ゲームステータス', style: TextStyle(color: Colors.white)),
|
||||
IconButton(
|
||||
icon: Icon(Icons.clear, color: Colors.white),
|
||||
icon: const Icon(Icons.clear, color: Colors.white),
|
||||
onPressed: toggleExpanded,
|
||||
),
|
||||
],
|
||||
@ -196,7 +198,7 @@ class _GameStateWidgetState extends State<GameStateWidget> {
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(4.0),
|
||||
child:GpsSignalStrengthIndicator(
|
||||
destinationController: Get.find<DestinationController>(),
|
||||
locationController: Get.find<LocationController>(),
|
||||
minimized: !isExpanded, // isExpanded はあなたのロジックに依存した変数),
|
||||
)
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user