Compare commits
2 Commits
fa129f17fb
...
b84e9d307d
| Author | SHA1 | Date | |
|---|---|---|---|
| b84e9d307d | |||
| 61f9eab0a5 |
@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:hydrated_bloc/hydrated_bloc.dart';
|
import 'package:hydrated_bloc/hydrated_bloc.dart';
|
||||||
import 'package:ot_viewer_app/global_location_store.dart';
|
import 'package:ot_viewer_app/global_location_store.dart';
|
||||||
|
import 'package:ot_viewer_app/refresh_cubit.dart';
|
||||||
import 'package:ot_viewer_app/settings_page.dart';
|
import 'package:ot_viewer_app/settings_page.dart';
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
import 'map_page.dart';
|
import 'map_page.dart';
|
||||||
@ -20,8 +21,22 @@ Future<void> main() async {
|
|||||||
|
|
||||||
GetIt.I
|
GetIt.I
|
||||||
.registerSingleton<GlobalLocationStoreCubit>(GlobalLocationStoreCubit());
|
.registerSingleton<GlobalLocationStoreCubit>(GlobalLocationStoreCubit());
|
||||||
|
GetIt.I.registerSingleton<RefreshCubit>(RefreshCubit());
|
||||||
|
|
||||||
runApp(MyApp());
|
runApp(
|
||||||
|
MultiBlocProvider(
|
||||||
|
providers: [
|
||||||
|
BlocProvider(
|
||||||
|
lazy: false,
|
||||||
|
create: (BuildContext context) => SettingsCubit(),
|
||||||
|
),
|
||||||
|
BlocProvider(
|
||||||
|
create: (BuildContext context) => GetIt.I.get<RefreshCubit>(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
child: MyApp(),
|
||||||
|
),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
class MyApp extends StatelessWidget {
|
class MyApp extends StatelessWidget {
|
||||||
@ -31,7 +46,17 @@ class MyApp extends StatelessWidget {
|
|||||||
title: 'OwnTracks Data Viewer',
|
title: 'OwnTracks Data Viewer',
|
||||||
theme: ThemeData.dark(),
|
theme: ThemeData.dark(),
|
||||||
home: Scaffold(
|
home: Scaffold(
|
||||||
appBar: AppBar(title: const Text('OwnTrakcs Data Viewer')),
|
appBar: AppBar(
|
||||||
|
title: const Text('OwnTrakcs Data Viewer'),
|
||||||
|
actions: [
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.refresh),
|
||||||
|
onPressed: () async {
|
||||||
|
context.read<RefreshCubit>().triggerRefresh();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
body: const MainPage(),
|
body: const MainPage(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@ -60,28 +85,24 @@ class _MainPageState extends State<MainPage> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BlocProvider(
|
return Scaffold(
|
||||||
lazy: false,
|
body: IndexedStack(
|
||||||
create: (BuildContext context) => SettingsCubit(),
|
index: _currentIndex,
|
||||||
child: Scaffold(
|
children: _pages,
|
||||||
body: IndexedStack(
|
),
|
||||||
index: _currentIndex,
|
bottomNavigationBar: BottomNavigationBar(
|
||||||
children: _pages,
|
items: const <BottomNavigationBarItem>[
|
||||||
),
|
BottomNavigationBarItem(
|
||||||
bottomNavigationBar: BottomNavigationBar(
|
icon: Icon(Icons.map),
|
||||||
items: const <BottomNavigationBarItem>[
|
label: 'Map',
|
||||||
BottomNavigationBarItem(
|
),
|
||||||
icon: Icon(Icons.map),
|
BottomNavigationBarItem(
|
||||||
label: 'Map',
|
icon: Icon(Icons.settings),
|
||||||
),
|
label: 'Settings',
|
||||||
BottomNavigationBarItem(
|
),
|
||||||
icon: Icon(Icons.settings),
|
],
|
||||||
label: 'Settings',
|
currentIndex: _currentIndex,
|
||||||
),
|
onTap: _onItemTapped,
|
||||||
],
|
|
||||||
currentIndex: _currentIndex,
|
|
||||||
onTap: _onItemTapped,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,6 +13,7 @@ import 'package:get_it/get_it.dart';
|
|||||||
import 'package:intl/intl.dart';
|
import 'package:intl/intl.dart';
|
||||||
import 'package:latlong2/latlong.dart';
|
import 'package:latlong2/latlong.dart';
|
||||||
import 'package:ot_viewer_app/global_location_store.dart';
|
import 'package:ot_viewer_app/global_location_store.dart';
|
||||||
|
import 'package:ot_viewer_app/refresh_cubit.dart';
|
||||||
import 'package:ot_viewer_app/settings_page.dart';
|
import 'package:ot_viewer_app/settings_page.dart';
|
||||||
import 'package:ot_viewer_app/user_path_bloc.dart';
|
import 'package:ot_viewer_app/user_path_bloc.dart';
|
||||||
import 'package:ot_viewer_app/util.dart';
|
import 'package:ot_viewer_app/util.dart';
|
||||||
@ -34,6 +35,8 @@ class MapPage extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _MapPageState extends State<MapPage> {
|
class _MapPageState extends State<MapPage> {
|
||||||
|
final MapController _mapController = MapController();
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
@ -48,40 +51,58 @@ class _MapPageState extends State<MapPage> {
|
|||||||
final settingsCubit = context.read<SettingsCubit>();
|
final settingsCubit = context.read<SettingsCubit>();
|
||||||
cubit.subscribe(settingsCubit.state);
|
cubit.subscribe(settingsCubit.state);
|
||||||
settingsCubit.stream.listen((settings) => cubit.subscribe(settings));
|
settingsCubit.stream.listen((settings) => cubit.subscribe(settings));
|
||||||
|
final refreshCubit = context.read<RefreshCubit>();
|
||||||
|
refreshCubit.stream.listen((_) => cubit.reconnect());
|
||||||
return cubit;
|
return cubit;
|
||||||
},
|
},
|
||||||
child: FutureBuilder<String>(
|
child: FutureBuilder<String>(
|
||||||
future: getPath(),
|
future: getPath(),
|
||||||
builder: (something, tempPath) => BlocBuilder<SettingsCubit, SettingsState>(
|
builder: (something, tempPath) =>
|
||||||
|
BlocBuilder<SettingsCubit, SettingsState>(
|
||||||
builder: (context, state) {
|
builder: (context, state) {
|
||||||
if (tempPath.data == null) {
|
if (tempPath.data == null) {
|
||||||
return const Center(child: Text('Loading Map...'));
|
return const Center(child: Text('Loading Map...'));
|
||||||
}
|
}
|
||||||
return FlutterMap(
|
return Stack(children: [
|
||||||
options: const MapOptions(
|
FlutterMap(
|
||||||
initialCenter: LatLng(48.3285, 9.8942),
|
mapController: _mapController,
|
||||||
initialZoom: 13.0,
|
options: const MapOptions(
|
||||||
|
initialCenter: LatLng(48.3285, 9.8942),
|
||||||
|
initialZoom: 13.0,
|
||||||
|
),
|
||||||
|
children: [
|
||||||
|
TileLayer(
|
||||||
|
urlTemplate:
|
||||||
|
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
|
||||||
|
tileProvider: CachedTileProvider(
|
||||||
|
maxStale: const Duration(days: 30),
|
||||||
|
store: HiveCacheStore(tempPath.data!,
|
||||||
|
hiveBoxName: 'HiveCacheStore')),
|
||||||
|
),
|
||||||
|
...state.activeDevices.map((id) =>
|
||||||
|
UserPath(key: ValueKey(id), device: id, settings: state)),
|
||||||
|
const MapCompass.cupertino(
|
||||||
|
rotationDuration: Duration(milliseconds: 600)),
|
||||||
|
// CurrentLocationLayer(), TODO: add permission
|
||||||
|
RichAttributionWidget(
|
||||||
|
attributions: [
|
||||||
|
TextSourceAttribution(
|
||||||
|
'OpenStreetMap contributors',
|
||||||
|
onTap: () =>
|
||||||
|
(Uri.parse('https://openstreetmap.org/copyright')),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
children: [
|
Positioned(
|
||||||
TileLayer(
|
bottom: 16,
|
||||||
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
|
left: 16,
|
||||||
tileProvider: CachedTileProvider(
|
child: TrackerSelector(
|
||||||
maxStale: const Duration(days: 30),
|
mapController: _mapController,
|
||||||
store: HiveCacheStore(tempPath.data!, hiveBoxName: 'HiveCacheStore')),
|
|
||||||
),
|
),
|
||||||
...state.activeDevices.map((id) => UserPath(key: ValueKey(id), device: id, settings: state)),
|
),
|
||||||
const MapCompass.cupertino(rotationDuration: Duration(milliseconds: 600)),
|
]);
|
||||||
// CurrentLocationLayer(), TODO: add permission
|
|
||||||
RichAttributionWidget(
|
|
||||||
attributions: [
|
|
||||||
TextSourceAttribution(
|
|
||||||
'OpenStreetMap contributors',
|
|
||||||
onTap: () => (Uri.parse('https://openstreetmap.org/copyright')),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -110,20 +131,34 @@ class _UserPathState extends State<UserPath> {
|
|||||||
// ONLY WORKS because gets rebuilt every time with settings update
|
// ONLY WORKS because gets rebuilt every time with settings update
|
||||||
return bloc;
|
return bloc;
|
||||||
},
|
},
|
||||||
child: BlocListener<LocationSubscribeCubit, LocationUpdateState>(
|
child: MultiBlocListener(
|
||||||
listenWhen: (prevState, state) => state is LocationUpdateReceived,
|
listeners: [
|
||||||
listener: (context, state) {
|
BlocListener<LocationSubscribeCubit, LocationUpdateState>(
|
||||||
UserPathBloc userPathBloc = context.read<UserPathBloc>();
|
listenWhen: (prevState, state) => state is LocationUpdateReceived,
|
||||||
if (state case LocationUpdateReceived(:final position, :final deviceId)) {
|
listener: (context, state) {
|
||||||
if (userPathBloc.deviceId == state.deviceId) {
|
UserPathBloc userPathBloc = context.read<UserPathBloc>();
|
||||||
userPathBloc.add(UserPathLiveSubscriptionUpdate(position));
|
if (state
|
||||||
}
|
case LocationUpdateReceived(
|
||||||
}
|
:final position,
|
||||||
},
|
:final deviceId
|
||||||
|
)) {
|
||||||
|
if (userPathBloc.deviceId == state.deviceId) {
|
||||||
|
userPathBloc.add(UserPathLiveSubscriptionUpdate(position));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
BlocListener<RefreshCubit, DateTime>(
|
||||||
|
listener: (context, state) {
|
||||||
|
context.read<UserPathBloc>().add(UserPathFullUpdate());
|
||||||
|
},
|
||||||
|
)
|
||||||
|
],
|
||||||
child: BlocBuilder<UserPathBloc, UserPathState>(
|
child: BlocBuilder<UserPathBloc, UserPathState>(
|
||||||
builder: (context, state) {
|
builder: (context, state) {
|
||||||
// TODO: change once smarter rebuilds are ready
|
// TODO: change once smarter rebuilds are ready
|
||||||
context.read<UserPathBloc>().add(UserPathLoginDataChanged(widget.settings));
|
context
|
||||||
|
.read<UserPathBloc>()
|
||||||
|
.add(UserPathLoginDataChanged(widget.settings));
|
||||||
|
|
||||||
print("rebuild");
|
print("rebuild");
|
||||||
final _istate = state as MainUserPathState;
|
final _istate = state as MainUserPathState;
|
||||||
@ -139,7 +174,8 @@ class _UserPathState extends State<UserPath> {
|
|||||||
mainAxisAlignment: MainAxisAlignment.end,
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
children: [
|
children: [
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
onTap: () => showUserLocationModalBottomSheet(context, widget.device),
|
onTap: () => showUserLocationModalBottomSheet(
|
||||||
|
context, widget.device),
|
||||||
child: Container(
|
child: Container(
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.black.withOpacity(0.85),
|
color: Colors.black.withOpacity(0.85),
|
||||||
@ -170,7 +206,8 @@ class _UserPathState extends State<UserPath> {
|
|||||||
List<List<LatLng>> segments = [];
|
List<List<LatLng>> segments = [];
|
||||||
List<Color> colors = [];
|
List<Color> colors = [];
|
||||||
if (state.initialPoints.isNotEmpty) {
|
if (state.initialPoints.isNotEmpty) {
|
||||||
final allPoints = state.initialPoints.map((e) => LatLng(e.lat, e.lon)).toList();
|
final allPoints =
|
||||||
|
state.initialPoints.map((e) => LatLng(e.lat, e.lon)).toList();
|
||||||
final segmentCount = math.min(100, allPoints.length);
|
final segmentCount = math.min(100, allPoints.length);
|
||||||
final pointsPerSegment = (allPoints.length / segmentCount).ceil();
|
final pointsPerSegment = (allPoints.length / segmentCount).ceil();
|
||||||
|
|
||||||
@ -193,8 +230,9 @@ class _UserPathState extends State<UserPath> {
|
|||||||
Polyline(
|
Polyline(
|
||||||
points: segments[i],
|
points: segments[i],
|
||||||
strokeWidth: 4.0,
|
strokeWidth: 4.0,
|
||||||
color: colors[i]
|
color: colors[i].withOpacity(
|
||||||
.withOpacity((math.pow(i, 2) / math.pow(segments.length, 2)) * 0.7 + 0.3), // Fading effect
|
(math.pow(i, 2) / math.pow(segments.length, 2)) * 0.7 +
|
||||||
|
0.3), // Fading effect
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -217,13 +255,17 @@ class _UserPathState extends State<UserPath> {
|
|||||||
...polylines
|
...polylines
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
PolylineLayer(key: ValueKey('${widget.device}_liveLines'), polylines: [
|
PolylineLayer(
|
||||||
Polyline(
|
key: ValueKey('${widget.device}_liveLines'),
|
||||||
points: state.livePoints.map((e) => LatLng(e.lat, e.lon)).toList(),
|
polylines: [
|
||||||
strokeWidth: 4.0,
|
Polyline(
|
||||||
color: Colors.blue.shade200,
|
points: state.livePoints
|
||||||
),
|
.map((e) => LatLng(e.lat, e.lon))
|
||||||
]),
|
.toList(),
|
||||||
|
strokeWidth: 4.0,
|
||||||
|
color: Colors.blue.shade200,
|
||||||
|
),
|
||||||
|
]),
|
||||||
MarkerLayer(markers: markers)
|
MarkerLayer(markers: markers)
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
@ -244,13 +286,15 @@ showUserLocationModalBottomSheet(BuildContext context, (String, String) user) {
|
|||||||
height: 500,
|
height: 500,
|
||||||
decoration: const BoxDecoration(
|
decoration: const BoxDecoration(
|
||||||
color: Colors.black,
|
color: Colors.black,
|
||||||
borderRadius: BorderRadius.only(topLeft: Radius.circular(30), topRight: Radius.circular(30)),
|
borderRadius: BorderRadius.only(
|
||||||
|
topLeft: Radius.circular(30), topRight: Radius.circular(30)),
|
||||||
),
|
),
|
||||||
padding: const EdgeInsets.all(32),
|
padding: const EdgeInsets.all(32),
|
||||||
child: StreamBuilder<UserPathState>(
|
child: StreamBuilder<UserPathState>(
|
||||||
stream: context.read<UserPathBloc>().stream,
|
stream: context.read<UserPathBloc>().stream,
|
||||||
builder: (sheetContext, state) {
|
builder: (sheetContext, state) {
|
||||||
final istate = state.data as MainUserPathState? ?? context.read<UserPathBloc>().state as MainUserPathState;
|
final istate = state.data as MainUserPathState? ??
|
||||||
|
context.read<UserPathBloc>().state as MainUserPathState;
|
||||||
if (istate.livePoints.isEmpty) {
|
if (istate.livePoints.isEmpty) {
|
||||||
return Text("Couldn't find ${user.$1}:${user.$2}'s Location");
|
return Text("Couldn't find ${user.$1}:${user.$2}'s Location");
|
||||||
}
|
}
|
||||||
@ -275,12 +319,15 @@ showUserLocationModalBottomSheet(BuildContext context, (String, String) user) {
|
|||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
Text("(${curLocation.lat.toStringAsFixed(4)}, ${curLocation.lon.toStringAsFixed(4)})"),
|
Text(
|
||||||
Text(DateFormat('dd.MM.yyyy - kk:mm:ss').format(curLocation.timestamp)),
|
"(${curLocation.lat.toStringAsFixed(4)}, ${curLocation.lon.toStringAsFixed(4)})"),
|
||||||
|
Text(DateFormat('dd.MM.yyyy - kk:mm:ss')
|
||||||
|
.format(curLocation.timestamp)),
|
||||||
StreamBuilder(
|
StreamBuilder(
|
||||||
stream: Stream.periodic(const Duration(seconds: 1)),
|
stream: Stream.periodic(const Duration(seconds: 1)),
|
||||||
builder: (context, _) {
|
builder: (context, _) {
|
||||||
return Text("${formatDuration(DateTime.now().difference(curLocation.timestamp))} ago");
|
return Text(
|
||||||
|
"${formatDuration(DateTime.now().difference(curLocation.timestamp))} ago");
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@ -291,7 +338,8 @@ showUserLocationModalBottomSheet(BuildContext context, (String, String) user) {
|
|||||||
),
|
),
|
||||||
Expanded(
|
Expanded(
|
||||||
// Ensure GridView.builder is within an Expanded widget
|
// Ensure GridView.builder is within an Expanded widget
|
||||||
child: BlocBuilder<GlobalLocationStoreCubit, GlobalLocationStoreState>(
|
child: BlocBuilder<GlobalLocationStoreCubit,
|
||||||
|
GlobalLocationStoreState>(
|
||||||
bloc: GetIt.I.get<GlobalLocationStoreCubit>(),
|
bloc: GetIt.I.get<GlobalLocationStoreCubit>(),
|
||||||
builder: (sheetContext, state) {
|
builder: (sheetContext, state) {
|
||||||
// get map camera
|
// get map camera
|
||||||
@ -299,22 +347,32 @@ showUserLocationModalBottomSheet(BuildContext context, (String, String) user) {
|
|||||||
|
|
||||||
final mapRotation = mapController.camera.rotation;
|
final mapRotation = mapController.camera.rotation;
|
||||||
|
|
||||||
List<MapEntry<(String, String), Point>> locations = state.locations
|
List<MapEntry<(String, String), Point>> locations = state
|
||||||
|
.locations
|
||||||
.remove(user) // remove this
|
.remove(user) // remove this
|
||||||
.entries // get entries into a list, and sort alphabetically
|
.entries // get entries into a list, and sort alphabetically
|
||||||
.toList()
|
.toList()
|
||||||
..sort((a, b) => "${a.key.$1}:${a.key.$2}".compareTo("${b.key.$1}:${b.key.$2}"));
|
..sort((a, b) => "${a.key.$1}:${a.key.$2}"
|
||||||
|
.compareTo("${b.key.$1}:${b.key.$2}"));
|
||||||
if (locations.isEmpty) {
|
if (locations.isEmpty) {
|
||||||
return const SizedBox();
|
return const SizedBox();
|
||||||
}
|
}
|
||||||
return GridView.builder(
|
return GridView.builder(
|
||||||
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
|
gridDelegate:
|
||||||
crossAxisCount: 1, crossAxisSpacing: 4.0, mainAxisSpacing: 4.0, mainAxisExtent: 100),
|
const SliverGridDelegateWithFixedCrossAxisCount(
|
||||||
|
crossAxisCount: 1,
|
||||||
|
crossAxisSpacing: 4.0,
|
||||||
|
mainAxisSpacing: 4.0,
|
||||||
|
mainAxisExtent: 100),
|
||||||
itemCount: locations.length,
|
itemCount: locations.length,
|
||||||
itemBuilder: (BuildContext context, int index) {
|
itemBuilder: (BuildContext context, int index) {
|
||||||
// calculate distance and bearing
|
// calculate distance and bearing
|
||||||
double distance = distanceBetween(curLocation.lat, curLocation.lon,
|
double distance = distanceBetween(
|
||||||
locations[index].value.lat, locations[index].value.lon, "meters");
|
curLocation.lat,
|
||||||
|
curLocation.lon,
|
||||||
|
locations[index].value.lat,
|
||||||
|
locations[index].value.lon,
|
||||||
|
"meters");
|
||||||
|
|
||||||
double bearing = (bearingBetween(
|
double bearing = (bearingBetween(
|
||||||
curLocation.lat,
|
curLocation.lat,
|
||||||
@ -333,7 +391,8 @@ showUserLocationModalBottomSheet(BuildContext context, (String, String) user) {
|
|||||||
margin: const EdgeInsets.all(8),
|
margin: const EdgeInsets.all(8),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.black,
|
color: Colors.black,
|
||||||
border: Border.all(color: Colors.pink, width: 2),
|
border:
|
||||||
|
Border.all(color: Colors.pink, width: 2),
|
||||||
borderRadius: BorderRadius.circular(10),
|
borderRadius: BorderRadius.circular(10),
|
||||||
),
|
),
|
||||||
padding: const EdgeInsets.all(16),
|
padding: const EdgeInsets.all(16),
|
||||||
@ -343,7 +402,8 @@ showUserLocationModalBottomSheet(BuildContext context, (String, String) user) {
|
|||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
"${locations[index].key.$1}:${locations[index].key.$2}",
|
"${locations[index].key.$1}:${locations[index].key.$2}",
|
||||||
style: const TextStyle(fontWeight: FontWeight.bold),
|
style: const TextStyle(
|
||||||
|
fontWeight: FontWeight.bold),
|
||||||
),
|
),
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
Text(formatDistance(distance ~/ 1)),
|
Text(formatDistance(distance ~/ 1)),
|
||||||
@ -359,11 +419,13 @@ showUserLocationModalBottomSheet(BuildContext context, (String, String) user) {
|
|||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
StreamBuilder(
|
StreamBuilder(
|
||||||
stream: Stream.periodic(const Duration(seconds: 1)),
|
stream: Stream.periodic(
|
||||||
|
const Duration(seconds: 1)),
|
||||||
builder: (context, _) {
|
builder: (context, _) {
|
||||||
return Text(
|
return Text(
|
||||||
"${formatDuration(DateTime.now().difference(locations[index].value.timestamp))} ago",
|
"${formatDuration(DateTime.now().difference(locations[index].value.timestamp))} ago",
|
||||||
style: const TextStyle(fontSize: 12));
|
style: const TextStyle(
|
||||||
|
fontSize: 12));
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
@ -386,3 +448,81 @@ showUserLocationModalBottomSheet(BuildContext context, (String, String) user) {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class TrackerSelector extends StatefulWidget {
|
||||||
|
final MapController mapController;
|
||||||
|
|
||||||
|
const TrackerSelector({super.key, required this.mapController});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<TrackerSelector> createState() => _TrackerSelectorState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _TrackerSelectorState extends State<TrackerSelector> {
|
||||||
|
bool _isExpanded = false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return AnimatedContainer(
|
||||||
|
duration: const Duration(milliseconds: 200),
|
||||||
|
width: _isExpanded ? MediaQuery.of(context).size.width - 32 : 48,
|
||||||
|
height: 48,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Colors.black87,
|
||||||
|
borderRadius: BorderRadius.circular(24),
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(_isExpanded ? Icons.close : Icons.people),
|
||||||
|
onPressed: () {
|
||||||
|
setState(() {
|
||||||
|
_isExpanded = !_isExpanded;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
if (_isExpanded)
|
||||||
|
Expanded(
|
||||||
|
child: BlocBuilder<GlobalLocationStoreCubit,
|
||||||
|
GlobalLocationStoreState>(
|
||||||
|
bloc: GetIt.I.get<GlobalLocationStoreCubit>(),
|
||||||
|
builder: (context, state) {
|
||||||
|
return ListView.builder(
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
itemCount: state.locations.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final entry = state.locations.entries.elementAt(index);
|
||||||
|
return GestureDetector(
|
||||||
|
onTap: () => widget.mapController
|
||||||
|
.moveAndRotate(entry.value.asLatLng, 15, 0),
|
||||||
|
child: Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
const Icon(
|
||||||
|
Icons.location_history,
|
||||||
|
color: Colors.white,
|
||||||
|
size: 24,
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
"${entry.key.$1}:${entry.key.$2}",
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
9
lib/refresh_cubit.dart
Normal file
9
lib/refresh_cubit.dart
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
|
||||||
|
class RefreshCubit extends Cubit<DateTime> {
|
||||||
|
RefreshCubit() : super(DateTime.now());
|
||||||
|
|
||||||
|
void triggerRefresh() {
|
||||||
|
emit(DateTime.now());
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,6 +1,6 @@
|
|||||||
// web_socket_cubit.dart
|
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
import 'package:anyhow/anyhow.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:ot_viewer_app/owntracks_api.dart';
|
import 'package:ot_viewer_app/owntracks_api.dart';
|
||||||
import 'package:ot_viewer_app/settings_page.dart';
|
import 'package:ot_viewer_app/settings_page.dart';
|
||||||
@ -24,86 +24,126 @@ class LocationUpdateReceived extends LocationUpdateState {
|
|||||||
|
|
||||||
class LocationSubscribeCubit extends Cubit<LocationUpdateState> {
|
class LocationSubscribeCubit extends Cubit<LocationUpdateState> {
|
||||||
Option<WebSocketClient> _wsClient = None;
|
Option<WebSocketClient> _wsClient = None;
|
||||||
|
Option<Completer<void>> _connectionCompleter = None;
|
||||||
String url = '';
|
String url = '';
|
||||||
String username = '';
|
String username = '';
|
||||||
String pass = '';
|
String pass = '';
|
||||||
|
|
||||||
LocationSubscribeCubit() : super(LocationUpdateUnconnected());
|
LocationSubscribeCubit() : super(LocationUpdateUnconnected());
|
||||||
|
|
||||||
|
// TODO: handle ongoing connection attempt by canceling? the loop? or smth
|
||||||
subscribe(SettingsState settings) async {
|
subscribe(SettingsState settings) async {
|
||||||
|
|
||||||
// check if resubscribe is necessary (different URL)
|
// check if resubscribe is necessary (different URL)
|
||||||
if (settings.url == url && settings.username == username && settings.password == pass) {
|
if (settings.url == url &&
|
||||||
|
settings.username == username &&
|
||||||
|
settings.password == pass) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
url = settings.url;
|
url = settings.url;
|
||||||
username = settings.username;
|
username = settings.username;
|
||||||
pass = settings.password;
|
pass = settings.password;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await _wsConnectionEstablish();
|
||||||
|
}
|
||||||
|
|
||||||
|
reconnect() async {
|
||||||
|
print("reconnecting...");
|
||||||
|
if (_wsClient.isSome()) {
|
||||||
|
await _wsClient.unwrap().close();
|
||||||
|
_wsClient = None;
|
||||||
|
} else {
|
||||||
|
print("not connected, not reconnecting");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
await _wsConnectionEstablish();
|
await _wsConnectionEstablish();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _wsConnectionEstablish() async {
|
Future<void> _wsConnectionEstablish() async {
|
||||||
|
// If there's an ongoing connection attempt, wait for it
|
||||||
|
if (_connectionCompleter.isSome()) {
|
||||||
|
await _connectionCompleter.unwrap().future;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start new connection attempt
|
||||||
|
_connectionCompleter = Some(Completer<void>());
|
||||||
|
|
||||||
if (_wsClient.isSome()) {
|
if (_wsClient.isSome()) {
|
||||||
await _wsClient.unwrap().close();
|
await _wsClient.unwrap().close();
|
||||||
_wsClient = None;
|
_wsClient = None;
|
||||||
}
|
}
|
||||||
|
|
||||||
var ws = await OwntracksApi(baseUrl: url, username: username, pass: pass)
|
Result<WebSocketClient> ws = bail('Not done yet');
|
||||||
.createWebSocketConnection(
|
|
||||||
wsPath: 'last',
|
while (!ws.isOk()) {
|
||||||
onMessage: (msg) {
|
ws = await OwntracksApi(baseUrl: url, username: username, pass: pass)
|
||||||
if (msg is String) {
|
.createWebSocketConnection(
|
||||||
if (msg == 'LAST') {
|
wsPath: 'last',
|
||||||
return;
|
onMessage: (msg) {
|
||||||
}
|
if (msg is String) {
|
||||||
try {
|
if (msg == 'LAST') {
|
||||||
final Map<String, dynamic> map = jsonDecode(msg);
|
return;
|
||||||
|
}
|
||||||
if (map['_type'] == 'location') {
|
try {
|
||||||
// filter points (only the ones for this device pls!)
|
final Map<String, dynamic> map = jsonDecode(msg);
|
||||||
final topic = (map['topic'] as String?)?.split('/');
|
|
||||||
if (topic == null || topic.length < 3) {
|
if (map['_type'] == 'location') {
|
||||||
// couldn't reconstruct ID, bail
|
// filter points (only the ones for this device pls!)
|
||||||
return;
|
final topic = (map['topic'] as String?)?.split('/');
|
||||||
}
|
if (topic == null || topic.length < 3) {
|
||||||
|
// couldn't reconstruct ID, bail
|
||||||
// build device_id
|
return;
|
||||||
final deviceId = (topic[1], topic[2]);
|
}
|
||||||
|
|
||||||
print(map);
|
// build device_id
|
||||||
|
final deviceId = (topic[1], topic[2]);
|
||||||
// build point
|
|
||||||
final p = Point(
|
print(map);
|
||||||
lat: map['lat'] as double,
|
|
||||||
lon: map['lon'] as double,
|
// build point
|
||||||
timestamp: DateTime.fromMillisecondsSinceEpoch((map['tst'] as int) * 1000));
|
final p = Point(
|
||||||
|
lat: map['lat'] as double,
|
||||||
print(p);
|
lon: map['lon'] as double,
|
||||||
|
timestamp: DateTime.fromMillisecondsSinceEpoch(
|
||||||
emit(LocationUpdateReceived(p, deviceId));
|
(map['tst'] as int) * 1000));
|
||||||
|
|
||||||
|
print(p);
|
||||||
|
|
||||||
|
emit(LocationUpdateReceived(p, deviceId));
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
print('BUG: Couldn\'t parse WS message: $msg ($e)');
|
||||||
}
|
}
|
||||||
} catch (e) {
|
|
||||||
print('BUG: Couldn\'t parse WS message: $msg ($e)');
|
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
onStateChange: (sc) {
|
||||||
onStateChange: (sc) {
|
switch (sc) {
|
||||||
switch (sc) {
|
case WebSocketClientState$Open(:final url):
|
||||||
case WebSocketClientState$Open(:final url):
|
_wsClient.map((wsc) => wsc.add('LAST'));
|
||||||
_wsClient.map((wsc) => wsc.add('LAST'));
|
emit(LocationUpdateConnected());
|
||||||
emit(LocationUpdateConnected());
|
break;
|
||||||
break;
|
default:
|
||||||
default:
|
emit(LocationUpdateUnconnected());
|
||||||
emit(LocationUpdateUnconnected());
|
break;
|
||||||
break;
|
}
|
||||||
}
|
print(sc);
|
||||||
print(sc);
|
},
|
||||||
},
|
);
|
||||||
);
|
|
||||||
|
if (!ws.isOk()) {
|
||||||
_wsClient = ws.expect("Estabilshing Websocket Conenction failed").toOption();
|
print(
|
||||||
|
'Failed to connect to WebSocket: ${ws.unwrapErr()}\n, retrying in 1s');
|
||||||
|
await Future.delayed(const Duration(seconds: 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_wsClient =
|
||||||
|
ws.expect("Estabilshing Websocket Conenction failed").toOption();
|
||||||
|
|
||||||
|
_connectionCompleter.unwrap().complete();
|
||||||
|
_connectionCompleter = None;
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
24
pubspec.lock
24
pubspec.lock
@ -73,6 +73,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.6"
|
version: "1.0.6"
|
||||||
|
dart_earcut:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: dart_earcut
|
||||||
|
sha256: "41b493147e30a051efb2da1e3acb7f38fe0db60afba24ac1ea5684cee272721e"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.1.0"
|
||||||
dio:
|
dio:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -178,26 +186,26 @@ packages:
|
|||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: flutter_map
|
name: flutter_map
|
||||||
sha256: cda8d72135b697f519287258b5294a57ce2f2a5ebf234f0e406aad4dc14c9399
|
sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.1.0"
|
version: "7.0.2"
|
||||||
flutter_map_cache:
|
flutter_map_cache:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: flutter_map_cache
|
name: flutter_map_cache
|
||||||
sha256: "5539033bbfbc0a663f3a038f223a36b472974d6613ce8f84fe7762eeff38aa5a"
|
sha256: "47607b8d95ca791f0367d18955035d098faf80990e5e3bb0dbfa26271a6c2f43"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.5.0"
|
version: "1.5.1"
|
||||||
flutter_map_compass:
|
flutter_map_compass:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: flutter_map_compass
|
name: flutter_map_compass
|
||||||
sha256: f904bdfa3f0aa008ed57abb1154197318ab4524a2cc6fda6888133aa70f2415f
|
sha256: "1dffdc4f562a63f17751d9eea20d99771955e7dd0fbcdcc3b83195672e7abf54"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.1"
|
version: "1.1.0"
|
||||||
flutter_map_math:
|
flutter_map_math:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@ -268,10 +276,10 @@ packages:
|
|||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: latlong2
|
name: latlong2
|
||||||
sha256: "18712164760cee655bc790122b0fd8f3d5b3c36da2cb7bf94b68a197fbb0811b"
|
sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.9.0"
|
version: "0.9.1"
|
||||||
leak_tracker:
|
leak_tracker:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|||||||
@ -35,7 +35,7 @@ dependencies:
|
|||||||
# The following adds the Cupertino Icons font to your application.
|
# The following adds the Cupertino Icons font to your application.
|
||||||
# Use with the CupertinoIcons class for iOS style icons.
|
# Use with the CupertinoIcons class for iOS style icons.
|
||||||
cupertino_icons: ^1.0.6
|
cupertino_icons: ^1.0.6
|
||||||
flutter_map: ^6.1.0
|
flutter_map: ^7.0.2
|
||||||
http: ^1.2.1
|
http: ^1.2.1
|
||||||
flutter_dotenv: ^5.1.0
|
flutter_dotenv: ^5.1.0
|
||||||
shared_preferences: ^2.2.2
|
shared_preferences: ^2.2.2
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user