diff --git a/Sources/dafl_project_flutter/lib/controller/controller.dart b/Sources/dafl_project_flutter/lib/controller/controller.dart index 1ba5c82..ef957a5 100644 --- a/Sources/dafl_project_flutter/lib/controller/controller.dart +++ b/Sources/dafl_project_flutter/lib/controller/controller.dart @@ -12,6 +12,7 @@ import '../services/position/location.dart'; import 'live_datas.dart'; import 'package:dafl_project_flutter/model/message.dart'; import 'package:dafl_project_flutter/services/messaging/message_database_service.dart'; +import 'dart:developer' as dev; class Controller { final ApiSpotify _api = ApiSpotify(); @@ -35,11 +36,12 @@ class Controller { - + initUser() async { await setCurrentMusic(); await setDiscoveries(); + beginRoutine(); } beginRoutine() async { @@ -66,14 +68,22 @@ class Controller { await getCompleteMusic(await _api.requests.getCurrentlyPlayingTrack()); } - List getSpots() => _data.spots; + List getSpots() { + return _data.spots; + } setSpots() async { + print('setspot'); _data.spots = await Location.sendCurrentLocation(); } LinkedHashMap getDiscoveries() => _data.discoveries; + void deleteDiscoveries(Music key) { + _data.discoveries.remove(key); + removeFromPlaylist(key.id); + } + setDiscoveries() async { LinkedHashMap tmpData = await _api.requests.getPlaylistTracks(); diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart index a9c8b33..5208a97 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart @@ -17,7 +17,6 @@ class _DiscoveryWidgetState extends State { @override initState() { MyApp.controller.getDiscoveries(); - MyApp.controller.setDiscoveries(); super.initState(); } @@ -163,9 +162,8 @@ class _DiscoveryListState extends State { dev.log(listDiscoveries.keys.toList()[reversedIndex].id); dev.log( listDiscoveries.keys.toList()[reversedIndex].name); - MyApp.controller.removeFromPlaylist( - listDiscoveries.keys.toList()[reversedIndex].id); - listDiscoveries = MyApp.controller.getDiscoveries(); + MyApp.controller.deleteDiscoveries( + listDiscoveries.keys.toList()[reversedIndex]); return true; } if (direction == DismissDirection.startToEnd) {