From 338f6381cbb78d815e4d66124415899d8f06bff9 Mon Sep 17 00:00:00 2001
From: Dorian HODIN <Dorian.HODIN@etu.uca.fr>
Date: Wed, 30 Nov 2022 12:56:09 +0100
Subject: [PATCH] setSpots now in controller.dart

---
 .idea/libraries/Dart_Packages.xml             | 96 +++++++++++++++++++
 .../lib/controller/controller.dart            | 43 +++++----
 .../lib/views/pages/main/p_main.dart          |  9 --
 3 files changed, 121 insertions(+), 27 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index fc497d8..5b21219 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -2,6 +2,20 @@
   <library name="Dart Packages" type="DartPackagesLibraryType">
     <properties>
       <option name="packageNameToDirsMap">
+        <entry key="_fe_analyzer_shared">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/_fe_analyzer_shared-50.0.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="analyzer">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-5.2.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="animations">
           <value>
             <list>
@@ -79,6 +93,13 @@
             </list>
           </value>
         </entry>
+        <entry key="color">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/color-3.0.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="convert">
           <value>
             <list>
@@ -107,6 +128,20 @@
             </list>
           </value>
         </entry>
+        <entry key="dart_style">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/dart_style-2.2.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="dartx">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/dartx-1.1.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="fading_edge_scrollview">
           <value>
             <list>
@@ -142,6 +177,20 @@
             </list>
           </value>
         </entry>
+        <entry key="flutter_gen">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/flutter_gen-5.1.0+1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="flutter_gen_core">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/flutter_gen_core-5.1.0+1/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="flutter_inappwebview">
           <value>
             <list>
@@ -261,6 +310,13 @@
             </list>
           </value>
         </entry>
+        <entry key="glob">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/glob-2.1.1/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="graphs">
           <value>
             <list>
@@ -380,6 +436,13 @@
             </list>
           </value>
         </entry>
+        <entry key="package_config">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/package_config-2.1.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="page_transition">
           <value>
             <list>
@@ -485,6 +548,13 @@
             </list>
           </value>
         </entry>
+        <entry key="pub_semver">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/pub_semver-2.1.3/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="random_string">
           <value>
             <list>
@@ -569,6 +639,13 @@
             </list>
           </value>
         </entry>
+        <entry key="time">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/time-2.1.3/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="typed_data">
           <value>
             <list>
@@ -597,6 +674,13 @@
             </list>
           </value>
         </entry>
+        <entry key="watcher">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/watcher-1.0.2/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="win32">
           <value>
             <list>
@@ -628,6 +712,8 @@
       </option>
     </properties>
     <CLASSES>
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/_fe_analyzer_shared-50.0.0/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-5.2.0/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/animations-2.0.7/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/archive-3.3.2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.1/lib" />
@@ -639,14 +725,19 @@
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/cli_util-0.3.5/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/color-3.0.0/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/convert-3.1.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/crypto-3.0.2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/csslib-0.17.2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.5/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/dart_style-2.2.4/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/dartx-1.1.0/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/fading_edge_scrollview-3.0.0/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/ffi-2.0.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/file-6.1.4/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/flutter_gen-5.1.0+1/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/flutter_gen_core-5.1.0+1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/flutter_inappwebview-5.7.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/flutter_launcher_icons-0.10.0/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/flutter_lints-2.0.1/lib" />
@@ -661,6 +752,7 @@
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_platform_interface-4.0.7/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_web-2.1.6/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_windows-0.1.1/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/glob-2.1.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/graphs-2.1.0/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/home_indicator-2.0.2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/html-0.15.1/lib" />
@@ -678,6 +770,7 @@
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/mime-1.0.2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/nested-1.0.0/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/package_config-2.1.0/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/page_transition-2.0.9/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-2.0.11/lib" />
@@ -693,6 +786,7 @@
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/postgresql2-1.0.3/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/process-4.2.4/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/provider-6.0.4/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/pub_semver-2.1.3/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/random_string-2.3.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/rikulo_commons-5.2.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/rive-0.9.1/lib" />
@@ -704,10 +798,12 @@
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/text_scroll-0.1.1/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/time-2.1.3/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/universal_io-2.0.4/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/vibration-1.7.6/lib" />
+      <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/watcher-1.0.2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/win32-3.0.1/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/xdg_directories-0.2.0+2/lib" />
       <root url="file://$PROJECT_DIR$/../flutter/.pub-cache/hosted/pub.dartlang.org/xml-6.1.0/lib" />
diff --git a/Sources/dafl_project_flutter/lib/controller/controller.dart b/Sources/dafl_project_flutter/lib/controller/controller.dart
index 6ba0afc..737a02d 100644
--- a/Sources/dafl_project_flutter/lib/controller/controller.dart
+++ b/Sources/dafl_project_flutter/lib/controller/controller.dart
@@ -1,4 +1,4 @@
-import 'dart:collection';
+import 'dart:async';
 import 'dart:convert';
 import 'package:dafl_project_flutter/controller/live_datas.dart';
 import 'package:dafl_project_flutter/model/music.dart';
@@ -11,48 +11,55 @@ import 'package:http/http.dart' as http;
 import '../model/user.dart';
 
 class Controller {
-  final ApiSpotify _api = ApiSpotify();
+  ApiSpotify _api = ApiSpotify();
   late User _currentUser;
   final DataBaseService _dataBaseService = DataBaseService();
-  final LiveData _data = LiveData();
+  final LiveDatas _datas = LiveDatas();
 
   late BuildContext navigatorKey;
+  //
+  // Constructor
+  //
+
+  Controller(){
+    setSpots();
+    Timer.periodic(const Duration(seconds: 10), (Timer t) => setSpots());
+  }
 
   //
-  // Methods to manage data
+  // Methods to manage datas
   //
 
-  // Data that can change
+  // Datas that can change
 
-  bool getChoice() => _data.discoveriesSortChoice;
+  bool getChoice() => _datas.discoveriesSortChoice;
 
   setChoice(bool c) {
-    _data.discoveriesSortChoice = c;
+    _datas.discoveriesSortChoice = c;
   }
 
-  Music getCurrentMusic() => _data.userCurrentMusic;
+  Music getCurrentMusic() => _datas.userCurrentMusic;
 
   setCurrentMusic() async {
-    _data.userCurrentMusic =
+    _datas.userCurrentMusic =
         await getCompleteMusic(await _api.requests.getCurrentlyPlayingTrack());
   }
 
-  List<Spot> getSpots() => _data.spots;
+  List<Spot> getSpots() => _datas.spots;
 
   setSpots() async {
-    _data.spots = await Location.sendCurrentLocation();
+    _datas.spots = await Location.sendCurrentLocation();
   }
 
-  LinkedHashMap<Music, DateTime> getDiscoveries() => _data.discoveries;
+  Map<Music, DateTime> getDiscoveries() => _datas.discoveries;
 
   setDiscoveries() async {
-    LinkedHashMap<String, DateTime> tmpData =
-        await _api.requests.getPlaylistTracks();
-    LinkedHashMap<Music, DateTime> tmpCast = LinkedHashMap();
+    Map<String, DateTime> tmpData = await _api.requests.getPlaylistTracks();
+    Map<Music, DateTime> tmpCast = {};
     tmpData.forEach((key, value) async {
       tmpCast[(await getCompleteMusic(key))] = value;
     });
-    _data.discoveries = tmpCast;
+    _datas.discoveries = tmpCast;
   }
 
   //Data that can not change
@@ -74,8 +81,8 @@ class Controller {
   }
 
   Future<Music> getCompleteMusic(String id) async {
-    Map info = await _api.requests.getTrackInfo(id);
-    return Music(id, info['name'], info['artist'], info['cover']);
+    Map infos = await _api.requests.getTrackInfo(id);
+    return Music(id, infos['name'], infos['artist'], infos['cover']);
   }
 
   removeFromPlaylist(String id) {
diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart b/Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart
index 0f7d518..4b3d579 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-import 'package:dafl_project_flutter/main.dart';
 import 'package:flutter/material.dart';
 import '../../presentation/custom_icons_icons.dart';
 import './w_settings.dart';
@@ -108,13 +106,6 @@ class _MainPageState extends State<MainPage> {
       ),
     );
   }
-
-  @override
-  void initState() {
-    super.initState();
-    Timer timer = Timer.periodic(
-        const Duration(seconds: 10), (Timer t) => MyApp.controller.getSpots());
-  }
 }
 
 class GradientText extends StatelessWidget {