diff --git a/lib/Components/multi_string_input_and_resource_container.dart b/lib/Components/multi_string_input_and_resource_container.dart index c55fec2..32c3455 100644 --- a/lib/Components/multi_string_input_and_resource_container.dart +++ b/lib/Components/multi_string_input_and_resource_container.dart @@ -3,8 +3,11 @@ import 'dart:convert'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; import 'package:manager_app/Components/multi_string_input_html_modal.dart'; +import 'package:manager_app/Models/managerContext.dart'; +import 'package:manager_app/app_context.dart'; import 'package:manager_app/constants.dart'; import 'package:manager_api_new/api.dart'; +import 'package:provider/provider.dart'; class MultiStringInputAndResourceContainer extends StatelessWidget { final Color color; @@ -31,7 +34,8 @@ class MultiStringInputAndResourceContainer extends StatelessWidget { @override Widget build(BuildContext context) { - + final appContext = Provider.of(context); + ManagerAppContext managerAppContext = appContext.getContext(); Size size = MediaQuery.of(context).size; return Container( child: Row( @@ -56,7 +60,7 @@ class MultiStringInputAndResourceContainer extends StatelessWidget { List initials = initialValue; - languages.forEach((value) { + managerAppContext.selectedConfiguration!.languages!.forEach((value) { if(initials.map((iv) => iv.language).contains(value)) { newValues.add(TranslationAndResourceDTO.fromJson(jsonDecode(jsonEncode(initials.firstWhere((element) => element.language == value)))!)!); } else { diff --git a/lib/Components/multi_string_input_container.dart b/lib/Components/multi_string_input_container.dart index a0bd57e..4fd7679 100644 --- a/lib/Components/multi_string_input_container.dart +++ b/lib/Components/multi_string_input_container.dart @@ -4,8 +4,11 @@ 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/Models/managerContext.dart'; +import 'package:manager_app/app_context.dart'; import 'package:manager_app/constants.dart'; import 'package:manager_api_new/api.dart'; +import 'package:provider/provider.dart'; class MultiStringInputContainer extends StatelessWidget { final Color color; @@ -36,6 +39,8 @@ class MultiStringInputContainer extends StatelessWidget { @override Widget build(BuildContext context) { + final appContext = Provider.of(context); + ManagerAppContext managerAppContext = appContext.getContext(); Size size = MediaQuery.of(context).size; return Container( @@ -61,7 +66,7 @@ class MultiStringInputContainer extends StatelessWidget { List initials = initialValue; - languages.forEach((value) { + managerAppContext.selectedConfiguration!.languages!.forEach((value) { if(initials.map((iv) => iv.language).contains(value)) { newValues.add(TranslationDTO.fromJson(jsonDecode(jsonEncode(initials.firstWhere((element) => element.language == value)))!)!); } else { diff --git a/lib/Components/resource_tab.dart b/lib/Components/resource_tab.dart index 86cf8ae..1eff192 100644 --- a/lib/Components/resource_tab.dart +++ b/lib/Components/resource_tab.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; -import 'package:manager_app/Components/upload_image_container.dart'; +import 'package:manager_app/Components/upload_content_container.dart'; import 'package:manager_app/Components/upload_online_resources_container.dart'; import 'package:manager_app/constants.dart'; import 'package:manager_api_new/api.dart'; diff --git a/lib/Components/translation_input_and_resource_container.dart b/lib/Components/translation_input_and_resource_container.dart index a07a797..5d8584a 100644 --- a/lib/Components/translation_input_and_resource_container.dart +++ b/lib/Components/translation_input_and_resource_container.dart @@ -18,6 +18,7 @@ class _TranslationInputAndResourceContainerState extends State(widget.newValues.first.language!); diff --git a/lib/Components/upload_image_container.dart b/lib/Components/upload_content_container.dart similarity index 100% rename from lib/Components/upload_image_container.dart rename to lib/Components/upload_content_container.dart diff --git a/lib/Screens/Configurations/Section/SubSection/Quizz/new_update_score_quizz - deprecated.dart b/lib/Screens/Configurations/Section/SubSection/Quizz/new_update_score_quizz - deprecated.dart index ff119a1..13f2c6d 100644 --- a/lib/Screens/Configurations/Section/SubSection/Quizz/new_update_score_quizz - deprecated.dart +++ b/lib/Screens/Configurations/Section/SubSection/Quizz/new_update_score_quizz - deprecated.dart @@ -32,7 +32,7 @@ Future showNewOrUpdateScoreQuizz(LevelDTO? inputLevelDTO, AppContext List initials = []; - languages.forEach((value) { + appContext.getContext().selectedConfiguration!.languages!.forEach((value) { if(initials.map((iv) => iv.language).contains(value)) { newValues.add(TranslationAndResourceDTO.fromJson(jsonDecode(jsonEncode(initials.firstWhere((element) => element.language == value)))!)!); } else { diff --git a/lib/Screens/Configurations/Section/SubSection/Quizz/quizz_answer_list.dart b/lib/Screens/Configurations/Section/SubSection/Quizz/quizz_answer_list.dart index 87fd514..c7bdcd2 100644 --- a/lib/Screens/Configurations/Section/SubSection/Quizz/quizz_answer_list.dart +++ b/lib/Screens/Configurations/Section/SubSection/Quizz/quizz_answer_list.dart @@ -108,7 +108,7 @@ class _QuizzResponseListState extends State { List initials = []; - languages.forEach((value) { + appContext.getContext().selectedConfiguration!.languages!.forEach((value) { if(initials.map((iv) => iv.language).contains(value)) { newValues.add(TranslationAndResourceDTO.fromJson(jsonDecode(jsonEncode(initials.firstWhere((element) => element.language == value)))!)!); } else { @@ -208,7 +208,7 @@ class _QuizzResponseListState extends State { List initials = response.label!; - languages.forEach((value) { + appContext.getContext().selectedConfiguration!.languages!.forEach((value) { if(initials.map((iv) => iv.language).contains(value)) { newValues.add(TranslationAndResourceDTO.fromJson(jsonDecode(jsonEncode(initials.firstWhere((element) => element.language == value)))!)!); } else { diff --git a/lib/Screens/Configurations/Section/SubSection/Quizz/quizz_config.dart b/lib/Screens/Configurations/Section/SubSection/Quizz/quizz_config.dart index f503388..0b4ce80 100644 --- a/lib/Screens/Configurations/Section/SubSection/Quizz/quizz_config.dart +++ b/lib/Screens/Configurations/Section/SubSection/Quizz/quizz_config.dart @@ -330,7 +330,7 @@ class _QuizzConfigState extends State { List initials = levelDTO.label!; - languages.forEach((value) { + appContext.getContext().selectedConfiguration!.languages!.forEach((value) { if(initials.map((iv) => iv.language).contains(value)) { newValues.add(TranslationAndResourceDTO.fromJson(jsonDecode(jsonEncode(initials.firstWhere((element) => element.language == value)))!)!); } else { diff --git a/lib/main.dart b/lib/main.dart index d172fc3..f343d5e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -76,7 +76,7 @@ class _MyAppState extends State { ), scrollBehavior: MyCustomScrollBehavior(), debugShowCheckedModeBanner: false, - title: 'MyMuseum - Manager', + title: 'MyInfoMate - Manager', initialRoute: widget.initialRoute, /*supportedLocales: [ const Locale('en', 'US'), diff --git a/pubspec.lock b/pubspec.lock index 038c84a..78d8d01 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -632,6 +632,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.8" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" logging: dependency: transitive description: @@ -651,18 +675,18 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" material_segmented_control: dependency: "direct main" description: @@ -675,10 +699,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" mime: dependency: transitive description: @@ -787,10 +811,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -1252,6 +1276,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" wakelock_plus: dependency: transitive description: @@ -1276,14 +1308,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1373,5 +1397,5 @@ packages: source: hosted version: "2.0.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.2.0-0 <4.0.0" flutter: ">=3.13.0" diff --git a/web/index.html b/web/index.html index 783dbeb..83a22bb 100644 --- a/web/index.html +++ b/web/index.html @@ -40,7 +40,7 @@ - MyMuseum - Manager + MyInfoMate - Manager