From e4cb6ee57405651e3805b46a438039df64e1db9a Mon Sep 17 00:00:00 2001 From: Thomas Fransolet Date: Thu, 2 Nov 2023 17:51:30 +0100 Subject: [PATCH] upgrade dependencies + Text to HtmlWidget + language svg to png --- android/app/build.gradle | 2 +- android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- assets/images/old/ar.png | Bin 0 -> 26167 bytes assets/images/old/cn.png | Bin 0 -> 4079 bytes assets/images/old/{DE.png => de.png} | Bin assets/images/old/{EN.png => en.png} | Bin assets/images/old/es.png | Bin 0 -> 30073 bytes assets/images/old/{FR.png => fr.png} | Bin assets/images/old/it.png | Bin 0 -> 705 bytes assets/images/old/{NL.png => nl.png} | Bin assets/images/old/pl.png | Bin 0 -> 189 bytes assets/images/old/uk.png | Bin 0 -> 279 bytes lib/Components/CustomAppBar.dart | 3 +- lib/Components/LanguageSelection.dart | 6 +- lib/Components/ShowImagePopup.dart | 5 +- lib/Screens/Article/article_page.dart | 13 +- lib/Screens/Home/configurations_list.dart | 12 +- lib/Screens/Quizz/questions_list.dart | 17 +- lib/Screens/Visit/beaconArticleFound.dart | 10 +- .../Visit/components/section_card.dart | 8 +- lib/Screens/Visit/visit.dart | 59 +-- linux/flutter/generated_plugin_registrant.cc | 4 + linux/flutter/generated_plugins.cmake | 1 + manager_api/pubspec.yaml | 2 +- pubspec.lock | 452 +++++++++++++++--- pubspec.yaml | 14 +- 27 files changed, 499 insertions(+), 117 deletions(-) create mode 100644 assets/images/old/ar.png create mode 100644 assets/images/old/cn.png rename assets/images/old/{DE.png => de.png} (100%) rename assets/images/old/{EN.png => en.png} (100%) create mode 100644 assets/images/old/es.png rename assets/images/old/{FR.png => fr.png} (100%) create mode 100644 assets/images/old/it.png rename assets/images/old/{NL.png => nl.png} (100%) create mode 100644 assets/images/old/pl.png create mode 100644 assets/images/old/uk.png diff --git a/android/app/build.gradle b/android/app/build.gradle index 22064a5..acbfb99 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 32 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/android/build.gradle b/android/build.gradle index 4256f91..713d7f6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..cfe88f6 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-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/assets/images/old/ar.png b/assets/images/old/ar.png new file mode 100644 index 0000000000000000000000000000000000000000..395928c08536e78ec84cee142205fafcfb4440a9 GIT binary patch literal 26167 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 CuGr!L literal 0 HcmV?d00001 diff --git a/assets/images/old/DE.png b/assets/images/old/de.png similarity index 100% rename from assets/images/old/DE.png rename to assets/images/old/de.png diff --git a/assets/images/old/EN.png b/assets/images/old/en.png similarity index 100% rename from assets/images/old/EN.png rename to assets/images/old/en.png diff --git a/assets/images/old/es.png b/assets/images/old/es.png new file mode 100644 index 0000000000000000000000000000000000000000..f19308d5b49ae90764d34af7e2bff8985bd88797 GIT binary patch literal 30073 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 DY@b^o literal 0 HcmV?d00001 diff --git a/assets/images/old/FR.png b/assets/images/old/fr.png similarity index 100% rename from assets/images/old/FR.png rename to assets/images/old/fr.png diff --git a/assets/images/old/it.png b/assets/images/old/it.png new file mode 100644 index 0000000000000000000000000000000000000000..81013f0ee15398462da3ba3ed529602750491cff GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7+9Er6kFKIlR%0;z$e6&VUnBArrLAb=6AD- z|NsAg%lhXIpcG@0x4R2Vf5y!~pr!;*7srr_TW>EIGBPMIFc~<_XwbT4KUwp~HV$vG xbJ9CvI~W+5SU3a}92!O$qk%wTO31j)|6B9vyM22Vt^yMtgQu&X%Q~loCICIEY5@QM literal 0 HcmV?d00001 diff --git a/assets/images/old/NL.png b/assets/images/old/nl.png similarity index 100% rename from assets/images/old/NL.png rename to assets/images/old/nl.png diff --git a/assets/images/old/pl.png b/assets/images/old/pl.png new file mode 100644 index 0000000000000000000000000000000000000000..91d8931bed5aa3b8002115dd92259864b2e041f7 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7#Nv>)VXbLJAo8ifKQ0)9TA)V|Np<=VR{KD z!kFak?!x$=N%tO*lj`Z>7*cWT?HNa21_ln61(*NLHEq#1=Wy`Nvtnv=P!Ql?A(;Xi bivrf`Uii!OKbF6<3nc96>gTe~DWM4f!0{_8 literal 0 HcmV?d00001 diff --git a/assets/images/old/uk.png b/assets/images/old/uk.png new file mode 100644 index 0000000000000000000000000000000000000000..8219610a6758affcfe14f63bb72b3290ac88a2a4 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7?_xWRHv9tCXnI`@Ck8c2;cGlI>Z0}{{^<% z_yYwQlf2zsn9{gwQh=O2o-U3d6}R4=Gh}37;9*kmUROW$=m!Cz2|zi#;PW~khXDl( Z;7 literal 0 HcmV?d00001 diff --git a/lib/Components/CustomAppBar.dart b/lib/Components/CustomAppBar.dart index 0f55dd3..13f6378 100644 --- a/lib/Components/CustomAppBar.dart +++ b/lib/Components/CustomAppBar.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:mymuseum_visitapp/Components/AdminPopup.dart'; import 'package:mymuseum_visitapp/Components/LanguageSelection.dart'; import 'package:mymuseum_visitapp/Models/visitContext.dart'; @@ -42,7 +43,7 @@ class _CustomAppBarState extends State { ), context: context ); }, - child: Text(widget.title), + child: HtmlWidget(widget.title), ), centerTitle: true, leading: widget.isHomeButton ? IconButton( diff --git a/lib/Components/LanguageSelection.dart b/lib/Components/LanguageSelection.dart index 1fe4687..e9ba842 100644 --- a/lib/Components/LanguageSelection.dart +++ b/lib/Components/LanguageSelection.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg_provider/flutter_svg_provider.dart'; +//import 'package:flutter_svg_provider/flutter_svg_provider.dart'; import 'package:manager_api/api.dart'; import 'package:mymuseum_visitapp/Models/visitContext.dart'; import 'package:mymuseum_visitapp/app_context.dart'; @@ -94,9 +94,9 @@ class _LanguageSelection extends State with TickerProviderSta //border: Border.all(width: 1.5, color: kSecondGrey), image: DecorationImage( fit: BoxFit.contain, - image: Svg( + image: AssetImage("assets/images/old/"+language.toLowerCase()+".png")/*Svg( "assets/images/"+language.toLowerCase()+".svg", - ), //AssetImage("assets/images/"+language+".png"), + )*/, //AssetImage("assets/images/"+language+".png"), ), boxShadow: const [ BoxShadow( diff --git a/lib/Components/ShowImagePopup.dart b/lib/Components/ShowImagePopup.dart index bc8d7c2..19c538b 100644 --- a/lib/Components/ShowImagePopup.dart +++ b/lib/Components/ShowImagePopup.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:manager_api/api.dart'; import 'package:mymuseum_visitapp/Helpers/translationHelper.dart'; import 'package:mymuseum_visitapp/Models/resourceModel.dart'; @@ -21,9 +22,9 @@ void showImagePopup(ImageDTO imageDTO, ResourceModel resourceModel, AppContext a if(TranslationHelper.get(imageDTO.title, appContext.getContext()).isNotEmpty) Padding( padding: const EdgeInsets.only(top: 8.0, left:8.0, right: 8.0), - child: Text( + child: HtmlWidget( TranslationHelper.get(imageDTO.title, appContext.getContext()), - style: const TextStyle(fontSize: kArticleContentSize, fontWeight: FontWeight.w400)), + textStyle: const TextStyle(fontSize: kArticleContentSize, fontWeight: FontWeight.w400)), ), SizedBox( height: size.height * 0.5, diff --git a/lib/Screens/Article/article_page.dart b/lib/Screens/Article/article_page.dart index 075c741..a2bebbd 100644 --- a/lib/Screens/Article/article_page.dart +++ b/lib/Screens/Article/article_page.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:typed_data'; import 'package:flutter/material.dart'; +import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:manager_api/api.dart'; import 'package:mymuseum_visitapp/Components/CustomAppBar.dart'; import 'package:mymuseum_visitapp/Components/Loading.dart'; @@ -208,10 +209,10 @@ class _ArticlePageState extends State { child: SingleChildScrollView( child: Padding( padding: const EdgeInsets.all(8.0), - child: Text( + child: HtmlWidget( TranslationHelper.get(articleDTO!.content, appContext.getContext()), - textAlign: TextAlign.left, - style: TextStyle(fontSize: (appContext.getContext() as VisitAppContext).isMaximizeTextSize ? kArticleContentBiggerSize : kArticleContentSize) + textStyle: TextStyle(fontSize: (appContext.getContext() as VisitAppContext).isMaximizeTextSize ? kArticleContentBiggerSize : kArticleContentSize), + //textAlign: TextAlign.left, ), ), ) @@ -241,10 +242,10 @@ class _ArticlePageState extends State { child: SingleChildScrollView( child: Padding( padding: const EdgeInsets.all(8.0), - child: Text( + child: HtmlWidget( TranslationHelper.get(articleDTO!.content, appContext.getContext()), - textAlign: TextAlign.left, - style: TextStyle(fontSize: (appContext.getContext() as VisitAppContext).isMaximizeTextSize ? kArticleContentBiggerSize : kArticleContentSize) + //textAlign: TextAlign.left, + textStyle: TextStyle(fontSize: (appContext.getContext() as VisitAppContext).isMaximizeTextSize ? kArticleContentBiggerSize : kArticleContentSize) ), ), ) diff --git a/lib/Screens/Home/configurations_list.dart b/lib/Screens/Home/configurations_list.dart index 3c00e77..63dbfc0 100644 --- a/lib/Screens/Home/configurations_list.dart +++ b/lib/Screens/Home/configurations_list.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:manager_api/api.dart'; import 'package:mymuseum_visitapp/Components/LanguageSelection.dart'; import 'package:mymuseum_visitapp/Components/Loading.dart'; @@ -194,14 +195,15 @@ class _ConfigurationsListState extends State { child: Center( child: Padding( padding: const EdgeInsets.only(left: 10), - child: AutoSizeText( + child: HtmlWidget( TranslationHelper.get( configurations[index].title, appContext.getContext()), - style: const TextStyle( - fontSize: kMenuTitleDetailSize), - maxFontSize: 18, - maxLines: 2, + textStyle: const TextStyle( + fontSize: kMenuDescriptionDetailSize, + ), + /*maxFontSize: 18, + maxLines: 2,*/ ), ), ), diff --git a/lib/Screens/Quizz/questions_list.dart b/lib/Screens/Quizz/questions_list.dart index 3c4557b..6b0fca2 100644 --- a/lib/Screens/Quizz/questions_list.dart +++ b/lib/Screens/Quizz/questions_list.dart @@ -1,6 +1,7 @@ import 'package:carousel_slider/carousel_slider.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:mymuseum_visitapp/Helpers/translationHelper.dart'; import 'package:mymuseum_visitapp/Models/ResponseSubDTO.dart'; import 'package:mymuseum_visitapp/Models/visitContext.dart'; @@ -141,7 +142,13 @@ class _QuestionsListWidget extends State { child: SingleChildScrollView( child: Padding( padding: const EdgeInsets.all(2.5), - child: Text(TranslationHelper.get(i.label, appContext.getContext() as VisitAppContext), textAlign: TextAlign.center, style: const TextStyle(fontSize: kDescriptionSize)), + child: HtmlWidget( + TranslationHelper.get(i.label, appContext.getContext() as VisitAppContext), + //textAlign: TextAlign.center, + customStylesBuilder: (element) { + return {'text-align': 'center'}; + }, + textStyle: const TextStyle(fontSize: kDescriptionSize)), ), ), ), @@ -203,7 +210,13 @@ class _QuestionsListWidget extends State { padding: const EdgeInsets.all(2.5), child: Container( alignment: Alignment.center, - child: Text(TranslationHelper.get(i.responsesSubDTO![index].label, appContext.getContext() as VisitAppContext), textAlign: TextAlign.center, style: TextStyle(fontSize: kDescriptionSize, color: i.chosen == index ? Colors.white : Colors.black)), + child: HtmlWidget( + TranslationHelper.get(i.responsesSubDTO![index].label, appContext.getContext() as VisitAppContext), + //textAlign: TextAlign.center, + customStylesBuilder: (element) { + return {'text-align': 'center'}; + }, + textStyle: TextStyle(fontSize: kDescriptionSize, color: i.chosen == index ? Colors.white : Colors.black)), decoration: BoxDecoration( color: !widget.isShowResponse ? i.chosen == index ? kTestSecondColor : kBackgroundLight : i.responsesSubDTO![index].isGood! ? kGreen : i.chosen == index ? kTextRed : kBackgroundLight, shape: BoxShape.rectangle, diff --git a/lib/Screens/Visit/beaconArticleFound.dart b/lib/Screens/Visit/beaconArticleFound.dart index c110560..c1846be 100644 --- a/lib/Screens/Visit/beaconArticleFound.dart +++ b/lib/Screens/Visit/beaconArticleFound.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:manager_api/api.dart'; import 'package:mymuseum_visitapp/Components/Loading.dart'; import 'package:mymuseum_visitapp/Components/SearchBox.dart'; @@ -94,8 +95,13 @@ class _BeaconArticleFoundState extends State { ), Align( alignment: Alignment.center, - child: Text( - TranslationHelper.get(sectionFound!.title, appContext.getContext()), style: const TextStyle(fontSize: kMenuTitleDetailSize), textAlign: TextAlign.center, + child: HtmlWidget( + TranslationHelper.get(sectionFound!.title, appContext.getContext()), + textStyle: const TextStyle(fontSize: kMenuTitleDetailSize), + customStylesBuilder: (element) { + return {'text-align': 'center'}; + }, + //textAlign: TextAlign.center, ), ), /*Row( diff --git a/lib/Screens/Visit/components/section_card.dart b/lib/Screens/Visit/components/section_card.dart index 3e2bc50..5fca7fa 100644 --- a/lib/Screens/Visit/components/section_card.dart +++ b/lib/Screens/Visit/components/section_card.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:manager_api/api.dart'; import 'package:mymuseum_visitapp/Components/Loading.dart'; import 'package:mymuseum_visitapp/Helpers/DatabaseHelper.dart'; @@ -133,17 +134,18 @@ class SectionCard extends StatelessWidget { child: SizedBox( height: 136, // our image take 200 width, thats why we set out total width - 200 - width: size.width - 200, + width: sectionDTO.imageId == null ? size.width - 75 : size.width - 200, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ const Spacer(), Padding( padding: const EdgeInsets.symmetric(horizontal: kDefaultPadding), - child: Text( + child: HtmlWidget(TranslationHelper.get(sectionDTO.title, appContext.getContext())) + /*Text( TranslationHelper.get(sectionDTO.title, appContext.getContext()), style: Theme.of(context).textTheme.button, - ), + )*/, ), // it use the available space const Spacer(), diff --git a/lib/Screens/Visit/visit.dart b/lib/Screens/Visit/visit.dart index 40fbeef..95f3f96 100644 --- a/lib/Screens/Visit/visit.dart +++ b/lib/Screens/Visit/visit.dart @@ -169,39 +169,44 @@ class _VisitPageState extends State with WidgetsBindingObserver { if(result.beacons.isNotEmpty) { print(result); print(result.beacons.map((b) => b.macAddress)); - print(visitAppContext.beaconSections!.map((bb) => bb!.minorBeaconId)); - var beaconList = visitAppContext.beaconSections!.where((bs) => result.beacons.any((element) => element.minor == bs!.minorBeaconId && element.accuracy < meterToBeacon)); - - if(beaconList.isNotEmpty) { - // FILTER CONFIG - beaconList = beaconList.where((beacon) => beacon!.configurationId == visitAppContext.configuration!.id!); - } - - if(beaconList.isNotEmpty && !modeDebugBeacon) { - // FILTER ALREADY READ - beaconList = beaconList.where((b) => !visitAppContext.readSections.any((ra) => ra.id == b!.sectionId)); - } - - if(beaconList.isNotEmpty) + if(visitAppContext.beaconSections != null) { - var milliLastTime = lastTimePopUpWasClosed == null ? 0 : lastTimePopUpWasClosed!.millisecondsSinceEpoch; - var checkIfMoreThanSec = (DateTime.now().millisecondsSinceEpoch - milliLastTime) > timeBetweenBeaconPopUp; + print(visitAppContext.beaconSections!.map((bb) => bb!.minorBeaconId)); + var beaconList = visitAppContext.beaconSections!.where((bs) => result.beacons.any((element) => element.minor == bs!.minorBeaconId && element.accuracy < meterToBeacon)); - if(!_isDialogShowing && !visitAppContext.isContentCurrentlyShown && checkIfMoreThanSec && visitAppContext.isScanningBeacons) { - print("Before sorting"); - print(beaconList); - beaconList.toList().sort((a, b) => a!.orderInConfig!.compareTo(b!.orderInConfig!)); - print("after storting"); - print(beaconList); - _onBeaconFound(visitAppContext, beaconList.first); - } else { - print("Non pas possible d'afficher pour le moment"); + if(beaconList.isNotEmpty) { + // FILTER CONFIG + beaconList = beaconList.where((beacon) => beacon!.configurationId == visitAppContext.configuration!.id!); } - /*ScaffoldMessenger.of(context).showSnackBar( + if(beaconList.isNotEmpty && !modeDebugBeacon) { + // FILTER ALREADY READ + beaconList = beaconList.where((b) => !visitAppContext.readSections.any((ra) => ra.id == b!.sectionId)); + } + + if(beaconList.isNotEmpty) + { + var milliLastTime = lastTimePopUpWasClosed == null ? 0 : lastTimePopUpWasClosed!.millisecondsSinceEpoch; + var checkIfMoreThanSec = (DateTime.now().millisecondsSinceEpoch - milliLastTime) > timeBetweenBeaconPopUp; + + if(!_isDialogShowing && !visitAppContext.isContentCurrentlyShown && checkIfMoreThanSec && visitAppContext.isScanningBeacons) { + print("Before sorting"); + print(beaconList); + beaconList.toList().sort((a, b) => a!.orderInConfig!.compareTo(b!.orderInConfig!)); + print("after storting"); + print(beaconList); + _onBeaconFound(visitAppContext, beaconList.first); + } else { + print("Non pas possible d'afficher pour le moment"); + } + + /*ScaffoldMessenger.of(context).showSnackBar( SnackBar(content: Text('BEACON - ${result.beacons.first.macAddress} - ${result.beacons.first.accuracy} - ${result.beacons.first.proximity.name}'), backgroundColor: kBlue2), );*/ + } + } else { + print("beaconSections is null !"); } } @@ -355,7 +360,7 @@ class _VisitPageState extends State with WidgetsBindingObserver { body: Body(configurationId: configuration!.id), // TODO handle error.. floatingActionButton: Stack( children: [ - visitAppContext.beaconSections!.where((bs) => bs!.configurationId == visitAppContext.configuration!.id).isNotEmpty ? Align( + visitAppContext.beaconSections != null && visitAppContext.beaconSections!.where((bs) => bs!.configurationId == visitAppContext.configuration!.id).isNotEmpty ? Align( alignment: Alignment.bottomRight, child: Padding( padding: const EdgeInsets.only(right: 90, bottom: 1), diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index e71a16d..f6f23bf 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,6 +6,10 @@ #include "generated_plugin_registrant.h" +#include void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 2e1de87..f16b4c3 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + url_launcher_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/manager_api/pubspec.yaml b/manager_api/pubspec.yaml index 67848de..99a0f1b 100644 --- a/manager_api/pubspec.yaml +++ b/manager_api/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: http: '>=0.13.0 <0.14.0' - intl: '^0.17.0' + intl: any meta: '^1.1.8' dev_dependencies: test: '>=1.16.0 <1.18.0' diff --git a/pubspec.lock b/pubspec.lock index b1267c7..d0ee74d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,18 +37,18 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" audio_session: dependency: transitive description: name: audio_session - sha256: e4acc4e9eaa32436dfc5d7aed7f0a370f2d7bb27ee27de30d6c4f220c2a05c73 + sha256: "8a2bc5e30520e18f3fb0e366793d78057fb64cd5287862c76af0c8771f2a52ad" url: "https://pub.dev" source: hosted - version: "0.1.13" + version: "0.1.16" auto_size_text: dependency: "direct main" description: @@ -129,6 +129,30 @@ packages: url: "https://pub.dev" source: hosted version: "8.4.3" + cached_network_image: + dependency: transitive + description: + name: cached_network_image + sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15 + url: "https://pub.dev" + source: hosted + version: "3.2.3" + cached_network_image_platform_interface: + dependency: transitive + description: + name: cached_network_image_platform_interface + sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7 + url: "https://pub.dev" + source: hosted + version: "2.0.0" + cached_network_image_web: + dependency: transitive + description: + name: cached_network_image_web + sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0 + url: "https://pub.dev" + source: hosted + version: "1.0.2" carousel_slider: dependency: "direct main" description: @@ -141,10 +165,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" checked_yaml: dependency: transitive description: @@ -153,6 +177,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" + chewie: + dependency: transitive + description: + name: chewie + sha256: "745e81e84c6d7f3835f89f85bb49771c0a66099e4caf8f8e9e9a372bc66fb2c1" + url: "https://pub.dev" + source: hosted + version: "1.5.0" cli_util: dependency: transitive description: @@ -181,10 +213,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.2" convert: dependency: transitive description: @@ -201,6 +233,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + csslib: + dependency: transitive + description: + name: csslib + sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" + url: "https://pub.dev" + source: hosted + version: "0.17.3" cupertino_icons: dependency: "direct main" description: @@ -270,6 +310,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.5.1" + flutter_blurhash: + dependency: transitive + description: + name: flutter_blurhash + sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6" + url: "https://pub.dev" + source: hosted + version: "0.7.0" + flutter_cache_manager: + dependency: transitive + description: + name: flutter_cache_manager + sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3" + url: "https://pub.dev" + source: hosted + version: "3.3.0" flutter_launcher_icons: dependency: "direct main" description: @@ -295,18 +351,10 @@ packages: dependency: transitive description: name: flutter_svg - sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2" + sha256: f991fdb1533c3caeee0cdc14b04f50f0c3916f0dbcbc05237ccbe4e3c6b93f3f url: "https://pub.dev" source: hosted - version: "1.1.6" - flutter_svg_provider: - dependency: "direct main" - description: - name: flutter_svg_provider - sha256: cbb2d02fd9feb70fc30221fc36a7ee5347f1cceae6b0c99ab4fa011bbd9f1f7f - url: "https://pub.dev" - source: hosted - version: "1.0.3" + version: "2.0.5" flutter_test: dependency: "direct dev" description: flutter @@ -317,6 +365,22 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_widget_from_html: + dependency: "direct main" + description: + name: flutter_widget_from_html + sha256: "9a51be2a49bee770d5f26a9d1d9352f5156791dba83567fed096745de859a57b" + url: "https://pub.dev" + source: hosted + version: "0.10.1" + flutter_widget_from_html_core: + dependency: transitive + description: + name: flutter_widget_from_html_core + sha256: "77f05cd7a738078dcdbe07741140d58b2fe7509197f3855a91269fb5a90f4bee" + url: "https://pub.dev" + source: hosted + version: "0.10.1" frontend_server_client: dependency: transitive description: @@ -325,6 +389,62 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.0" + fwfh_cached_network_image: + dependency: transitive + description: + name: fwfh_cached_network_image + sha256: "396ebb3a01978aa75cad416656abef6ffa31e12de71cf2ccf5ff4173bd35a3eb" + url: "https://pub.dev" + source: hosted + version: "0.7.0+5" + fwfh_chewie: + dependency: transitive + description: + name: fwfh_chewie + sha256: "6474630c084cc90fbd348cea007d3cb41d62478460f75364e591f2baf26abccd" + url: "https://pub.dev" + source: hosted + version: "0.7.1+2" + fwfh_just_audio: + dependency: transitive + description: + name: fwfh_just_audio + sha256: "7b97696c264f36f7921c2f94e95c1d4186021699d85ca19aaa280f6b9700fb35" + url: "https://pub.dev" + source: hosted + version: "0.9.0+2" + fwfh_svg: + dependency: transitive + description: + name: fwfh_svg + sha256: "398e8eec980e7b2868481489fd423634f7e337bc04c37508db6f84868b982120" + url: "https://pub.dev" + source: hosted + version: "0.8.0+2" + fwfh_text_style: + dependency: transitive + description: + name: fwfh_text_style + sha256: f0883ccb64b7bb3f2a7a091542c2e834fc3e2a6aa54158f46b3c43b55675d8f7 + url: "https://pub.dev" + source: hosted + version: "2.22.8+3" + fwfh_url_launcher: + dependency: transitive + description: + name: fwfh_url_launcher + sha256: ff7f7a877c20fdbea24b453a0cd846a03ef1ea6b933943a7d37082388c27e849 + url: "https://pub.dev" + source: hosted + version: "0.9.0+2" + fwfh_webview: + dependency: transitive + description: + name: fwfh_webview + sha256: "7ebd3dff551d7281dd3fbb9f5523a8455592665ff75459ca84871ebbebe864a8" + url: "https://pub.dev" + source: hosted + version: "0.7.0+2" get: dependency: "direct main" description: @@ -349,6 +469,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.0" + html: + dependency: transitive + description: + name: html + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + url: "https://pub.dev" + source: hosted + version: "0.15.4" http: dependency: transitive description: @@ -385,10 +513,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.1" io: dependency: transitive description: @@ -401,10 +529,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -417,26 +545,26 @@ packages: dependency: "direct main" description: name: just_audio - sha256: "7a5057a4d05c8f88ee968cec6fdfe1015577d5184e591d5ac15ab16d8f5ecb17" + sha256: "890cd0fc41a1a4530c171e375a2a3fb6a09d84e9d508c5195f40bcff54330327" url: "https://pub.dev" source: hosted - version: "0.9.31" + version: "0.9.34" just_audio_platform_interface: dependency: transitive description: name: just_audio_platform_interface - sha256: eff112d5138bea3ba544b6338b1e0537a32b5e1425e4d0dc38f732771cda7c84 + sha256: d8409da198bbc59426cd45d4c92fca522a2ec269b576ce29459d6d6fcaeb44df url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.2.1" just_audio_web: dependency: transitive description: name: just_audio_web - sha256: "89d8db6f19f3821bb6bf908c4bfb846079afb2ab575b783d781a6bf119e3abaf" + sha256: ff62f733f437b25a0ff590f0e295fa5441dcb465f1edbdb33b3dea264705bc13 url: "https://pub.dev" source: hosted - version: "0.4.7" + version: "0.4.8" lints: dependency: transitive description: @@ -464,26 +592,26 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -500,6 +628,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + octo_image: + dependency: transitive + description: + name: octo_image + sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143" + url: "https://pub.dev" + source: hosted + version: "1.0.2" openapi_generator: dependency: "direct main" description: @@ -536,18 +672,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" - path_drawing: - dependency: transitive - description: - name: path_drawing - sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977 - url: "https://pub.dev" - source: hosted - version: "1.0.1" + version: "1.8.3" path_parsing: dependency: transitive description: @@ -604,6 +732,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.3" + pedantic: + dependency: transitive + description: + name: pedantic + sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" + url: "https://pub.dev" + source: hosted + version: "1.11.1" permission_handler: dependency: "direct main" description: @@ -680,10 +816,10 @@ packages: dependency: "direct main" description: name: provider - sha256: "59471e0a4595e264625d3496af567ac85bdae1148ec985aff1e0555786f53ecf" + sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "6.0.5" pub_semver: dependency: transitive description: @@ -749,18 +885,18 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: "direct main" description: name: sqflite - sha256: "78324387dc81df14f78df06019175a86a2ee0437624166c382e145d0a7fd9a4f" + sha256: "851d5040552cf911f4cabda08d003eca76b27da3ed0002978272e27c8fbf8ecc" url: "https://pub.dev" source: hosted - version: "2.2.4+1" + version: "2.2.5" sqflite_common: dependency: transitive description: @@ -821,10 +957,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.6.0" timing: dependency: transitive description: @@ -841,6 +977,70 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + url_launcher: + dependency: transitive + description: + name: url_launcher + sha256: eb1e00ab44303d50dd487aab67ebc575456c146c6af44422f9c13889984c00f3 + url: "https://pub.dev" + source: hosted + version: "6.1.11" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: eed4e6a1164aa9794409325c3b707ff424d4d1c2a785e7db67f8bbda00e36e51 + url: "https://pub.dev" + source: hosted + version: "6.0.35" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: "6bb1e5d7fe53daf02a8fee85352432a40b1f868a81880e99ec7440113d5cfcab" + url: "https://pub.dev" + source: hosted + version: "2.0.17" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771" + url: "https://pub.dev" + source: hosted + version: "3.0.6" uuid: dependency: transitive description: @@ -849,6 +1049,30 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.7" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: ea8d3fc7b2e0f35de38a7465063ecfcf03d8217f7962aa2a6717132cb5d43a79 + url: "https://pub.dev" + source: hosted + version: "1.1.5" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: a5eaa5d19e123ad4f61c3718ca1ed921c4e6254238d9145f82aa214955d9aced + url: "https://pub.dev" + source: hosted + version: "1.1.5" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "15edc42f7eaa478ce854eaf1fbb9062a899c0e4e56e775dd73b7f4709c97c4ca" + url: "https://pub.dev" + source: hosted + version: "1.1.5" vector_math: dependency: transitive description: @@ -857,6 +1081,86 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + video_player: + dependency: transitive + description: + name: video_player + sha256: de95f0e9405f29b5582573d4166132e71f83b3158aac14e8ee5767a54f4f1fbd + url: "https://pub.dev" + source: hosted + version: "2.6.1" + video_player_android: + dependency: transitive + description: + name: video_player_android + sha256: f338a5a396c845f4632959511cad3542cdf3167e1b2a1a948ef07f7123c03608 + url: "https://pub.dev" + source: hosted + version: "2.4.9" + video_player_avfoundation: + dependency: transitive + description: + name: video_player_avfoundation + sha256: "4c274e439f349a0ee5cb3c42978393ede173a443b98f50de6ffe6900eaa19216" + url: "https://pub.dev" + source: hosted + version: "2.4.6" + video_player_platform_interface: + dependency: transitive + description: + name: video_player_platform_interface + sha256: a8c4dcae2a7a6e7cc1d7f9808294d968eca1993af34a98e95b9bdfa959bec684 + url: "https://pub.dev" + source: hosted + version: "6.1.0" + video_player_web: + dependency: transitive + description: + name: video_player_web + sha256: "44ce41424d104dfb7cf6982cc6b84af2b007a24d126406025bf40de5d481c74c" + url: "https://pub.dev" + source: hosted + version: "2.0.16" + wakelock: + dependency: transitive + description: + name: wakelock + sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db" + url: "https://pub.dev" + source: hosted + version: "0.6.2" + wakelock_macos: + dependency: transitive + description: + name: wakelock_macos + sha256: "047c6be2f88cb6b76d02553bca5a3a3b95323b15d30867eca53a19a0a319d4cd" + url: "https://pub.dev" + source: hosted + version: "0.4.0" + wakelock_platform_interface: + dependency: transitive + description: + name: wakelock_platform_interface + sha256: "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621" + url: "https://pub.dev" + source: hosted + version: "0.3.0" + wakelock_web: + dependency: transitive + description: + name: wakelock_web + sha256: "1b256b811ee3f0834888efddfe03da8d18d0819317f20f6193e2922b41a501b5" + url: "https://pub.dev" + source: hosted + version: "0.4.0" + wakelock_windows: + dependency: transitive + description: + name: wakelock_windows + sha256: "857f77b3fe6ae82dd045455baa626bc4b93cb9bb6c86bf3f27c182167c3a5567" + url: "https://pub.dev" + source: hosted + version: "0.2.1" watcher: dependency: transitive description: @@ -865,6 +1169,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -873,6 +1185,38 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.0" + webview_flutter: + dependency: transitive + description: + name: webview_flutter + sha256: "789d52bd789373cc1e100fb634af2127e86c99cf9abde09499743270c5de8d00" + url: "https://pub.dev" + source: hosted + version: "4.2.2" + webview_flutter_android: + dependency: transitive + description: + name: webview_flutter_android + sha256: "532135f6f6b8030cd039f30eab23f340d650350e29f38e9b37d2eaad028f1018" + url: "https://pub.dev" + source: hosted + version: "3.8.0" + webview_flutter_platform_interface: + dependency: transitive + description: + name: webview_flutter_platform_interface + sha256: "656e2aeaef318900fffd21468b6ddc7958c7092a642f0e7220bac328b70d4a81" + url: "https://pub.dev" + source: hosted + version: "2.3.1" + webview_flutter_wkwebview: + dependency: transitive + description: + name: webview_flutter_wkwebview + sha256: ecc9e9ea15216afc5ba3b1f14aa19414ceba526e57b19cebd970bfa91a0f4058 + url: "https://pub.dev" + source: hosted + version: "3.5.0" win32: dependency: transitive description: @@ -906,5 +1250,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.0 <3.0.0" - flutter: ">=3.3.0" + dart: ">=3.1.0-185.0.dev <4.0.0" + flutter: ">=3.7.0" diff --git a/pubspec.yaml b/pubspec.yaml index 7a985a3..4dd87dd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.9+18 environment: - sdk: ">=2.16.2 <3.0.0" + sdk: ">=2.19.4 <3.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -37,18 +37,19 @@ dependencies: openapi_generator: ^4.0.0 openapi_generator_annotations: ^4.0.0 sqflite: - provider: ^5.0.0 - carousel_slider: ^4.0.0 - flutter_svg_provider: ^1.0.3 + provider: ^6.0.5 + carousel_slider: ^4.2.1 + #flutter_svg_provider: ^1.0.3 photo_view: ^0.14.0 - intl: ^0.17.0 + intl: ^0.18.0 flutter_launcher_icons: ^0.10.0 #audioplayers: ^2.0.0 - just_audio: ^0.9.31 + just_audio: ^0.9.34 flutter_beacon: ^0.5.1 get: ^4.6.5 permission_handler: ^8.2.4 diacritic: ^0.1.3 + flutter_widget_from_html: ^0.10.1 manager_api: path: manager_api @@ -84,6 +85,7 @@ flutter: assets: #- assets/icons/ - assets/images/ + - assets/images/old/ #- assets/animations/ #- assets/files/ # To add assets to your application, add an assets section, like this: