diff --git a/packages/uni_app/ios/Flutter/AppFrameworkInfo.plist b/packages/uni_app/ios/Flutter/AppFrameworkInfo.plist index 9625e105d..7c5696400 100644 --- a/packages/uni_app/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/uni_app/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/packages/uni_app/ios/Podfile b/packages/uni_app/ios/Podfile index 15c570493..d97f17e22 100644 --- a/packages/uni_app/ios/Podfile +++ b/packages/uni_app/ios/Podfile @@ -41,4 +41,4 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) end -end \ No newline at end of file +end diff --git a/packages/uni_app/ios/Runner.xcodeproj/project.pbxproj b/packages/uni_app/ios/Runner.xcodeproj/project.pbxproj index 889daa0d4..f3ff7eddb 100644 --- a/packages/uni_app/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/uni_app/ios/Runner.xcodeproj/project.pbxproj @@ -214,7 +214,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 378A17102ACF02E100B89C1C = { diff --git a/packages/uni_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/uni_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 28bc2d73f..5b0c182f6 100644 --- a/packages/uni_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/uni_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ > getLectures(Session session, Profile profile); + Future> getLectures(Session session); List getWeeks(DateTime now) { final week = Week(start: now); diff --git a/packages/uni_app/lib/controller/fetchers/schedule_fetcher/schedule_fetcher_api.dart b/packages/uni_app/lib/controller/fetchers/schedule_fetcher/schedule_fetcher_api.dart index 7efc35063..0c7da4f56 100644 --- a/packages/uni_app/lib/controller/fetchers/schedule_fetcher/schedule_fetcher_api.dart +++ b/packages/uni_app/lib/controller/fetchers/schedule_fetcher/schedule_fetcher_api.dart @@ -3,7 +3,6 @@ import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher.dart'; import 'package:uni/controller/networking/network_router.dart'; import 'package:uni/controller/parsers/schedule/api/parser.dart'; import 'package:uni/model/entities/lecture.dart'; -import 'package:uni/model/entities/profile.dart'; import 'package:uni/model/utils/time/week.dart'; import 'package:uni/session/flows/base/session.dart'; @@ -19,7 +18,7 @@ class ScheduleFetcherApi extends ScheduleFetcher { /// Fetches the user's lectures from the faculties' API. @override - Future> getLectures(Session session, Profile profile) async { + Future> getLectures(Session session) async { final dates = getDates(); final urls = getEndpoints(session); diff --git a/packages/uni_app/lib/controller/fetchers/schedule_fetcher/schedule_fetcher_new_api.dart b/packages/uni_app/lib/controller/fetchers/schedule_fetcher/schedule_fetcher_new_api.dart index e42f24e30..9ab5b041f 100644 --- a/packages/uni_app/lib/controller/fetchers/schedule_fetcher/schedule_fetcher_new_api.dart +++ b/packages/uni_app/lib/controller/fetchers/schedule_fetcher/schedule_fetcher_new_api.dart @@ -2,7 +2,6 @@ import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher.dart'; import 'package:uni/controller/networking/network_router.dart'; import 'package:uni/controller/parsers/schedule/new_api/parser.dart'; import 'package:uni/model/entities/lecture.dart'; -import 'package:uni/model/entities/profile.dart'; import 'package:uni/session/flows/base/session.dart'; /// Class for fetching the user's lectures from the schedule's HTML page. @@ -17,7 +16,7 @@ class ScheduleFetcherNewApi extends ScheduleFetcher { /// Fetches the user's lectures from the schedule's HTML page. @override - Future> getLectures(Session session, Profile profile) async { + Future> getLectures(Session session) async { final endpoints = getEndpoints(session); final lectiveYear = getLectiveYear(DateTime.now()); diff --git a/packages/uni_app/lib/controller/local_storage/database/app_course_units_database.dart b/packages/uni_app/lib/controller/local_storage/database/app_course_units_database.dart index 85d895df8..5418d240a 100644 --- a/packages/uni_app/lib/controller/local_storage/database/app_course_units_database.dart +++ b/packages/uni_app/lib/controller/local_storage/database/app_course_units_database.dart @@ -9,19 +9,21 @@ class AppCourseUnitsDatabase extends AppDatabase> { : super( 'course_units.db', [createScript], + onUpgrade: migrate, + version: 2, ); static const String createScript = '''CREATE TABLE course_units(ucurr_id INTEGER, ucurr_codigo TEXT, ucurr_sigla TEXT , ''' '''ucurr_nome TEXT, ano INTEGER, ocorr_id INTEGER, per_codigo TEXT, ''' '''per_nome TEXT, tipo TEXT, estado TEXT, resultado_melhor TEXT, resultado_ects TEXT, ''' - '''resultado_insc TEXT, creditos_ects REAL, schoolYear TEXT)'''; + '''ectsGrade TEXT, resultado_insc TEXT, creditos_ects REAL, schoolYear TEXT)'''; Future> courseUnits() async { final db = await getDatabase(); final List> maps = await db.query('course_units'); return List.generate(maps.length, (i) { return CourseUnit( - id: maps[i]['ucurr_id'] as int, + id: maps[i]['ucurr_id'] as int?, code: maps[i]['ucurr_codigo'] as String, abbreviation: maps[i]['ucurr_sigla'] as String, name: maps[i]['ucurr_nome'] as String, @@ -55,6 +57,17 @@ class AppCourseUnitsDatabase extends AppDatabase> { await db.delete('course_units'); } + static FutureOr migrate( + Database db, + int oldVersion, + int newVersion, + ) async { + final batch = db.batch() + ..execute('DROP TABLE IF EXISTS course_units') + ..execute(createScript); + await batch.commit(); + } + @override Future saveToDatabase(List data) async { await deleteCourseUnits(); diff --git a/packages/uni_app/lib/generated/intl/messages_en.dart b/packages/uni_app/lib/generated/intl/messages_en.dart index 595583f38..4719af7cd 100644 --- a/packages/uni_app/lib/generated/intl/messages_en.dart +++ b/packages/uni_app/lib/generated/intl/messages_en.dart @@ -62,6 +62,7 @@ class MessageLookup extends MessageLookupByLibrary { "balance": MessageLookupByLibrary.simpleMessage("Balance:"), "banner_info": MessageLookupByLibrary.simpleMessage( "We do now collect anonymous usage statistics in order to improve your experience. You can change it in settings."), + "bibliography": MessageLookupByLibrary.simpleMessage("Bibliography"), "bs_description": MessageLookupByLibrary.simpleMessage( "Did you find any bugs in the application?\nDo you have any suggestions for the app?\nTell us so we can improve!"), "bug_description": MessageLookupByLibrary.simpleMessage( @@ -120,6 +121,7 @@ class MessageLookup extends MessageLookupByLibrary { "edit_on": MessageLookupByLibrary.simpleMessage("Finish editing"), "empty_text": MessageLookupByLibrary.simpleMessage("Please fill in this field"), + "evaluation": MessageLookupByLibrary.simpleMessage("Evaluation"), "exams_filter": MessageLookupByLibrary.simpleMessage("Exams Filter Settings"), "exit_confirm": @@ -248,6 +250,7 @@ class MessageLookup extends MessageLookupByLibrary { "prints": MessageLookupByLibrary.simpleMessage("Prints"), "problem_id": MessageLookupByLibrary.simpleMessage( "Brief identification of the problem"), + "program": MessageLookupByLibrary.simpleMessage("Program"), "reference_sigarra_help": MessageLookupByLibrary.simpleMessage( "The generated reference data will appear in Sigarra, checking account.\nProfile > Checking Account"), "reference_success": MessageLookupByLibrary.simpleMessage( diff --git a/packages/uni_app/lib/generated/intl/messages_pt_PT.dart b/packages/uni_app/lib/generated/intl/messages_pt_PT.dart index 6f1667a4a..0198f3d78 100644 --- a/packages/uni_app/lib/generated/intl/messages_pt_PT.dart +++ b/packages/uni_app/lib/generated/intl/messages_pt_PT.dart @@ -62,6 +62,7 @@ class MessageLookup extends MessageLookupByLibrary { "balance": MessageLookupByLibrary.simpleMessage("Saldo:"), "banner_info": MessageLookupByLibrary.simpleMessage( "Agora recolhemos estatísticas de uso anónimas para melhorar a tua experiência. Podes alterá-lo nas definições."), + "bibliography": MessageLookupByLibrary.simpleMessage("Bibliografia"), "bs_description": MessageLookupByLibrary.simpleMessage( "Encontraste algum bug na aplicação?\nTens alguma sugestão para a app?\nConta-nos para que possamos melhorar!"), "bug_description": MessageLookupByLibrary.simpleMessage( @@ -119,6 +120,7 @@ class MessageLookup extends MessageLookupByLibrary { "edit_on": MessageLookupByLibrary.simpleMessage("Concluir edição"), "empty_text": MessageLookupByLibrary.simpleMessage( "Por favor preenche este campo"), + "evaluation": MessageLookupByLibrary.simpleMessage("Avaliação"), "exams_filter": MessageLookupByLibrary.simpleMessage("Definições Filtro de Exames"), "exit_confirm": MessageLookupByLibrary.simpleMessage( @@ -249,6 +251,7 @@ class MessageLookup extends MessageLookupByLibrary { "prints": MessageLookupByLibrary.simpleMessage("Impressões"), "problem_id": MessageLookupByLibrary.simpleMessage( "Breve identificação do problema"), + "program": MessageLookupByLibrary.simpleMessage("Programa"), "reference_sigarra_help": MessageLookupByLibrary.simpleMessage( "Os dados da referência gerada aparecerão no Sigarra, conta corrente. Perfil > Conta Corrente"), "reference_success": MessageLookupByLibrary.simpleMessage( diff --git a/packages/uni_app/lib/generated/l10n.dart b/packages/uni_app/lib/generated/l10n.dart index 74b11f274..3ec5fd8f5 100644 --- a/packages/uni_app/lib/generated/l10n.dart +++ b/packages/uni_app/lib/generated/l10n.dart @@ -250,6 +250,16 @@ class S { ); } + /// `Bibliography` + String get bibliography { + return Intl.message( + 'Bibliography', + name: 'bibliography', + desc: '', + args: [], + ); + } + /// `Did you find any bugs in the application?\nDo you have any suggestions for the app?\nTell us so we can improve!` String get bs_description { return Intl.message( @@ -580,6 +590,16 @@ class S { ); } + /// `Evaluation` + String get evaluation { + return Intl.message( + 'Evaluation', + name: 'evaluation', + desc: '', + args: [], + ); + } + /// `Exams Filter Settings` String get exams_filter { return Intl.message( @@ -1268,6 +1288,16 @@ class S { ); } + /// `Program` + String get program { + return Intl.message( + 'Program', + name: 'program', + desc: '', + args: [], + ); + } + /// `Error opening the file` String get open_error { return Intl.message( diff --git a/packages/uni_app/lib/l10n/intl_en.arb b/packages/uni_app/lib/l10n/intl_en.arb index 20950b4af..c6c45536e 100644 --- a/packages/uni_app/lib/l10n/intl_en.arb +++ b/packages/uni_app/lib/l10n/intl_en.arb @@ -40,6 +40,8 @@ "@banner_info": {}, "balance": "Balance:", "@balance": {}, + "bibliography": "Bibliography", + "@bibliography": {}, "bs_description": "Did you find any bugs in the application?\nDo you have any suggestions for the app?\nTell us so we can improve!", "@bs_description": {}, "bug_description": "Bug found, how to reproduce it, etc.", @@ -106,6 +108,8 @@ "@edit_on": {}, "empty_text": "Please fill in this field", "@empty_text": {}, + "evaluation": "Evaluation", + "@evaluation": {}, "exams_filter": "Exams Filter Settings", "@exams_filter": {}, "expired_password": "Your password has expired", @@ -248,6 +252,8 @@ "@successful_open": {}, "permission_denied": "Permission denied", "@permission_denied": {}, + "program": "Program", + "@program": {}, "open_error": "Error opening the file", "@open_error": {}, "no_app": "No app found to open the file", diff --git a/packages/uni_app/lib/l10n/intl_pt_PT.arb b/packages/uni_app/lib/l10n/intl_pt_PT.arb index 766458f7b..14837abe4 100644 --- a/packages/uni_app/lib/l10n/intl_pt_PT.arb +++ b/packages/uni_app/lib/l10n/intl_pt_PT.arb @@ -42,6 +42,8 @@ "@banner_info": {}, "balance": "Saldo:", "@balance": {}, + "bibliography": "Bibliografia", + "@bibliography": {}, "bs_description": "Encontraste algum bug na aplicação?\nTens alguma sugestão para a app?\nConta-nos para que possamos melhorar!", "@bs_description": {}, "bug_description": "Bug encontrado, como o reproduzir, etc", @@ -108,6 +110,8 @@ "@edit_on": {}, "empty_text": "Por favor preenche este campo", "@empty_text": {}, + "evaluation": "Avaliação", + "@evaluation": {}, "exams_filter": "Definições Filtro de Exames", "@exams_filter": {}, "expired_password": "A tua palavra-passe expirou", @@ -252,6 +256,8 @@ "@personal_assistance": {}, "press_again": "Pressione novamente para sair", "@press_again": {}, + "program": "Programa", + "@program": {}, "print": "Impressão", "@print": {}, "prints": "Impressões", diff --git a/packages/uni_app/lib/model/entities/course.dart b/packages/uni_app/lib/model/entities/course.dart index ca287f149..25a978382 100644 --- a/packages/uni_app/lib/model/entities/course.dart +++ b/packages/uni_app/lib/model/entities/course.dart @@ -14,7 +14,7 @@ part '../../generated/model/entities/course.g.dart'; @JsonSerializable(createFactory: false) class Course { Course({ - required this.id, + this.id, this.festId, this.name, this.abbreviation, @@ -27,10 +27,15 @@ class Course { }); factory Course.fromJson(Map json) { + var name = json['cur_nome'] as String?; + if (name == null || name.isEmpty) { + name = json['fest_tipo_descr'] as String?; + } + return Course( - id: json['cur_id'] as int, + id: json['cur_id'] as int?, festId: json['fest_id'] as int?, - name: json['cur_nome'] as String?, + name: name, abbreviation: json['abbreviation'] as String?, currYear: json['ano_curricular'] as String?, firstEnrollment: json['fest_a_lect_1_insc'] as int?, @@ -41,8 +46,8 @@ class Course { ); } @JsonKey(name: 'cur_id') - final int id; - @JsonKey(name: 'fest_id ') + final int? id; + @JsonKey(name: 'fest_id') final int? festId; @JsonKey(name: 'cur_nome') final String? name; diff --git a/packages/uni_app/lib/model/providers/lazy/lecture_provider.dart b/packages/uni_app/lib/model/providers/lazy/lecture_provider.dart index d7a3d4de4..9f0f178e5 100644 --- a/packages/uni_app/lib/model/providers/lazy/lecture_provider.dart +++ b/packages/uni_app/lib/model/providers/lazy/lecture_provider.dart @@ -5,7 +5,6 @@ import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher_api.da import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher_new_api.dart'; import 'package:uni/controller/local_storage/database/app_lectures_database.dart'; import 'package:uni/model/entities/lecture.dart'; -import 'package:uni/model/entities/profile.dart'; import 'package:uni/model/providers/state_provider_notifier.dart'; import 'package:uni/model/providers/state_providers.dart'; import 'package:uni/session/flows/base/session.dart'; @@ -23,17 +22,14 @@ class LectureProvider extends StateProviderNotifier> { Future> loadFromRemote(StateProviders stateProviders) async { return fetchUserLectures( stateProviders.sessionProvider.state!, - stateProviders.profileProvider.state!, ); } Future> fetchUserLectures( - Session session, - Profile profile, { + Session session, { ScheduleFetcher? fetcher, }) async { - final lectures = - await getLecturesFromFetcherOrElse(fetcher, session, profile); + final lectures = await getLecturesFromFetcherOrElse(fetcher, session); final db = AppLecturesDatabase(); await db.saveIfPersistentSession(lectures); @@ -44,13 +40,12 @@ class LectureProvider extends StateProviderNotifier> { Future> getLecturesFromFetcherOrElse( ScheduleFetcher? fetcher, Session session, - Profile profile, ) => - fetcher?.getLectures(session, profile) ?? getLectures(session, profile); + fetcher?.getLectures(session) ?? getLectures(session); - Future> getLectures(Session session, Profile profile) { - return ScheduleFetcherApi().getLectures(session, profile).catchError( - (e) => ScheduleFetcherNewApi().getLectures(session, profile), + Future> getLectures(Session session) { + return ScheduleFetcherApi().getLectures(session).catchError( + (e) => ScheduleFetcherNewApi().getLectures(session), ); } } diff --git a/packages/uni_app/lib/model/providers/state_provider_notifier.dart b/packages/uni_app/lib/model/providers/state_provider_notifier.dart index 2b47392fc..ff0469e95 100644 --- a/packages/uni_app/lib/model/providers/state_provider_notifier.dart +++ b/packages/uni_app/lib/model/providers/state_provider_notifier.dart @@ -16,8 +16,12 @@ abstract class StateProviderNotifier extends ChangeNotifier { RequestStatus initialStatus = RequestStatus.busy, T? initialState, }) : _requestStatus = initialStatus, + _initialState = initialState, _state = initialState; + /// The initial state of the model. + final T? _initialState; + /// The model that this notifier provides. /// This future will throw if the data loading fails. T? _state; @@ -68,7 +72,7 @@ abstract class StateProviderNotifier extends ChangeNotifier { /// Makes the state null, as if the model has never been loaded, /// so that consumers may trigger the loading again. void invalidate() { - _state = null; + _state = _initialState; notifyListeners(); } diff --git a/packages/uni_app/lib/view/course_unit_info/widgets/course_unit_sheet.dart b/packages/uni_app/lib/view/course_unit_info/widgets/course_unit_sheet.dart index f5cdb1fd5..d4df55a78 100644 --- a/packages/uni_app/lib/view/course_unit_info/widgets/course_unit_sheet.dart +++ b/packages/uni_app/lib/view/course_unit_info/widgets/course_unit_sheet.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart'; import 'package:provider/provider.dart'; import 'package:uni/controller/fetchers/book_fetcher.dart'; +import 'package:uni/generated/l10n.dart'; import 'package:uni/model/entities/course_units/sheet.dart'; import 'package:uni/model/providers/startup/profile_provider.dart'; import 'package:uni/model/providers/startup/session_provider.dart'; @@ -37,18 +38,23 @@ class CourseUnitSheetView extends StatelessWidget { secondChild: buildExpandedProfessors(context, courseUnitSheet.professors), ), - _buildCard('Programa', courseUnitSheet.content), - _buildCard('Avaliação', courseUnitSheet.evaluation), - const Opacity( - opacity: 0.25, - child: Divider(color: Colors.grey), + _buildCard(S.of(context).program, courseUnitSheet.content, context), + _buildCard( + S.of(context).evaluation, + courseUnitSheet.evaluation, + context, ), - const Text( - 'Bibliografia', - style: TextStyle(fontSize: 20), - ), - if (courseUnitSheet.books.isNotEmpty) + if (courseUnitSheet.books.isNotEmpty) ...[ + const Opacity( + opacity: 0.25, + child: Divider(color: Colors.grey), + ), + Text( + S.of(context).bibliography, + style: const TextStyle(fontSize: 20), + ), buildBooksRow(context, courseUnitSheet.books), + ], ], ), ), @@ -215,7 +221,8 @@ Widget buildBooksRow(BuildContext context, List books) { Widget _buildCard( String sectionTitle, - dynamic sectionContent, + String sectionContent, + BuildContext context, ) { return Padding( padding: const EdgeInsets.symmetric(vertical: 8), @@ -226,7 +233,9 @@ Widget _buildCard( child: Divider(color: Colors.grey), ), GenericExpandable( - content: HtmlWidget(sectionContent.toString()), + content: HtmlWidget( + sectionContent != 'null' ? sectionContent : S.of(context).no_info, + ), title: sectionTitle, ), ], diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index 04ebf0c95..5a4c5d044 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -81,14 +81,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.11.0" - audio_session: - dependency: transitive - description: - name: audio_session - sha256: "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261" - url: "https://pub.dev" - source: hosted - version: "0.1.21" battery_plus: dependency: "direct main" description: @@ -217,14 +209,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" - chewie: - dependency: transitive - description: - name: chewie - sha256: "8bc4ac4cf3f316e50a25958c0f5eb9bb12cf7e8308bb1d74a43b230da2cfc144" - url: "https://pub.dev" - source: hosted - version: "1.7.5" ci: dependency: transitive description: @@ -597,14 +581,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_widget_from_html: - dependency: "direct main" - description: - name: flutter_widget_from_html - sha256: "22c911b6ccf82b83e0c457d987bac4e703440fea0fc88dab24f4dfe995a5f33f" - url: "https://pub.dev" - source: hosted - version: "0.14.11" flutter_widget_from_html_core: dependency: "direct main" description: @@ -629,54 +605,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.0" - fwfh_cached_network_image: - dependency: transitive - description: - name: fwfh_cached_network_image - sha256: "952aea958a5fda7d616cc297ba4bc08427e381459e75526fa375d6d8345630d3" - url: "https://pub.dev" - source: hosted - version: "0.14.2" - fwfh_chewie: - dependency: transitive - description: - name: fwfh_chewie - sha256: bbb036cd322ab77dc0edd34cbbf76181681f5e414987ece38745dc4f3d7408ed - url: "https://pub.dev" - source: hosted - version: "0.14.7" - fwfh_just_audio: - dependency: transitive - description: - name: fwfh_just_audio - sha256: "4962bc59cf8bbb0a77a55ff56a7b925612b0d8263bc2ede3636b9c86113cb493" - url: "https://pub.dev" - source: hosted - version: "0.14.2" - fwfh_svg: - dependency: transitive - description: - name: fwfh_svg - sha256: "3fd83926b7245d287f133a437ef430befd99d3b00ba8c600f26cc324af281f72" - url: "https://pub.dev" - source: hosted - version: "0.8.1" - fwfh_url_launcher: - dependency: transitive - description: - name: fwfh_url_launcher - sha256: "2a526c9819f74b4106ba2fba4dac79f0082deecd8d2c7011cd0471cb710e3eff" - url: "https://pub.dev" - source: hosted - version: "0.9.0+4" - fwfh_webview: - dependency: transitive - description: - name: fwfh_webview - sha256: b828bb5ddd4361a866cdb8f1b0de4f3348f332915ecf2f4215ba17e46c656adc - url: "https://pub.dev" - source: hosted - version: "0.14.8" glob: dependency: transitive description: @@ -797,30 +725,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.7.1" - just_audio: - dependency: transitive - description: - name: just_audio - sha256: ee50602364ba83fa6308f5512dd560c713ec3e1f2bc75f0db43618f0d82ef71a - url: "https://pub.dev" - source: hosted - version: "0.9.39" - just_audio_platform_interface: - dependency: transitive - description: - name: just_audio_platform_interface - sha256: "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790" - url: "https://pub.dev" - source: hosted - version: "4.3.0" - just_audio_web: - dependency: transitive - description: - name: just_audio_web - sha256: "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c" - url: "https://pub.dev" - source: hosted - version: "0.4.11" latlong2: dependency: "direct main" description: @@ -1102,6 +1006,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.2" + phosphor_flutter: + dependency: transitive + description: + name: phosphor_flutter + sha256: "8a14f238f28a0b54842c5a4dc20676598dd4811fcba284ed828bd5a262c11fde" + url: "https://pub.dev" + source: hosted + version: "2.1.0" platform: dependency: transitive description: @@ -1658,46 +1570,6 @@ packages: url: "https://pub.dev" source: hosted version: "5.1.0" - video_player: - dependency: transitive - description: - name: video_player - sha256: afc65f4b8bcb2c188f64a591f84fb471f4f2e19fc607c65fd8d2f8fedb3dec23 - url: "https://pub.dev" - source: hosted - version: "2.8.3" - video_player_android: - dependency: transitive - description: - name: video_player_android - sha256: "4dd9b8b86d70d65eecf3dcabfcdfbb9c9115d244d022654aba49a00336d540c2" - url: "https://pub.dev" - source: hosted - version: "2.4.12" - video_player_avfoundation: - dependency: transitive - description: - name: video_player_avfoundation - sha256: "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed" - url: "https://pub.dev" - source: hosted - version: "2.5.6" - video_player_platform_interface: - dependency: transitive - description: - name: video_player_platform_interface - sha256: "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6" - url: "https://pub.dev" - source: hosted - version: "6.2.2" - video_player_web: - dependency: transitive - description: - name: video_player_web - sha256: "8e9cb7fe94e49490e67bbc15149691792b58a0ade31b32e3f3688d104a0e057b" - url: "https://pub.dev" - source: hosted - version: "2.2.0" vm_service: dependency: transitive description: @@ -1706,22 +1578,6 @@ packages: url: "https://pub.dev" source: hosted version: "14.2.1" - wakelock_plus: - dependency: transitive - description: - name: wakelock_plus - sha256: "14758533319a462ffb5aa3b7ddb198e59b29ac3b02da14173a1715d65d4e6e68" - url: "https://pub.dev" - source: hosted - version: "1.2.5" - wakelock_plus_platform_interface: - dependency: transitive - description: - name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" - url: "https://pub.dev" - source: hosted - version: "1.2.1" watcher: dependency: transitive description: @@ -1754,38 +1610,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" - webview_flutter: - dependency: transitive - description: - name: webview_flutter - sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932" - url: "https://pub.dev" - source: hosted - version: "4.7.0" - webview_flutter_android: - dependency: transitive - description: - name: webview_flutter_android - sha256: "3e5f4e9d818086b0d01a66fb1ff9cc72ab0cc58c71980e3d3661c5685ea0efb0" - url: "https://pub.dev" - source: hosted - version: "3.15.0" - webview_flutter_platform_interface: - dependency: transitive - description: - name: webview_flutter_platform_interface - sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d - url: "https://pub.dev" - source: hosted - version: "2.10.0" - webview_flutter_wkwebview: - dependency: transitive - description: - name: webview_flutter_wkwebview - sha256: "9bf168bccdf179ce90450b5f37e36fe263f591c9338828d6bf09b6f8d0f57f86" - url: "https://pub.dev" - source: hosted - version: "3.12.0" win32: dependency: transitive description: diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 53bebcc5c..62564d405 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -39,7 +39,6 @@ dependencies: flutter_markdown: ^0.6.0 flutter_secure_storage: ^9.2.2 flutter_svg: ^2.0.9 - flutter_widget_from_html: ^0.14.11 flutter_widget_from_html_core: ^0.14.11 html: ^0.15.0 http: ^1.1.0