diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 05e5bf8..9fcacd0 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
-
+
@@ -44,6 +44,13 @@
+
+
+
+
+
+
+
@@ -72,6 +79,13 @@
+
+
+
+
+
+
+
@@ -100,6 +114,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -124,7 +152,7 @@
-
+
@@ -156,6 +184,13 @@
+
+
+
+
+
+
+
@@ -254,6 +289,13 @@
+
+
+
+
+
+
+
@@ -275,6 +317,13 @@
+
+
+
+
+
+
+
@@ -296,6 +345,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -303,6 +401,13 @@
+
+
+
+
+
+
+
@@ -310,6 +415,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -317,6 +443,13 @@
+
+
+
+
+
+
+
@@ -373,13 +506,6 @@
-
-
-
-
-
-
-
@@ -408,6 +534,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -426,24 +566,29 @@
-
+
+
+
+
+
-
+
+
@@ -458,15 +603,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -474,11 +633,12 @@
-
+
+
diff --git a/Sources/dafl_project_flutter/lib/main.dart b/Sources/dafl_project_flutter/lib/main.dart
index 0aea77e..95d07d8 100644
--- a/Sources/dafl_project_flutter/lib/main.dart
+++ b/Sources/dafl_project_flutter/lib/main.dart
@@ -9,7 +9,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:rive/rive.dart';
-
import 'package:dafl_project_flutter/controller/controller.dart';
diff --git a/Sources/dafl_project_flutter/lib/persistence/database_connexion.dart b/Sources/dafl_project_flutter/lib/persistence/database_connexion.dart
index 2288fbc..72028bc 100644
--- a/Sources/dafl_project_flutter/lib/persistence/database_connexion.dart
+++ b/Sources/dafl_project_flutter/lib/persistence/database_connexion.dart
@@ -35,7 +35,7 @@ class DatabaseConnexion{
}
- //Initialise connexion to the database
+ //Initialise connection to the database
Future initConnexion() async{
await _loadLogs();
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 bbdb13e..dc3ed46 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
@@ -4,6 +4,8 @@ import './w_settings.dart';
import './w_spot.dart';
import './w_discovery.dart';
import './w_profile.dart';
+import '../../../position/location.dart';
+
class MainPage extends StatefulWidget {
const MainPage({Key? key}) : super(key: key);
@@ -26,6 +28,8 @@ class _MainPageState extends State {
];
@override
Widget build(BuildContext context) {
+ Location.sendCurrentLocation();
+ Location.getData();
double height = MediaQuery.of(context).size.height;
return Scaffold(
body: screens[_index],
diff --git a/Sources/dafl_project_flutter/macos/Flutter/GeneratedPluginRegistrant.swift b/Sources/dafl_project_flutter/macos/Flutter/GeneratedPluginRegistrant.swift
index 977f380..3557088 100644
--- a/Sources/dafl_project_flutter/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/Sources/dafl_project_flutter/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,9 @@ import FlutterMacOS
import Foundation
import geolocator_apple
+import path_provider_macos
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
+ PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
}
diff --git a/Sources/dafl_project_flutter/pubspec.lock b/Sources/dafl_project_flutter/pubspec.lock
index 7ed6371..8aa14de 100644
--- a/Sources/dafl_project_flutter/pubspec.lock
+++ b/Sources/dafl_project_flutter/pubspec.lock
@@ -14,7 +14,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
- version: "3.3.2"
+ version: "3.3.4"
args:
dependency: transitive
description:
@@ -152,7 +152,7 @@ packages:
name: flutter_native_splash
url: "https://pub.dartlang.org"
source: hosted
- version: "2.2.13"
+ version: "2.2.14"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -177,6 +177,55 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "8.1.1"
+ font_awesome_flutter:
+ dependency: "direct main"
+ description:
+ name: font_awesome_flutter
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "10.2.1"
+ geolocator:
+ dependency: "direct main"
+ description:
+ name: geolocator
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "9.0.2"
+ geolocator_android:
+ dependency: transitive
+ description:
+ name: geolocator_android
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "4.1.4"
+ geolocator_apple:
+ dependency: transitive
+ description:
+ name: geolocator_apple
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.2.3"
+ geolocator_platform_interface:
+ dependency: transitive
+ description:
+ name: geolocator_platform_interface
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "4.0.7"
+ geolocator_web:
+ dependency: transitive
+ description:
+ name: geolocator_web
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.1.6"
+ geolocator_windows:
+ dependency: transitive
+ description:
+ name: geolocator_windows
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.1"
graphs:
dependency: transitive
description:
@@ -359,6 +408,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
+ pointycastle:
+ dependency: transitive
+ description:
+ name: pointycastle
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "3.6.2"
postgresql2:
dependency: "direct main"
description:
@@ -475,7 +531,7 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
- version: "3.0.1"
+ version: "3.1.1"
xdg_directories:
dependency: transitive
description:
diff --git a/Sources/dafl_project_flutter/pubspec.yaml b/Sources/dafl_project_flutter/pubspec.yaml
index acd3aa7..ace705f 100644
--- a/Sources/dafl_project_flutter/pubspec.yaml
+++ b/Sources/dafl_project_flutter/pubspec.yaml
@@ -45,6 +45,8 @@ dependencies:
vibration: ^1.7.6
postgresql2: ^1.0.3
path_provider: ^2.0.11
+ font_awesome_flutter: ^10.2.1
+ geolocator: ^9.0.2
dev_dependencies:
flutter_test:
@@ -66,7 +68,7 @@ flutter_native_splash:
color: "#141414"
#background_image: "assets/images/background_blur.png"
- image: "assets/images/Logo_launcher_2.png"
+ image: "assets/images/icon_App.png"
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
@@ -74,9 +76,10 @@ flutter_native_splash:
# The following section is specific to Flutter packages.
flutter_icons:
+ image_path_android: "assets/images/icon_App.png"
+ image_path_ios: "assets/images/icon_App.png"
android: true
ios: true
- image_path: "assets/images/Logo_launcher_2.png"
flutter:
@@ -87,7 +90,8 @@ flutter:
# To add assets to your application, add an assets section, like this:
assets:
- - assets/
+ - assets/images/
+ - assets/fonts/
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware