Clean code + add icons (mymuseum)

lib/Components/check_input_container.dart

@@ -1,6 +1,4 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:manager_app/Components/color_picker.dart';
 
 import '../constants.dart';
 

lib/Components/color_picker_input_container.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/color_picker.dart';
 

lib/Components/multi_select_container.dart

@@ -71,7 +71,7 @@ class MultiSelectChip extends StatefulWidget {
 }
 class _MultiSelectChipState extends State<MultiSelectChip> {
   _buildChoiceList() {
-    List<Widget> choices = List();
+    List<Widget> choices = [];
     widget.values.forEach((item) {
       choices.add(Container(
         padding: const EdgeInsets.all(2.0),

lib/Components/multi_select_dropdown_container.dart

@@ -5,8 +5,6 @@ import 'package:multi_select_flutter/dialog/multi_select_dialog_field.dart';
 import 'package:multi_select_flutter/util/multi_select_item.dart';
 import 'package:multi_select_flutter/util/multi_select_list_type.dart';
 
-import 'message_notification.dart';
-
 class MultiSelectDropdownContainer extends StatelessWidget {
   final Color color;
   final String label;
@@ -53,22 +51,10 @@ class MultiSelectDropdownContainer extends StatelessWidget {
                 title: Text("Veuillez sélectionner une langue"),
                 dialogHeight: size.height *0.4,
                 dialogWidth: size.width *0.2,
-                onConfirm: (values) {
-                  print("do something");
-                  //_selectedAnimals = values;
-                },
                 onSelectionChanged: (selectedList) {
                   onChanged(selectedList);
                 },
-              ),/*MultiSelectDropdown(
-                values,
-                initialValue,
-                isMultiple,
-                isAtLeastOne,
-                onSelectionChanged: (selectedList) {
-                  onChanged(selectedList);
-                },
-              )*/
+              ),
             ),
           ),
         ],

lib/Components/multi_string_input_container.dart

@@ -42,7 +42,7 @@ class MultiStringContainer extends StatelessWidget {
               width: size.width *0.15,
               child: InkWell(
                 onTap: () {
-                  List<TranslationDTO> newValues = new List<TranslationDTO>();
+                  List<TranslationDTO> newValues = <TranslationDTO>[];
                   // Make a copy
                   initialValue.forEach((value) {
                     newValues.add(TranslationDTO.fromJson(jsonDecode(jsonEncode(value))));

lib/Components/resource_tab.dart

@@ -23,7 +23,7 @@ class ResourceTab extends StatefulWidget {
 
 class _ResourceTabState extends State<ResourceTab> with SingleTickerProviderStateMixin {
   TabController _tabController;
-  List<Tab> tabsToShow = new List<Tab>();
+  List<Tab> tabsToShow = <Tab>[];
 
   @override
   void initState() {
@@ -89,7 +89,7 @@ class _ResourceTabState extends State<ResourceTab> with SingleTickerProviderStat
 }
 
 getContent(ResourceDTO resourceDTO, Function onFileUpload, Function onFileUploadWeb) {
-  List<Widget> tabsToShow = new List<Widget>();
+  List<Widget> tabsToShow = <Widget>[];
 
   // Local Image
   tabsToShow.add(

lib/Components/translation_tab.dart

@@ -52,7 +52,7 @@ class _TranslationTabState extends State<TranslationTab> with SingleTickerProvid
 }
 
 getContent(List<TranslationDTO> translations, int maxLines) {
-  List<Widget> tabsToShow = new List<Widget>();
+  List<Widget> tabsToShow = <Widget>[];
   translations.forEach((translation) {
     tabsToShow.add(
       new Padding(
@@ -103,7 +103,7 @@ getContent(List<TranslationDTO> translations, int maxLines) {
 }
 
 getTabs(List<TranslationDTO> newValues) {
-  List<Tab> tabsToShow = new List<Tab>();
+  List<Tab> tabsToShow = <Tab>[];
   newValues.forEach((value) {
     tabsToShow.add(
         new Tab(text: value.language));

lib/Components/upload_image_container.dart

@@ -1,7 +1,5 @@
 import 'dart:io';
-import 'dart:typed_data';
 import 'package:file_picker/file_picker.dart';
-import 'package:manager_app/Components/loading.dart';
 import 'package:manager_app/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;

lib/Components/upload_online_resources_container.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:manager_app/Components/rounded_input_field.dart';
 import 'package:manager_app/constants.dart';
 import 'package:managerapi/api.dart';

lib/Components/vlc_viewer.dart

@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+
 //import 'package:dart_vlc/dart_vlc.dart';
 /*
 class DartVLC extends StatefulWidget {

lib/Helpers/FileHelper.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:developer';
 import 'dart:io';
 
 import 'package:encrypt/encrypt.dart';
@@ -9,7 +8,6 @@ import 'package:manager_app/Models/session.dart';
 import 'package:manager_app/client.dart';
 import 'package:manager_app/constants.dart';
 import 'package:managerapi/api.dart';
-//import 'package:path_provider/path_provider.dart';
 
 class FileHelper {
   final key = Key.fromUtf8('aVs:ZMe3EK-yS<y:;k>vCGrj3T8]yG6E');

lib/Models/Model.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
 import 'package:password_credential/credentials.dart';
 import 'package:password_credential/entity/mediation.dart';
 import 'package:password_credential/entity/password_credential.dart';

lib/Models/managerContext.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:manager_app/Models/session.dart';
 import 'package:manager_app/client.dart';
 import 'package:managerapi/api.dart';
 

lib/Screens/Configurations/Section/SubSection/Article/article_config.dart

@@ -1,10 +1,6 @@
-import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/check_input_container.dart';
 import 'package:manager_app/Components/multi_string_input_container.dart';
-import 'package:manager_app/Components/text_form_input_container.dart';
-import 'package:manager_app/Models/managerContext.dart';
 import 'package:manager_app/Screens/Configurations/Section/SubSection/Slider/listView_card_image.dart';
 import 'package:manager_app/Screens/Configurations/Section/SubSection/Slider/new_update_image_slider.dart';
 import 'package:manager_app/app_context.dart';

lib/Screens/Configurations/Section/SubSection/Article/download_pdf.dart

@@ -1,10 +1,7 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Helpers/PDFHelper.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 DownloadPDF extends StatefulWidget {
   final List<SectionDTO> sections;
@@ -26,9 +23,6 @@ class _DownloadPDFState extends State<DownloadPDF> {
 
   @override
   Widget build(BuildContext context) {
-    final appContext = Provider.of<AppContext>(context);
-    Size size = MediaQuery.of(context).size;
-
     return
       InkWell(
         onTap: () async {

lib/Screens/Configurations/Section/SubSection/Map/geopoint_image_list.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Screens/Configurations/Section/SubSection/Map/listView_card_geoPoint_images.dart';
 import 'package:manager_app/Screens/Resources/select_resource_modal.dart';

lib/Screens/Configurations/Section/SubSection/Map/map_config.dart

@@ -1,5 +1,4 @@
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/fetch_section_icon.dart';
 import 'package:manager_app/Components/image_input_container.dart';

lib/Screens/Configurations/Section/SubSection/Menu/menu_config.dart

@@ -1,5 +1,4 @@
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/fetch_section_icon.dart';
 import 'package:manager_app/Screens/Configurations/Section/SubSection/Menu/listView_card_subSection.dart';

lib/Screens/Configurations/Section/SubSection/Quizz/new_update_response_quizz.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/message_notification.dart';
 import 'package:manager_app/Components/rounded_button.dart';

lib/Screens/Configurations/Section/SubSection/Quizz/quizz_answer_list.dart

@@ -1,5 +1,4 @@
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/app_context.dart';
 import 'package:manager_app/constants.dart';

lib/Screens/Configurations/Section/SubSection/Quizz/quizz_config.dart

@@ -1,5 +1,4 @@
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/rounded_button.dart';
 import 'package:manager_app/app_context.dart';
@@ -330,7 +329,7 @@ class _QuizzConfigState extends State<QuizzConfig> {
                         padding: const EdgeInsets.all(8.0),
                         child: Icon(
                           Icons.delete,
-                          color: kPrimaryColor,
+                          color: kPrimaryColorOld,
                           size: 25.0,
                         ),
                       )

lib/Screens/Configurations/Section/SubSection/Slider/listView_card_image.dart

@@ -27,8 +27,6 @@ class ListViewCardImage extends StatefulWidget {
 class _ListViewCard extends State<ListViewCardImage> {
   @override
   Widget build(BuildContext context) {
-    Size size = MediaQuery.of(context).size;
-
     return Card(
       margin: EdgeInsets.all(4),
       child: Stack(

lib/Screens/Configurations/Section/SubSection/Slider/slider_config.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Screens/Configurations/Section/SubSection/Slider/listView_card_image.dart';
 import 'package:manager_app/Screens/Configurations/Section/SubSection/Slider/new_update_image_slider.dart';

lib/Screens/Configurations/Section/section_detail_screen.dart

@@ -265,7 +265,7 @@ class _SectionDetailScreenState extends State<SectionDetailScreen> {
             child: RoundedButton(
               text: "Supprimer",
               icon: Icons.delete,
-              color: kPrimaryColor,
+              color: kPrimaryColorOld,
               textColor: Colors.white,
               fontSize: 15,
               press: () {

lib/Screens/Configurations/configuration_detail_screen.dart

@@ -1,16 +1,14 @@
 import 'dart:developer';
 import 'dart:io';
 
-import 'package:flutter/cupertino.dart';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/painting.dart';
 import 'package:manager_app/Components/check_input_container.dart';
 import 'package:manager_app/Components/color_picker_input_container.dart';
 import 'package:manager_app/Components/confirmation_dialog.dart';
 import 'package:manager_app/Components/loading_common.dart';
 import 'package:manager_app/Components/message_notification.dart';
-import 'package:manager_app/Components/multi_select_container.dart';
 import 'package:manager_app/Components/multi_select_dropdown_container.dart';
 import 'package:manager_app/Components/rounded_button.dart';
 import 'package:manager_app/Components/string_input_container.dart';
@@ -321,7 +319,7 @@ class _ConfigurationDetailScreenState extends State<ConfigurationDetailScreen> {
             child: RoundedButton(
               text: "Supprimer",
               icon: Icons.delete,
-              color: kPrimaryColor,
+              color: kPrimaryColorOld,
               textColor: Colors.white,
               fontSize: 15,
               press: () {

lib/Screens/Configurations/section_reorderList.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/string_input_container.dart';
 import 'package:manager_app/Models/managerContext.dart';

lib/Screens/Devices/change_device_info_modal.dart

@@ -123,7 +123,7 @@ showChangeInfo (String text, DeviceDTO inputDevice, Function onGetResult, int ma
 }
 
 getConfigurationsElement(DeviceDTO inputDevice, data, Function onGetResult) {
-  List<Widget> widgets = new List<Widget>();
+  List<Widget> widgets = <Widget>[];
   for(var configuration in data as List<ConfigurationDTO>) {
     var widget = new InkWell(
       onTap: () {

lib/Screens/Main/components/body.dart

@@ -1,6 +1,4 @@
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Models/managerContext.dart';
 import 'package:manager_app/Models/menu.dart';
@@ -39,7 +37,7 @@ class _BodyState extends State<Body> {
     final appContext = Provider.of<AppContext>(context);
     Size size = MediaQuery.of(context).size;
 
-    menu.sections = new List<MenuSection>(); // TODO CLEAN
+    menu.sections = <MenuSection>[];
     menu.sections.add(devices);
     menu.sections.add(configurations);
     menu.sections.add(resources);
@@ -73,7 +71,7 @@ class _BodyState extends State<Body> {
                       alignment: AlignmentDirectional.bottomStart,
                       child: AutoSizeText(
                         menu.title,
-                        style: new TextStyle(color: kBlack, fontSize: 30, fontWeight: FontWeight.w400, fontFamily: "Helvetica"),
+                        style: new TextStyle(color: kPrimaryColor, fontSize: 30, fontWeight: FontWeight.w400, fontFamily: "Helvetica"),
                         maxLines: 1,
                       ),
                     ),

lib/Screens/Resources/resources_screen.dart

@@ -1,9 +1,6 @@
-import 'dart:convert';
-import 'dart:developer';
 import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:manager_app/Components/loading.dart';
 import 'package:manager_app/Components/loading_common.dart';
 import 'package:manager_app/Components/message_notification.dart';
 import 'package:manager_app/Models/managerContext.dart';
@@ -124,7 +121,7 @@ Future<ResourceDTO> create(ResourceDTO resourceDTO, List<File> files, List<Platf
         request.fields['type'] = ResourceType.image.toString();
 
         var res = await request.send();
-        final respStr = await res.stream.bytesToString();
+        await res.stream.bytesToString();
 
         if (res.statusCode == 200) {
           showNotification(Colors.green, kWhite, 'La ressource a été créée avec succès', context, null);

lib/Screens/Resources/select_resource_modal.dart

@@ -60,7 +60,7 @@ dynamic showSelectResourceModal (String text, int maxLines, bool onlyImage, Buil
 }
 
 showValues(List<TranslationDTO> newValues) {
-  List<Widget> valuesToShow = new List<Widget>();
+  List<Widget> valuesToShow = <Widget>[];
   newValues.forEach((newValue) {
     valuesToShow.add(
         new StringInputContainer(

lib/Screens/Resources/show_resource_popup.dart

@@ -70,7 +70,7 @@ void showResource(ResourceDTO resourceDTO, AppContext appContext, BuildContext c
                   child: RoundedButton(
                     text: "Supprimer",
                     icon: Icons.delete,
-                    color: kPrimaryColor,
+                    color: kPrimaryColorOld,
                     textColor: kWhite,
                     press: () {
                       delete(resourceDTO, appContext, context);

lib/Screens/login_screen.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:manager_app/Components/loading.dart';
 import 'package:manager_app/Components/loading_common.dart';
 import 'package:manager_app/Components/message_notification.dart';
 import 'package:manager_app/Components/rounded_button.dart';
@@ -15,9 +14,6 @@ import 'package:manager_app/constants.dart';
 import 'package:managerapi/api.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
-import 'package:password_credential/credentials.dart';
-import 'package:password_credential/entity/password_credential.dart';
-import 'package:password_credential/entity/result.dart';
 
 class LoginScreen extends StatefulWidget {
   final Session session;
@@ -151,6 +147,19 @@ class _LoginScreenState extends State<LoginScreen> {
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: <Widget>[
+                  Padding(
+                    padding: const EdgeInsets.only(bottom: 20),
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: Icon(Icons.museum_outlined, color: kPrimaryColor, size: size.height*0.08),
+                        ),
+                        Text("MyMuseum", style: TextStyle(color: kPrimaryColor, fontSize: 45, fontFamily: "Helvetica")),
+                      ],
+                    ),
+                  ),
                   RoundedInputField(
                       hintText: "Host",
                       onChanged: (value) {

lib/constants.dart

@@ -6,7 +6,8 @@ const kTitleTextColor = Color(0xFF303030);
 const kBodyTextColor = Color(0xFF4B4B4B); // TODO
 
 const kBackgroundColor = Color(0xFFf5f5f7);
-const kPrimaryColor = Color(0xFFCA413F);
+const kPrimaryColor = Color(0xFF308aae);
+const kPrimaryColorOld = Color(0xFFCA413F);
 const kTextLightColor = Color(0xFFFCFDFD);
 const kSecond = Color(0xFFC2C9D6);
 const kWhite = Color(0xFFFFFFFF);

lib/main.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'dart:ui';
 
 import 'package:manager_app/Models/managerContext.dart';
@@ -49,7 +48,7 @@ class _MyAppState extends State<MyApp> {
       child: MaterialApp(
           scrollBehavior: MyCustomScrollBehavior(),
           debugShowCheckedModeBanner: false,
-          title: 'MyMuseum App',
+          title: 'MyMuseum manager',
           initialRoute: widget.initialRoute,
           /*supportedLocales: [
             const Locale('en', 'US'),