From 2bfef1bdc7ff224672e389a9f96b828700f95fab Mon Sep 17 00:00:00 2001 From: "dorian.hodin" Date: Mon, 14 Nov 2022 21:47:29 +0100 Subject: [PATCH 1/8] Problem resolution 2 --- .idea/Daflv4.iml | 12 ++++++++++++ .../dafl_project_flutter/lib/position/location.dart | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.idea/Daflv4.iml b/.idea/Daflv4.iml index 508dab8..0a4c8b0 100644 --- a/.idea/Daflv4.iml +++ b/.idea/Daflv4.iml @@ -30,6 +30,18 @@ + + + + + + + + + + + + diff --git a/Sources/dafl_project_flutter/lib/position/location.dart b/Sources/dafl_project_flutter/lib/position/location.dart index 1c7761b..906b1da 100644 --- a/Sources/dafl_project_flutter/lib/position/location.dart +++ b/Sources/dafl_project_flutter/lib/position/location.dart @@ -2,7 +2,6 @@ import 'package:dafl_project_flutter/main.dart'; import 'package:geolocator/geolocator.dart'; import 'package:http/http.dart' as http; import 'dart:convert'; -import 'dart:developer'; import 'dart:async'; class Location { @@ -36,7 +35,6 @@ class Location { "id" : actualUser.toString(), }); var data = jsonDecode(response.body); - log(data.toString()); return data.toString(); } } \ No newline at end of file From a8c997c5f70ebe8405727a3e61d8086475f42fa1 Mon Sep 17 00:00:00 2001 From: "dorian.hodin" Date: Mon, 14 Nov 2022 22:17:01 +0100 Subject: [PATCH 2/8] Problem resolution 3 --- .idea/Daflv4.iml | 6 ++++++ Sources/dafl_project_flutter/pubspec.yaml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.idea/Daflv4.iml b/.idea/Daflv4.iml index 0a4c8b0..29145de 100644 --- a/.idea/Daflv4.iml +++ b/.idea/Daflv4.iml @@ -42,6 +42,12 @@ + + + + + + diff --git a/Sources/dafl_project_flutter/pubspec.yaml b/Sources/dafl_project_flutter/pubspec.yaml index 1eecef9..09cc8dd 100644 --- a/Sources/dafl_project_flutter/pubspec.yaml +++ b/Sources/dafl_project_flutter/pubspec.yaml @@ -91,7 +91,6 @@ flutter: assets: - assets/images/ - assets/fonts/ - - assets/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware From a91ff704941b1b46055883c48fab5fa6a7f9cb2b Mon Sep 17 00:00:00 2001 From: Dorian HODIN Date: Mon, 14 Nov 2022 22:17:57 +0100 Subject: [PATCH 3/8] Supprimer 'Sources/phpLocation/.idea/workspace.xml' --- Sources/phpLocation/.idea/workspace.xml | 87 ------------------------- 1 file changed, 87 deletions(-) delete mode 100644 Sources/phpLocation/.idea/workspace.xml diff --git a/Sources/phpLocation/.idea/workspace.xml b/Sources/phpLocation/.idea/workspace.xml deleted file mode 100644 index 5302c39..0000000 --- a/Sources/phpLocation/.idea/workspace.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - $PROJECT_DIR$/composer.json - - - - - - - - - - - - - - - - - - - - - - - - - 1668370798748 - - - - - - - - - \ No newline at end of file From 2554b885ec587e6641b0fa536a693471e112b26b Mon Sep 17 00:00:00 2001 From: Dorian HODIN Date: Mon, 14 Nov 2022 22:18:14 +0100 Subject: [PATCH 4/8] Supprimer 'Sources/dafl_project_flutter/assets/logs.txt' --- Sources/dafl_project_flutter/assets/logs.txt | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Sources/dafl_project_flutter/assets/logs.txt diff --git a/Sources/dafl_project_flutter/assets/logs.txt b/Sources/dafl_project_flutter/assets/logs.txt deleted file mode 100644 index 7d70a00..0000000 --- a/Sources/dafl_project_flutter/assets/logs.txt +++ /dev/null @@ -1,4 +0,0 @@ -postgres -mdpDaflBd -89.83.54.48 -BD-DaflMusic \ No newline at end of file From 5db108fe39aeb2886b37347fd36cc539d3bcfc8d Mon Sep 17 00:00:00 2001 From: Dorian HODIN Date: Mon, 14 Nov 2022 22:26:27 +0100 Subject: [PATCH 5/8] Supprimer 'Sources/phpLocation/.idea/workspace.xml' --- Sources/phpLocation/.idea/workspace.xml | 87 ------------------------- 1 file changed, 87 deletions(-) delete mode 100644 Sources/phpLocation/.idea/workspace.xml diff --git a/Sources/phpLocation/.idea/workspace.xml b/Sources/phpLocation/.idea/workspace.xml deleted file mode 100644 index 5302c39..0000000 --- a/Sources/phpLocation/.idea/workspace.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - $PROJECT_DIR$/composer.json - - - - - - - - - - - - - - - - - - - - - - - - - 1668370798748 - - - - - - - - - \ No newline at end of file From 17b73282bcd07a71ddf3139dae122d96fc243444 Mon Sep 17 00:00:00 2001 From: "dorian.hodin" Date: Mon, 14 Nov 2022 22:28:53 +0100 Subject: [PATCH 6/8] Problem resolution 4 --- .idea/libraries/Dart_Packages.xml | 32 +++++++++++++++++++ .../lib/views/pages/main/p_main.dart | 4 --- .../flutter/generated_plugin_registrant.cc | 11 +++++++ .../flutter/generated_plugin_registrant.h | 15 +++++++++ .../linux/flutter/generated_plugins.cmake | 23 +++++++++++++ 5 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.cc create mode 100644 Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.h create mode 100644 Sources/dafl_project_flutter/linux/flutter/generated_plugins.cmake diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index 433111f..0568fe9 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -135,6 +135,13 @@ + + + + + + @@ -184,6 +191,13 @@ + + + + + + @@ -233,6 +247,13 @@ + + + + + + @@ -429,6 +450,13 @@ + + + + + + @@ -569,11 +597,13 @@ + + @@ -581,6 +611,7 @@ + @@ -609,6 +640,7 @@ + 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 ebce433..39f7306 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 @@ -32,10 +32,6 @@ class _MainPageState extends State { Widget build(BuildContext context) { Location.sendCurrentLocation(); double height = MediaQuery.of(context).size.height; - double height = MediaQuery - .of(context) - .size - .height; return Scaffold( resizeToAvoidBottomInset: false, body: screens[_index], diff --git a/Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.cc b/Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..e71a16d --- /dev/null +++ b/Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.h b/Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/Sources/dafl_project_flutter/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/Sources/dafl_project_flutter/linux/flutter/generated_plugins.cmake b/Sources/dafl_project_flutter/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..2e1de87 --- /dev/null +++ b/Sources/dafl_project_flutter/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) From c8b3f11ab0f1074cb4b8322ff04d7af845a2c305 Mon Sep 17 00:00:00 2001 From: "dorian.hodin" Date: Mon, 14 Nov 2022 22:31:49 +0100 Subject: [PATCH 7/8] Problem resolution 5 --- Sources/dafl_project_flutter/lib/position/location.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/dafl_project_flutter/lib/position/location.dart b/Sources/dafl_project_flutter/lib/position/location.dart index 94cce8d..df1d6fe 100644 --- a/Sources/dafl_project_flutter/lib/position/location.dart +++ b/Sources/dafl_project_flutter/lib/position/location.dart @@ -28,8 +28,8 @@ class Location { } static Future getData() async { + String actualUser = MyApp.controller.currentUser.usernameDafl; Uri uri = Uri.parse("http://89.83.53.34/phpmyadmin/dafldev/distance.php"); - String actualUser = MyApp().controller.currentUser.usernameDafl; http.Response response = await http.post(uri, body : { "id" : actualUser.toString(), }); From 33cfa6bf7c4198534c0943d961ccc654e992e642 Mon Sep 17 00:00:00 2001 From: Dorian HODIN Date: Mon, 14 Nov 2022 22:35:59 +0100 Subject: [PATCH 8/8] Supprimer 'Sources/.gitkeep' --- Sources/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sources/.gitkeep diff --git a/Sources/.gitkeep b/Sources/.gitkeep deleted file mode 100644 index e69de29..0000000