Add pinCode to manager + show devices tab (fort logic)

.gitignore

@@ -32,7 +32,6 @@
 /build/
 
 # Web related
-lib/generated_plugin_registrant.dart
 
 # Symbolication related
 app.*.symbols

Dockerfile

@@ -0,0 +1,23 @@
+#Stage 1 - Install dependencies and build the app in a build environment
+FROM debian:latest AS build-env
+# Install flutter dependencies
+RUN apt-get update
+RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback lib32stdc++6 python3 sed
+RUN apt-get clean
+# Clone the flutter repo
+RUN git clone https://github.com/flutter/flutter.git /usr/local/flutter
+# Set flutter path
+ENV PATH="${PATH}:/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin"
+# Run flutter doctor
+RUN flutter doctor -v
+RUN flutter channel master
+RUN flutter upgrade
+# Copy files to container and build
+RUN mkdir /app/
+COPY . /app/
+WORKDIR /app/
+RUN flutter build web
+#--no-sound-null-safety
+# Stage 2 - Create the run-time image
+FROM nginx:1.21.1-alpine
+COPY --from=build-env /app/build/web /usr/share/nginx/html

README.md

@@ -15,14 +15,24 @@ For help getting started with Flutter, view our
 [online documentation](https://flutter.dev/docs), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
 
-# Model generation via command line 
+# Ancienne version de generation = Model generation via command line
 
 java -cp openapi-generator-cli-5.1.0.jar org.openapitools.codegen.OpenAPIGenerator generate -i swagger.yaml --additional-properties pubName=managerapi -g dart --enable-post-process-file
 
-=> Faudrait mettre à jour le projet avec les nouvelles versions plugins 
+# OPENAPI Generation cmd
+
+flutter clean
+
+flutter pub get
+
+flutter pub run build_runner build --delete-conflicting-outputs
+
+Le fichier est dans le projet.
 
 # Publication sur docker
 
+Avant de build en docker, il faut build en web => flutter build web
+
 docker build -t flutter-web .
 
 Pour tester en local : 

RELEASE/Version1_3/Changelog - Copy.txt

@@ -0,0 +1 @@
+Ajout du Module quizz

RELEASE/Version1_3/How to deploy - Copy.txt

@@ -0,0 +1,26 @@
+- Create BAK folder !!
+- FTP fichiers vers rpi (home/Manager_app)
+- puis mv -v /home/ubuntu/Manager_app/* /var/www/html/manager/
+- Changer nginx : etc/nginx/sites-enabled
+	- Changer le port du service vers le 5002
+	- Ajouter ou décommenter (check addresse ip):
+
+server {
+       listen 8080;
+       listen [::]:8080;
+
+       server_name 192.168.31.96; 
+
+       root /var/www/html/manager;
+       index index.html;
+
+       location / {
+              try_files $uri $uri/ =404;
+       }
+}
+
+
+- Tester nginx : sudo nginx -t
+- Reload nginx : sudo systemctl reload nginx 
+
+Connect manager via http://192.168.1.19:8089 => Si pas ça, peut aller changer dans le main.dart.js puis faire un CTRL MAJ R

RELEASE/Version1_3/WEB - Copy/.last_build_id

@@ -0,0 +1 @@
+2850532bac056cc3a4316af3c232a077

RELEASE/Version1_3/WEB - Copy/assets/AssetManifest.json

@@ -0,0 +1 @@
+{"assets/animations/MDLF_animation.flr":["assets/animations/MDLF_animation.flr"],"assets/files/session.json":["assets/files/session.json"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}

RELEASE/Version1_3/WEB - Copy/assets/FontManifest.json

@@ -0,0 +1 @@
+[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]},{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]}]

RELEASE/Version1_3/WEB - Copy/flutter_service_worker.js

@@ -0,0 +1,219 @@
+'use strict';
+const MANIFEST = 'flutter-app-manifest';
+const TEMP = 'flutter-temp-cache';
+const CACHE_NAME = 'flutter-app-cache';
+const RESOURCES = {
+  "assets/AssetManifest.json": "7ceda6dd13738309d0b4d4d2702b3010",
+"assets/assets/animations/MDLF_animation.flr": "5151e91ce20a70dbc097f01a7ec97497",
+"assets/assets/files/session.json": "d41d8cd98f00b204e9800998ecf8427e",
+"assets/FontManifest.json": "dc3d03800ccca4601324923c0b1d6d57",
+"assets/fonts/MaterialIcons-Regular.otf": "4e6447691c9509f7acdbf8a931a85ca1",
+"assets/NOTICES": "838205c3fa2fbd0319ce48d7c8347af6",
+"assets/packages/cupertino_icons/assets/CupertinoIcons.ttf": "6d342eb68f170c97609e9da345464e5e",
+"favicon.png": "5dcef449791fa27946b3d35ad8803796",
+"icons/android-icon-144x144.png": "25849c1de85e1ac87dfde295a6c97dfe",
+"icons/android-icon-192x192.png": "2f38b513d97a00ddf494059260c193b5",
+"icons/android-icon-36x36.png": "5317b23569b5976037738ae5dec04859",
+"icons/android-icon-48x48.png": "1f7a48a32ed8b3d4c1e6fa7734534fc7",
+"icons/android-icon-72x72.png": "6db0636ec0c228480197e362f3f32fe5",
+"icons/android-icon-96x96.png": "d925090c0a2f6b1a24078a8640fb18e4",
+"icons/apple-icon-114x114.png": "ddd67f65d43fb30b64ebf7b3ff702427",
+"icons/apple-icon-120x120.png": "b6bee39cb32e80068c5e1e87c600ffbc",
+"icons/apple-icon-144x144.png": "25849c1de85e1ac87dfde295a6c97dfe",
+"icons/apple-icon-152x152.png": "42b1ae2dedce452961803388468d6eae",
+"icons/apple-icon-180x180.png": "17655db1c0eaff334ff6208d302a576a",
+"icons/apple-icon-57x57.png": "ffd9c2b4dfe93b5874edbef7a3829495",
+"icons/apple-icon-60x60.png": "5984c1c3aca2b357f604855446cf30f5",
+"icons/apple-icon-72x72.png": "6db0636ec0c228480197e362f3f32fe5",
+"icons/apple-icon-76x76.png": "45bb7aabc4d7211f0ee13c77e6300ec4",
+"icons/apple-icon-precomposed.png": "9cd7f52d632b4bb32f3b701eed4ec663",
+"icons/apple-icon.png": "9cd7f52d632b4bb32f3b701eed4ec663",
+"icons/browserconfig.xml": "653d077300a12f09a69caeea7a8947f8",
+"icons/favicon-16x16.png": "4fca1fd9f6c90305df787a99fe7abf62",
+"icons/favicon-32x32.png": "e78cf52bb5861c5829d6f2b63e0f703e",
+"icons/favicon-96x96.png": "91b367951bf21712259a3aa598456d29",
+"icons/favicon.ico": "941f61fe5dd76ff538f9fd9456705d7a",
+"icons/Icon-192.png": "ac9a721a12bbc803b44f645561ecb1e1",
+"icons/Icon-512.png": "96e752610906ba2a93c65f8abe1645f1",
+"icons/manifest.json": "b58fcfa7628c9205cb11a1b2c3e8f99a",
+"icons/ms-icon-144x144.png": "7f185a22f8c85fb7ccd97cd7711214e5",
+"icons/ms-icon-150x150.png": "5e33aababf68472e0bcc89c752e33fec",
+"icons/ms-icon-310x310.png": "9eace62e32aec3853604ae2919eca0ea",
+"icons/ms-icon-70x70.png": "6720855c40d6a5ba6cd4a384605fc270",
+"index.html": "b934f3f00758439d39e79bff55598ca7",
+"/": "b934f3f00758439d39e79bff55598ca7",
+"main.dart.js": "d92d406acbbcdeb9b4675562b75a0cd3",
+"manifest.json": "2ea69ab3cf494be775c9c65d32512a45",
+"version.json": "c659aa18797537bf2ce076aa3126b86e"
+};
+
+// The application shell files that are downloaded before a service worker can
+// start.
+const CORE = [
+  "/",
+"main.dart.js",
+"index.html",
+"assets/NOTICES",
+"assets/AssetManifest.json",
+"assets/FontManifest.json"];
+// During install, the TEMP cache is populated with the application shell files.
+self.addEventListener("install", (event) => {
+  self.skipWaiting();
+  return event.waitUntil(
+    caches.open(TEMP).then((cache) => {
+      return cache.addAll(
+        CORE.map((value) => new Request(value, {'cache': 'reload'})));
+    })
+  );
+});
+
+// During activate, the cache is populated with the temp files downloaded in
+// install. If this service worker is upgrading from one with a saved
+// MANIFEST, then use this to retain unchanged resource files.
+self.addEventListener("activate", function(event) {
+  return event.waitUntil(async function() {
+    try {
+      var contentCache = await caches.open(CACHE_NAME);
+      var tempCache = await caches.open(TEMP);
+      var manifestCache = await caches.open(MANIFEST);
+      var manifest = await manifestCache.match('manifest');
+      // When there is no prior manifest, clear the entire cache.
+      if (!manifest) {
+        await caches.delete(CACHE_NAME);
+        contentCache = await caches.open(CACHE_NAME);
+        for (var request of await tempCache.keys()) {
+          var response = await tempCache.match(request);
+          await contentCache.put(request, response);
+        }
+        await caches.delete(TEMP);
+        // Save the manifest to make future upgrades efficient.
+        await manifestCache.put('manifest', new Response(JSON.stringify(RESOURCES)));
+        return;
+      }
+      var oldManifest = await manifest.json();
+      var origin = self.location.origin;
+      for (var request of await contentCache.keys()) {
+        var key = request.url.substring(origin.length + 1);
+        if (key == "") {
+          key = "/";
+        }
+        // If a resource from the old manifest is not in the new cache, or if
+        // the MD5 sum has changed, delete it. Otherwise the resource is left
+        // in the cache and can be reused by the new service worker.
+        if (!RESOURCES[key] || RESOURCES[key] != oldManifest[key]) {
+          await contentCache.delete(request);
+        }
+      }
+      // Populate the cache with the app shell TEMP files, potentially overwriting
+      // cache files preserved above.
+      for (var request of await tempCache.keys()) {
+        var response = await tempCache.match(request);
+        await contentCache.put(request, response);
+      }
+      await caches.delete(TEMP);
+      // Save the manifest to make future upgrades efficient.
+      await manifestCache.put('manifest', new Response(JSON.stringify(RESOURCES)));
+      return;
+    } catch (err) {
+      // On an unhandled exception the state of the cache cannot be guaranteed.
+      console.error('Failed to upgrade service worker: ' + err);
+      await caches.delete(CACHE_NAME);
+      await caches.delete(TEMP);
+      await caches.delete(MANIFEST);
+    }
+  }());
+});
+
+// The fetch handler redirects requests for RESOURCE files to the service
+// worker cache.
+self.addEventListener("fetch", (event) => {
+  if (event.request.method !== 'GET') {
+    return;
+  }
+  var origin = self.location.origin;
+  var key = event.request.url.substring(origin.length + 1);
+  // Redirect URLs to the index.html
+  if (key.indexOf('?v=') != -1) {
+    key = key.split('?v=')[0];
+  }
+  if (event.request.url == origin || event.request.url.startsWith(origin + '/#') || key == '') {
+    key = '/';
+  }
+  // If the URL is not the RESOURCE list then return to signal that the
+  // browser should take over.
+  if (!RESOURCES[key]) {
+    return;
+  }
+  // If the URL is the index.html, perform an online-first request.
+  if (key == '/') {
+    return onlineFirst(event);
+  }
+  event.respondWith(caches.open(CACHE_NAME)
+    .then((cache) =>  {
+      return cache.match(event.request).then((response) => {
+        // Either respond with the cached resource, or perform a fetch and
+        // lazily populate the cache.
+        return response || fetch(event.request).then((response) => {
+          cache.put(event.request, response.clone());
+          return response;
+        });
+      })
+    })
+  );
+});
+
+self.addEventListener('message', (event) => {
+  // SkipWaiting can be used to immediately activate a waiting service worker.
+  // This will also require a page refresh triggered by the main worker.
+  if (event.data === 'skipWaiting') {
+    self.skipWaiting();
+    return;
+  }
+  if (event.data === 'downloadOffline') {
+    downloadOffline();
+    return;
+  }
+});
+
+// Download offline will check the RESOURCES for all files not in the cache
+// and populate them.
+async function downloadOffline() {
+  var resources = [];
+  var contentCache = await caches.open(CACHE_NAME);
+  var currentContent = {};
+  for (var request of await contentCache.keys()) {
+    var key = request.url.substring(origin.length + 1);
+    if (key == "") {
+      key = "/";
+    }
+    currentContent[key] = true;
+  }
+  for (var resourceKey of Object.keys(RESOURCES)) {
+    if (!currentContent[resourceKey]) {
+      resources.push(resourceKey);
+    }
+  }
+  return contentCache.addAll(resources);
+}
+
+// Attempt to download the resource online before falling back to
+// the offline cache.
+function onlineFirst(event) {
+  return event.respondWith(
+    fetch(event.request).then((response) => {
+      return caches.open(CACHE_NAME).then((cache) => {
+        cache.put(event.request, response.clone());
+        return response;
+      });
+    }).catch((error) => {
+      return caches.open(CACHE_NAME).then((cache) => {
+        return cache.match(event.request).then((response) => {
+          if (response != null) {
+            return response;
+          }
+          throw error;
+        });
+      });
+    })
+  );
+}

RELEASE/Version1_3/WEB - Copy/icons/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

RELEASE/Version1_3/WEB - Copy/icons/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

RELEASE/Version1_3/WEB - Copy/index.html

@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+  -->
+  <base href="/">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter application.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="manager_app">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+  <link rel="apple-touch-icon" sizes="57x57" href="icons/apple-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="icons/apple-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="icons/apple-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="icons/apple-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="icons/apple-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="icons/apple-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="icons/apple-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="icons/apple-icon-152x152.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="icons/apple-icon-180x180.png">
+  <link rel="icon" type="image/png" sizes="192x192"  href="icons/android-icon-192x192.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png">
+  <link rel="manifest" href="/manifest.json">
+  <meta name="msapplication-TileColor" content="#ffffff">
+  <meta name="msapplication-TileImage" content="icons/ms-icon-144x144.png">
+  <meta name="theme-color" content="#ffffff">
+
+  <title>manager_app</title>
+  <link rel="manifest" href="manifest.json">
+</head>
+<body>
+  <!-- This script installs service_worker.js to provide PWA functionality to
+       application. For more information, see:
+       https://developers.google.com/web/fundamentals/primers/service-workers -->
+  <script>
+    var serviceWorkerVersion = '3552968134';
+    var scriptLoaded = false;
+    function loadMainDartJs() {
+      if (scriptLoaded) {
+        return;
+      }
+      scriptLoaded = true;
+      var scriptTag = document.createElement('script');
+      scriptTag.src = 'main.dart.js';
+      scriptTag.type = 'application/javascript';
+      document.body.append(scriptTag);
+    }
+
+    if ('serviceWorker' in navigator) {
+      // Service workers are supported. Use them.
+      window.addEventListener('load', function () {
+        // Wait for registration to finish before dropping the <script> tag.
+        // Otherwise, the browser will load the script multiple times,
+        // potentially different versions.
+        var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
+        navigator.serviceWorker.register(serviceWorkerUrl)
+          .then((reg) => {
+            function waitForActivation(serviceWorker) {
+              serviceWorker.addEventListener('statechange', () => {
+                if (serviceWorker.state == 'activated') {
+                  console.log('Installed new service worker.');
+                  loadMainDartJs();
+                }
+              });
+            }
+            if (!reg.active && (reg.installing || reg.waiting)) {
+              // No active web worker and we have installed or are installing
+              // one for the first time. Simply wait for it to activate.
+              waitForActivation(reg.installing ?? reg.waiting);
+            } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
+              // When the app updates the serviceWorkerVersion changes, so we
+              // need to ask the service worker to update.
+              console.log('New service worker available.');
+              reg.update();
+              waitForActivation(reg.installing);
+            } else {
+              // Existing service worker is still good.
+              console.log('Loading app from service worker.');
+              loadMainDartJs();
+            }
+          });
+
+        // If service worker doesn't succeed in a reasonable amount of time,
+        // fallback to plaint <script> tag.
+        setTimeout(() => {
+          if (!scriptLoaded) {
+            console.warn(
+              'Failed to load app from service worker. Falling back to plain <script> tag.',
+            );
+            loadMainDartJs();
+          }
+        }, 4000);
+      });
+    } else {
+      // Service workers not supported. Just drop the <script> tag.
+      loadMainDartJs();
+    }
+  </script>
+</body>
+</html>

RELEASE/Version1_3/WEB - Copy/manifest.json

@@ -0,0 +1,59 @@
+{
+    "name": "Manager app",
+    "short_name": "Manager_app",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "Manager application for MDLF",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/android-icon-36x36.png",
+            "sizes": "36x36",
+            "type": "image/png",
+            "density": "0.75"
+        },
+        {
+            "src": "icons/android-icon-48x48.png",
+            "sizes": "48x48",
+            "type": "image/png",
+            "density": "1.0"
+        },
+        {
+            "src": "icons/android-icon-72x72.png",
+            "sizes": "72x72",
+            "type": "image/png",
+            "density": "1.5"
+        },
+        {
+            "src": "icons/android-icon-96x96.png",
+            "sizes": "96x96",
+            "type": "image/png",
+            "density": "2.0"
+        },
+        {
+            "src": "icons/android-icon-144x144.png",
+            "sizes": "144x144",
+            "type": "image/png",
+            "density": "3.0"
+        },
+        {
+            "src": "icons/android-icon-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "density": "4.0"
+        },
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
+}

RELEASE/Version1_3/WEB - Copy/version.json

@@ -0,0 +1 @@
+{"app_name":"manager_app","version":"1.0.0","build_number":"1","package_name":"manager_app"}

assets/files/policy_page.html

@@ -0,0 +1,111 @@
+<h1>Privacy Policy</h1>
+<p>Effective date: 2023-02-20</p>
+<p>Updated on: 2023-02-20</p>
+<p>
+    This Privacy Policy explains the policies of UNOV on the collection
+    and use of the information we collect when you access https://fortsaintheribert.mymuseum.be/ (the “Service”). This Privacy Policy describes your
+    privacy rights and how you are protected under privacy laws.</p>
+<p>
+    By using our Service, you are consenting to the collection and use of your information in accordance
+    with this Privacy Policy. Please do not access or use our Service if you do not consent to the collection
+    and use of your information as outlined in this Privacy Policy. This Privacy Policy has been created with
+    the help of <a target="_blank" href="https://cookie-script.com/privacy-policy-generator">CookieScript Privacy Policy Generator</a>.</p>
+<p>UNOV is authorized to modify this Privacy Policy at any time.
+    This may occur without prior notice.</p>
+<p>
+    UNOV will post the revised Privacy Policy on the https://fortsaintheribert.mymuseum.be/ website</p>
+
+<h3>Collection and Use of Your Personal Information</h3>
+<h4>Information We Collect</h4>
+<p>
+    When using our Service, you will be prompted to provide us with personal information used to
+    contact or identify you. https://fortsaintheribert.mymuseum.be/ collects the following information:    </p>
+
+<ul>
+    <li>Usage Data</li>
+</ul>
+
+<p>Usage Data includes the following:</p>
+<ul>
+    <li>Internet Protocol (IP) address of computers accessing the site</li>
+    <li>Web page requests</li>
+    <li>Referring web pages</li>
+    <li>Browser used to access site</li>
+    <li>Time and date of access</li>
+</ul>
+
+<h4>How We Collect Information</h4>
+<p>
+    https://fortsaintheribert.mymuseum.be/ collects and receives information from you in the following manner:    </p>
+<ul>
+    <li>When you fill a registration form or otherwise submit your personal information.</li>
+</ul>
+<p>
+    Your information will be stored for up to 1 days after it is
+    no longer required to provide you the services. Your information may be retained for longer periods for
+    reporting or record- keeping in accordance with applicable laws. Information which does not identify you
+    personally may be stored indefinitely.    </p>
+
+<h4>How We Use Your Information</h4>
+<p>
+    https://fortsaintheribert.mymuseum.be/ may use your information for the following purposes:        </p>
+<ul>
+    <li><b>Providing and maintaining our Service,</b> as well as monitoring the usage of our Service.</li>
+    <li><b>For other purposes.</b> UNOV will use your information for data analysis to identify usage
+        trends or determine the effective of our marketing campaigns when reasonable. We will use
+        your information to evaluate and improve our Service, products, services, and marketing efforts.</li>
+    <li>Show content based on location</li>
+</ul>
+
+<h4>How We Share Your Information</h4>
+<p>
+    UNOV will share your information, when applicable, in the following situations:        </p>
+<ul>
+    <li><b>With your consent.</b> UNOV will share your information for any purpose with your explicit
+        consent.</li>
+</ul>
+
+<h4>Third-party Sharing</h4>
+
+<p>Your information may be disclosed for additional reasons, including:</p>
+<ul>
+    <li>Complying with applicable laws, regulations, or court orders.</li>
+    <li>Responding to claims that your use of our Service violates third-party rights.</li>
+    <li>Enforcing agreements you make with us, including this Privacy Policy.</li>
+</ul>
+
+<h4>Cookies</h4>
+<p>
+    Cookies are small text files that are placed on your computer by websites that you visit. Websites use
+    cookies to help users navigate efficiently and perform certain functions. Cookies that are required for
+    the website to operate properly are allowed to be set without your permission. All other cookies need
+    to be approved before they can be set in the browser.    </p>
+<ul>
+    <li><b>Strictly necessary cookies.</b> Strictly necessary cookies allow core website functionality such as
+        user login and account management. The website cannot be used properly without strictly necessary cookies.</li>
+</ul>
+
+
+<h4>Security</h4>
+<p>
+    Your information’s security is important to us. https://fortsaintheribert.mymuseum.be/
+    utilizes a range of security measures to prevent the misuse, loss, or alteration of the information you have given us.
+    However, because we cannot guarantee the security of the information you provide us, you must access our service at your
+    own risk.    </p>
+<p>
+    UNOV is not responsible for the performance of websites
+    operated by third parties or your interactions with them. When you leave this website, we recommend you review the
+    privacy practices of other websites you interact with and determine the adequacy of those practices.    </p>
+
+<h4>Contact Us</h4>
+<p>For any questions, please contact us through the following methods:</p>
+<p>Name: UNOV</p>
+<p>Address: Rue Mazy 72</p>
+<p>Email: contact@unov.be</p>
+<p>Website: https://fortsaintheribert.mymuseum.be/</p>
+
+
+<p>
+    For any queries or concerns you have related to the processing of your information,
+    you may contact our Privacy Officer at Fransolet Thomas, contact@unov.be.        </p>
+

assets/files/policy_text.text

@@ -0,0 +1,100 @@
+PRIVACY POLICY
+
+Effective date: 2023-02-20
+
+Updated on: 2023-02-20
+
+This Privacy Policy explains the policies of UNOV on the collection and use of the information we collect when you use the mobile app "Fort de Saint-Héribert". This Privacy Policy describes your privacy rights and how you are protected under privacy laws.
+
+By using our Service, you are consenting to the collection and use of your information in accordance with this Privacy Policy. Please do not access or use our
+Service if you do not consent to the collection and use of your information as outlined in this Privacy Policy. This Privacy Policy has been created with the
+help of CookieScript Privacy Policy Generator.
+
+UNOV is authorized to modify this Privacy Policy at any time. This may occur without prior notice.
+
+UNOV will post the revised Privacy Policy on the https://fortsaintheribert.mymuseum.be/ website
+
+
+COLLECTION AND USE OF YOUR PERSONAL INFORMATION
+
+INFORMATION WE COLLECT
+
+When using our Service, you will be prompted to provide us with personal information used to contact or identify you. The mobile app "Fort de Saint-Héribert" collects the following information:
+
+ * Usage Data
+ * User location but briefly and only to show content in app. This location data is not store or send to other services. The collection of location data also occurs in background.
+
+
+Usage Data includes the following:
+
+ * Internet Protocol (IP) address of computers accessing the site
+ * Web page requests
+ * Referring web pages
+ * Browser used to access site
+ * Time and date of access
+
+HOW WE COLLECT INFORMATION
+
+The mobile app "Fort de Saint-Héribert" collects and receives information from you in the following manner:
+
+ * When you fill a registration form or otherwise submit your personal information.
+
+Your information will be stored for up to 1 days after it is no longer required to provide you the services. Your information may be retained for longer periods
+for reporting or record- keeping in accordance with applicable laws. Information which does not identify you personally may be stored indefinitely.
+
+HOW WE USE YOUR INFORMATION
+
+The mobile app "Fort de Saint-Héribert" may use your information for the following purposes:
+
+ * Providing and maintaining our Service, as well as monitoring the usage of our Service.
+ * For other purposes. UNOV will use your information for data analysis to identify usage trends or determine the effective of our marketing campaigns when
+   reasonable. We will use your information to evaluate and improve our Service, products, services, and marketing efforts.
+ * As explained before, only to show content based on location (The collection of location data also occurs in background)
+
+HOW WE SHARE YOUR INFORMATION
+
+UNOV will share your information, when applicable, in the following situations:
+
+ * With your consent. UNOV will share your information for any purpose with your explicit consent.
+
+THIRD-PARTY SHARING
+
+Your information may be disclosed for additional reasons, including:
+
+ * Complying with applicable laws, regulations, or court orders.
+ * Responding to claims that your use of our Service violates third-party rights.
+ * Enforcing agreements you make with us, including this Privacy Policy.
+
+COOKIES
+
+Cookies are small text files that are placed on your computer by websites that you visit. Websites use cookies to help users navigate efficiently and perform
+certain functions. Cookies that are required for the website to operate properly are allowed to be set without your permission. All other cookies need to be
+approved before they can be set in the browser.
+
+ * Strictly necessary cookies. Strictly necessary cookies allow core website functionality such as user login and account management. The website cannot be used
+   properly without strictly necessary cookies.
+
+SECURITY
+
+Your information’s security is important to us. The mobile app "Fort de Saint-Héribert" utilizes a range of security measures to prevent the misuse, loss, or
+alteration of the information you have given us. However, because we cannot guarantee the security of the information you provide us, you must access our
+service at your own risk.
+
+UNOV is not responsible for the performance of websites operated by third parties or your interactions with them. When you leave this website, we recommend you
+review the privacy practices of other websites you interact with and determine the adequacy of those practices.
+
+CONTACT US
+
+For any questions, please contact us through the following methods:
+
+Name: UNOV
+
+Address: Rue Mazy 72
+
+Email: contact@unov.be
+
+Website: https://fortsaintheribert.mymuseum.be/
+
+Mobile Application : "Fort de Saint-Héribert" 
+
+For any queries or concerns you have related to the processing of your information, you may contact our Privacy Officer at Fransolet Thomas, contact@unov.be.

lib/Components/audio_input_container.dart

@@ -0,0 +1,170 @@
+import 'package:auto_size_text/auto_size_text.dart';
+import 'package:flutter/material.dart';
+import 'package:manager_app/Components/loading_common.dart';
+import 'package:manager_app/Models/managerContext.dart';
+import 'package:manager_app/app_context.dart';
+import 'package:manager_app/constants.dart';
+import 'package:manager_app/Screens/Resources/select_resource_modal.dart';
+import 'package:manager_api_new/api.dart';
+import 'package:provider/provider.dart';
+
+class AudioInputContainer extends StatefulWidget {
+  final Color color;
+  final String? label;
+  final String? initialValue;
+  final ValueChanged<ResourceDTO> onChanged;
+  final BoxFit imageFit;
+  final bool isSmall;
+  final double fontSize;
+  const AudioInputContainer({
+    Key? key,
+    this.color = kSecond,
+    this.label,
+    this.initialValue,
+    required this.onChanged,
+    this.imageFit = BoxFit.cover,
+    this.isSmall = false,
+    this.fontSize = 20
+  }) : super(key: key);
+
+  @override
+  _AudioInputContainerState createState() => _AudioInputContainerState();
+}
+
+class _AudioInputContainerState extends State<AudioInputContainer> {
+  String? resourceIdToShow;
+
+  @override
+  void initState() {
+    resourceIdToShow = widget.initialValue;
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    return Container(
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          if(widget.label != null) Align(
+              alignment: AlignmentDirectional.centerStart,
+              child: AutoSizeText(
+                widget.label!,
+                style: TextStyle(fontSize: widget.fontSize, fontWeight: FontWeight.w300),
+                maxLines: 2,
+                maxFontSize: widget.fontSize,
+                textAlign: TextAlign.center,
+              )
+          ),
+          Container(
+            //color: widget.isSmall ? Colors.cyanAccent: Colors.red,
+            child: Padding(
+              padding: EdgeInsets.only(left: widget.isSmall ? 5 : 10, top: 10, bottom: 10),
+              child: Container(
+                width: size.width *0.125,
+                height: size.width *0.06,
+                child: InkWell(
+                  onTap: () async {
+                    ResourceDTO? result = await showSelectResourceModal(
+                      "Sélectionner une ressource",
+                      1,
+                      [ResourceType.Audio],
+                      context
+                    );
+
+                    if (result != null) {
+                      setState(() {
+                        resourceIdToShow = result.id != null ? result.id : null;
+                      });
+                      widget.onChanged(result);
+                    }
+                  },
+                  child: getElement(context),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  getElement(BuildContext context) {
+    if (resourceIdToShow != null) {
+      Size size = MediaQuery.of(context).size;
+      final appContext = Provider.of<AppContext>(context);
+      return FutureBuilder(
+          future: getResource(resourceIdToShow!, appContext),
+          builder: (context, AsyncSnapshot<ResourceDTO?> snapshot) {
+            if (snapshot.connectionState == ConnectionState.done) {
+              if (snapshot.data != null) {
+                return Container(
+                  decoration: boxDecoration(snapshot.data!, appContext),
+                  child: Center(child: AutoSizeText(snapshot.data!.label!, textAlign: TextAlign.center)),
+                );
+              } else {
+                return Text("No data");
+              }
+
+            } else if (snapshot.connectionState == ConnectionState.none) {
+              return Text("No data");
+            } else {
+              return Center(
+                  child: Container(
+                      height: size.height * 0.1,
+                      child: LoadingCommon()
+                  )
+              );
+            }
+          }
+      );
+    } else {
+      return Container(
+            decoration: BoxDecoration(
+              color: widget.color,
+              borderRadius: BorderRadius.circular(20),
+            ),
+            child: Padding(
+              padding: const EdgeInsets.only(left: 5, right: 5, top: 15, bottom: 15),
+              child: Center(
+                  child: AutoSizeText(
+                    "Choisir un fichier audio",
+                    style: TextStyle(color: kWhite),
+                    maxLines: 1,
+                    textAlign: TextAlign.center,
+                  )
+              ),
+            )
+        );
+    }
+  }
+
+  Future<ResourceDTO?> getResource(String resourceIdToShow, dynamic appContext) async {
+    // Just in resource tab detail not here
+    ResourceDTO? resource = await (appContext.getContext() as ManagerAppContext).clientAPI!.resourceApi!.resourceGetDetail(resourceIdToShow);
+    return resource;
+  }
+
+  boxDecoration(ResourceDTO resourceDTO, appContext) {
+    return BoxDecoration(
+      shape: BoxShape.rectangle,
+      color: kWhite,
+      borderRadius: BorderRadius.circular(20.0),
+      /*image: new DecorationImage(
+        fit: widget.imageFit,
+        image: resourceDTO.type != null ?  new NetworkImage(
+          resourceDTO.type == ResourceType.image ? appContext.getContext().clientAPI.resourceApi.apiClient.basePath+"/api/Resource/"+ resourceDTO.id : resourceDTO.data,
+        ) : null,
+      ),*/
+      boxShadow: [
+        BoxShadow(
+          spreadRadius: 0.5,
+          blurRadius: 1,
+          offset: Offset(0, 1.5), // changes position of shadow
+        ),
+      ],
+    );
+  }
+}

lib/Components/audio_player.dart

@@ -0,0 +1,242 @@
+import 'dart:typed_data';
+
+//import 'package:audioplayers/audioplayers.dart';
+import 'package:flutter/material.dart';
+import 'package:manager_app/app_context.dart';
+import 'package:manager_app/constants.dart';
+import 'package:provider/provider.dart';
+
+import 'package:just_audio/just_audio.dart';
+
+
+class AudioPlayerFloatingContainer extends StatefulWidget {
+  const AudioPlayerFloatingContainer({Key? key, required this.audioBytes, required this.isAuto}) : super(key: key);
+
+  final Uint8List audioBytes;
+  final bool isAuto;
+
+  @override
+  State<AudioPlayerFloatingContainer> createState() => _AudioPlayerFloatingContainerState();
+}
+
+class _AudioPlayerFloatingContainerState extends State<AudioPlayerFloatingContainer> {
+  AudioPlayer player = AudioPlayer();
+  late Uint8List audiobytes;
+  bool isplaying = false;
+  bool audioplayed = false;
+  int currentpos = 0;
+  int maxduration = 100;
+  Duration? durationAudio;
+  String currentpostlabel = "00:00";
+
+  @override
+  void initState() {
+    Future.delayed(Duration.zero, () async {
+
+      audiobytes = widget.audioBytes;
+      player.durationStream.listen((Duration? d) { //get the duration of audio
+        if(d != null) {
+          maxduration = d.inSeconds;
+          durationAudio = d;
+        }
+      });
+
+      //player.bufferedPositionStream
+
+      player.positionStream.listen((event) {
+        if(durationAudio != null) {
+
+          currentpos = event.inMilliseconds; //get the current position of playing audio
+
+          //generating the duration label
+          int shours = Duration(milliseconds:durationAudio!.inMilliseconds - currentpos).inHours;
+          int sminutes = Duration(milliseconds:durationAudio!.inMilliseconds - currentpos).inMinutes;
+          int sseconds = Duration(milliseconds:durationAudio!.inMilliseconds - currentpos).inSeconds;
+
+          int rminutes = sminutes - (shours * 60);
+          int rseconds = sseconds - (sminutes * 60 + shours * 60 * 60);
+
+          String minutesToShow = rminutes < 10 ? '0$rminutes': rminutes.toString();
+          String secondsToShow = rseconds < 10 ? '0$rseconds': rseconds.toString();
+
+          currentpostlabel = "$minutesToShow:$secondsToShow";
+
+          setState(() {
+            //refresh the UI
+            if(currentpos > player.duration!.inMilliseconds) {
+              print("RESET ALL");
+              player.stop();
+              player.seek(const Duration(seconds: 0));
+              isplaying = false;
+              audioplayed = false;
+              currentpostlabel = "00:00";
+            }
+          });
+        }
+      });
+
+
+
+      /*player.onPositionChanged.listen((Duration  p){
+        currentpos = p.inMilliseconds; //get the current position of playing audio
+
+        //generating the duration label
+        int shours = Duration(milliseconds:currentpos).inHours;
+        int sminutes = Duration(milliseconds:currentpos).inMinutes;
+        int sseconds = Duration(milliseconds:currentpos).inSeconds;
+
+        int rminutes = sminutes - (shours * 60);
+        int rseconds = sseconds - (sminutes * 60 + shours * 60 * 60);
+
+        String minutesToShow = rminutes < 10 ? '0$rminutes': rminutes.toString();
+        String secondsToShow = rseconds < 10 ? '0$rseconds': rseconds.toString();
+
+        currentpostlabel = "$minutesToShow:$secondsToShow";
+
+        setState(() {
+          //refresh the UI
+        });
+      });*/
+
+      if(widget.isAuto) {
+        //player.play(BytesSource(audiobytes));
+        await player.setAudioSource(LoadedSource(audiobytes));
+        player.play();
+        setState(() {
+          isplaying = true;
+          audioplayed = true;
+        });
+      }
+    });
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    player.stop();
+    player.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final appContext = Provider.of<AppContext>(context);
+
+    return FloatingActionButton(
+      backgroundColor: kPrimaryColor.withOpacity(0.7),
+      onPressed: () async {
+        if(!isplaying && !audioplayed){
+          //player.play(BytesSource(audiobytes));
+          await player.setAudioSource(LoadedSource(audiobytes));
+          player.play();
+          setState(() {
+            isplaying = true;
+            audioplayed = true;
+          });
+        }else if(audioplayed && !isplaying){
+          //player.resume();
+          player.play();
+          setState(() {
+            isplaying = true;
+            audioplayed = true;
+          });
+        }else{
+          player.pause();
+          setState(() {
+            isplaying = false;
+          });
+        }
+      },
+      child: isplaying ? Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          const Icon(Icons.pause),
+          Text(currentpostlabel),
+        ],
+      ) : audioplayed ? Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          const Icon(Icons.play_arrow),
+          Text(currentpostlabel),
+        ],
+      ): const Icon(Icons.play_arrow),
+
+      /*Column(
+        children: [
+          //Text(currentpostlabel, style: const TextStyle(fontSize: 25)),
+          Wrap(
+            spacing: 10,
+            children: [
+              ElevatedButton.icon(
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: kSecondColor, // Background color
+                  ),
+                  onPressed: () async {
+                    if(!isplaying && !audioplayed){
+                      //player.play(BytesSource(audiobytes));
+                      await player.setAudioSource(LoadedSource(audiobytes));
+                      player.play();
+                      setState(() {
+                        isplaying = true;
+                        audioplayed = true;
+                      });
+                    }else if(audioplayed && !isplaying){
+                      //player.resume();
+                      player.play();
+                      setState(() {
+                        isplaying = true;
+                        audioplayed = true;
+                      });
+                    }else{
+                      player.pause();
+                      setState(() {
+                        isplaying = false;
+                      });
+                    }
+                  },
+                  icon: Icon(isplaying?Icons.pause:Icons.play_arrow),
+                  //label:Text(isplaying?TranslationHelper.getFromLocale("pause", appContext.getContext()):TranslationHelper.getFromLocale("play", appContext.getContext()))
+              ),
+
+              /*ElevatedButton.icon(
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: kSecondColor, // Background color
+                  ),
+                  onPressed: () async {
+                    player.stop();
+                    player.seek(const Duration(seconds: 0));
+                    setState(() {
+                      isplaying = false;
+                      audioplayed = false;
+                      currentpostlabel = "00:00";
+                    });
+                  },
+                  icon: const Icon(Icons.stop),
+                  //label: Text(TranslationHelper.getFromLocale("stop", appContext.getContext()))
+              ),*/
+            ],
+          )
+        ],
+      ),*/
+    );
+  }
+}
+
+// Feed your own stream of bytes into the player
+class LoadedSource extends StreamAudioSource {
+  final List<int> bytes;
+  LoadedSource(this.bytes);
+
+  @override
+  Future<StreamAudioResponse> request([int? start, int? end]) async {
+    start ??= 0;
+    end ??= bytes.length;
+    return StreamAudioResponse(
+      sourceLength: bytes.length,
+      contentLength: end - start,
+      offset: start,
+      stream: Stream.value(bytes.sublist(start, end)),
+      contentType: 'audio/mpeg',
+    );
+  }
+}

lib/Components/check_input_container.dart

@@ -0,0 +1,88 @@
+import 'package:auto_size_text/auto_size_text.dart';
+import 'package:flutter/material.dart';
+
+import '../constants.dart';
+
+class CheckInputContainer extends StatefulWidget {
+  final bool? isChecked;
+  final IconData? icon;
+  final String label;
+  final ValueChanged<bool> onChanged;
+  final double fontSize;
+  const CheckInputContainer({
+    Key? key,
+    this.isChecked,
+    this.icon,
+    required this.label,
+    required this.onChanged,
+    this.fontSize = 20
+  }) : super(key: key);
+
+  @override
+  _CheckInputContainerState createState() => _CheckInputContainerState();
+}
+
+class _CheckInputContainerState extends State<CheckInputContainer> {
+  bool? isChecked;
+
+  @override
+  void initState() {
+    setState(() {
+      isChecked = widget.isChecked;
+    });
+    super.initState();
+  }
+  @override
+  Widget build(BuildContext context) {
+
+    return Container(
+      child: Row(
+        children: [
+          Align(
+              alignment: AlignmentDirectional.centerStart,
+              child: Row(
+                children: [
+                  if(widget.icon != null)
+                    Padding(
+                      padding: const EdgeInsets.only(right: 8.0),
+                      child: Icon(
+                        widget.icon,
+                        color: kPrimaryColor,
+                        size: 25.0,
+                      ),
+                    ),
+                  if(widget.label != null)
+                    AutoSizeText(
+                      widget.label,
+                      style: new TextStyle(fontSize: widget.fontSize, fontWeight: FontWeight.w300),
+                      maxLines: 2,
+                      maxFontSize: widget.fontSize,
+                      textAlign: TextAlign.center,
+                    ),
+                ],
+              )
+          ),
+          Padding(
+            padding: const EdgeInsets.all(10.0),
+            child: Container(
+              width: 50,
+              height: 50,
+              child: Checkbox(
+                shape: CircleBorder(),
+                value: isChecked,
+                checkColor: Colors.white,
+                activeColor: kPrimaryColor,
+                onChanged: (bool? value) {
+                  setState(() {
+                    isChecked = value;
+                  });
+                  widget.onChanged(value!);
+                },
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/Components/color_picker_input_container.dart

@@ -1,16 +1,18 @@
-import 'package:flutter/cupertino.dart';
+import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/color_picker.dart';
 
 class ColorPickerInputContainer extends StatefulWidget {
-  final String color;
+  final String? color;
   final String label;
+  final double fontSize;
   final ValueChanged<String> onChanged;
   const ColorPickerInputContainer({
-    Key key,
+    Key? key,
     this.color,
-    this.label,
-    this.onChanged,
+    required this.label,
+    this.fontSize = 25,
+    required this.onChanged,
   }) : super(key: key);
 
   @override
@@ -18,12 +20,12 @@ class ColorPickerInputContainer extends StatefulWidget {
 }
 
 class _ColorPickerInputContainerState extends State<ColorPickerInputContainer> {
-  Color colorVar;
+  Color? colorVar;
 
   @override
   void initState() {
     setState(() {
-      colorVar = widget.color == null ? new Color(0x12345678) : new Color(int.parse(widget.color.split('(0x')[1].split(')')[0], radix: 16));
+      colorVar = widget.color == null ? new Color(0x12345678) : new Color(int.parse(widget.color!.split('(0x')[1].split(')')[0], radix: 16));
     });
     super.initState();
   }
@@ -35,14 +37,20 @@ class _ColorPickerInputContainerState extends State<ColorPickerInputContainer> {
         children: [
           Align(
               alignment: AlignmentDirectional.centerStart,
-              child: Text(widget.label, style: TextStyle(fontSize: 25, fontWeight: FontWeight.w300))
+              child: AutoSizeText(
+                widget.label,
+                style: TextStyle(fontSize: widget.fontSize, fontWeight: FontWeight.w300),
+                maxLines: 2,
+                maxFontSize: widget.fontSize,
+                textAlign: TextAlign.center,
+              )
           ),
           Padding(
             padding: const EdgeInsets.all(10.0),
             child: InkWell(
               onTap: () {
                 showColorPicker(
-                    colorVar,
+                    colorVar!,
                     (Color color)  {
                       setState(() {
                         colorVar = color;

lib/Components/fetch_resource_icon.dart

@@ -1,18 +1,21 @@
 import 'package:flutter/material.dart';
-import 'package:managerapi/api.dart';
+import 'package:manager_api_new/api.dart';
 
 IconData getResourceIcon(elementType) {
   switch(elementType) {
-    case ResourceType.image:
+    case ResourceType.Image:
       return Icons.image;
       break;
-    case ResourceType.imageUrl:
+    case ResourceType.ImageUrl:
       return Icons.image_search; // art_track
       break;
-    case ResourceType.video:
+    case ResourceType.Audio:
+      return Icons.audiotrack; // art_track
+      break;
+    case ResourceType.Video:
       return Icons.slow_motion_video;
       break;
-    case ResourceType.videoUrl:
+    case ResourceType.VideoUrl:
       return Icons.ondemand_video_sharp;
       break;
   }

lib/Components/fetch_section_icon.dart

@@ -1,26 +1,29 @@
 import 'package:flutter/material.dart';
-import 'package:managerapi/api.dart';
+import 'package:manager_api_new/api.dart';
 
 IconData getSectionIcon(elementType) {
   switch(elementType) {
-    case SectionType.map:
+    case SectionType.Map:
       return Icons.location_on;
       break;
-    case SectionType.slider:
+    case SectionType.Slider:
       return Icons.collections; // art_track
       break;
-    case SectionType.video:
+    case SectionType.Video:
       return Icons.ondemand_video_rounded;
       break;
-    case SectionType.web:
+    case SectionType.Web:
       return Icons.web;
       break;
-    case SectionType.menu:
+    case SectionType.Menu:
       return Icons.apps_sharp;
       break;
-    case SectionType.quizz:
+    case SectionType.Quizz:
       return Icons.question_answer;
       break;
+    case SectionType.Article:
+      return Icons.article_outlined;
+      break;
   }
   return Icons.menu;
 }

lib/Components/flag_decoration.dart

@@ -0,0 +1,36 @@
+import 'package:flare_flutter/flare_actor.dart';
+import 'package:flutter/material.dart';
+import 'package:manager_app/constants.dart';
+
+class FlagDecoration extends StatelessWidget {
+  final String language;
+  FlagDecoration({Key? key, required this.language}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    return Container(
+      width: 35,
+      height: 35,
+      decoration: BoxDecoration(
+        color: kBackgroundColor,
+        shape: BoxShape.circle,
+        //border: Border.all(width: 1.5, color: kSecondGrey),
+        image: DecorationImage(
+          fit: BoxFit.contain,
+          image: AssetImage("assets/images/"+language.toLowerCase()+".png")/*Svg(
+          "assets/images/"+language.toLowerCase()+".svg",
+        )*/, //AssetImage("assets/images/"+language+".png"),
+        ),
+        boxShadow: const [
+          BoxShadow(
+            color: kBackgroundColor,
+            spreadRadius: 0.5,
+            blurRadius: 5,
+            offset: Offset(0, 1.5), // changes position of shadow
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/Components/image_input_container.dart

@@ -1,27 +1,30 @@
 import 'package:auto_size_text/auto_size_text.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/Models/managerContext.dart';
 import 'package:manager_app/app_context.dart';
 import 'package:manager_app/constants.dart';
 import 'package:manager_app/Screens/Resources/select_resource_modal.dart';
-import 'package:managerapi/api.dart';
+import 'package:manager_api_new/api.dart';
 import 'package:provider/provider.dart';
 
 class ImageInputContainer extends StatefulWidget {
   final Color color;
   final String label;
-  final String initialValue;
+  final String? initialValue;
   final ValueChanged<ResourceDTO> onChanged;
   final BoxFit imageFit;
   final bool isSmall;
+  final double fontSize;
   const ImageInputContainer({
-    Key key,
+    Key? key,
     this.color = kSecond,
-    this.label,
+    required this.label,
     this.initialValue,
-    this.onChanged,
+    required this.onChanged,
     this.imageFit = BoxFit.cover,
     this.isSmall = false,
+    this.fontSize = 25
   }) : super(key: key);
 
   @override
@@ -29,7 +32,7 @@ class ImageInputContainer extends StatefulWidget {
 }
 
 class _ImageInputContainerState extends State<ImageInputContainer> {
-  String resourceIdToShow;
+  String? resourceIdToShow;
 
   @override
   void initState() {
@@ -45,24 +48,33 @@ class _ImageInputContainerState extends State<ImageInputContainer> {
         children: [
           Align(
               alignment: AlignmentDirectional.centerStart,
-              child: Text(widget.label, style: TextStyle(fontSize: 25, fontWeight: FontWeight.w300))
+              child: AutoSizeText(
+                widget.label,
+                style: TextStyle(fontSize: widget.fontSize, fontWeight: FontWeight.w300),
+                maxLines: 2,
+                maxFontSize: widget.fontSize,
+                textAlign: TextAlign.center,
+              )
           ),
-          Padding(
-            padding: EdgeInsets.only(left: widget.isSmall ? 15 : 70, top: 10, bottom: 10),
+          Container(
+            //color: widget.isSmall ? Colors.cyanAccent: Colors.red,
+            child: Padding(
+              padding: EdgeInsets.only(left: widget.isSmall ? 5 : 10, top: 10, bottom: 10),
               child: Container(
                 width: size.width *0.08,
+                height: size.width *0.08,
                 child: InkWell(
                   onTap: () async {
-                  var result = await showSelectResourceModal(
+                    ResourceDTO? result = await showSelectResourceModal(
                       "Sélectionner une ressource",
                       1,
-                    true,
+                      [ResourceType.Image, ResourceType.ImageUrl],
                       context
                     );
 
                     if (result != null) {
                       setState(() {
-                      resourceIdToShow = result.id;
+                        resourceIdToShow = result.id != null ? result.id : null;
                       });
                       widget.onChanged(result);
                     }
@@ -71,31 +83,34 @@ class _ImageInputContainerState extends State<ImageInputContainer> {
                 ),
               ),
             ),
+          ),
         ],
       ),
     );
   }
 
-  getElement(String initialValue, BuildContext context, bool isSmall) {
+  getElement(String? initialValue, BuildContext context, bool isSmall) {
     if (resourceIdToShow != null) {
       Size size = MediaQuery.of(context).size;
       final appContext = Provider.of<AppContext>(context);
       return FutureBuilder(
-          future: getResource(resourceIdToShow, appContext),
+          future: getResource(resourceIdToShow!, appContext),
           builder: (context, AsyncSnapshot<dynamic> snapshot) {
             if (snapshot.connectionState == ConnectionState.done) {
               if (snapshot.data != null) {
-                return Transform.scale(
-                  scale: isSmall ? size.aspectRatio * 0.5: size.aspectRatio * 0.9,
-                  child: AspectRatio(
-                    aspectRatio: 4/4,
-                    child: Container(
+                return Container(
                   decoration: boxDecoration(snapshot.data, appContext),
-                    ),
-                  ),
                 );
               } else {
-                return Text("No data");
+                return Center(
+                    child: Container(
+                      decoration: boxDecoration(null, appContext),
+                      child: Padding(
+                        padding: const EdgeInsets.all(8.0),
+                        child: Text("Aucune image"),
+                      )
+                    )
+                );
               }
 
             } else if (snapshot.connectionState == ConnectionState.none) {
@@ -104,7 +119,7 @@ class _ImageInputContainerState extends State<ImageInputContainer> {
               return Center(
                   child: Container(
                       height: size.height * 0.1,
-                      child: Loading()
+                      child: LoadingCommon()
                   )
               );
             }
@@ -114,7 +129,7 @@ class _ImageInputContainerState extends State<ImageInputContainer> {
       return Container(
             decoration: BoxDecoration(
               color: widget.color,
-              borderRadius: BorderRadius.circular(50),
+              borderRadius: BorderRadius.circular(20),
             ),
             child: Padding(
               padding: const EdgeInsets.only(left: 5, right: 5, top: 15, bottom: 15),
@@ -130,22 +145,22 @@ class _ImageInputContainerState extends State<ImageInputContainer> {
     }
   }
 
-  Future<ResourceDTO> getResource(String resourceIdToShow, dynamic appContext) async {
-    ResourceDTO resource = await appContext.getContext().clientAPI.resourceApi.resourceGetDetail(resourceIdToShow);
+  Future<ResourceDTO?> getResource(String resourceIdToShow, dynamic appContext) async {
+    ResourceDTO? resource = await (appContext.getContext() as ManagerAppContext).clientAPI!.resourceApi!.resourceGetDetail(resourceIdToShow);
     return resource;
   }
 
-  boxDecoration(ResourceDTO resourceDTO, appContext) {
+  boxDecoration(ResourceDTO? resourceDTO, AppContext appContext) {
     return BoxDecoration(
       shape: BoxShape.rectangle,
       color: kWhite,
       borderRadius: BorderRadius.circular(30.0),
-      image: new DecorationImage(
+      image: resourceDTO != null ? resourceDTO.type != null ? new DecorationImage(
         fit: widget.imageFit,
-        image: resourceDTO.type != null ?  new NetworkImage(
-          resourceDTO.type == ResourceType.image ? appContext.getContext().clientAPI.resourceApi.apiClient.basePath+"/api/Resource/"+ resourceDTO.id : resourceDTO.data,
-        ) : null,
+        image: new NetworkImage(
+          resourceDTO.type! == ResourceType.Image ? (appContext.getContext() as ManagerAppContext).clientAPI!.resourceApi!.apiClient.basePath+"/api/Resource/"+ resourceDTO.id! : resourceDTO.data!,
         ),
+      ) : null : null,
       boxShadow: [
         BoxShadow(
           spreadRadius: 0.5,

lib/Components/loading.dart

@@ -2,7 +2,7 @@ import 'package:flare_flutter/flare_actor.dart';
 import 'package:flutter/material.dart';
 
 class Loading extends StatelessWidget {
-  Loading({Key key}) : super(key: key);
+  Loading({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

lib/Components/loading_common.dart

@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:manager_app/constants.dart';
+
+class LoadingCommon extends StatefulWidget {
+  const LoadingCommon({Key? key}) : super(key: key);
+
+  @override
+  State<LoadingCommon> createState() => _LoadingCommonState();
+}
+
+class _LoadingCommonState extends State<LoadingCommon> with TickerProviderStateMixin {
+  AnimationController? _controller;
+
+  @override
+  void initState() {
+    _controller = AnimationController(
+      duration: const Duration(milliseconds: 5000),
+      vsync: this,
+    )..repeat();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _controller!.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    _controller!.forward(from: 0.0);
+    _controller!.addListener(() {
+      if (_controller!.isCompleted) {
+        _controller!.reverse();
+      }
+      if(_controller!.isDismissed){
+        _controller!.forward();
+      }
+    });
+    return Center(
+      child: RotationTransition(
+        turns: Tween(begin: 0.0, end: 3.0).animate(_controller!),
+        child: Icon(Icons.museum_outlined, color: kPrimaryColor, size: size.height*0.1),
+      ),
+    );
+  }
+}
+
+

lib/Components/message_notification.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 
-showNotification (Color backgroundColor, Color textColor, String text, BuildContext context, int duration) {
+showNotification (Color backgroundColor, Color textColor, String text, BuildContext context, int? duration) {
   final snackBar = SnackBar(
       behavior: SnackBarBehavior.floating,
       duration: duration == null ? Duration(milliseconds: 1500) : Duration(milliseconds: duration),
-      width: 280.0, // Width of the SnackBar.
+      width: 320.0, // Width of the SnackBar.
       backgroundColor: backgroundColor,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(10.0),

lib/Components/multi_input_modal.dart

@@ -1,15 +1,21 @@
+import 'dart:ui';
+
 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/text_form_input_container.dart';
 import 'package:manager_app/Models/managerContext.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';
+import 'package:manager_api_new/api.dart';
 import 'package:collection/collection.dart';
 import 'package:provider/provider.dart';
 
-showMultiStringInput (String label, String modalLabel, List<TranslationDTO> values, List<TranslationDTO> newValues, Function onGetResult, int maxLines, BuildContext context) { /*Function onSelect,*/
+import 'audio_input_container.dart';
+import 'flag_decoration.dart';
+
+showMultiStringInput (String label, String modalLabel, bool isTitle, List<TranslationDTO> values, List<TranslationDTO> newValues, Function onGetResult, int maxLines, bool isAudio, BuildContext context) { /*Function onSelect,*/
   showDialog(
     builder: (BuildContext context) => AlertDialog(
       shape: RoundedRectangleBorder(
@@ -23,7 +29,7 @@ showMultiStringInput (String label, String modalLabel, List<TranslationDTO> valu
               child: SingleChildScrollView(
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.spaceAround,
-                  children: getTranslations(context, Provider.of<AppContext>(context), label, newValues),
+                  children: getTranslations(context, Provider.of<AppContext>(context), label, isTitle, isAudio, newValues),
                 ),
               ),
             ),
@@ -45,7 +51,9 @@ showMultiStringInput (String label, String modalLabel, List<TranslationDTO> valu
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: [
-            Container(
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Container(
                 width: 180,
                 height: 70,
                 child: RoundedButton(
@@ -59,7 +67,10 @@ showMultiStringInput (String label, String modalLabel, List<TranslationDTO> valu
                   fontSize: 20,
                 ),
               ),
-            Container(
+            ),
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Container(
                 width: 180,
                 height: 70,
                 child: RoundedButton(
@@ -77,6 +88,7 @@ showMultiStringInput (String label, String modalLabel, List<TranslationDTO> valu
                   fontSize: 20,
                 ),
               ),
+            ),
           ],
         ),
       ],
@@ -84,17 +96,18 @@ showMultiStringInput (String label, String modalLabel, List<TranslationDTO> valu
   );
 }
 
-getTranslations(BuildContext context, AppContext appContext, String label, List<TranslationDTO> newValues) {
+getTranslations(BuildContext context, AppContext appContext, String label, bool isTitle, bool isAudio, List<TranslationDTO> newValues) {
   List<Widget> translations = <Widget>[];
   ManagerAppContext managerAppContext = appContext.getContext();
-  for(var language in managerAppContext.selectedConfiguration.languages) {
+  for(var language in managerAppContext.selectedConfiguration!.languages!) {
     translations.add(
         Padding(
           padding: const EdgeInsets.all(8.0),
           child: Row(
-            mainAxisAlignment: MainAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Container(
+              FlagDecoration(language: language),
+              /*Container(
                   width: MediaQuery.of(context).size.width *0.05,
                   height: MediaQuery.of(context).size.height *0.10,
                   decoration: BoxDecoration(
@@ -103,7 +116,7 @@ getTranslations(BuildContext context, AppContext appContext, String label, List<
                     ),
                   ),
                   child: Center(child: AutoSizeText(language.toUpperCase()))
-              ),
+              ),*/
               Padding(
                 padding: const EdgeInsets.only(left: 8.0),
                 child: Container(
@@ -111,14 +124,30 @@ getTranslations(BuildContext context, AppContext appContext, String label, List<
                     mainAxisAlignment: MainAxisAlignment.spaceAround,
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
+                      !isAudio ?
                       TextFormInputContainer(
                         label: label,
                         color: kWhite,
-                        isTitle: true,
-                        initialValue: newValues.where((element) => element.language == language).first.value,
+                        isTitle: isTitle,
+                        initialValue: newValues.where((element) => element.language == language).first.value!,
                         onChanged: (value) {
                           newValues.where((element) => element.language == language).first.value = value;
                         },
+                      ) :
+                      Container(
+                        width: MediaQuery.of(context).size.width *0.15,
+                        height: 100,
+                        //color: Colors.blueAccent,
+                        child: Center(
+                          child: AudioInputContainer(
+                            //label: "Audio :",
+                            initialValue: newValues.where((element) => element.language == language).first.value,
+                            color: kPrimaryColor,
+                            onChanged: (ResourceDTO resource) {
+                              newValues.where((element) => element.language == language).first.value = resource.id;
+                            },
+                          ),
+                        ),
                       ),
                     ],
                   ),
@@ -131,6 +160,7 @@ getTranslations(BuildContext context, AppContext appContext, String label, List<
   }
   return translations;
 }
+
 /*
 showValues(List<TranslationDTO> newValues) {
   List<Widget> valuesToShow = new List<Widget>();
@@ -147,5 +177,3 @@ showValues(List<TranslationDTO> newValues) {
   });
   return valuesToShow;
 }*/
-
-

lib/Components/multi_select_container.dart

@@ -12,14 +12,14 @@ class MultiSelectContainer extends StatelessWidget {
   final bool isAtLeastOne;
   final ValueChanged<List<dynamic>> onChanged;
   const MultiSelectContainer({
-    Key key,
+    Key? key,
     this.color = kSecond,
-    this.label,
-    this.values,
-    this.initialValue,
-    this.isMultiple,
+    required this.label,
+    required this.values,
+    required this.initialValue,
+    required this.isMultiple,
     this.isAtLeastOne = false,
-    this.onChanged,
+    required this.onChanged,
   }) : super(key: key);
 
   @override
@@ -64,14 +64,14 @@ class MultiSelectChip extends StatefulWidget {
       this.selectedValues,
       this.isMultiple,
       this.isAtLeastOne,
-      {this.onSelectionChanged} // +added
+      {required this.onSelectionChanged} // +added
       );
   @override
   _MultiSelectChipState createState() => _MultiSelectChipState();
 }
 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

@@ -0,0 +1,82 @@
+import 'package:auto_size_text/auto_size_text.dart';
+import 'package:flutter/material.dart';
+import 'package:manager_app/constants.dart';
+import 'package:multi_select_flutter/chip_display/multi_select_chip_display.dart';
+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 'flag_decoration.dart';
+
+class MultiSelectDropdownContainer extends StatelessWidget {
+  final Color color;
+  final String label;
+  final String labelHint;
+  final List<String> values;
+  final List<String> initialValue;
+  final bool isMultiple;
+  final bool isAtLeastOne;
+  final double fontSize;
+  final ValueChanged<List<dynamic>> onChanged;
+  const MultiSelectDropdownContainer({
+    Key? key,
+    this.color = kSecond,
+    required this.label,
+    this.labelHint = "Veuillez sélectionner une langue",
+    required this.values,
+    required this.initialValue,
+    required this.isMultiple,
+    this.isAtLeastOne = false,
+    this.fontSize = 25,
+    required this.onChanged,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    return Container(
+      child: Row(
+        children: [
+          Align(
+              alignment: AlignmentDirectional.centerStart,
+              child: AutoSizeText(
+                label,
+                style: TextStyle(fontSize: fontSize, fontWeight: FontWeight.w300),
+                maxLines: 2,
+                maxFontSize: fontSize,
+                textAlign: TextAlign.center,
+              )
+          ),
+          Padding(
+            padding: const EdgeInsets.all(10.0),
+            child: Container(
+              width: size.width *0.2,
+              child: MultiSelectDialogField(
+                items: values.map((e) => MultiSelectItem(e, e)).toList(),
+                listType: MultiSelectListType.LIST,
+                cancelText: Text("Annuler"),
+                initialValue: initialValue,
+                buttonText: Text("Sélectionner"),
+                checkColor: Colors.white,
+                searchable: true,
+                chipDisplay: MultiSelectChipDisplay.none(),
+                selectedColor: kPrimaryColor,
+                title: Text(labelHint),
+                dialogHeight: size.height *0.4,
+                dialogWidth: size.width *0.2,
+                onSelectionChanged: (selectedList) {
+                  onChanged(selectedList);
+                },
+                onConfirm: (List<dynamic> test)
+                {
+                  print("onConfirm MultiSelectDialogField");
+                  print(test);
+                },
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/Components/multi_string_input_container.dart

@@ -3,24 +3,33 @@ import 'dart:convert';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/multi_input_modal.dart';
+import 'package:manager_app/Components/multi_string_input_html_modal.dart';
 import 'package:manager_app/constants.dart';
-import 'package:managerapi/api.dart';
+import 'package:manager_api_new/api.dart';
 
-class MultiStringContainer extends StatelessWidget {
+class MultiStringInputContainer extends StatelessWidget {
   final Color color;
   final String label;
   final String modalLabel;
   final List<TranslationDTO> initialValue;
   final Function onGetResult;
   final int maxLines;
-  const MultiStringContainer({
-    Key key,
+  final bool isTitle;
+  final bool isAudio;
+  final bool isHTML;
+  final double fontSize;
+  const MultiStringInputContainer({
+    Key? key,
     this.color = kSecond,
-    this.label,
-    this.modalLabel,
-    this.initialValue,
-    this.onGetResult,
-    this.maxLines,
+    required this.label,
+    required this.modalLabel,
+    required this.initialValue,
+    required this.onGetResult,
+    required this.maxLines,
+    required this.isTitle,
+    this.isAudio = false,
+    this.isHTML = false,
+    this.fontSize = 25,
   }) : super(key: key);
 
   @override
@@ -32,7 +41,13 @@ class MultiStringContainer extends StatelessWidget {
         children: [
           Align(
               alignment: AlignmentDirectional.centerStart,
-              child: Text(label, style: TextStyle(fontSize: 25, fontWeight: FontWeight.w300))
+              child: AutoSizeText(
+                label,
+                style: TextStyle(fontSize: fontSize, fontWeight: FontWeight.w300),
+                maxLines: 2,
+                maxFontSize: fontSize,
+                textAlign: TextAlign.center,
+              )
           ),
           Padding(
             padding: const EdgeInsets.all(10.0),
@@ -40,12 +55,28 @@ class MultiStringContainer extends StatelessWidget {
               width: size.width *0.15,
               child: InkWell(
                 onTap: () {
-                  List<TranslationDTO> newValues = new List<TranslationDTO>();
-                  // Make a copy
-                  initialValue.forEach((value) {
-                    newValues.add(TranslationDTO.fromJson(jsonDecode(jsonEncode(value))));
+                  List<TranslationDTO> newValues = <TranslationDTO>[];
+
+                  List<TranslationDTO> initials = initialValue;
+                  if(initials == null) {
+                    initials = [];
+                  }
+
+                  languages.forEach((value) {
+                    if(initials.map((iv) => iv.language).contains(value)) {
+                      newValues.add(TranslationDTO.fromJson(jsonDecode(jsonEncode(initials.firstWhere((element) => element.language == value)))!)!);
+                    } else {
+                      // New language
+                      newValues.add(TranslationDTO(language: value, value: null));
+                    }
                   });
-                  showMultiStringInput(label, modalLabel, initialValue, newValues, onGetResult, maxLines, context);
+
+                  if(isHTML) {
+                    showMultiStringInputHTML(label, modalLabel, isTitle, initials, newValues, onGetResult, maxLines, isAudio, context);
+                  } else {
+                    showMultiStringInput(label, modalLabel, isTitle, initials, newValues, onGetResult, maxLines, isAudio, context);
+                  }
+
                 },
                 child: Container(
                     decoration: BoxDecoration(
@@ -56,7 +87,7 @@ class MultiStringContainer extends StatelessWidget {
                     padding: const EdgeInsets.only(left: 5, right: 5, top: 15, bottom: 15),
                     child: Center(
                         child: AutoSizeText(
-                          "Changer les traductions",
+                          isAudio ? "Changer audios" : "Changer traductions",
                           style: TextStyle(color: kWhite),
                           maxLines: 2,
                         )

lib/Components/multi_string_input_html_modal.dart

@@ -0,0 +1,62 @@
+import 'dart:ui';
+import 'package:flutter/material.dart';
+import 'package:manager_app/Components/rounded_button.dart';
+import 'package:manager_app/Components/translation_input_container.dart';
+import 'package:manager_app/constants.dart';
+import 'package:manager_api_new/api.dart';
+import 'package:collection/collection.dart';
+
+showMultiStringInputHTML (String label, String modalLabel, bool isTitle, List<TranslationDTO> values, List<TranslationDTO> newValues, Function onGetResult, int maxLines, bool isAudio, BuildContext context) {
+  showDialog(
+    builder: (BuildContext context) {
+      return AlertDialog(
+        shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(20.0))
+        ),
+        title: Center(child: Text(modalLabel)),
+        content: SingleChildScrollView(
+            child: TranslationInputContainer(isTitle: isTitle, values: values, newValues: newValues, onGetResult: onGetResult, maxLines: maxLines, isAudio: isAudio)
+        ),
+        actions: <Widget>[
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            children: [
+              Container(
+                width: 180,
+                height: 70,
+                child: RoundedButton(
+                  text: "Annuler",
+                  icon: Icons.undo,
+                  color: kSecond,
+                  press: () {
+                    onGetResult(values);
+                    Navigator.of(context).pop();
+                  },
+                  fontSize: 20,
+                ),
+              ),
+              Container(
+                width: 180,
+                height: 70,
+                child: RoundedButton(
+                  text: "Valider",
+                  icon: Icons.check,
+                  color: kPrimaryColor,
+                  textColor: kWhite,
+                  press: () {
+                    Function deepEq = const DeepCollectionEquality().equals;
+                    if (!deepEq(values, newValues)) {
+                      onGetResult(newValues);
+                    }
+                    Navigator.of(context).pop();
+                  },
+                  fontSize: 20,
+                ),
+              ),
+            ],
+          ),
+        ],
+      );
+    }, context: context
+  );
+}

lib/Components/number_input_container.dart

@@ -0,0 +1,63 @@
+import 'package:auto_size_text/auto_size_text.dart';
+import 'package:flutter/material.dart';
+import 'package:manager_app/Components/rounded_input_field.dart';
+import 'package:manager_app/constants.dart';
+
+class NumberInputContainer extends StatelessWidget {
+  final Color color;
+  final String label;
+  final int initialValue;
+  final ValueChanged<String> onChanged;
+  final bool isUrl;
+  final bool isSmall;
+  final int maxLength;
+  final double fontSize;
+  final double fontSizeText;
+  const NumberInputContainer({
+    Key? key,
+    this.color = kSecond,
+    required this.label,
+    required this.initialValue,
+    required this.onChanged,
+    this.isUrl = false,
+    this.isSmall = false,
+    this.maxLength = 50,
+    this.fontSize = 25,
+    this.fontSizeText = 20,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    return Container(
+     child: Row(
+        children: [
+          Align(
+              alignment: AlignmentDirectional.centerStart,
+              child: AutoSizeText(
+                label,
+                style: TextStyle(fontSize: fontSize, fontWeight: FontWeight.w300),
+                maxLines: 2,
+                maxFontSize: fontSize,
+                textAlign: TextAlign.center,
+              ),
+          ),
+          Padding(
+            padding: const EdgeInsets.all(10.0),
+            child: Container(
+              width: isUrl ? size.width *0.6 : isSmall ? size.width *0.1 : size.width *0.2,
+              child: RoundedInputField(
+                color: color,
+                textColor: kBlack,
+                fontSize: fontSizeText,
+                initialValue: initialValue.toString(),
+                onChanged: onChanged,
+                maxLength: maxLength,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/Components/resource_tab.dart

@@ -2,19 +2,20 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
+import 'package:manager_app/Components/upload_audio_container.dart';
 import 'package:manager_app/Components/upload_image_container.dart';
 import 'package:manager_app/Components/upload_online_resources_container.dart';
 import 'package:manager_app/constants.dart';
-import 'package:managerapi/api.dart';
+import 'package:manager_api_new/api.dart';
 class ResourceTab extends StatefulWidget {
   final ResourceDTO resourceDTO;
   final Function onFileUpload;
   final Function onFileUploadWeb;
   const ResourceTab({
-    Key key,
-    this.resourceDTO,
-    this.onFileUpload,
-    this.onFileUploadWeb,
+    Key? key,
+    required this.resourceDTO,
+    required this.onFileUpload,
+    required this.onFileUploadWeb,
   }) : super(key: key);
 
   @override
@@ -22,17 +23,18 @@ class ResourceTab extends StatefulWidget {
 }
 
 class _ResourceTabState extends State<ResourceTab> with SingleTickerProviderStateMixin {
-  TabController _tabController;
-  List<Tab> tabsToShow = new List<Tab>();
+  TabController? _tabController;
+  List<Tab> tabsToShow = <Tab>[];
 
   @override
   void initState() {
     tabsToShow.add(new Tab(text: "Image local"));
     tabsToShow.add(new Tab(text: "Image en ligne"));
-    tabsToShow.add(new Tab(text: "Vidéo en ligne"));
+    tabsToShow.add(new Tab(text: "Audio local"));
+    //tabsToShow.add(new Tab(text: "Vidéo en ligne"));
 
     _tabController = new TabController(length: 3, vsync: this);
-    _tabController.addListener(_handleTabSelection);
+    _tabController!.addListener(_handleTabSelection);
 
     super.initState();
   }
@@ -65,23 +67,23 @@ class _ResourceTabState extends State<ResourceTab> with SingleTickerProviderStat
   }
 
   void _handleTabSelection() {
-      switch(_tabController.index) {
+      switch(_tabController!.index) {
         case 0:
           setState(() {
             widget.resourceDTO.data = null;
-            widget.resourceDTO.type = ResourceType.image;
+            widget.resourceDTO.type = ResourceType.Image;
           });
           break;
         case 1:
           setState(() {
             widget.resourceDTO.data = null;
-            widget.resourceDTO.type = ResourceType.imageUrl;
+            widget.resourceDTO.type = ResourceType.ImageUrl;
           });
           break;
         case 2:
           setState(() {
             widget.resourceDTO.data = null;
-            widget.resourceDTO.type = ResourceType.videoUrl;
+            widget.resourceDTO.type = ResourceType.Audio;
           });
           break;
       }
@@ -89,20 +91,20 @@ 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(
       new Padding(
         padding: EdgeInsets.symmetric(horizontal: 8, vertical: 16),
         child: UploadImageContainer(
-            onChanged: (List<File> files) {
+            onChanged: (List<File>? files) {
               onFileUpload(files);
-              resourceDTO.type = ResourceType.image;
+              resourceDTO.type = ResourceType.Image;
             },
-            onChangedWeb: (List<PlatformFile> files) {
+            onChangedWeb: (List<PlatformFile>? files) {
               onFileUploadWeb(files);
-              resourceDTO.type = ResourceType.image;
+              resourceDTO.type = ResourceType.Image;
             },
         ),
       )
@@ -121,8 +123,25 @@ getContent(ResourceDTO resourceDTO, Function onFileUpload, Function onFileUpload
       )
   );
 
-  // Online Video
+  // Audio local
   tabsToShow.add(
+      new Padding(
+        padding: EdgeInsets.symmetric(horizontal: 8, vertical: 16),
+        child: UploadAudioContainer(
+          onChanged: (List<File> files) {
+            onFileUpload(files);
+            resourceDTO.type = ResourceType.Audio;
+          },
+          onChangedWeb: (List<PlatformFile> files) {
+            onFileUploadWeb(files);
+            resourceDTO.type = ResourceType.Audio;
+          },
+        ),
+      )
+  );
+
+  // Online Video
+  /*tabsToShow.add(
       new Padding(
         padding: EdgeInsets.symmetric(horizontal: 8, vertical: 16),
         child: UploadOnlineResourceContainer(
@@ -132,6 +151,6 @@ getContent(ResourceDTO resourceDTO, Function onFileUpload, Function onFileUpload
           },
         ),
       )
-  );
+  );*/
   return tabsToShow;
 }

lib/Components/rounded_button.dart

@@ -1,23 +1,24 @@
+import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/constants.dart';
 
 class RoundedButton extends StatelessWidget {
   final String text;
   final Function press;
-  final IconData icon;
+  final IconData? icon;
   final Color color, textColor;
   final double fontSize;
-  final int vertical;
-  final int horizontal;
+  final double? vertical;
+  final double? horizontal;
 
   const RoundedButton({
-    Key key,
-    this.text,
-    this.press,
+    Key? key,
+    required this.text,
+    required this.press,
     this.icon,
     this.color = kPrimaryColor,
     this.textColor = kWhite,
-    this.fontSize,
+    required this.fontSize,
     this.vertical,
     this.horizontal
   }) : super(key: key);
@@ -27,7 +28,7 @@ class RoundedButton extends StatelessWidget {
     //Size size = MediaQuery.of(context).size;
     return TextButton(
         style: ButtonStyle(
-          padding: MaterialStateProperty.resolveWith((states) => EdgeInsets.symmetric(vertical: this.vertical != null ? this.vertical : 25, horizontal: this.horizontal != null ? this.horizontal : (icon == null ? 85 : 30))),
+          padding: MaterialStateProperty.resolveWith((states) => EdgeInsets.symmetric(vertical: this.vertical != null ? this.vertical! : 25, horizontal: this.horizontal != null ? this.horizontal!: (icon == null ? 85 : 30))),
           backgroundColor: MaterialStateColor.resolveWith((states) => color),
           shape: MaterialStateProperty.all<RoundedRectangleBorder>(
               RoundedRectangleBorder(
@@ -49,9 +50,12 @@ class RoundedButton extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: [
           Center(
-            child: Text(
+            child: AutoSizeText(
                     text,
                     style: new TextStyle(color: textColor, fontSize: fontSize, fontWeight: FontWeight.w400),
+                    maxLines: 2,
+                    maxFontSize: fontSize,
+                    textAlign: TextAlign.center,
                   ),
           ),
           SizedBox(
@@ -65,9 +69,11 @@ class RoundedButton extends StatelessWidget {
         ],
       );
     } else {
-      return Text(
+      return AutoSizeText(
         text,
         style: new TextStyle(color: textColor, fontSize: fontSize, fontWeight: FontWeight.w400),
+        maxLines: 2,
+        textAlign: TextAlign.center,
       );
     }
   }

lib/Components/rounded_input_field.dart

@@ -1,26 +1,33 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:manager_app/Components/text_field_container.dart';
 import 'package:manager_app/constants.dart';
 
 class RoundedInputField extends StatelessWidget {
-  final String hintText;
-  final IconData icon;
+  final String? hintText;
+  final IconData? icon;
   final ValueChanged<String> onChanged;
-  final String initialValue;
+  final String? initialValue;
   final Color color, textColor, iconColor;
-  final int maxLength;
+  final int? maxLength;
   final bool isEmail;
+  final double fontSize;
+  final String? autofill;
+  final bool isInt;
   const RoundedInputField({
-    Key key,
+    Key? key,
     this.hintText,
     this.initialValue,
     this.icon,
     this.color = kSecond,
     this.textColor = kBlack,
     this.iconColor = kPrimaryColor,
-    this.onChanged,
+    required this.onChanged,
     this.maxLength, // 50
-    this.isEmail = false
+    this.isEmail = false,
+    this.fontSize = 20,
+    this.autofill,
+    this.isInt = false
   }) : super(key: key);
 
   @override
@@ -32,15 +39,19 @@ class RoundedInputField extends StatelessWidget {
         initialValue: initialValue,
         cursorColor: textColor,
         maxLength: maxLength,
-        keyboardType: isEmail ? TextInputType.emailAddress : TextInputType.text,
-        style: TextStyle(fontSize: 20, color: textColor),
+        autofillHints: autofill != null ? [autofill!] : [],
+        keyboardType: isEmail ? TextInputType.emailAddress : isInt ? TextInputType.number : TextInputType.text,
+        inputFormatters: !isInt ? [] : <TextInputFormatter>[
+          FilteringTextInputFormatter.digitsOnly
+        ],
+        style: TextStyle(fontSize: fontSize, color: textColor),
         decoration: InputDecoration(
           icon: icon != null ? Icon(
             icon,
             color: iconColor,
           ): null,
           hintText: hintText,
-          hintStyle: TextStyle(fontSize: 20.0, color: textColor),
+          hintStyle: TextStyle(fontSize: fontSize, color: textColor),
           border: InputBorder.none,
         )
       ),

lib/Components/rounded_password_field.dart

@@ -6,9 +6,9 @@ class RoundedPasswordField extends StatefulWidget {
   final ValueChanged<String> onChanged;
   final String initialValue;
   const RoundedPasswordField({
-    Key key,
-    this.onChanged,
-    this.initialValue,
+    Key? key,
+    required this.onChanged,
+    required this.initialValue
   }) : super(key: key);
 
   @override
@@ -25,10 +25,11 @@ class _RoundedPasswordFieldState extends State<RoundedPasswordField> {
         obscureText: isVisible,
         onChanged: widget.onChanged,
         initialValue: widget.initialValue,
+        autofillHints: [AutofillHints.password],
         cursorColor: kPrimaryColor,
         style: TextStyle(fontSize: 20, color: kBlack),
         decoration: InputDecoration(
-          hintText: "Password",
+          hintText: "Mot de passe",
           hintStyle: TextStyle(fontSize: 20.0, color: kBlack),
           icon: Icon(
             Icons.lock,

lib/Components/slider_input_container.dart

@@ -9,13 +9,13 @@ class SliderInputContainer extends StatefulWidget {
   final int max;
   final ValueChanged<double> onChanged;
   const SliderInputContainer({
-    Key key,
+    Key? key,
     this.color = kSecond,
-    this.label,
-    this.initialValue,
-    this.min,
-    this.max,
-    this.onChanged,
+    required this.label,
+    required this.initialValue,
+    required this.min,
+    required this.max,
+    required this.onChanged,
   }) : super(key: key);
 
   @override
@@ -23,7 +23,7 @@ class SliderInputContainer extends StatefulWidget {
 }
 
 class _SliderInputContainerState extends State<SliderInputContainer> {
-  double currentValue;
+  double? currentValue;
 
   @override
   void initState() {
@@ -43,7 +43,7 @@ class _SliderInputContainerState extends State<SliderInputContainer> {
           Padding(
             padding: const EdgeInsets.all(10.0),
             child: Slider(
-              value: currentValue,
+              value: currentValue!,
               onChanged: (value) {
                 setState(() => currentValue = value);
                 widget.onChanged(value);

lib/Components/string_input_container.dart

@@ -1,43 +1,56 @@
+import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:manager_app/Components/rounded_input_field.dart';
 import 'package:manager_app/constants.dart';
 
 class StringInputContainer extends StatelessWidget {
-  final Color color;
+  final Color? color;
   final String label;
-  final String initialValue;
+  final String? initialValue;
   final ValueChanged<String> onChanged;
   final bool isUrl;
   final bool isSmall;
   final int maxLength;
+  final double fontSize;
+  final double fontSizeText;
   const StringInputContainer({
-    Key key,
+    Key? key,
     this.color = kSecond,
-    this.label,
-    this.initialValue,
-    this.onChanged,
+    required this.label,
+    this.initialValue = "",
+    required this.onChanged,
     this.isUrl = false,
     this.isSmall = false,
     this.maxLength = 50,
+    this.fontSize = 25,
+    this.fontSizeText = 20,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
+
     return Container(
      child: Row(
         children: [
           Align(
               alignment: AlignmentDirectional.centerStart,
-              child: Text(label, style: TextStyle(fontSize: 25, fontWeight: FontWeight.w300))
+              child: AutoSizeText(
+                label,
+                style: TextStyle(fontSize: fontSize, fontWeight: FontWeight.w300),
+                maxLines: 2,
+                maxFontSize: fontSize,
+                textAlign: TextAlign.center,
+              ),
           ),
           Padding(
             padding: const EdgeInsets.all(10.0),
             child: Container(
               width: isUrl ? size.width *0.6 : isSmall ? size.width *0.1 : size.width *0.2,
               child: RoundedInputField(
-                color: color,
+                color: color!,
                 textColor: kBlack,
+                fontSize: fontSizeText,
                 initialValue: initialValue,
                 onChanged: onChanged,
                 maxLength: maxLength,

lib/Components/text_field_container.dart

@@ -5,8 +5,8 @@ class TextFieldContainer extends StatelessWidget {
   final Widget child;
   final Color color;
   const TextFieldContainer({
-    Key key,
-    this.child,
+    Key? key,
+    required this.child,
     this.color = kSecond,
   }) : super(key: key);
 

lib/Components/text_form_input_container.dart

@@ -9,13 +9,13 @@ class TextFormInputContainer extends StatelessWidget {
   final int maxLines;
   final ValueChanged<String> onChanged;
   const TextFormInputContainer({
-    Key key,
+    Key? key,
     this.color = kSecond,
-    this.label,
-    this.initialValue,
-    this.isTitle,
+    required this.label,
+    required this.initialValue,
+    required this.isTitle,
     this.maxLines = 5,
-    this.onChanged
+    required this.onChanged
   }) : super(key: key);
 
   @override

lib/Components/translation_input_container.dart

@@ -0,0 +1,238 @@
+import 'package:flutter/material.dart';
+import 'package:manager_api_new/api.dart';
+import 'package:manager_app/Components/audio_input_container.dart';
+import 'package:manager_app/app_context.dart';
+import 'package:manager_app/constants.dart';
+import 'package:provider/provider.dart';
+import 'package:quill_html_editor/quill_html_editor.dart';
+
+import 'flag_decoration.dart';
+
+class _TranslationInputContainerState extends State<TranslationInputContainer> with TickerProviderStateMixin {
+  TabController? _tabController;
+  QuillEditorController controllerQuill = QuillEditorController();
+  ValueNotifier<String?>? currentLanguage;
+
+  @override
+  void initState() {
+    super.initState();
+    _tabController = new TabController(length: widget.newValues.length, vsync: this);
+    currentLanguage = ValueNotifier<String>(widget.newValues.first.language!);
+    controllerQuill.insertText(widget.newValues[_tabController!.index].value!);
+
+    controllerQuill.onTextChanged((p0) async {
+      var plainText = await controllerQuill.getPlainText();
+      if(widget.isTitle) {
+        if(plainText.length > 60) {
+          print("to much text au dessus");
+          controllerQuill.undo();
+        }
+      } else {
+        if(plainText.length > 2500) {
+          print("to much text description au dessus");
+          controllerQuill.undo();
+        }
+      }
+    });
+
+    _tabController!.addListener(() {
+      if (!_tabController!.indexIsChanging) {
+        setState(() {
+          currentLanguage!.value = widget.newValues[_tabController!.index].language;
+          if(!widget.isAudio) {
+            controllerQuill.clear();
+            controllerQuill.insertText(widget.newValues[_tabController!.index].value!);
+          }
+        });
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _tabController!.dispose();
+  }
+
+  getTranslation(BuildContext context, AppContext appContext, QuillEditorController controllerQuill, List<ToolBarStyle> customToolBarList, bool isTitle, bool isAudio, List<TranslationDTO> newValues, ValueNotifier<String?> currentLanguage) {
+    return Padding(
+      padding: const EdgeInsets.all(6.0),
+      child: Padding(
+        padding: const EdgeInsets.only(left: 8.0),
+        child: Container(
+          width: MediaQuery.of(context).size.width *0.7,
+          height: widget.isTitle ? MediaQuery.of(context).size.height *0.25 : MediaQuery.of(context).size.height *0.4,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              !isAudio ?
+              Column(
+                children: [
+                  ToolBar(
+                    toolBarColor: kSecond,
+                    activeIconColor: kPrimaryColor,
+                    padding: const EdgeInsets.all(8),
+                    iconSize: 20,
+                    toolBarConfig: customToolBarList,
+                    controller: controllerQuill,
+                    customButtons: [],
+                  ),
+                  SingleChildScrollView(
+                    child: Container(
+                      height: widget.isTitle ? MediaQuery.of(context).size.height *0.13 : MediaQuery.of(context).size.height *0.35,
+                      child: QuillHtmlEditor(
+                        text: newValues.where((element) => element.language! == currentLanguage.value).first.value!,
+                        //hintText: 'Hint text goes here',
+                        controller: controllerQuill,
+                        minHeight: widget.isTitle ? 80 : 240,
+                        /*textStyle: _editorTextStyle,
+                              hintTextStyle: _hintTextStyle,*/
+                        hintTextAlign: TextAlign.start,
+                        padding: const EdgeInsets.only(left: 10, right: 10, top: 5),
+                        hintTextPadding: EdgeInsets.zero,
+                        backgroundColor: kBackgroundColor,
+                        ensureVisible: true,
+                        inputAction: widget.isTitle ? InputAction.send : InputAction.newline, // don't accept enter if title
+                        onFocusChanged: (hasFocus) => debugPrint('has focus $hasFocus'),
+                        //onTextChanged: (text) => debugPrint('widget text change $text'),
+                        onTextChanged: (value) {
+                          newValues.where((element) => element.language! == currentLanguage.value).first.value = value;
+                        },
+                        onEditorCreated: () => debugPrint('Editor has been loaded'),
+                        onEditorResized: (height) =>
+                            debugPrint('Editor resized $height'),
+                        onSelectionChanged: (sel) =>
+                            debugPrint('${sel.index},${sel.length}'),
+                      ),
+                    ),
+                  ),
+                ],
+              )
+              /*HtmlEditor(
+                    controller: controller,
+                    htmlEditorOptions: HtmlEditorOptions(
+                      hint: "Your text here...",
+                      initialText: newValues.where((element) => element.language == language).first.value!,
+                      shouldEnsureVisible: true,
+                    ),
+                    htmlToolbarOptions: HtmlToolbarOptions(
+                      toolbarPosition: ToolbarPosition.aboveEditor, //required to place toolbar anywhere!
+                      //other options
+                    ),
+                    otherOptions: OtherOptions(
+                      height: 400,
+                    ),
+                  )*/
+              /*TextFormInputContainer(
+                    label: label,
+                    color: kWhite,
+                    isTitle: isTitle,
+                    initialValue: newValues.where((element) => element.language == language).first.value!,
+                    onChanged: (value) {
+                      newValues.where((element) => element.language == language).first.value = value;
+                    },
+                  )*/ :
+              Container(
+                width: 250,
+                height: 120,
+                child: ValueListenableBuilder<String?>(
+                  valueListenable: currentLanguage,
+                  builder: (context, value, _) {
+                    return AudioInputContainer(
+                      //label: "Audio :",
+                      initialValue: newValues.where((element) => element.language! == value).first.value,
+                      color: kPrimaryColor,
+                      onChanged: (ResourceDTO resource) {
+                        newValues.where((element) => element.language! == value).first.value = resource.id;
+                      },
+                    );
+                  },
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final customToolBarList = widget.isTitle ? [
+      ToolBarStyle.bold,
+      ToolBarStyle.italic,
+      ToolBarStyle.color,
+      ToolBarStyle.background,
+      ToolBarStyle.clean
+    ] : [
+      ToolBarStyle.bold,
+      ToolBarStyle.italic,
+      ToolBarStyle.color,
+      ToolBarStyle.background,
+      ToolBarStyle.listBullet,
+      ToolBarStyle.listOrdered,
+      ToolBarStyle.clean
+    ];
+
+    return Container(
+      height: widget.isTitle ? MediaQuery.of(context).size.height *0.35 : MediaQuery.of(context).size.height *0.53,
+      width: MediaQuery.of(context).size.width *0.7,
+      constraints: BoxConstraints(
+        minHeight: 200,
+        minWidth: 300
+      ),
+      child: DefaultTabController(
+        length: widget.newValues.length,
+        child: Column(
+          children: [
+            RotatedBox(
+              quarterTurns: 0, // Can be used to test vertical tab in case of smaller screen
+              child: TabBar(
+                indicatorColor: kPrimaryColor,
+                //overlayColor: MaterialStateProperty().c,
+                labelColor: kPrimaryColor,
+                unselectedLabelColor: Colors.black,
+                controller: _tabController,
+                tabs: widget.newValues.map((v) => Tab(icon: FlagDecoration(language: v.language!))).toList(), // text: v.language!.toUpperCase(),
+              ),
+            ),
+            getTranslation(context, Provider.of<AppContext>(context), controllerQuill, customToolBarList, widget.isTitle, widget.isAudio, widget.newValues, currentLanguage!)
+            /*TabContainer(
+                      radius: 0,
+                      tabs: values.map((v) => v.language!.toUpperCase()).toList(),
+                      children: getTranslations(context, Provider.of<AppContext>(context), controllerQuill, customToolBarList, label, isTitle, isAudio, newValues),
+
+                      /*child: Column(
+                        mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        children: getTranslations(context, Provider.of<AppContext>(context), controllerQuill, label, isTitle, isAudio, newValues),
+                      ),*/
+                    ),*/
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class TranslationInputContainer extends StatefulWidget  {
+  TranslationInputContainer({
+    Key? key,
+    required this.isTitle,
+    required this.values,
+    required this.newValues,
+    required this.onGetResult,
+    required this.maxLines,
+    required this.isAudio,
+  }) : super(key: key);
+
+  bool isTitle;
+  List<TranslationDTO> values;
+  List<TranslationDTO> newValues;
+  Function onGetResult;
+  int maxLines;
+  bool isAudio;
+
+  @override
+  State<TranslationInputContainer> createState() => _TranslationInputContainerState();
+}

lib/Components/translation_tab.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:manager_app/constants.dart';
-import 'package:managerapi/api.dart';
+import 'package:manager_api_new/api.dart';
 class TranslationTab extends StatefulWidget {
   final List<TranslationDTO> translations;
   final int maxLines;
   const TranslationTab({
-    Key key,
-    this.translations,
-    this.maxLines,
+    Key? key,
+    required this.translations,
+    required this.maxLines,
   }) : super(key: key);
 
   @override
@@ -15,7 +15,7 @@ class TranslationTab extends StatefulWidget {
 }
 
 class _TranslationTabState extends State<TranslationTab> with SingleTickerProviderStateMixin {
-  TabController _tabController;
+  TabController? _tabController;
 
   @override
   void initState() {
@@ -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(
@@ -64,8 +64,8 @@ getContent(List<TranslationDTO> translations, int maxLines) {
           maxLines: maxLines,
           initialValue: translation.value,
           onChanged: (String value)  {
-            print("onChanged value in tranbslationTAB");
-            print(value);
+            //print("onChanged value in tranbslationTAB");
+            //print(value);
             translation.value = value;
           },
           cursorColor: kPrimaryColor,
@@ -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_audio_container.dart

@@ -0,0 +1,206 @@
+import 'dart:io';
+import 'package:file_picker/file_picker.dart';
+import 'package:manager_app/constants.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart' show kIsWeb;
+
+class UploadAudioContainer extends StatefulWidget {
+  final ValueChanged<List<File>> onChanged;
+  final ValueChanged<List<PlatformFile>> onChangedWeb;
+  const UploadAudioContainer({
+    Key? key,
+    required this.onChanged,
+    required this.onChangedWeb,
+  }) : super(key: key);
+
+  @override
+  _UploadAudioContainerState createState() => _UploadAudioContainerState();
+}
+
+class _UploadAudioContainerState extends State<UploadAudioContainer> with SingleTickerProviderStateMixin {
+  var filePath;
+  File? fileToShow;
+  String? fileToShowWeb;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Size size = MediaQuery.of(context).size;
+    return Container(
+      width: size.width *0.5,
+      height: size.height *0.5,
+      child: displayElement(),
+      );
+  }
+
+  String getFileName(filePath) {
+    return (filePath.toString().split('\\').last);
+  }
+
+  Future<void> filePicker() async {
+    FilePickerResult? result;
+    if (kIsWeb) {
+      result = await FilePicker.platform.pickFiles(
+        type: FileType.custom,
+        dialogTitle: 'Sélectionner un fichier audio mp3',
+        allowMultiple: true,
+        allowedExtensions: ['mp3'],
+      );
+
+      if (result != null) {
+        List<PlatformFile> files = result.files;
+
+        setState(() {
+          filePath = "Fichiers"; // Only show one picture
+          fileToShowWeb = "Aucun aperçu possible"; // Only show one picture
+          widget.onChangedWeb(files);
+        });
+      }
+    } else {
+      result = await FilePicker.platform.pickFiles(
+        type: FileType.custom,
+        dialogTitle: 'Sélectionner un fichier audio mp3',
+        allowMultiple: true,
+        allowedExtensions: ['mp3'],
+      );
+
+      if(result != null) {
+        List<File> files = result.paths.map((path) => File(path!)).toList();
+        var file = files[0];
+        setState(() {
+          filePath = file.path; // Only show one picture
+          fileToShow = file; // Only show one picture
+          widget.onChanged(files);
+        });
+      }
+    }
+    /*final file = OpenFilePicker()
+      ..filterSpecification = {
+        'Images (*.jpg; *.jpeg;*.png)': '*.jpg;*.jpeg;*.png',
+        //'Video (*.mp4)': '*.mp4',
+        //'All Files': '*.*'
+      }
+      ..defaultFilterIndex = 0
+      ..title = 'Sélectionner un fichier';
+
+    final result = file.getFile();
+
+    if (result != null) {
+
+      setState(() {
+        filePath = result.path;
+        fileToShow = result;
+        widget.onChanged(result);
+      });
+    }*/
+  }
+
+  showFile() {
+    if (getFileName(filePath).contains(".mp4")) {
+      /*return FutureBuilder(
+          future: loadFile(fileToShow),
+          builder: (context, AsyncSnapshot<dynamic> snapshot) {
+            if (snapshot.connectionState == ConnectionState.done) {
+              return Container(
+                  height: 300,
+                  child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Text("La prévisualisation de la vidéo n'est pas disponible"),
+                    ),
+                    Icon(
+                      Icons.ondemand_video_sharp,
+                      size: 35,
+                    ),
+                  ],
+                 ),
+                //DartVLC(file: snapshot.data)
+              );
+            } else if (snapshot.connectionState == ConnectionState.none) {
+              return Text("No data");
+            } else {
+              return Center(
+                  child: Container(
+                      height: 200,
+                      child: LoadingCommon()
+                  )
+              );
+            }
+          }
+      );*/
+    } else {
+      if (kIsWeb) {
+        return null;
+      } else {
+        return Text("TODO player affiché ou pas ?");/*Image.file(
+            fileToShow,
+            height: 200,
+            fit:BoxFit.scaleDown
+        );*/
+      }
+    }
+  }
+
+  loadFile(File fileToShow) async {
+    //return await Media.file(fileToShow);
+    return null; // Useless no mp4 for now
+  }
+
+  displayElement() {
+    if (fileToShow == null && fileToShowWeb == null) return Center(
+      child: InkWell(
+        onTap: () async {
+          filePicker();
+        },
+        child: Container(
+            decoration: BoxDecoration(
+                color: kPrimaryColor,
+                borderRadius: BorderRadius.circular(15)
+            ),
+            child: Padding(
+              padding: const EdgeInsets.only(left: 25.0, right: 25.0, top: 15.0, bottom: 15.0),
+              child: Text(
+                "Ajouter un ou plusieurs fichiers",
+                style: new TextStyle(color: kWhite),
+              ),
+            )
+        ),
+      ),
+    );
+    if (fileToShow != null || fileToShowWeb != null)
+      return Container(
+      margin: EdgeInsets.all(8.0),
+      child: Card(
+        color: kBackgroundColor,
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0))),
+        child: InkWell(
+          onTap: () async {
+            filePicker();
+          },
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: <Widget>[
+              ClipRRect(
+                borderRadius: BorderRadius.only(
+                topLeft: Radius.circular(8.0),
+                topRight: Radius.circular(8.0),
+                ),
+              child: showFile()
+              ),
+              ListTile(
+                title: Text(getFileName(filePath)),
+                subtitle: Text(filePath),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/Components/upload_image_container.dart

@@ -1,18 +1,16 @@
 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;
 
 class UploadImageContainer extends StatefulWidget {
-  final ValueChanged<List<File>> onChanged;
-  final ValueChanged<List<PlatformFile>> onChangedWeb;
+  final ValueChanged<List<File>?> onChanged;
+  final ValueChanged<List<PlatformFile>?> onChangedWeb;
   const UploadImageContainer({
-    Key key,
-    this.onChanged,
-    this.onChangedWeb,
+    Key? key,
+    required this.onChanged,
+    required this.onChangedWeb,
   }) : super(key: key);
 
   @override
@@ -21,8 +19,8 @@ class UploadImageContainer extends StatefulWidget {
 
 class _UploadImageContainerState extends State<UploadImageContainer> with SingleTickerProviderStateMixin {
   var filePath;
-  File fileToShow;
-  String fileToShowWeb;
+  File? fileToShow;
+  String? fileToShowWeb;
 
   @override
   void initState() {
@@ -44,7 +42,7 @@ class _UploadImageContainerState extends State<UploadImageContainer> with Single
   }
 
   Future<void> filePicker() async {
-    FilePickerResult result;
+    FilePickerResult? result;
     if (kIsWeb) {
       result = await FilePicker.platform.pickFiles(
         type: FileType.custom,
@@ -70,7 +68,8 @@ class _UploadImageContainerState extends State<UploadImageContainer> with Single
         allowedExtensions: ['jpg', 'jpeg', 'png'],
       );
 
-      List<File> files = result.paths.map((path) => File(path)).toList();
+      if (result != null) {
+        List<File> files = result.paths.map((path) => File(path!)).toList();
         var file = files[0];
         setState(() {
           filePath = file.path; // Only show one picture
@@ -78,6 +77,7 @@ class _UploadImageContainerState extends State<UploadImageContainer> with Single
           widget.onChanged(files);
         });
       }
+    }
     /*final file = OpenFilePicker()
       ..filterSpecification = {
         'Images (*.jpg; *.jpeg;*.png)': '*.jpg;*.jpeg;*.png',
@@ -128,7 +128,7 @@ class _UploadImageContainerState extends State<UploadImageContainer> with Single
               return Center(
                   child: Container(
                       height: 200,
-                      child: Loading()
+                      child: LoadingCommon()
                   )
               );
             }
@@ -138,14 +138,16 @@ class _UploadImageContainerState extends State<UploadImageContainer> with Single
       if (kIsWeb) {
         return null;
       } else {
+        if(fileToShow != null) {
           return Image.file(
-            fileToShow,
+              fileToShow!,
               height: 200,
               fit:BoxFit.scaleDown
           );
         }
       }
     }
+  }
 
   loadFile(File fileToShow) async {
     //return await Media.file(fileToShow);

lib/Components/upload_online_resources_container.dart

@@ -1,16 +1,15 @@
-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';
+import 'package:manager_api_new/api.dart';
 import 'package:flutter/material.dart';
 
 class UploadOnlineResourceContainer extends StatefulWidget {
   final ResourceDTO resourceDTO;
   final ValueChanged<ResourceDTO> onChanged;
   const UploadOnlineResourceContainer({
-    Key key,
-    this.resourceDTO,
-    this.onChanged,
+    Key? key,
+    required this.resourceDTO,
+    required this.onChanged,
   }) : super(key: key);
 
   @override
@@ -18,7 +17,7 @@ class UploadOnlineResourceContainer extends StatefulWidget {
 }
 
 class _UploadOnlineResourceContainerState extends State<UploadOnlineResourceContainer> with SingleTickerProviderStateMixin {
-  String urlResourceToShow;
+  String? urlResourceToShow;
 
   @override
   void initState() {
@@ -28,12 +27,12 @@ class _UploadOnlineResourceContainerState extends State<UploadOnlineResourceCont
   @override
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
-     print(size.width);
+     //print(size.width);
     return displayElement(size);
   }
 
   showFile() {
-    if (widget.resourceDTO.type == ResourceType.videoUrl || widget.resourceDTO.type == ResourceType.video) {
+    if (widget.resourceDTO.type == ResourceType.VideoUrl || widget.resourceDTO.type == ResourceType.Video) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
@@ -65,9 +64,24 @@ class _UploadOnlineResourceContainerState extends State<UploadOnlineResourceCont
       /*await Media.file(widget.file)*/
     } else {
       return Image.network(
-          urlResourceToShow,
+          urlResourceToShow!,
           height: 200,
-          fit:BoxFit.scaleDown
+          fit:BoxFit.scaleDown,
+          loadingBuilder: (BuildContext context, Widget child,
+              ImageChunkEvent? loadingProgress) {
+            if (loadingProgress == null) {
+              return child;
+            }
+            return Center(
+              child: CircularProgressIndicator(
+                color: kPrimaryColor,
+                value: loadingProgress.expectedTotalBytes != null
+                    ? loadingProgress.cumulativeBytesLoaded /
+                    loadingProgress.expectedTotalBytes!
+                    : null,
+              ),
+            );
+          },
       );
     }
   }
@@ -91,10 +105,10 @@ class _UploadOnlineResourceContainerState extends State<UploadOnlineResourceCont
                 child: Container(
                   width: size.width *0.35, // TODO GET SIZE
                   child: RoundedInputField(
-                    hintText: widget.resourceDTO.type == ResourceType.imageUrl ? "Url de l'image" : "Url de la vidéo",
-                    icon: widget.resourceDTO.type == ResourceType.imageUrl ? Icons.image : Icons.ondemand_video, // TODO: TBD
+                    hintText: widget.resourceDTO.type == ResourceType.ImageUrl ? "Url de l'image" : "Url de la vidéo",
+                    icon: widget.resourceDTO.type == ResourceType.ImageUrl ? Icons.image : Icons.ondemand_video, // TODO: TBD
                     onChanged: (String text) {
-                      print("onchanged url");
+                      //print("onchanged url");
                       widget.resourceDTO.data = text;
                       widget.onChanged(widget.resourceDTO);
                     },
@@ -104,7 +118,7 @@ class _UploadOnlineResourceContainerState extends State<UploadOnlineResourceCont
               ),
               InkWell(
                 onTap: () {
-                  print("refresh preview");
+                  //print("refresh preview");
                   setState(() {
                     urlResourceToShow = widget.resourceDTO.data;
                   });

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';
@@ -8,8 +7,7 @@ import 'package:manager_app/Components/message_notification.dart';
 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';
+import 'package:manager_api_new/api.dart';
 
 class FileHelper {
   final key = Key.fromUtf8('aVs:ZMe3EK-yS<y:;k>vCGrj3T8]yG6E');
@@ -32,7 +30,7 @@ class FileHelper {
 
     if (session.password != null) {
       var encrypter = Encrypter(AES(key));
-      var encrypted = encrypter.encrypt(session.password, iv: iv);
+      var encrypted = encrypter.encrypt(session.password!, iv: iv);
 
       session.password = encrypted.base64;
     }
@@ -42,20 +40,20 @@ class FileHelper {
 
   Future<File> storeConfiguration(ExportConfigurationDTO exportConfigurationDTO) async {
     final path = await _localPath;
-    new File('$path/'+exportConfigurationDTO.label+'.json').createSync(recursive: true);
+    new File('$path/'+exportConfigurationDTO.label!+'.json').createSync(recursive: true);
 
     // Write the file
-    File file = File('$path/'+exportConfigurationDTO.label+'.json');
+    File file = File('$path/'+exportConfigurationDTO.label!+'.json');
     return file.writeAsString(jsonEncode(exportConfigurationDTO.toJson()));
   }
 
-  Future<void> importConfiguration(FilePickerResult filePickerResult, String path, Client client, context) async {
+  Future<void> importConfiguration(FilePickerResult filePickerResult, String? path, Client client, context) async {
     var fileTest = filePickerResult.files[0];
-    String fileContent = utf8.decode(fileTest.bytes);
-    ExportConfigurationDTO export = ExportConfigurationDTO.fromJson(jsonDecode(fileContent));
+    String fileContent = utf8.decode(fileTest.bytes!);
+    ExportConfigurationDTO export = ExportConfigurationDTO.fromJson(jsonDecode(fileContent))!;
     try {
-      String test = await client.configurationApi.configurationImport(export);
-      if (test.contains("successfully")) {
+      String? test = await client.configurationApi!.configurationImport(export);
+      if (test != null && test.contains("successfully")) {
         showNotification(kSuccess, kWhite, 'La configuration a été importée avec succès', context, null);
       } else {
         showNotification(kPrimaryColor, kWhite, 'Une erreur est survenue lors de l''import de la configuration', context, null);
@@ -78,7 +76,7 @@ class FileHelper {
       var encrypter = Encrypter(AES(key));
 
       if (session.password != null) {
-        session.password = encrypter.decrypt64(session.password, iv: iv);
+        session.password = encrypter.decrypt64(session.password!, iv: iv);
       }
 
       return session;
@@ -86,7 +84,7 @@ class FileHelper {
       if (e.toString().contains("cannot find the file")) {
         final path = await _localPath;
         new File('$path/session.json').createSync(recursive: true);
-        print("file created");
+        //print("file created");
         await writeSession(new Session(rememberMe: false));
       }
       // If encountering an error, return 0

lib/Helpers/PDFHelper.dart

@@ -0,0 +1,74 @@
+import 'package:flutter/services.dart';
+import 'package:manager_api_new/api.dart';
+import 'dart:convert';
+import 'package:pdf/pdf.dart';
+import 'package:pdf/widgets.dart' as pw;
+import 'dart:html' as html;
+
+class PDFHelper {
+  static downloadPDF(List<SectionDTO> sections) async {
+    var sectionsArticle = sections.where((section) => section.type == SectionType.Article || section.type == SectionType.Quizz); // TODO HERE Support more section types
+    if(sectionsArticle.length > 0) {
+      //final font = await rootBundle.load("fonts/OpenSans-Medium.ttf");
+      //Uint8List byteData = new File("fonts/OpenSans-Medium.ttf").readAsBytesSync();
+      //ByteData font = ByteData.view(byteData.buffer);
+      //final ttf = pw.Font.ttf(font);
+      final pdf = pw.Document();
+          pdf.addPage(pw.MultiPage(
+              pageFormat: PdfPageFormat.a4,
+              build: (pw.Context context) {
+                return <pw.Widget> [
+                  for(var section in sectionsArticle)
+                    pw.Center(
+                      child:
+                        pw.Column(
+                          children: [
+                            pw.Text(section.label!.replaceAll(RegExp("[^A-Za-z0-9---():!éàèëêäâç' ]"), '')), //style: pw.TextStyle(font: ttf, fontSize: 30)
+                            pw.Padding(padding: const pw.EdgeInsets.only(top: 20)),
+                            pw.BarcodeWidget(
+                              data: section.id!,
+                              width: 150,
+                              height: 150,
+                              barcode: pw.Barcode.qrCode(),
+                              drawText: false,
+                            ),
+                            pw.Padding(padding: const pw.EdgeInsets.only(bottom: 30)),
+                          ]
+                        )
+                    )
+                  ];
+              }));
+
+          /*pdf.addPage(pw.Page(
+              pageFormat: PdfPageFormat.a4,
+              build: (pw.Context context) {
+                return
+                  pw.Center(
+                      child: pw.Column(
+                        children: [
+                          pw.Text(section.label, style: pw.TextStyle(font: ttf, fontSize: 30)),
+                          pw.Padding(padding: const pw.EdgeInsets.only(top: 10)),
+                          pw.BarcodeWidget(
+                            data: section.id,
+                            width: 150,
+                            height: 150,
+                            barcode: pw.Barcode.qrCode(),
+                            drawText: false,
+                          ),
+                        ],
+                      )
+                  );
+              }));*/
+
+
+
+      var test = await pdf.save();
+      final content = base64Encode(test);
+      final fileName = sectionsArticle.length > 1 ? 'QRCodes' : sectionsArticle.first.label;
+      final anchor = html.AnchorElement(
+          href: "data:application/octet-stream;charset=utf-16le;base64,$content")
+        ..setAttribute("download", '$fileName.pdf')
+        ..click();
+    }
+  }
+}

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';
@@ -8,7 +7,7 @@ import 'package:password_credential/entity/result.dart';
 class Model with ChangeNotifier {
   final _credentials = Credentials();
 
-  bool hasCredentialFeature = false;
+  bool? hasCredentialFeature = false;
   var idEdit = TextEditingController();
   var passwordEdit = TextEditingController();
 
@@ -27,11 +26,11 @@ class Model with ChangeNotifier {
   Future<PasswordCredential> get(Mediation mediation) async {
     var credential = await _credentials.get(mediation: mediation);
     if (credential != null) {
-      idEdit.text = credential.id;
-      passwordEdit.text = credential.password;
+      idEdit.text = credential.id!;
+      passwordEdit.text = credential.password!;
       notifyListeners();
     }
-    return credential;
+    return credential!;
   }
 
   Future<void> delete() async {

lib/Models/managerContext.dart

@@ -1,23 +1,25 @@
 import 'package:flutter/material.dart';
-import 'package:manager_app/Models/session.dart';
 import 'package:manager_app/client.dart';
-import 'package:managerapi/api.dart';
+import 'package:manager_api_new/api.dart';
 
 
 class ManagerAppContext with ChangeNotifier{
-  String email;
-  TokenDTO token;
-  Client clientAPI;
-  String currentRoute;
-  ConfigurationDTO selectedConfiguration;
-  SectionDTO selectedSection;
-  bool isLoading = false;
+  String? email;
+  String? instanceId;
+  String? host;
+  String? accessToken;
+  int? pinCode;
+  Client? clientAPI;
+  String? currentRoute;
+  ConfigurationDTO? selectedConfiguration;
+  SectionDTO? selectedSection;
+  bool? isLoading = false;
 
-  ManagerAppContext({this.email, this.token, this.currentRoute});
+  ManagerAppContext({this.email, this.accessToken, this.currentRoute});
 
   // Implement toString to make it easier to see information about
   @override
   String toString() {
-    return 'ManagerAppContext{email: $email, token: $token, currentRoute: $currentRoute}, selectedConfiguration: $selectedConfiguration, selectedSection: $selectedSection}';
+    return 'ManagerAppContext{email: $email, host: $host, token: $accessToken, instanceId: $instanceId, currentRoute: $currentRoute}, selectedConfiguration: $selectedConfiguration, selectedSection: $selectedSection}';
   }
 }

lib/Models/menu.dart

@@ -2,9 +2,9 @@ import 'package:manager_app/Models/menuSection.dart';
 
 class Menu {
   String title;
-  List<MenuSection> sections;
+  List<MenuSection>? sections;
 
-  Menu({this.title, this.sections});
+  Menu({required this.title, this.sections});
 
   factory Menu.fromJson(Map<String, dynamic> json) {
     return new Menu(

lib/Models/menuSection.dart

@@ -3,7 +3,7 @@ class MenuSection {
   String type;
   int order;
 
-  MenuSection({this.name, this.type, this.order});
+  MenuSection({required this.name, required this.type, required this.order});
 
   factory MenuSection.fromJson(Map<String, dynamic> json) {
     return new MenuSection(

lib/Models/resourceTypeModel.dart

@@ -0,0 +1,27 @@
+import 'package:manager_api_new/api.dart';
+
+class ResourceTypeModel {
+  String label;
+  ResourceType type;
+
+  ResourceTypeModel({required this.label, required this.type});
+
+  factory ResourceTypeModel.fromJson(Map<String, dynamic> json) {
+    return new ResourceTypeModel(
+      label: json['label'] as String,
+      type: json['type'] as ResourceType,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'label': label,
+      'type': type
+    };
+  }
+
+  @override
+  String toString() {
+    return '{label: $label, type: $type}';
+  }
+}

lib/Models/session.dart

@@ -1,10 +1,10 @@
 class Session {
   bool rememberMe;
-  String host;
-  String email;
-  String password;
+  String? host;
+  String? email;
+  String? password;
 
-  Session({this.rememberMe, this.host, this.email, this.password});
+  Session({required this.rememberMe, this.host, this.email, this.password});
 
   factory Session.fromJson(Map<String, dynamic> json) {
     return new Session(