diff --git a/android/app/build.gradle b/android/app/build.gradle index f288817..3513c06 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,7 +43,7 @@ apply plugin: 'com.google.gms.google-services'*/ android { namespace "be.unov.myinfomate.tablet" - compileSdkVersion 34 + compileSdkVersion 36 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/android/build.gradle b/android/build.gradle index b8bd72e..7c1d253 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -23,12 +23,12 @@ rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } -subprojects { - //project.evaluationDependsOn(':app') - project.configurations.all { + +allprojects { + configurations.all { resolutionStrategy.eachDependency { details -> if (details.requested.group == 'androidx.lifecycle') { - details.useVersion '2.4.0' // To fix mapbox issue.. + details.useVersion '2.8.7' // Pin to last version with setViewTreeLifecycleOwner } } } diff --git a/android/gradle.properties b/android/gradle.properties index a8c8d76..dfc4218 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true android.enableR8=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 6b66533..9162f10 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 2e8e75d..3cd6b68 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,9 +18,9 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id 'com.android.application' version '7.2.0' apply false - id 'com.android.library' version '7.2.0' apply false - id 'org.jetbrains.kotlin.android' version '1.9.0' apply false + id 'com.android.application' version '8.9.1' apply false + id 'com.android.library' version '8.9.1' apply false + id 'org.jetbrains.kotlin.android' version '2.2.0' apply false id "com.google.gms.google-services" version "4.3.15" apply false id "com.google.firebase.crashlytics" version "2.9.9" apply false /*id "com.google.firebase:firebase-bom" version "32.7.0" diff --git a/build_log.txt b/build_log.txt new file mode 100644 index 0000000..350113d Binary files /dev/null and b/build_log.txt differ diff --git a/lib/Screens/MainView/main_view.dart b/lib/Screens/MainView/main_view.dart index a70dc94..be03b2a 100644 --- a/lib/Screens/MainView/main_view.dart +++ b/lib/Screens/MainView/main_view.dart @@ -218,6 +218,8 @@ class _MainViewWidget extends State { Future getCurrentConfiguration(dynamic appContext) async { TabletAppContext tabletAppContext = await appContext.getContext(); try { + print("getCurrentConfiguration - configId: ${tabletAppContext.configuration?.id}"); + print("getCurrentConfiguration - host: ${tabletAppContext.host}"); ConfigurationDTO? configurationDTO = await tabletAppContext.clientAPI!.configurationApi!.configurationGetDetail(tabletAppContext.configuration!.id!); // tabletAppContext.configuration!.id! // 65c5f0ee4c030e63ce16bff5 TODO Remove tabletAppContext.configuration = configurationDTO; @@ -242,6 +244,7 @@ class _MainViewWidget extends State { return configurationDTO; } catch (e) { + print("getCurrentConfiguration - ERROR: $e"); ScaffoldMessenger.of(context).showSnackBar( const SnackBar( content: Text('Une erreur est survenue lors de la récupération de la configuration'), @@ -281,6 +284,8 @@ class _MainViewWidget extends State { if(isInit) { try { + print("getSections - configId: ${tabletAppContext.configuration?.id}"); + print("getSections - host: ${tabletAppContext.host}"); final rawList = await tabletAppContext.clientAPI!.sectionApi!.sectionGetFromConfigurationDetail(tabletAppContext.configuration!.id!); rawSectionsData = jsonDecode(jsonEncode(rawList)); List sectionList = jsonDecode(jsonEncode(rawSectionsData)).map((json) => SectionDTO.fromJson(json)).whereType().toList(); @@ -288,7 +293,7 @@ class _MainViewWidget extends State { isInit = false; return sectionList; } catch (e) { - print(e); + print("getSections - ERROR: $e"); print("IN CATCH"); Navigator.pushAndRemoveUntil( context, diff --git a/lib/api/openApi.dart b/lib/api/openApi.dart index 18add1e..326b727 100644 --- a/lib/api/openApi.dart +++ b/lib/api/openApi.dart @@ -1,4 +1,4 @@ -// Openapi Generator last run: : 2025-05-23T15:19:19.419517 +// Openapi Generator last run: : 2026-04-16T14:08:45.302446 import 'package:openapi_generator_annotations/openapi_generator_annotations.dart'; @Openapi( diff --git a/lib/api/swagger.yaml b/lib/api/swagger.yaml index f146761..f277226 100644 --- a/lib/api/swagger.yaml +++ b/lib/api/swagger.yaml @@ -4,11 +4,11 @@ "info": { "title": "Manager Service", "description": "API Manager Service", - "version": "Version Alpha 3" + "version": "Version Alpha" }, "servers": [ { - "url": "https://localhost:5001" + "url": "https://api.myinfomate.be" } ], "paths": { @@ -197,8 +197,8 @@ "name": "pinCode", "in": "query", "schema": { - "type": "string", - "nullable": true + "type": "integer", + "format": "int32" }, "x-position": 1 } @@ -923,7 +923,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/InstanceDTO" + "$ref": "#/components/schemas/Instance" } } }, @@ -988,7 +988,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/InstanceDTO" + "$ref": "#/components/schemas/Instance" } } }, @@ -1177,8 +1177,8 @@ "name": "pinCode", "in": "query", "schema": { - "type": "string", - "nullable": true + "type": "integer", + "format": "int32" }, "x-position": 1 } @@ -1687,16 +1687,6 @@ } } } - }, - "400": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } } }, "security": [ @@ -1779,7 +1769,9 @@ "x-name": "updatedSection", "content": { "application/json": { - "schema": {} + "schema": { + "$ref": "#/components/schemas/SectionDTO" + } } }, "required": true, @@ -1790,7 +1782,9 @@ "description": "", "content": { "application/json": { - "schema": {} + "schema": { + "$ref": "#/components/schemas/SectionDTO" + } } } }, @@ -2023,7 +2017,9 @@ "description": "", "content": { "application/json": { - "schema": {} + "schema": { + "$ref": "#/components/schemas/SectionDTO" + } } } }, @@ -2390,19 +2386,19 @@ ] } }, - "/api/Section/QuizDTO": { + "/api/Section/QuizzDTO": { "get": { "tags": [ "Section" ], - "operationId": "Section_GetQuizDTO", + "operationId": "Section_GetQuizzDTO", "responses": { "200": { "description": "", "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/QuizDTO" + "$ref": "#/components/schemas/QuizzDTO" } } } @@ -2540,518 +2536,6 @@ ] } }, - "/api/SectionMap/{sectionId}/points": { - "get": { - "tags": [ - "Section map" - ], - "operationId": "SectionMap_GetAllGeoPointsFromSection", - "parameters": [ - { - "name": "sectionId", - "in": "path", - "required": true, - "schema": { - "type": "string", - "nullable": true - }, - "x-position": 1 - } - ], - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/GeoPointDTO" - } - } - } - } - }, - "404": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "500": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - }, - "post": { - "tags": [ - "Section map" - ], - "operationId": "SectionMap_Create", - "parameters": [ - { - "name": "sectionId", - "in": "path", - "required": true, - "schema": { - "type": "string", - "nullable": true - }, - "x-position": 1 - } - ], - "requestBody": { - "x-name": "geoPointDTO", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/GeoPointDTO" - } - } - }, - "required": true, - "x-position": 2 - }, - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/GeoPointDTO" - } - } - } - }, - "400": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "409": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "500": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - }, - "security": [ - { - "bearer": [] - } - ] - } - }, - "/api/SectionMap": { - "put": { - "tags": [ - "Section map" - ], - "operationId": "SectionMap_Update", - "requestBody": { - "x-name": "geoPointDTO", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/GeoPointDTO" - } - } - }, - "required": true, - "x-position": 1 - }, - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/GeoPoint" - } - } - } - }, - "400": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "404": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "500": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - }, - "security": [ - { - "bearer": [] - } - ] - } - }, - "/api/SectionMap/points/delete/{geoPointId}": { - "delete": { - "tags": [ - "Section map" - ], - "operationId": "SectionMap_Delete", - "parameters": [ - { - "name": "geoPointId", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "x-position": 1 - } - ], - "responses": { - "202": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "404": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "500": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - }, - "security": [ - { - "bearer": [] - } - ] - } - }, - "/api/SectionQuiz/{sectionId}/questions": { - "get": { - "tags": [ - "Section quiz" - ], - "operationId": "SectionQuiz_GetAllQuizQuestionFromSection", - "parameters": [ - { - "name": "sectionId", - "in": "path", - "required": true, - "schema": { - "type": "string", - "nullable": true - }, - "x-position": 1 - } - ], - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/QuestionDTO" - } - } - } - } - }, - "404": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "500": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - }, - "post": { - "tags": [ - "Section quiz" - ], - "operationId": "SectionQuiz_Create", - "parameters": [ - { - "name": "sectionId", - "in": "path", - "required": true, - "schema": { - "type": "string", - "nullable": true - }, - "x-position": 1 - } - ], - "requestBody": { - "x-name": "questionDTO", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/QuestionDTO" - } - } - }, - "required": true, - "x-position": 2 - }, - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/QuestionDTO" - } - } - } - }, - "400": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "409": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "500": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - }, - "security": [ - { - "bearer": [] - } - ] - } - }, - "/api/SectionQuiz": { - "put": { - "tags": [ - "Section quiz" - ], - "operationId": "SectionQuiz_Update", - "requestBody": { - "x-name": "questionDTO", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/QuestionDTO" - } - } - }, - "required": true, - "x-position": 1 - }, - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/QuestionDTO" - } - } - } - }, - "400": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "404": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "500": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - }, - "security": [ - { - "bearer": [] - } - ] - } - }, - "/api/SectionQuiz/questions/delete/{quizQuestionId}": { - "delete": { - "tags": [ - "Section quiz" - ], - "operationId": "SectionQuiz_Delete", - "parameters": [ - { - "name": "quizQuestionId", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "x-position": 1 - } - ], - "responses": { - "202": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "404": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - }, - "500": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - }, - "security": [ - { - "bearer": [] - } - ] - } - }, "/api/User": { "get": { "tags": [ @@ -3095,11 +2579,11 @@ ], "operationId": "User_CreateUser", "requestBody": { - "x-name": "newUserDTO", + "x-name": "newUser", "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/UserDetailDTO" + "$ref": "#/components/schemas/User" } } }, @@ -3164,7 +2648,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/UserDetailDTO" + "$ref": "#/components/schemas/User" } } }, @@ -3541,6 +3025,22 @@ "type": "string", "nullable": true }, + "weatherCity": { + "type": "string", + "nullable": true + }, + "weatherUpdatedDate": { + "type": "string", + "format": "date-time", + "nullable": true + }, + "weatherResult": { + "type": "string", + "nullable": true + }, + "isWeather": { + "type": "boolean" + }, "isDate": { "type": "boolean" }, @@ -3651,10 +3151,13 @@ "type": { "$ref": "#/components/schemas/SectionType" }, + "data": { + "type": "string", + "nullable": true + }, "dateCreation": { "type": "string", - "format": "date-time", - "nullable": true + "format": "date-time" }, "order": { "type": "integer", @@ -3690,14 +3193,14 @@ }, "SectionType": { "type": "integer", - "description": "0 = Map\n1 = Slider\n2 = Video\n3 = Web\n4 = Menu\n5 = Quiz\n6 = Article\n7 = PDF\n8 = Puzzle\n9 = Agenda\n10 = Weather", + "description": "0 = Map\n1 = Slider\n2 = Video\n3 = Web\n4 = Menu\n5 = Quizz\n6 = Article\n7 = PDF\n8 = Puzzle\n9 = Agenda\n10 = Weather", "x-enumNames": [ "Map", "Slider", "Video", "Web", "Menu", - "Quiz", + "Quizz", "Article", "PDF", "Puzzle", @@ -3808,13 +3311,11 @@ }, "dateCreation": { "type": "string", - "format": "date-time", - "nullable": true + "format": "date-time" }, "dateUpdate": { "type": "string", - "format": "date-time", - "nullable": true + "format": "date-time" }, "instanceId": { "type": "string", @@ -3854,25 +3355,22 @@ "Instance": { "type": "object", "additionalProperties": false, - "required": [ - "id", - "name" - ], "properties": { "id": { "type": "string", - "minLength": 1 + "nullable": true }, "name": { "type": "string", - "minLength": 1 + "nullable": true }, "dateCreation": { "type": "string", "format": "date-time" }, "pinCode": { - "type": "string", + "type": "integer", + "format": "int32", "nullable": true } } @@ -3891,85 +3389,78 @@ }, "dateCreation": { "type": "string", - "format": "date-time", - "nullable": true + "format": "date-time" }, "pinCode": { - "type": "string", + "type": "integer", + "format": "int32", "nullable": true } } }, "MapDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" + "type": "object", + "additionalProperties": false, + "properties": { + "zoom": { + "type": "integer", + "format": "int32" }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "zoom": { - "type": "integer", - "format": "int32" - }, - "mapType": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/MapTypeApp" - } - ] - }, - "mapTypeMapbox": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/MapTypeMapBox" - } - ] - }, - "mapProvider": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/MapProvider" - } - ] - }, - "points": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/GeoPointDTO" - } - }, - "iconResourceId": { - "type": "string", - "nullable": true - }, - "iconSource": { - "type": "string", - "nullable": true - }, - "categories": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/CategorieDTO" - } - }, - "centerLatitude": { - "type": "string", - "nullable": true - }, - "centerLongitude": { - "type": "string", - "nullable": true + "mapType": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/MapTypeApp" } + ] + }, + "mapTypeMapbox": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/MapTypeMapBox" + } + ] + }, + "mapProvider": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/MapProvider" + } + ] + }, + "points": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/GeoPointDTO" } + }, + "iconResourceId": { + "type": "string", + "nullable": true + }, + "iconSource": { + "type": "string", + "nullable": true + }, + "categories": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/CategorieDTO" + } + }, + "latitude": { + "type": "string", + "nullable": true + }, + "longitude": { + "type": "string", + "nullable": true } - ] + } }, "MapTypeApp": { "type": "integer", @@ -4050,9 +3541,17 @@ "type": "array", "nullable": true, "items": { - "$ref": "#/components/schemas/ContentDTO" + "$ref": "#/components/schemas/ContentGeoPoint" } }, + "categorie": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/CategorieDTO" + } + ] + }, "categorieId": { "type": "integer", "format": "int32", @@ -4111,6 +3610,75 @@ } } }, + "ContentGeoPoint": { + "type": "object", + "additionalProperties": false, + "properties": { + "resourceId": { + "type": "string", + "nullable": true + }, + "resourceType": { + "$ref": "#/components/schemas/ResourceType" + }, + "resourceUrl": { + "type": "string", + "nullable": true + }, + "resourceName": { + "type": "string", + "nullable": true + } + } + }, + "CategorieDTO": { + "type": "object", + "additionalProperties": false, + "properties": { + "id": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "label": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/TranslationDTO" + } + }, + "icon": { + "type": "string", + "nullable": true + }, + "iconResourceId": { + "type": "string", + "nullable": true + }, + "iconUrl": { + "type": "string", + "nullable": true + }, + "order": { + "type": "integer", + "format": "int32", + "nullable": true + } + } + }, + "SliderDTO": { + "type": "object", + "additionalProperties": false, + "properties": { + "contents": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/ContentDTO" + } + } + } + }, "ContentDTO": { "type": "object", "additionalProperties": false, @@ -4129,131 +3697,55 @@ "$ref": "#/components/schemas/TranslationDTO" } }, - "order": { - "type": "integer", - "format": "int32" - }, "resourceId": { "type": "string", "nullable": true }, - "resource": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/ResourceDTO" - } - ] - } - } - }, - "CategorieDTO": { - "type": "object", - "additionalProperties": false, - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "label": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "icon": { + "resourceUrl": { "type": "string", "nullable": true }, - "resourceDTO": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/ResourceDTO" - } - ] - }, "order": { "type": "integer", - "format": "int32", + "format": "int32" + }, + "resourceType": { + "$ref": "#/components/schemas/ResourceType" + } + } + }, + "VideoDTO": { + "type": "object", + "additionalProperties": false, + "properties": { + "source": { + "type": "string", "nullable": true } } }, - "SliderDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "contents": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/ContentDTO" - } - } - } - } - ] - }, - "VideoDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "source": { - "type": "string", - "nullable": true - } - } - } - ] - }, "WebDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "source": { - "type": "string", - "nullable": true - } - } + "type": "object", + "additionalProperties": false, + "properties": { + "source": { + "type": "string", + "nullable": true } - ] + } }, "MenuDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "sections": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/SectionDTO" - } - } + "type": "object", + "additionalProperties": false, + "properties": { + "sections": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/SectionDTO" } } - ] + } }, "PlayerMessageDTO": { "type": "object", @@ -4267,63 +3759,55 @@ } } }, - "QuizDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "questions": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/QuestionDTO" - } - }, - "bad_level": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationAndResourceDTO" - } - }, - "medium_level": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationAndResourceDTO" - } - }, - "good_level": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationAndResourceDTO" - } - }, - "great_level": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationAndResourceDTO" - } - } + "QuizzDTO": { + "type": "object", + "additionalProperties": false, + "properties": { + "questions": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/QuestionDTO" } + }, + "bad_level": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/LevelDTO" + } + ] + }, + "medium_level": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/LevelDTO" + } + ] + }, + "good_level": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/LevelDTO" + } + ] + }, + "great_level": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/LevelDTO" + } + ] } - ] + } }, "QuestionDTO": { "type": "object", "additionalProperties": false, "properties": { - "id": { - "type": "integer", - "format": "int32", - "nullable": true - }, "label": { "type": "array", "nullable": true, @@ -4346,7 +3830,7 @@ "nullable": true, "oneOf": [ { - "$ref": "#/components/schemas/ResourceType" + "$ref": "#/components/schemas/ResourceType2" } ] }, @@ -4356,8 +3840,7 @@ }, "order": { "type": "integer", - "format": "int32", - "nullable": true + "format": "int32" } } }, @@ -4377,13 +3860,17 @@ "type": "string", "nullable": true }, - "resource": { + "resourceType": { "nullable": true, "oneOf": [ { - "$ref": "#/components/schemas/ResourceDTO" + "$ref": "#/components/schemas/ResourceType" } ] + }, + "resourceUrl": { + "type": "string", + "nullable": true } } }, @@ -4407,71 +3894,104 @@ } } }, - "ArticleDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "content": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "isContentTop": { - "type": "boolean" - }, - "audioIds": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "isReadAudioAuto": { - "type": "boolean" - }, - "contents": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/ContentDTO" - } - } - } - } + "ResourceType2": { + "type": "integer", + "description": "0 = Unknown\n1 = FileObject\n2 = Service\n3 = Printer\n4 = RegistryKey\n5 = LMShare\n6 = KernelObject\n7 = WindowObject\n8 = DSObject\n9 = DSObjectAll\n10 = ProviderDefined\n11 = WmiGuidObject\n12 = RegistryWow6432Key", + "x-enumNames": [ + "Unknown", + "FileObject", + "Service", + "Printer", + "RegistryKey", + "LMShare", + "KernelObject", + "WindowObject", + "DSObject", + "DSObjectAll", + "ProviderDefined", + "WmiGuidObject", + "RegistryWow6432Key" + ], + "enum": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12 ] }, - "PdfDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "pdfs": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/OrderedTranslationAndResourceDTO" - } - } - } - } - ] - }, - "OrderedTranslationAndResourceDTO": { + "LevelDTO": { "type": "object", "additionalProperties": false, "properties": { - "translationAndResourceDTOs": { + "label": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/TranslationAndResourceDTO" + } + } + } + }, + "ArticleDTO": { + "type": "object", + "additionalProperties": false, + "properties": { + "content": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/TranslationDTO" + } + }, + "isContentTop": { + "type": "boolean" + }, + "audioIds": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/TranslationDTO" + } + }, + "isReadAudioAuto": { + "type": "boolean" + }, + "contents": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/ContentDTO" + } + } + } + }, + "PdfDTO": { + "type": "object", + "additionalProperties": false, + "properties": { + "pdfs": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/PDFFileDTO" + } + } + } + }, + "PDFFileDTO": { + "type": "object", + "additionalProperties": false, + "properties": { + "pdfFilesAndTitles": { "type": "array", "nullable": true, "items": { @@ -4480,439 +4000,102 @@ }, "order": { "type": "integer", - "format": "int32" + "format": "int32", + "nullable": true } } }, "PuzzleDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "messageDebut": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationAndResourceDTO" - } - }, - "messageFin": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationAndResourceDTO" - } - }, - "puzzleImage": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/ResourceDTO" - } - ] - }, - "puzzleImageId": { - "type": "string", - "nullable": true - }, - "rows": { - "type": "integer", - "format": "int32" - }, - "cols": { - "type": "integer", - "format": "int32" - } - } - } - ] - }, - "AgendaDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "resourceIds": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "agendaMapProvider": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/MapProvider" - } - ] - } - } - } - ] - }, - "WeatherDTO": { - "allOf": [ - { - "$ref": "#/components/schemas/SectionDTO" - }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "city": { - "type": "string", - "nullable": true - }, - "updatedDate": { - "type": "string", - "format": "date-time", - "nullable": true - }, - "result": { - "type": "string", - "nullable": true - } - } - } - ] - }, - "GeoPoint": { "type": "object", "additionalProperties": false, - "required": [ - "id", - "title", - "description", - "contents", - "schedules", - "prices", - "phone", - "email", - "site" - ], "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "title": { + "messageDebut": { "type": "array", + "nullable": true, "items": { - "$ref": "#/components/schemas/TranslationDTO" + "$ref": "#/components/schemas/TranslationAndResourceDTO" } }, - "description": { + "messageFin": { "type": "array", + "nullable": true, "items": { - "$ref": "#/components/schemas/TranslationDTO" + "$ref": "#/components/schemas/TranslationAndResourceDTO" } }, - "contents": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ContentDTO" - } - }, - "categorieId": { - "type": "integer", - "format": "int32", - "nullable": true - }, - "latitude": { - "type": "string", - "nullable": true - }, - "longitude": { - "type": "string", - "nullable": true - }, - "imageResourceId": { - "type": "string", - "nullable": true - }, - "imageUrl": { - "type": "string", - "nullable": true - }, - "schedules": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "prices": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "phone": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "email": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "site": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "sectionMapId": { - "type": "string", - "nullable": true - }, - "sectionMap": { + "image": { "nullable": true, "oneOf": [ { - "$ref": "#/components/schemas/SectionMap" + "$ref": "#/components/schemas/ContentDTO" + } + ] + }, + "rows": { + "type": "integer", + "format": "int32" + }, + "cols": { + "type": "integer", + "format": "int32" + } + } + }, + "AgendaDTO": { + "type": "object", + "additionalProperties": false, + "properties": { + "resourceIds": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/TranslationDTO" + } + }, + "mapProvider": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/MapProvider" } ] } } }, - "SectionMap": { - "allOf": [ - { - "$ref": "#/components/schemas/Section" - }, - { - "type": "object", - "additionalProperties": false, - "required": [ - "mapCategories" - ], - "properties": { - "mapZoom": { - "type": "integer", - "format": "int32" - }, - "mapMapType": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/MapTypeApp" - } - ] - }, - "mapTypeMapbox": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/MapTypeMapBox" - } - ] - }, - "mapMapProvider": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/MapProvider" - } - ] - }, - "mapPoints": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/GeoPoint" - } - }, - "mapResourceId": { - "type": "string", - "nullable": true - }, - "mapResource": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/Resource" - } - ] - }, - "mapCategories": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CategorieDTO" - } - }, - "mapCenterLatitude": { - "type": "string", - "nullable": true - }, - "mapCenterLongitude": { - "type": "string", - "nullable": true - } - } - } - ] - }, - "Resource": { + "WeatherDTO": { "type": "object", "additionalProperties": false, - "required": [ - "id", - "type", - "label", - "instanceId" - ], "properties": { - "id": { - "type": "string", - "minLength": 1 - }, - "type": { - "$ref": "#/components/schemas/ResourceType" - }, - "label": { - "type": "string", - "minLength": 1 - }, - "dateCreation": { - "type": "string", - "format": "date-time" - }, - "instanceId": { - "type": "string", - "minLength": 1 - }, - "url": { - "type": "string", - "nullable": true - } - } - }, - "Section": { - "type": "object", - "additionalProperties": false, - "required": [ - "id", - "label", - "title", - "configurationId", - "type", - "isSubSection", - "instanceId" - ], - "properties": { - "id": { - "type": "string", - "minLength": 1 - }, - "label": { - "type": "string", - "minLength": 1 - }, - "title": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "description": { - "type": "array", - "nullable": true, - "items": { - "$ref": "#/components/schemas/TranslationDTO" - } - }, - "order": { - "type": "integer", - "format": "int32" - }, - "configurationId": { - "type": "string", - "minLength": 1 - }, - "imageId": { + "city": { "type": "string", "nullable": true }, - "imageSource": { + "updatedDate": { "type": "string", + "format": "date-time", "nullable": true }, - "type": { - "$ref": "#/components/schemas/SectionType" - }, - "isSubSection": { - "type": "boolean" - }, - "parentId": { + "result": { "type": "string", "nullable": true - }, - "dateCreation": { - "type": "string", - "format": "date-time" - }, - "instanceId": { - "type": "string", - "minLength": 1 - }, - "isBeacon": { - "type": "boolean" - }, - "beaconId": { - "type": "integer", - "format": "int32", - "nullable": true - }, - "latitude": { - "type": "string", - "nullable": true - }, - "longitude": { - "type": "string", - "nullable": true - }, - "meterZoneGPS": { - "type": "integer", - "format": "int32", - "nullable": true } } }, "User": { "type": "object", "additionalProperties": false, - "required": [ - "id", - "email", - "password", - "lastName", - "token", - "instanceId" - ], "properties": { "id": { "type": "string", - "minLength": 1 + "nullable": true }, "email": { "type": "string", - "minLength": 1 + "nullable": true }, "password": { "type": "string", - "minLength": 1 + "nullable": true }, "firstName": { "type": "string", @@ -4920,11 +4103,11 @@ }, "lastName": { "type": "string", - "minLength": 1 + "nullable": true }, "token": { "type": "string", - "minLength": 1 + "nullable": true }, "dateCreation": { "type": "string", @@ -4932,7 +4115,7 @@ }, "instanceId": { "type": "string", - "minLength": 1 + "nullable": true } } }, @@ -4955,10 +4138,6 @@ "lastName": { "type": "string", "nullable": true - }, - "instanceId": { - "type": "string", - "nullable": true } } }, @@ -4995,7 +4174,8 @@ "nullable": true }, "pinCode": { - "type": "string", + "type": "integer", + "format": "int32", "nullable": true } } @@ -5057,14 +4237,6 @@ "name": "Section", "description": "Section management" }, - { - "name": "Section map", - "description": "Section map management" - }, - { - "name": "Section quiz", - "description": "Section quiz management" - }, { "name": "User", "description": "User management" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index a7a5897..10eaa66 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -14,10 +14,11 @@ import just_audio import package_info_plus import path_provider_foundation import shared_preferences_foundation -import sqflite +import sqflite_darwin import url_launcher_macos import video_player_avfoundation import wakelock_plus +import webview_flutter_wkwebview func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) @@ -33,4 +34,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin")) WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) + WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin")) } diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig new file mode 100644 index 0000000..6333a27 --- /dev/null +++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -0,0 +1,12 @@ +// This is a generated file; do not edit or check into version control. +FLUTTER_ROOT=C:\PROJ\flutter +FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\GITEA\tablet-app +COCOAPODS_PARALLEL_CODE_SIGN=true +FLUTTER_BUILD_DIR=build +FLUTTER_BUILD_NAME=2.1.5 +FLUTTER_BUILD_NUMBER=26 +FLUTTER_CLI_BUILD_MODE=debug +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=true +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh new file mode 100644 index 0000000..48fa81f --- /dev/null +++ b/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=C:\PROJ\flutter" +export "FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\GITEA\tablet-app" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=2.1.5" +export "FLUTTER_BUILD_NUMBER=26" +export "FLUTTER_CLI_BUILD_MODE=debug" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/pubspec.yaml b/pubspec.yaml index b435e82..245e232 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: google_maps_flutter_web: ^0.5.4+3 # Specific WEB youtube_player_iframe: ^5.1.2 # Handle mobile and web here => TO TEST - mapbox_maps_flutter: ^2.0.0 # specific mobile .. + mapbox_maps_flutter: ^2.5.0 # specific mobile .. flutter_map: ^7.0.2 #all diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index f7fb082..941d79d 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -16,6 +17,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); FirebaseStoragePluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FirebaseStoragePluginCApi")); + FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi")); PermissionHandlerWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index d17f009..6da9426 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -5,6 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST firebase_core firebase_storage + flutter_inappwebview_windows permission_handler_windows url_launcher_windows )