From fe6fe9edc5438264b71211dbc1751c7fe7be21ac Mon Sep 17 00:00:00 2001 From: Thomas Fransolet Date: Mon, 26 Jul 2021 18:52:33 +0200 Subject: [PATCH] Clean code --- lib/Components/multi_input_modal.dart | 2 -- lib/Components/rounded_button.dart | 2 +- lib/Components/slider_input_container.dart | 1 - lib/Components/text_form_input_container.dart | 1 - lib/Components/upload_image_container.dart | 5 ----- lib/Components/upload_online_resources_container.dart | 4 ---- lib/Components/vlc_viewer.dart | 2 -- lib/Models/managerContext.dart | 1 - lib/Models/menu.dart | 3 --- lib/Models/menuSection.dart | 3 --- .../SubSection/Map/listView_card_geoPoint_images.dart | 4 ---- .../Section/SubSection/Map/showNewOrUpdateGeoPoint.dart | 1 - .../Configurations/Section/section_detail_screen.dart | 1 - lib/Screens/Configurations/configuration_detail_screen.dart | 2 +- lib/Screens/Configurations/configurations_screen.dart | 1 - lib/Screens/Configurations/listView_card_section.dart | 2 -- lib/Screens/Configurations/new_configuration_popup.dart | 2 +- lib/Screens/Configurations/section_reorderList.dart | 4 +--- lib/Screens/Devices/device_element.dart | 2 +- lib/Screens/Devices/devices_screen.dart | 2 +- lib/Screens/Devices/dropDown_configuration.dart | 6 ++---- lib/Screens/Main/components/background.dart | 2 +- 22 files changed, 9 insertions(+), 44 deletions(-) diff --git a/lib/Components/multi_input_modal.dart b/lib/Components/multi_input_modal.dart index f650e4a..dcb9c3b 100644 --- a/lib/Components/multi_input_modal.dart +++ b/lib/Components/multi_input_modal.dart @@ -1,9 +1,7 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; import 'package:manager_app/Components/rounded_button.dart'; -import 'package:manager_app/Components/string_input_container.dart'; import 'package:manager_app/Components/text_form_input_container.dart'; -import 'package:manager_app/Components/translation_tab.dart'; import 'package:manager_app/Models/managerContext.dart'; import 'package:manager_app/app_context.dart'; import 'package:manager_app/constants.dart'; diff --git a/lib/Components/rounded_button.dart b/lib/Components/rounded_button.dart index 5da827f..62c6d28 100644 --- a/lib/Components/rounded_button.dart +++ b/lib/Components/rounded_button.dart @@ -20,7 +20,7 @@ class RoundedButton extends StatelessWidget { @override Widget build(BuildContext context) { - Size size = MediaQuery.of(context).size; + //Size size = MediaQuery.of(context).size; return TextButton( style: ButtonStyle( padding: MaterialStateProperty.resolveWith((states) => EdgeInsets.symmetric(vertical: 25, horizontal: icon == null ? 85 : 40)), diff --git a/lib/Components/slider_input_container.dart b/lib/Components/slider_input_container.dart index bba21bf..d9b0e7c 100644 --- a/lib/Components/slider_input_container.dart +++ b/lib/Components/slider_input_container.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:manager_app/Components/rounded_input_field.dart'; import 'package:manager_app/constants.dart'; class SliderInputContainer extends StatefulWidget { diff --git a/lib/Components/text_form_input_container.dart b/lib/Components/text_form_input_container.dart index fca37f0..3765b18 100644 --- a/lib/Components/text_form_input_container.dart +++ b/lib/Components/text_form_input_container.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:manager_app/Components/rounded_input_field.dart'; import 'package:manager_app/constants.dart'; class TextFormInputContainer extends StatelessWidget { diff --git a/lib/Components/upload_image_container.dart b/lib/Components/upload_image_container.dart index f82cc1f..b1df58d 100644 --- a/lib/Components/upload_image_container.dart +++ b/lib/Components/upload_image_container.dart @@ -1,12 +1,7 @@ import 'dart:io'; -import 'dart:convert'; import 'package:dart_vlc/dart_vlc.dart'; import 'package:manager_app/Components/loading.dart'; -import 'package:manager_app/Components/vlc_viewer.dart'; import 'package:manager_app/constants.dart'; -import 'package:path/path.dart'; -import 'package:async/async.dart'; -import 'package:http/http.dart' as http; import 'package:filepicker_windows/filepicker_windows.dart'; import 'package:flutter/material.dart'; diff --git a/lib/Components/upload_online_resources_container.dart b/lib/Components/upload_online_resources_container.dart index f1c7222..f46df99 100644 --- a/lib/Components/upload_online_resources_container.dart +++ b/lib/Components/upload_online_resources_container.dart @@ -1,9 +1,5 @@ -import 'dart:io'; -import 'package:dart_vlc/dart_vlc.dart'; import 'package:flutter/cupertino.dart'; import 'package:manager_app/Components/rounded_input_field.dart'; -import 'package:manager_app/Components/string_input_container.dart'; -import 'package:manager_app/Components/vlc_viewer.dart'; import 'package:manager_app/constants.dart'; import 'package:managerapi/api.dart'; import 'package:flutter/material.dart'; diff --git a/lib/Components/vlc_viewer.dart b/lib/Components/vlc_viewer.dart index bda1337..2c654ec 100644 --- a/lib/Components/vlc_viewer.dart +++ b/lib/Components/vlc_viewer.dart @@ -1,5 +1,3 @@ -import 'dart:io'; -import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:dart_vlc/dart_vlc.dart'; diff --git a/lib/Models/managerContext.dart b/lib/Models/managerContext.dart index 55c734c..651d089 100644 --- a/lib/Models/managerContext.dart +++ b/lib/Models/managerContext.dart @@ -1,4 +1,3 @@ -import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:manager_app/client.dart'; import 'package:managerapi/api.dart'; diff --git a/lib/Models/menu.dart b/lib/Models/menu.dart index e67248a..c905bbc 100644 --- a/lib/Models/menu.dart +++ b/lib/Models/menu.dart @@ -1,6 +1,3 @@ -import 'dart:io'; -import 'dart:ui' as ui; - import 'package:manager_app/Models/menuSection.dart'; class Menu { diff --git a/lib/Models/menuSection.dart b/lib/Models/menuSection.dart index d4ec3cf..ed2e89e 100644 --- a/lib/Models/menuSection.dart +++ b/lib/Models/menuSection.dart @@ -1,6 +1,3 @@ -import 'dart:io'; -import 'dart:ui' as ui; - class MenuSection { String name; String type; diff --git a/lib/Screens/Configurations/Section/SubSection/Map/listView_card_geoPoint_images.dart b/lib/Screens/Configurations/Section/SubSection/Map/listView_card_geoPoint_images.dart index f55712a..326c3dc 100644 --- a/lib/Screens/Configurations/Section/SubSection/Map/listView_card_geoPoint_images.dart +++ b/lib/Screens/Configurations/Section/SubSection/Map/listView_card_geoPoint_images.dart @@ -1,8 +1,4 @@ -import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; -import 'package:manager_app/Components/fetch_section_icon.dart'; -import 'file:///C:/Users/Thomas%20Fransolet/Documents/Documents/Perso/MuseeDeLaFraise/manager-app/lib/Screens/Configurations/Section/SubSection/Slider/new_update_image_slider.dart'; -import 'file:///C:/Users/Thomas%20Fransolet/Documents/Documents/Perso/MuseeDeLaFraise/manager-app/lib/Screens/Configurations/Section/SubSection/Menu/showEditSubSection.dart'; import 'package:manager_app/app_context.dart'; import 'package:manager_app/constants.dart'; import 'package:managerapi/api.dart'; diff --git a/lib/Screens/Configurations/Section/SubSection/Map/showNewOrUpdateGeoPoint.dart b/lib/Screens/Configurations/Section/SubSection/Map/showNewOrUpdateGeoPoint.dart index 2a1ad31..f624a14 100644 --- a/lib/Screens/Configurations/Section/SubSection/Map/showNewOrUpdateGeoPoint.dart +++ b/lib/Screens/Configurations/Section/SubSection/Map/showNewOrUpdateGeoPoint.dart @@ -1,5 +1,4 @@ import 'package:auto_size_text/auto_size_text.dart'; -import 'package:manager_app/Components/image_input_container.dart'; import 'package:flutter/material.dart'; import 'package:manager_app/Components/rounded_button.dart'; import 'package:manager_app/Components/string_input_container.dart'; diff --git a/lib/Screens/Configurations/Section/section_detail_screen.dart b/lib/Screens/Configurations/Section/section_detail_screen.dart index 6a9ee46..9796991 100644 --- a/lib/Screens/Configurations/Section/section_detail_screen.dart +++ b/lib/Screens/Configurations/Section/section_detail_screen.dart @@ -4,7 +4,6 @@ import 'package:manager_app/Components/fetch_section_icon.dart'; import 'package:manager_app/Components/image_input_container.dart'; import 'package:manager_app/Components/loading.dart'; import 'package:manager_app/Components/message_notification.dart'; -import 'package:manager_app/Components/multi_select_container.dart'; import 'package:manager_app/Components/multi_string_input_container.dart'; import 'package:manager_app/Components/rounded_button.dart'; import 'package:manager_app/Components/string_input_container.dart'; diff --git a/lib/Screens/Configurations/configuration_detail_screen.dart b/lib/Screens/Configurations/configuration_detail_screen.dart index 16a5cdd..57557c5 100644 --- a/lib/Screens/Configurations/configuration_detail_screen.dart +++ b/lib/Screens/Configurations/configuration_detail_screen.dart @@ -273,7 +273,7 @@ class _ConfigurationDetailScreenState extends State { // Update section order ManagerAppContext managerAppContext = appContext.getContext(); - var result = await managerAppContext.clientAPI.sectionApi.sectionUpdateOrder(sections); + await managerAppContext.clientAPI.sectionApi.sectionUpdateOrder(sections); }, ), ), diff --git a/lib/Screens/Configurations/configurations_screen.dart b/lib/Screens/Configurations/configurations_screen.dart index c4daefa..eacef42 100644 --- a/lib/Screens/Configurations/configurations_screen.dart +++ b/lib/Screens/Configurations/configurations_screen.dart @@ -1,5 +1,4 @@ import 'package:auto_size_text/auto_size_text.dart'; -import 'package:flare_flutter/flare_actor.dart'; import 'package:flutter/material.dart'; import 'package:manager_app/Components/loading.dart'; import 'package:manager_app/Models/managerContext.dart'; diff --git a/lib/Screens/Configurations/listView_card_section.dart b/lib/Screens/Configurations/listView_card_section.dart index 43813df..e133903 100644 --- a/lib/Screens/Configurations/listView_card_section.dart +++ b/lib/Screens/Configurations/listView_card_section.dart @@ -1,8 +1,6 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; import 'package:manager_app/Components/fetch_section_icon.dart'; -import 'file:///C:/Users/Thomas%20Fransolet/Documents/Documents/Perso/MuseeDeLaFraise/manager-app/lib/Screens/Configurations/Section/SubSection/Slider/new_update_image_slider.dart'; -import 'file:///C:/Users/Thomas%20Fransolet/Documents/Documents/Perso/MuseeDeLaFraise/manager-app/lib/Screens/Configurations/Section/SubSection/Menu/showEditSubSection.dart'; import 'package:manager_app/app_context.dart'; import 'package:manager_app/constants.dart'; import 'package:managerapi/api.dart'; diff --git a/lib/Screens/Configurations/new_configuration_popup.dart b/lib/Screens/Configurations/new_configuration_popup.dart index 65f2264..a3d71e7 100644 --- a/lib/Screens/Configurations/new_configuration_popup.dart +++ b/lib/Screens/Configurations/new_configuration_popup.dart @@ -79,7 +79,7 @@ void showNewConfiguration(AppContext appContext, BuildContext context) { void create(ConfigurationDTO configurationDTO, AppContext appContext, context) async { if (configurationDTO.label != null) { - ConfigurationDTO newConfiguration = await appContext.getContext().clientAPI.configurationApi.configurationCreate(configurationDTO); + await appContext.getContext().clientAPI.configurationApi.configurationCreate(configurationDTO); ManagerAppContext managerAppContext = appContext.getContext(); managerAppContext.selectedConfiguration = null; appContext.setContext(managerAppContext); diff --git a/lib/Screens/Configurations/section_reorderList.dart b/lib/Screens/Configurations/section_reorderList.dart index 784c522..67c7aa0 100644 --- a/lib/Screens/Configurations/section_reorderList.dart +++ b/lib/Screens/Configurations/section_reorderList.dart @@ -1,10 +1,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:manager_app/Models/managerContext.dart'; -import 'package:manager_app/Screens/Configurations/Section/SubSection/Map/listView_card_geoPoint_images.dart'; import 'package:manager_app/Screens/Configurations/listView_card_section.dart'; import 'package:manager_app/Screens/Configurations/new_section_popup.dart'; -import 'package:manager_app/Screens/Resources/select_resource_modal.dart'; import 'package:manager_app/app_context.dart'; import 'package:manager_app/constants.dart'; import 'package:managerapi/api.dart'; @@ -57,7 +55,7 @@ class _SectionReorderListState extends State { @override Widget build(BuildContext context) { final appContext = Provider.of(context); - Size size = MediaQuery.of(context).size; + //Size size = MediaQuery.of(context).size; return Stack( children: [ diff --git a/lib/Screens/Devices/device_element.dart b/lib/Screens/Devices/device_element.dart index 54c1590..cff8f35 100644 --- a/lib/Screens/Devices/device_element.dart +++ b/lib/Screens/Devices/device_element.dart @@ -30,7 +30,7 @@ class _DeviceElementState extends State { @override Widget build(BuildContext context) { final appContext = Provider.of(context); - Size size = MediaQuery.of(context).size; + //Size size = MediaQuery.of(context).size; return Stack( children: [ Positioned( diff --git a/lib/Screens/Devices/devices_screen.dart b/lib/Screens/Devices/devices_screen.dart index 90118ee..2489130 100644 --- a/lib/Screens/Devices/devices_screen.dart +++ b/lib/Screens/Devices/devices_screen.dart @@ -203,7 +203,7 @@ class _DevicesScreenState extends State { Future updateMainInfos(DeviceDTO deviceToUpdate, dynamic appContext) async { ManagerAppContext managerAppContext = appContext.getContext(); - DeviceDTO device = await managerAppContext.clientAPI.deviceApi.deviceUpdateMainInfos(deviceToUpdate); + await managerAppContext.clientAPI.deviceApi.deviceUpdateMainInfos(deviceToUpdate); } boxDecoration() { diff --git a/lib/Screens/Devices/dropDown_configuration.dart b/lib/Screens/Devices/dropDown_configuration.dart index f20ba3c..8809df6 100644 --- a/lib/Screens/Devices/dropDown_configuration.dart +++ b/lib/Screens/Devices/dropDown_configuration.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:manager_app/app_context.dart'; import 'package:manager_app/constants.dart'; import 'package:managerapi/api.dart'; -import 'package:provider/provider.dart'; class DropDownConfig extends StatefulWidget { final List configurations; @@ -30,8 +28,8 @@ class _DropDownConfigState extends State { @override Widget build(BuildContext context) { - final appContext = Provider.of(context); - Size size = MediaQuery.of(context).size; + /*final appContext = Provider.of(context); + Size size = MediaQuery.of(context).size;*/ return DropdownButton( value: configurationDTO, icon: const Icon(Icons.arrow_downward), diff --git a/lib/Screens/Main/components/background.dart b/lib/Screens/Main/components/background.dart index 0678e22..8141daa 100644 --- a/lib/Screens/Main/components/background.dart +++ b/lib/Screens/Main/components/background.dart @@ -11,7 +11,7 @@ class Background extends StatelessWidget { @override Widget build(BuildContext context) { Size size = MediaQuery.of(context).size; - final notchInset = MediaQuery.of(context).padding; + //final notchInset = MediaQuery.of(context).padding; return Container( width: double.infinity, height: size.height,