From 021edc80ea47a7f3bf16d81e85052a56050d78dc Mon Sep 17 00:00:00 2001 From: Rubem Neto Date: Thu, 26 Sep 2024 17:09:32 +0100 Subject: [PATCH 01/35] Course Grade Card --- packages/uni_ui/lib/course_grade_card.dart | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 packages/uni_ui/lib/course_grade_card.dart diff --git a/packages/uni_ui/lib/course_grade_card.dart b/packages/uni_ui/lib/course_grade_card.dart new file mode 100644 index 000000000..0ceb9c263 --- /dev/null +++ b/packages/uni_ui/lib/course_grade_card.dart @@ -0,0 +1,51 @@ +import 'package:flutter/material.dart'; +import 'package:uni_ui/generic_card.dart'; + +class CourseGradeCard extends StatelessWidget { + const CourseGradeCard( + {required this.courseName, + required this.ects, + required this.grade, + super.key}); + + final String courseName; + final double ects; + final double grade; + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + return GenericCard( + key: key, + child: SizedBox( + width: MediaQuery.of(context).size.width * 0.35, + height: MediaQuery.of(context).size.height * 0.09, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text( + courseName, + style: theme.textTheme.titleLarge?.copyWith( + color: theme.colorScheme.primary, + fontWeight: FontWeight.w600), + overflow: TextOverflow.ellipsis, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + "${ects} ECTS", + style: theme.textTheme.bodyLarge + ?.copyWith(color: theme.colorScheme.primary), + ), + Text("${grade.toInt()}", + style: theme.textTheme.bodyLarge + ?.copyWith(color: theme.colorScheme.primary)) + ], + ) + ], + ), + )); + } +} From d3946f6303f49abac35bdb97f533215c3a07109c Mon Sep 17 00:00:00 2001 From: DGoiana Date: Sun, 29 Sep 2024 23:24:34 +0100 Subject: [PATCH 02/35] fixing ios build to v1.9.3 --- packages/uni_app/pubspec.lock | 8 ++++---- packages/uni_app/pubspec.yaml | 2 +- packages/uni_app/windows/flutter/generated_plugins.cmake | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index 5a4c5d044..105438605 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -1114,18 +1114,18 @@ packages: dependency: transitive description: name: sentry - sha256: "57514bc72d441ffdc463f498d6886aa586a2494fa467a1eb9d649c28010d7ee3" + sha256: "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd" url: "https://pub.dev" source: hosted - version: "7.20.2" + version: "8.9.0" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "9723d58470ca43a360681ddd26abb71ca7b815f706bc8d3747afd054cf639ded" + sha256: "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a" url: "https://pub.dev" source: hosted - version: "7.20.2" + version: "8.9.0" shared_preferences: dependency: "direct main" description: diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index b1ac16565..2d97b3529 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -59,7 +59,7 @@ dependencies: percent_indicator: ^4.2.2 plausible_analytics: ^0.3.0 provider: ^6.1.1 - sentry_flutter: ^7.14.0 + sentry_flutter: ^8.9.0 shared_preferences: ^2.2.2 shimmer: ^3.0.0 sqflite: ^2.0.3 diff --git a/packages/uni_app/windows/flutter/generated_plugins.cmake b/packages/uni_app/windows/flutter/generated_plugins.cmake index a9445985d..5261a5887 100644 --- a/packages/uni_app/windows/flutter/generated_plugins.cmake +++ b/packages/uni_app/windows/flutter/generated_plugins.cmake @@ -7,11 +7,11 @@ list(APPEND FLUTTER_PLUGIN_LIST battery_plus connectivity_plus flutter_secure_storage_windows - sentry_flutter url_launcher_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + sentry_flutter ) set(PLUGIN_BUNDLED_LIBRARIES) From 374a03cab4fb4e4ffc311ec67b202ee878dbeed3 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Sun, 29 Sep 2024 23:26:11 +0100 Subject: [PATCH 03/35] updating transitive dependencies --- packages/uni_app/pubspec.lock | 196 +++++++++++++++++----------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index 105438605..5eceef7f0 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: asn1lib - sha256: "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda" + sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70" url: "https://pub.dev" source: hosted - version: "1.5.3" + version: "1.5.5" async: dependency: transitive description: @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: battery_plus_platform_interface - sha256: "942707f90e2f7481dcb178df02e22a9c6971b3562b848d6a1b8c7cff9f1a1fec" + sha256: e8342c0f32de4b1dfd0223114b6785e48e579bfc398da9471c9179b907fa4910 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" boolean_selector: dependency: transitive description: @@ -173,26 +173,26 @@ packages: dependency: "direct main" description: name: cached_network_image - sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" + sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" + sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.1" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - sha256: "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7" + sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" characters: dependency: transitive description: @@ -277,18 +277,18 @@ packages: dependency: transitive description: name: coverage - sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e" + sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5 url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.2" crypto: dependency: "direct main" description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" crypto_keys: dependency: transitive description: @@ -317,10 +317,10 @@ packages: dependency: "direct main" description: name: currency_text_input_formatter - sha256: d2eed8c7d40520729ac38252368954aba430a7ee510e5d5357e45cde1f6417a6 + sha256: a2a8ea078b211054539f9b391e87bdfc0e650e9d39b9bef4a9767b62d525b5a4 url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.5" custom_lint: dependency: "direct dev" description: @@ -365,10 +365,10 @@ packages: dependency: "direct main" description: name: diacritic - sha256: "96db5db6149cbe4aa3cfcbfd170aca9b7648639be7e48025f9d458517f807fe4" + sha256: "12981945ec38931748836cd76f2b38773118d0baef3c68404bdfde9566147876" url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.1.6" email_validator: dependency: "direct main" description: @@ -405,10 +405,10 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" figma_squircle: dependency: transitive description: @@ -442,10 +442,10 @@ packages: dependency: "direct main" description: name: flutter_cache_manager - sha256: "395d6b7831f21f3b989ebedbb785545932adb9afe2622c1ffacf7f4b53a7e544" + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" url: "https://pub.dev" source: hosted - version: "3.3.2" + version: "3.4.1" flutter_dotenv: dependency: "direct main" description: @@ -474,10 +474,10 @@ packages: dependency: transitive description: name: flutter_local_notifications_linux - sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03" + sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af url: "https://pub.dev" source: hosted - version: "4.0.0+1" + version: "4.0.1" flutter_local_notifications_platform_interface: dependency: transitive description: @@ -593,18 +593,18 @@ packages: dependency: transitive description: name: freezed_annotation - sha256: f54946fdb1fa7b01f780841937b1a80783a20b393485f3f6cdf336fd6f4705f2 + sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.4" frontend_server_client: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" glob: dependency: transitive description: @@ -617,10 +617,10 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" gtk: dependency: transitive description: @@ -649,10 +649,10 @@ packages: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -713,18 +713,18 @@ packages: dependency: "direct main" description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" json_serializable: dependency: "direct main" description: name: json_serializable - sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 + sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b url: "https://pub.dev" source: hosted - version: "6.7.1" + version: "6.8.0" latlong2: dependency: "direct main" description: @@ -777,10 +777,10 @@ packages: dependency: "direct main" description: name: logger - sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4 + sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" logging: dependency: transitive description: @@ -841,10 +841,10 @@ packages: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" mockito: dependency: "direct dev" description: @@ -881,10 +881,10 @@ packages: dependency: transitive description: name: octo_image - sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d" + sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" open_file_plus: dependency: "direct main" description: @@ -914,18 +914,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e + sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" path: dependency: "direct main" description: @@ -946,18 +946,18 @@ packages: dependency: "direct main" description: name: path_provider - sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" url: "https://pub.dev" source: hosted - version: "2.2.6" + version: "2.2.10" path_provider_foundation: dependency: transitive description: @@ -986,10 +986,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" percent_indicator: dependency: "direct main" description: @@ -1098,10 +1098,10 @@ packages: dependency: transitive description: name: quiver - sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" rxdart: dependency: transitive description: @@ -1130,58 +1130,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.2" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577" + sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.2" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7" + sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.2" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shelf: dependency: transitive description: @@ -1202,10 +1202,10 @@ packages: dependency: transitive description: name: shelf_static - sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" shelf_web_socket: dependency: transitive description: @@ -1247,10 +1247,10 @@ packages: dependency: transitive description: name: source_map_stack_trace - sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" source_maps: dependency: transitive description: @@ -1303,10 +1303,10 @@ packages: dependency: transitive description: name: sqlite3 - sha256: "6d17989c0b06a5870b2190d391925186f944cb943e5262d0d3f778fcfca3bc6e" + sha256: "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.6" stack_trace: dependency: transitive description: @@ -1423,10 +1423,10 @@ packages: dependency: "direct main" description: name: ua_client_hints - sha256: ee3da4e4b6ed211fe54deaa19832dd25613f11fc2951912d4e62a093da03fbbb + sha256: dfea54a1b4d259c057d0f33f198094cf4e09e1a21d347baadbe6dbd3d820c0d4 url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.4.0" uni_ui: dependency: "direct main" description: @@ -1470,34 +1470,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf + sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79 url: "https://pub.dev" source: hosted - version: "6.3.3" + version: "6.3.9" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: @@ -1510,26 +1510,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" uuid: dependency: transitive description: name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.1" vector_graphics: dependency: transitive description: @@ -1590,18 +1590,18 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.0" webkit_inspection_protocol: dependency: transitive description: @@ -1614,10 +1614,10 @@ packages: dependency: transitive description: name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 + sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.5.4" wkt_parser: dependency: transitive description: @@ -1638,10 +1638,10 @@ packages: dependency: transitive description: name: x509 - sha256: "3262dc9a7d45b0876f886c01bfc7d5e765704f7dfd31f8cf5224fc875c17a6c6" + sha256: cbd1a63846884afd273cda247b0365284c8d85a365ca98e110413f93d105b935 url: "https://pub.dev" source: hosted - version: "0.2.4+2" + version: "0.2.4+3" xdg_directories: dependency: transitive description: From ded05b5ac739109eb82d1da36e3e6c4ccfbf69c1 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Sun, 6 Oct 2024 00:00:41 +0100 Subject: [PATCH 04/35] removing old api and filtering classes --- .../schedule_fetcher_new_api.dart | 47 +++++++++---------- .../providers/lazy/lecture_provider.dart | 5 +- 2 files changed, 23 insertions(+), 29 deletions(-) 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 9ab5b041f..8e5fc78a2 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 @@ -17,40 +17,35 @@ class ScheduleFetcherNewApi extends ScheduleFetcher { /// Fetches the user's lectures from the schedule's HTML page. @override Future> getLectures(Session session) async { - final endpoints = getEndpoints(session); + final url = getEndpoints(session)[0]; final lectiveYear = getLectiveYear(DateTime.now()); - final futures = endpoints.map((baseUrl) async { - final scheduleResponse = await NetworkRouter.getWithCookies( - baseUrl, - { - 'pv_num_unico': session.username, - 'pv_ano_lectivo': lectiveYear.toString(), - 'pv_periodos': '1', - }, - session, - ); + final scheduleResponse = await NetworkRouter.getWithCookies( + url, + { + 'pv_num_unico': session.username, + 'pv_ano_lectivo': lectiveYear.toString(), + 'pv_periodos': '1', + }, + session, + ); - final scheduleApiUrl = getScheduleApiUrlFromHtml(scheduleResponse); + final scheduleApiUrl = getScheduleApiUrlFromHtml(scheduleResponse); - if (scheduleApiUrl == null) { - return []; - } + if (scheduleApiUrl == null) { + return []; + } - final scheduleApiResponse = await NetworkRouter.getWithCookies( - scheduleApiUrl, - {}, - session, - ); + final scheduleApiResponse = await NetworkRouter.getWithCookies( + scheduleApiUrl, + {}, + session, + ); - return getLecturesFromApiResponse(scheduleApiResponse); - }); - - final results = await Future.wait(futures); + final results = getLecturesFromApiResponse(scheduleApiResponse); // TODO(limwa,#1281): Check if handling of lectures in both faculties is correct. - final lectures = results.expand((element) => element).toList() - ..sort((l1, l2) => l1.compare(l2)); + final lectures = results..sort((l1, l2) => l1.compare(l2)); return lectures; } 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 9f0f178e5..662473f48 100644 --- a/packages/uni_app/lib/model/providers/lazy/lecture_provider.dart +++ b/packages/uni_app/lib/model/providers/lazy/lecture_provider.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher.dart'; -import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher_api.dart'; 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'; @@ -44,8 +43,8 @@ class LectureProvider extends StateProviderNotifier> { fetcher?.getLectures(session) ?? getLectures(session); Future> getLectures(Session session) { - return ScheduleFetcherApi().getLectures(session).catchError( - (e) => ScheduleFetcherNewApi().getLectures(session), + return ScheduleFetcherNewApi().getLectures(session).catchError( + (e) => [], ); } } From 6f38eb1e65c19574885ae224fe73b75368e77697 Mon Sep 17 00:00:00 2001 From: thePeras Date: Sun, 6 Oct 2024 00:33:34 +0100 Subject: [PATCH 05/35] Add vertical scroll at lectures tab --- .../uni_app/lib/view/schedule/schedule.dart | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/uni_app/lib/view/schedule/schedule.dart b/packages/uni_app/lib/view/schedule/schedule.dart index 878d1e9b7..452674a37 100644 --- a/packages/uni_app/lib/view/schedule/schedule.dart +++ b/packages/uni_app/lib/view/schedule/schedule.dart @@ -133,24 +133,26 @@ class SchedulePageViewState extends State ) { return Container( key: Key('schedule-page-day-column-$day'), - child: Column( - mainAxisSize: MainAxisSize.min, - children: lectures - .map( - // TODO(thePeras): ScheduleSlot should receive a lecture - // instead of all these parameters. - (lecture) => ScheduleSlot( - subject: lecture.subject, - typeClass: lecture.typeClass, - rooms: lecture.room, - begin: lecture.startTime, - end: lecture.endTime, - occurrId: lecture.occurrId, - teacher: lecture.teacher, - classNumber: lecture.classNumber, - ), - ) - .toList(), + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + children: lectures + .map( + // TODO(thePeras): ScheduleSlot should receive a lecture + // instead of all these parameters. + (lecture) => ScheduleSlot( + subject: lecture.subject, + typeClass: lecture.typeClass, + rooms: lecture.room, + begin: lecture.startTime, + end: lecture.endTime, + occurrId: lecture.occurrId, + teacher: lecture.teacher, + classNumber: lecture.classNumber, + ), + ) + .toList(), + ), ), ); } From 44d77e073d83389f81f251f2e55ffbde10dbb0a9 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Sun, 6 Oct 2024 00:39:38 +0100 Subject: [PATCH 06/35] upgrading flutter to 3.24.3 --- .../background_workers/notifications.dart | 3 +- .../providers/state_provider_notifier.dart | 7 +- .../general/widgets/refresh_state.dart | 6 +- .../view/common_widgets/toast_message.dart | 5 +- packages/uni_app/lib/view/lazy_consumer.dart | 6 +- packages/uni_app/pubspec.lock | 325 ++++++++++-------- packages/uni_app/pubspec.yaml | 4 +- 7 files changed, 195 insertions(+), 161 deletions(-) diff --git a/packages/uni_app/lib/controller/background_workers/notifications.dart b/packages/uni_app/lib/controller/background_workers/notifications.dart index 5b8fa88c1..7d1a7a218 100644 --- a/packages/uni_app/lib/controller/background_workers/notifications.dart +++ b/packages/uni_app/lib/controller/background_workers/notifications.dart @@ -102,7 +102,8 @@ class NotificationManager { _localNotificationsPlugin.resolvePlatformSpecificImplementation< AndroidFlutterLocalNotificationsPlugin>()!; try { - final permissionGranted = await androidPlugin.requestPermission(); + final permissionGranted = + await androidPlugin.requestNotificationsPermission(); if (permissionGranted != true) { return; } 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 ff0469e95..4043391d6 100644 --- a/packages/uni_app/lib/model/providers/state_provider_notifier.dart +++ b/packages/uni_app/lib/model/providers/state_provider_notifier.dart @@ -168,8 +168,11 @@ abstract class StateProviderNotifier extends ChangeNotifier { if (!context.mounted || _state != null) { return; } - await _loadFromStorage(context) - .then((value) => _loadFromRemoteFromContext(context)); + await _loadFromStorage(context).then((value) { + if (context.mounted) { + _loadFromRemoteFromContext(context); + } + }); }, timeout: _lockTimeout, ); diff --git a/packages/uni_app/lib/view/common_widgets/pages_layouts/general/widgets/refresh_state.dart b/packages/uni_app/lib/view/common_widgets/pages_layouts/general/widgets/refresh_state.dart index 95ca95af8..0f20e1849 100644 --- a/packages/uni_app/lib/view/common_widgets/pages_layouts/general/widgets/refresh_state.dart +++ b/packages/uni_app/lib/view/common_widgets/pages_layouts/general/widgets/refresh_state.dart @@ -33,7 +33,11 @@ class RefreshState extends StatelessWidget { ProfileProvider.fetchOrGetCachedProfilePicture( Provider.of(context, listen: false).state!, forceRetrieval: true, - ).then((value) => onRefresh(context)), + ).then((value) { + if (context.mounted) { + onRefresh(context); + } + }), child: ConstrainedBox( constraints: BoxConstraints( minHeight: viewportConstraints.maxHeight, diff --git a/packages/uni_app/lib/view/common_widgets/toast_message.dart b/packages/uni_app/lib/view/common_widgets/toast_message.dart index ca8271bf8..62412e29c 100644 --- a/packages/uni_app/lib/view/common_widgets/toast_message.dart +++ b/packages/uni_app/lib/view/common_widgets/toast_message.dart @@ -79,8 +79,11 @@ class ToastMessage { context: context, builder: (toastContext) { Future.delayed(const Duration(milliseconds: 2000), () { - Navigator.of(toastContext).pop(); + if (toastContext.mounted) { + Navigator.of(toastContext).pop(); + } }); + return mToast; }, ); diff --git a/packages/uni_app/lib/view/lazy_consumer.dart b/packages/uni_app/lib/view/lazy_consumer.dart index ba0a910fe..49e9f39b6 100644 --- a/packages/uni_app/lib/view/lazy_consumer.dart +++ b/packages/uni_app/lib/view/lazy_consumer.dart @@ -56,8 +56,10 @@ class LazyConsumer, T2> ? Provider.of(context, listen: false) .ensureInitialized(context) .then((_) async { - await Provider.of(context, listen: false) - .ensureInitialized(context); + if (context.mounted) { + await Provider.of(context, listen: false) + .ensureInitialized(context); + } }) : Future(() {}); } catch (err, st) { diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index 5a4c5d044..e0f1d9e83 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -5,10 +5,15 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" add_2_calendar: dependency: "direct main" description: @@ -21,10 +26,10 @@ packages: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.7.0" analyzer_plugin: dependency: transitive description: @@ -69,10 +74,10 @@ packages: dependency: transitive description: name: asn1lib - sha256: "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda" + sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70" url: "https://pub.dev" source: hosted - version: "1.5.3" + version: "1.5.5" async: dependency: transitive description: @@ -93,10 +98,10 @@ packages: dependency: transitive description: name: battery_plus_platform_interface - sha256: "942707f90e2f7481dcb178df02e22a9c6971b3562b848d6a1b8c7cff9f1a1fec" + sha256: e8342c0f32de4b1dfd0223114b6785e48e579bfc398da9471c9179b907fa4910 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" boolean_selector: dependency: transitive description: @@ -141,18 +146,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.13" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.2" built_collection: dependency: transitive description: @@ -173,26 +178,26 @@ packages: dependency: "direct main" description: name: cached_network_image - sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" + sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" + sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.1" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - sha256: "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7" + sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" characters: dependency: transitive description: @@ -277,18 +282,18 @@ packages: dependency: transitive description: name: coverage - sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e" + sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5 url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.2" crypto: dependency: "direct main" description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" crypto_keys: dependency: transitive description: @@ -317,42 +322,42 @@ packages: dependency: "direct main" description: name: currency_text_input_formatter - sha256: d2eed8c7d40520729ac38252368954aba430a7ee510e5d5357e45cde1f6417a6 + sha256: a2a8ea078b211054539f9b391e87bdfc0e650e9d39b9bef4a9767b62d525b5a4 url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.5" custom_lint: dependency: "direct dev" description: name: custom_lint - sha256: "7c0aec12df22f9082146c354692056677f1e70bc43471644d1fdb36c6fdda799" + sha256: "6e1ec47427ca968f22bce734d00028ae7084361999b41673291138945c5baca0" url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" custom_lint_builder: dependency: transitive description: name: custom_lint_builder - sha256: d7dc41e709dde223806660268678be7993559e523eb3164e2a1425fd6f7615a9 + sha256: ba2f90fff4eff71d202d097eb14b14f87087eaaef742e956208c0eb9d3a40a21 url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" custom_lint_core: dependency: transitive description: name: custom_lint_core - sha256: a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6 + sha256: "4ddbbdaa774265de44c97054dcec058a83d9081d071785ece601e348c18c267d" url: "https://pub.dev" source: hosted - version: "0.6.3" + version: "0.6.5" dart_style: dependency: transitive description: name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.7" dbus: dependency: transitive description: @@ -365,10 +370,10 @@ packages: dependency: "direct main" description: name: diacritic - sha256: "96db5db6149cbe4aa3cfcbfd170aca9b7648639be7e48025f9d458517f807fe4" + sha256: "12981945ec38931748836cd76f2b38773118d0baef3c68404bdfde9566147876" url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.1.6" email_validator: dependency: "direct main" description: @@ -405,10 +410,10 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" figma_squircle: dependency: transitive description: @@ -442,10 +447,10 @@ packages: dependency: "direct main" description: name: flutter_cache_manager - sha256: "395d6b7831f21f3b989ebedbb785545932adb9afe2622c1ffacf7f4b53a7e544" + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" url: "https://pub.dev" source: hosted - version: "3.3.2" + version: "3.4.1" flutter_dotenv: dependency: "direct main" description: @@ -466,18 +471,18 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "401643a6ea9d8451365f2ec11145335bf130560cfde367bdf8f0be6d60f89479" + sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71" url: "https://pub.dev" source: hosted - version: "15.1.3" + version: "17.2.3" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux - sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03" + sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af url: "https://pub.dev" source: hosted - version: "4.0.0+1" + version: "4.0.1" flutter_local_notifications_platform_interface: dependency: transitive description: @@ -593,18 +598,18 @@ packages: dependency: transitive description: name: freezed_annotation - sha256: f54946fdb1fa7b01f780841937b1a80783a20b393485f3f6cdf336fd6f4705f2 + sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.4" frontend_server_client: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" glob: dependency: transitive description: @@ -617,10 +622,10 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" gtk: dependency: transitive description: @@ -649,10 +654,10 @@ packages: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -713,18 +718,18 @@ packages: dependency: "direct main" description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" json_serializable: dependency: "direct main" description: name: json_serializable - sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 + sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b url: "https://pub.dev" source: hosted - version: "6.7.1" + version: "6.8.0" latlong2: dependency: "direct main" description: @@ -737,18 +742,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -777,10 +782,10 @@ packages: dependency: "direct main" description: name: logger - sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4 + sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" logging: dependency: transitive description: @@ -789,6 +794,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" markdown: dependency: transitive description: @@ -809,10 +822,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" material_design_icons_flutter: dependency: "direct main" description: @@ -825,10 +838,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mgrs_dart: dependency: transitive description: @@ -841,10 +854,10 @@ packages: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "2.0.0" mockito: dependency: "direct dev" description: @@ -881,10 +894,10 @@ packages: dependency: transitive description: name: octo_image - sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d" + sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" open_file_plus: dependency: "direct main" description: @@ -914,18 +927,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e + sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" path: dependency: "direct main" description: @@ -946,18 +959,18 @@ packages: dependency: "direct main" description: name: path_provider - sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a + sha256: f7544c346a0742aee1450f9e5c0f5269d7c602b9c95fdbcd9fb8f5b1df13b1cc url: "https://pub.dev" source: hosted - version: "2.2.6" + version: "2.2.11" path_provider_foundation: dependency: transitive description: @@ -986,10 +999,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" percent_indicator: dependency: "direct main" description: @@ -1098,90 +1111,90 @@ packages: dependency: transitive description: name: quiver - sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" rxdart: dependency: transitive description: name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" url: "https://pub.dev" source: hosted - version: "0.27.7" + version: "0.28.0" sentry: dependency: transitive description: name: sentry - sha256: "57514bc72d441ffdc463f498d6886aa586a2494fa467a1eb9d649c28010d7ee3" + sha256: e572d33a3ff1d69549f33ee828a8ff514047d43ca8eea4ab093d72461205aa3e url: "https://pub.dev" source: hosted - version: "7.20.2" + version: "7.20.1" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "9723d58470ca43a360681ddd26abb71ca7b815f706bc8d3747afd054cf639ded" + sha256: ac8cf6bb849f3560353ae33672e17b2713809a4e8de0d3cf372e9e9c42013757 url: "https://pub.dev" source: hosted - version: "7.20.2" + version: "7.20.1" shared_preferences: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.2" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577" + sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.3" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shelf: dependency: transitive description: @@ -1202,18 +1215,18 @@ packages: dependency: transitive description: name: shelf_static - sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" shimmer: dependency: "direct main" description: @@ -1247,10 +1260,10 @@ packages: dependency: transitive description: name: source_map_stack_trace - sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" source_maps: dependency: transitive description: @@ -1279,34 +1292,34 @@ packages: dependency: "direct main" description: name: sqflite - sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d + sha256: ff5a2436ef8ebdfda748fbfe957f9981524cb5ff11e7bafa8c42771840e8a788 url: "https://pub.dev" source: hosted - version: "2.3.3+1" + version: "2.3.3+2" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" + sha256: "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4" url: "https://pub.dev" source: hosted - version: "2.5.4" + version: "2.5.4+4" sqflite_common_ffi: dependency: "direct dev" description: name: sqflite_common_ffi - sha256: "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5" + sha256: a6057d4c87e9260ba1ec436ebac24760a110589b9c0a859e128842eb69a7ef04 url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.3.3+1" sqlite3: dependency: transitive description: name: sqlite3 - sha256: "6d17989c0b06a5870b2190d391925186f944cb943e5262d0d3f778fcfca3bc6e" + sha256: "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.6" stack_trace: dependency: transitive description: @@ -1343,10 +1356,10 @@ packages: dependency: "direct main" description: name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.1.0+1" + version: "3.3.0+3" term_glyph: dependency: transitive description: @@ -1359,26 +1372,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" + sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" url: "https://pub.dev" source: hosted - version: "1.25.2" + version: "1.25.7" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" test_core: dependency: transitive description: name: test_core - sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" + sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.4" timelines: dependency: "direct main" description: @@ -1423,10 +1436,10 @@ packages: dependency: "direct main" description: name: ua_client_hints - sha256: ee3da4e4b6ed211fe54deaa19832dd25613f11fc2951912d4e62a093da03fbbb + sha256: dfea54a1b4d259c057d0f33f198094cf4e09e1a21d347baadbe6dbd3d820c0d4 url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.4.0" uni_ui: dependency: "direct main" description: @@ -1470,34 +1483,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf + sha256: "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2" url: "https://pub.dev" source: hosted - version: "6.3.3" + version: "6.3.12" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: @@ -1510,26 +1523,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" uuid: dependency: transitive description: name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.1" vector_graphics: dependency: transitive description: @@ -1574,10 +1587,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" watcher: dependency: transitive description: @@ -1590,18 +1603,26 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "3.0.1" webkit_inspection_protocol: dependency: transitive description: @@ -1614,10 +1635,10 @@ packages: dependency: transitive description: name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 + sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec" url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.5.5" wkt_parser: dependency: transitive description: @@ -1638,18 +1659,18 @@ packages: dependency: transitive description: name: x509 - sha256: "3262dc9a7d45b0876f886c01bfc7d5e765704f7dfd31f8cf5224fc875c17a6c6" + sha256: cbd1a63846884afd273cda247b0365284c8d85a365ca98e110413f93d105b935 url: "https://pub.dev" source: hosted - version: "0.2.4+2" + version: "0.2.4+3" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.1.0" xml: dependency: transitive description: @@ -1667,5 +1688,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.3" diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index b1ac16565..414cabee5 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -11,7 +11,7 @@ version: 1.10.0-beta.14+314 environment: sdk: ">=3.4.0 <4.0.0" - flutter: 3.22.0 + flutter: 3.24.3 dependencies: add_2_calendar: ^3.0.1 @@ -31,7 +31,7 @@ dependencies: sdk: flutter flutter_cache_manager: ^3.3.1 flutter_dotenv: ^5.0.2 - flutter_local_notifications: ^15.1.0+1 + flutter_local_notifications: ^17.2.3 flutter_localizations: sdk: flutter flutter_map: ^5.0.0 From 0a87ac7a4183d58efd08cef109d31ca2d929380a Mon Sep 17 00:00:00 2001 From: limwa Date: Sun, 6 Oct 2024 00:09:17 +0000 Subject: [PATCH 07/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 3a7dd4f5f..8a7b74c84 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.14+314 +1.10.0-beta.15+315 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 2d97b3529..359e84784 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.14+314 +version: 1.10.0-beta.15+315 environment: sdk: ">=3.4.0 <4.0.0" From adc33ba8b172fa259cd7d260230e422dcdc6bfee Mon Sep 17 00:00:00 2001 From: limwa Date: Sun, 6 Oct 2024 00:18:46 +0000 Subject: [PATCH 08/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 8a7b74c84..fa4c08179 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.15+315 +1.10.0-beta.16+316 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 359e84784..71bbd925e 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.15+315 +version: 1.10.0-beta.16+316 environment: sdk: ">=3.4.0 <4.0.0" From 1f8be59a97165804e26d8f2cb9ef8ccfb10e7dee Mon Sep 17 00:00:00 2001 From: niaefeup-admin Date: Sun, 6 Oct 2024 12:59:21 +0000 Subject: [PATCH 09/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index fa4c08179..9bdaf190c 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.16+316 +1.10.0-beta.17+318 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 71bbd925e..220fb7723 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.16+316 +version: 1.10.0-beta.17+318 environment: sdk: ">=3.4.0 <4.0.0" From 9fdcb4f4ed66ca194f00f3f52dd6d5d25ebd71fd Mon Sep 17 00:00:00 2001 From: DGoiana Date: Sun, 29 Sep 2024 23:24:34 +0100 Subject: [PATCH 10/35] fixing ios build to v1.9.3 --- packages/uni_app/pubspec.lock | 60 +++++++++++++------ packages/uni_app/pubspec.yaml | 2 +- .../windows/flutter/generated_plugins.cmake | 2 +- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index e0f1d9e83..cecb4e53f 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -330,18 +330,18 @@ packages: dependency: "direct dev" description: name: custom_lint - sha256: "6e1ec47427ca968f22bce734d00028ae7084361999b41673291138945c5baca0" + sha256: "832fcdc676171205201c9cffafd6b5add19393962f6598af8472b48b413026e6" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.6.8" custom_lint_builder: dependency: transitive description: name: custom_lint_builder - sha256: ba2f90fff4eff71d202d097eb14b14f87087eaaef742e956208c0eb9d3a40a21 + sha256: c3d82779026f91b8e00c9ac18934595cbc9b490094ea682052beeafdb2bd50ac url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.6.8" custom_lint_core: dependency: transitive description: @@ -426,10 +426,10 @@ packages: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" fixnum: dependency: transitive description: @@ -967,10 +967,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: f7544c346a0742aee1450f9e5c0f5269d7c602b9c95fdbcd9fb8f5b1df13b1cc + sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a url: "https://pub.dev" source: hosted - version: "2.2.11" + version: "2.2.12" path_provider_foundation: dependency: transitive description: @@ -1127,18 +1127,18 @@ packages: dependency: transitive description: name: sentry - sha256: e572d33a3ff1d69549f33ee828a8ff514047d43ca8eea4ab093d72461205aa3e + sha256: "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd" url: "https://pub.dev" source: hosted - version: "7.20.1" + version: "8.9.0" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: ac8cf6bb849f3560353ae33672e17b2713809a4e8de0d3cf372e9e9c42013757 + sha256: "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a" url: "https://pub.dev" source: hosted - version: "7.20.1" + version: "8.9.0" shared_preferences: dependency: "direct main" description: @@ -1292,18 +1292,26 @@ packages: dependency: "direct main" description: name: sqflite - sha256: ff5a2436ef8ebdfda748fbfe957f9981524cb5ff11e7bafa8c42771840e8a788 + sha256: "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3" url: "https://pub.dev" source: hosted - version: "2.3.3+2" + version: "2.4.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4" + sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490" url: "https://pub.dev" source: hosted - version: "2.5.4+4" + version: "2.5.4+5" sqflite_common_ffi: dependency: "direct dev" description: @@ -1312,6 +1320,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.3+1" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027" + url: "https://pub.dev" + source: hosted + version: "2.4.1-1" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sqlite3: dependency: transitive description: @@ -1475,10 +1499,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_android: dependency: transitive description: diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 414cabee5..35c7d25c0 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -59,7 +59,7 @@ dependencies: percent_indicator: ^4.2.2 plausible_analytics: ^0.3.0 provider: ^6.1.1 - sentry_flutter: ^7.14.0 + sentry_flutter: ^8.9.0 shared_preferences: ^2.2.2 shimmer: ^3.0.0 sqflite: ^2.0.3 diff --git a/packages/uni_app/windows/flutter/generated_plugins.cmake b/packages/uni_app/windows/flutter/generated_plugins.cmake index a9445985d..5261a5887 100644 --- a/packages/uni_app/windows/flutter/generated_plugins.cmake +++ b/packages/uni_app/windows/flutter/generated_plugins.cmake @@ -7,11 +7,11 @@ list(APPEND FLUTTER_PLUGIN_LIST battery_plus connectivity_plus flutter_secure_storage_windows - sentry_flutter url_launcher_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + sentry_flutter ) set(PLUGIN_BUNDLED_LIBRARIES) From 14b47602b736a48f04abfaa7871a513173af1aa8 Mon Sep 17 00:00:00 2001 From: limwa Date: Sun, 6 Oct 2024 00:09:17 +0000 Subject: [PATCH 11/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 3a7dd4f5f..8a7b74c84 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.14+314 +1.10.0-beta.15+315 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 35c7d25c0..bffe01c8d 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.14+314 +version: 1.10.0-beta.15+315 environment: sdk: ">=3.4.0 <4.0.0" From 0ddbe11d054ef8cbbed432b3bdcc1dba9bdd180f Mon Sep 17 00:00:00 2001 From: thePeras Date: Sun, 6 Oct 2024 00:33:34 +0100 Subject: [PATCH 12/35] Add vertical scroll at lectures tab --- .../uni_app/lib/view/schedule/schedule.dart | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/uni_app/lib/view/schedule/schedule.dart b/packages/uni_app/lib/view/schedule/schedule.dart index 878d1e9b7..452674a37 100644 --- a/packages/uni_app/lib/view/schedule/schedule.dart +++ b/packages/uni_app/lib/view/schedule/schedule.dart @@ -133,24 +133,26 @@ class SchedulePageViewState extends State ) { return Container( key: Key('schedule-page-day-column-$day'), - child: Column( - mainAxisSize: MainAxisSize.min, - children: lectures - .map( - // TODO(thePeras): ScheduleSlot should receive a lecture - // instead of all these parameters. - (lecture) => ScheduleSlot( - subject: lecture.subject, - typeClass: lecture.typeClass, - rooms: lecture.room, - begin: lecture.startTime, - end: lecture.endTime, - occurrId: lecture.occurrId, - teacher: lecture.teacher, - classNumber: lecture.classNumber, - ), - ) - .toList(), + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + children: lectures + .map( + // TODO(thePeras): ScheduleSlot should receive a lecture + // instead of all these parameters. + (lecture) => ScheduleSlot( + subject: lecture.subject, + typeClass: lecture.typeClass, + rooms: lecture.room, + begin: lecture.startTime, + end: lecture.endTime, + occurrId: lecture.occurrId, + teacher: lecture.teacher, + classNumber: lecture.classNumber, + ), + ) + .toList(), + ), ), ); } From a7ded1635b5b3edbc2f767c6f3a0247f103cb561 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Sun, 6 Oct 2024 00:00:41 +0100 Subject: [PATCH 13/35] removing old api and filtering classes --- .../schedule_fetcher_new_api.dart | 47 +++++++++---------- .../providers/lazy/lecture_provider.dart | 5 +- 2 files changed, 23 insertions(+), 29 deletions(-) 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 9ab5b041f..8e5fc78a2 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 @@ -17,40 +17,35 @@ class ScheduleFetcherNewApi extends ScheduleFetcher { /// Fetches the user's lectures from the schedule's HTML page. @override Future> getLectures(Session session) async { - final endpoints = getEndpoints(session); + final url = getEndpoints(session)[0]; final lectiveYear = getLectiveYear(DateTime.now()); - final futures = endpoints.map((baseUrl) async { - final scheduleResponse = await NetworkRouter.getWithCookies( - baseUrl, - { - 'pv_num_unico': session.username, - 'pv_ano_lectivo': lectiveYear.toString(), - 'pv_periodos': '1', - }, - session, - ); + final scheduleResponse = await NetworkRouter.getWithCookies( + url, + { + 'pv_num_unico': session.username, + 'pv_ano_lectivo': lectiveYear.toString(), + 'pv_periodos': '1', + }, + session, + ); - final scheduleApiUrl = getScheduleApiUrlFromHtml(scheduleResponse); + final scheduleApiUrl = getScheduleApiUrlFromHtml(scheduleResponse); - if (scheduleApiUrl == null) { - return []; - } + if (scheduleApiUrl == null) { + return []; + } - final scheduleApiResponse = await NetworkRouter.getWithCookies( - scheduleApiUrl, - {}, - session, - ); + final scheduleApiResponse = await NetworkRouter.getWithCookies( + scheduleApiUrl, + {}, + session, + ); - return getLecturesFromApiResponse(scheduleApiResponse); - }); - - final results = await Future.wait(futures); + final results = getLecturesFromApiResponse(scheduleApiResponse); // TODO(limwa,#1281): Check if handling of lectures in both faculties is correct. - final lectures = results.expand((element) => element).toList() - ..sort((l1, l2) => l1.compare(l2)); + final lectures = results..sort((l1, l2) => l1.compare(l2)); return lectures; } 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 9f0f178e5..662473f48 100644 --- a/packages/uni_app/lib/model/providers/lazy/lecture_provider.dart +++ b/packages/uni_app/lib/model/providers/lazy/lecture_provider.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher.dart'; -import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher_api.dart'; 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'; @@ -44,8 +43,8 @@ class LectureProvider extends StateProviderNotifier> { fetcher?.getLectures(session) ?? getLectures(session); Future> getLectures(Session session) { - return ScheduleFetcherApi().getLectures(session).catchError( - (e) => ScheduleFetcherNewApi().getLectures(session), + return ScheduleFetcherNewApi().getLectures(session).catchError( + (e) => [], ); } } From e28e7ccedd7769a60dc0dd15fecf09fc95f58211 Mon Sep 17 00:00:00 2001 From: limwa Date: Sun, 6 Oct 2024 00:18:46 +0000 Subject: [PATCH 14/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 8a7b74c84..fa4c08179 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.15+315 +1.10.0-beta.16+316 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index bffe01c8d..2b302f7cc 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.15+315 +version: 1.10.0-beta.16+316 environment: sdk: ">=3.4.0 <4.0.0" From fa45fd2efe0b980ff58c3c1ad1bb0e3723b11166 Mon Sep 17 00:00:00 2001 From: niaefeup-admin Date: Sun, 6 Oct 2024 12:59:21 +0000 Subject: [PATCH 15/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index fa4c08179..9bdaf190c 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.16+316 +1.10.0-beta.17+318 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 2b302f7cc..b3236b498 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.16+316 +version: 1.10.0-beta.17+318 environment: sdk: ">=3.4.0 <4.0.0" From 04b656b0ac3f978461b48d84f16f84ffffdc0969 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Tue, 8 Oct 2024 18:47:47 +0100 Subject: [PATCH 16/35] bumping custom_lint --- packages/uni_app/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index b3236b498..81768d1b2 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -74,7 +74,7 @@ dependencies: dev_dependencies: build_runner: ^2.4.8 - custom_lint: ^0.6.4 + custom_lint: ^0.6.8 flutter_launcher_icons: ^0.13.1 flutter_test: sdk: flutter From 9db62a905f23e22195cdd06d2b1c6cf79e83fef6 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Wed, 9 Oct 2024 14:39:02 +0100 Subject: [PATCH 17/35] bumping leancode_lint --- packages/uni_app/pubspec.lock | 4 ++-- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index cecb4e53f..db6103892 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -766,10 +766,10 @@ packages: dependency: "direct dev" description: name: leancode_lint - sha256: "85b7c09c806400083faa37304c701fd1bd5dbcb826882438dd50f0e465f30fd8" + sha256: "6e6500dac54ea3d0ad01f6e851a09b815f3d75f7e87bb9ab589d1fd19dd826f1" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.1.0" lists: dependency: transitive description: diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 81768d1b2..4f5589bf7 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -78,7 +78,7 @@ dev_dependencies: flutter_launcher_icons: ^0.13.1 flutter_test: sdk: flutter - leancode_lint: ^13.0.0 + leancode_lint: ^14.0.0 mockito: 5.4.4 sqflite_common_ffi: ^2.3.0+4 test: any From 1108223e357a80b58beb46c1eaba354f13de59cd Mon Sep 17 00:00:00 2001 From: DGoiana Date: Wed, 9 Oct 2024 15:07:02 +0100 Subject: [PATCH 18/35] resolving new linter issues --- .../parsers/parser_restaurants.dart | 10 ++++----- .../uni_app/lib/model/entities/location.dart | 21 ++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/packages/uni_app/lib/controller/parsers/parser_restaurants.dart b/packages/uni_app/lib/controller/parsers/parser_restaurants.dart index 7ca640558..8a4dc1462 100644 --- a/packages/uni_app/lib/controller/parsers/parser_restaurants.dart +++ b/packages/uni_app/lib/controller/parsers/parser_restaurants.dart @@ -8,8 +8,6 @@ import 'package:uni/model/entities/meal.dart'; import 'package:uni/model/entities/restaurant.dart'; import 'package:uni/model/utils/day_of_week.dart'; -// ignore_for_file: avoid_dynamic_calls - /// Reads restaurants's menu from /feup/pt/CANTINA.EMENTASHOW List getRestaurantsFromHtml(Response response) { final document = parse(response.body); @@ -93,13 +91,15 @@ Restaurant getRestaurantFromGSheets( response.body.indexOf('(') + 1, response.body.lastIndexOf(')'), ); - final parsedJson = jsonDecode(jsonString); + final parsedJson = + jsonDecode(jsonString) as Map>; final mealsList = []; final format = DateFormat('d/M/y'); - for (final row in parsedJson['table']['rows'] as List) { - final cellList = row['c']; + for (final row + in parsedJson['table']?['rows'] as List>) { + final cellList = row['c'] as List>; if ((cellList[1]['v'] == 'Almoço' && isDinner) || (cellList[1]['v'] != 'Almoço' && !isDinner)) { continue; diff --git a/packages/uni_app/lib/model/entities/location.dart b/packages/uni_app/lib/model/entities/location.dart index bb716e178..12dc3bee8 100644 --- a/packages/uni_app/lib/model/entities/location.dart +++ b/packages/uni_app/lib/model/entities/location.dart @@ -60,7 +60,6 @@ abstract class Location { Map toMap({int? groupId}); - // ignore_for_file: argument_type_not_assignable static Location fromJSON(Map json, int floor) { final args = json['args'] as Map; switch (json['type']) { @@ -69,23 +68,31 @@ abstract class Location { case 'VENDING_MACHINE': return VendingMachine(floor); case 'ROOM': - return RoomLocation(floor, args['room']); + return RoomLocation(floor, args['room'].toString()); case 'SPECIAL_ROOM': - return SpecialRoomLocation(floor, args['room'], args['name']); + return SpecialRoomLocation( + floor, + args['room'].toString(), + args['name'].toString(), + ); case 'ROOMS': - return RoomGroupLocation(floor, args['firstRoom'], args['lastRoom']); + return RoomGroupLocation( + floor, + args['firstRoom'].toString(), + args['lastRoom'].toString(), + ); case 'ATM': return Atm(floor); case 'PRINTER': return Printer(floor); case 'RESTAURANT': - return RestaurantLocation(floor, args['name']); + return RestaurantLocation(floor, args['name'].toString()); case 'STORE': - return StoreLocation(floor, args['name']); + return StoreLocation(floor, args['name'].toString()); case 'WC': return WcLocation(floor); default: - return UnknownLocation(floor, json['type']); + return UnknownLocation(floor, json['type'].toString()); } } } From b40045a7b29d5bc00d8814743b99a57610e5af78 Mon Sep 17 00:00:00 2001 From: thePeras Date: Wed, 9 Oct 2024 22:20:42 +0100 Subject: [PATCH 19/35] Save ucs page semester and school year dropdown values on preferences --- .../local_storage/preferences_controller.dart | 24 +++++++++++++++++++ .../lib/view/course_units/course_units.dart | 7 ++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/lib/controller/local_storage/preferences_controller.dart b/packages/uni_app/lib/controller/local_storage/preferences_controller.dart index 5c54bcef2..585f6d49c 100644 --- a/packages/uni_app/lib/controller/local_storage/preferences_controller.dart +++ b/packages/uni_app/lib/controller/local_storage/preferences_controller.dart @@ -39,6 +39,8 @@ class PreferencesController { static const String _favoriteRestaurants = 'favorite_restaurants'; static const String _filteredExamsTypes = 'filtered_exam_types'; static final List _defaultFilteredExamTypes = Exam.displayedTypes; + static const String _semesterValue = 'semester_value'; + static const String _schoolYearValue = 'school_year_value'; static final _statsToggleStreamController = StreamController.broadcast(); @@ -261,4 +263,26 @@ class PreferencesController { await prefs.setBool(_usageStatsToggleKey, value); _statsToggleStreamController.add(value); } + + static Future setSemesterValue(String? value) async { + await prefs.setString(_semesterValue, value ?? ''); + if (value == null) { + await prefs.remove(_semesterValue); + } + } + + static String? getSemesterValue() { + return prefs.getString(_semesterValue); + } + + static Future setSchoolYearValue(String? value) async { + await prefs.setString(_schoolYearValue, value ?? ''); + if (value == null) { + await prefs.remove(_schoolYearValue); + } + } + + static String? getSchoolYearValue() { + return prefs.getString(_schoolYearValue); + } } diff --git a/packages/uni_app/lib/view/course_units/course_units.dart b/packages/uni_app/lib/view/course_units/course_units.dart index 4ab198253..ee2bb0418 100644 --- a/packages/uni_app/lib/view/course_units/course_units.dart +++ b/packages/uni_app/lib/view/course_units/course_units.dart @@ -1,6 +1,7 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:uni/controller/local_storage/preferences_controller.dart'; import 'package:uni/generated/l10n.dart'; import 'package:uni/model/entities/course_units/course_unit.dart'; import 'package:uni/model/entities/profile.dart'; @@ -23,8 +24,8 @@ class CourseUnitsPageView extends StatefulWidget { class CourseUnitsPageViewState extends SecondaryPageViewState { - String? selectedSchoolYear; - String? selectedSemester; + String? selectedSchoolYear = PreferencesController.getSchoolYearValue(); + String? selectedSemester = PreferencesController.getSemesterValue(); @override Widget? getHeader(BuildContext context) { @@ -139,6 +140,7 @@ class CourseUnitsPageViewState icon: const Icon(Icons.arrow_drop_down), onChanged: (newValue) { setState(() => selectedSemester = newValue); + PreferencesController.setSemesterValue(newValue); }, items: availableSemesters.map>((value) { return DropdownMenuItem( @@ -156,6 +158,7 @@ class CourseUnitsPageViewState icon: const Icon(Icons.arrow_drop_down), onChanged: (newValue) { setState(() => selectedSchoolYear = newValue); + PreferencesController.setSchoolYearValue(newValue); }, items: availableYears.map>((value) { return DropdownMenuItem( From 20b2adea5429da1a5cb2e4203e5f0a6b0cf04c30 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Wed, 9 Oct 2024 22:21:43 +0100 Subject: [PATCH 20/35] adding in app updates --- packages/uni_app/lib/main.dart | 191 +++++++++++++++++---------------- packages/uni_app/pubspec.lock | 84 +++++++++++---- packages/uni_app/pubspec.yaml | 1 + 3 files changed, 165 insertions(+), 111 deletions(-) diff --git a/packages/uni_app/lib/main.dart b/packages/uni_app/lib/main.dart index 9956d5e50..410b31835 100644 --- a/packages/uni_app/lib/main.dart +++ b/packages/uni_app/lib/main.dart @@ -50,6 +50,7 @@ import 'package:uni/view/settings/settings.dart'; import 'package:uni/view/theme.dart'; import 'package:uni/view/theme_notifier.dart'; import 'package:uni/view/transports/transports.dart'; +import 'package:upgrader/upgrader.dart'; import 'package:workmanager/workmanager.dart'; SentryEvent? beforeSend(SentryEvent event) { @@ -217,100 +218,104 @@ class ApplicationState extends State { DeviceOrientation.portraitUp, ]); return Consumer2( - builder: (context, themeNotifier, localeNotifier, _) => MaterialApp( - title: 'uni', + builder: (context, themeNotifier, localeNotifier, _) => UpgradeAlert( navigatorKey: Application.navigatorKey, - theme: applicationLightTheme, - darkTheme: applicationDarkTheme, - themeMode: themeNotifier.getTheme(), - locale: localeNotifier.getLocale().localeCode, - localizationsDelegates: const [ - S.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ], - supportedLocales: S.delegate.supportedLocales, - initialRoute: widget.initialRoute, - navigatorObservers: navigatorObservers, - onGenerateRoute: (settings) { - final transitions = { - '/${NavigationItem.navLogin.route}': - PageTransition.makePageTransition( - page: const LoginPageView(), - settings: settings, - ), - '/${NavigationItem.navPersonalArea.route}': - PageTransition.makePageTransition( - page: const HomePageView(), - settings: settings, - ), - '/${NavigationItem.navSchedule.route}': - PageTransition.makePageTransition( - page: SchedulePage(), - settings: settings, - ), - '/${NavigationItem.navExams.route}': - PageTransition.makePageTransition( - page: const ExamsPageView(), - settings: settings, - ), - '/${NavigationItem.navStops.route}': - PageTransition.makePageTransition( - page: const BusStopNextArrivalsPage(), - settings: settings, - ), - '/${NavigationItem.navCourseUnits.route}': - PageTransition.makePageTransition( - page: const CourseUnitsPageView(), - settings: settings, - ), - '/${NavigationItem.navLocations.route}': - PageTransition.makePageTransition( - page: const LocationsPage(), - settings: settings, - ), - '/${NavigationItem.navRestaurants.route}': - PageTransition.makePageTransition( - page: const RestaurantPageView(), - settings: settings, - ), - '/${NavigationItem.navCalendar.route}': - PageTransition.makePageTransition( - page: const CalendarPageView(), - settings: settings, - ), - '/${NavigationItem.navLibrary.route}': - PageTransition.makePageTransition( - page: const LibraryPage(), - settings: settings, - ), - '/${NavigationItem.navFaculty.route}': - PageTransition.makePageTransition( - page: const FacultyPageView(), - settings: settings, - ), - '/${NavigationItem.navAcademicPath.route}': - PageTransition.makePageTransition( - page: const AcademicPathPageView(), - settings: settings, - ), - '/${NavigationItem.navTransports.route}': - PageTransition.makePageTransition( - page: const TransportsPageView(), - settings: settings, - ), - '/${NavigationItem.navProfile.route}': - MaterialPageRoute( - builder: (__) => const ProfilePageView(), - ), - '/${NavigationItem.navSettings.route}': - MaterialPageRoute( - builder: (_) => const SettingsPage(), - ), - }; - return transitions[settings.name]; - }, + showIgnore: false, + child: MaterialApp( + title: 'uni', + navigatorKey: Application.navigatorKey, + theme: applicationLightTheme, + darkTheme: applicationDarkTheme, + themeMode: themeNotifier.getTheme(), + locale: localeNotifier.getLocale().localeCode, + localizationsDelegates: const [ + S.delegate, + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + supportedLocales: S.delegate.supportedLocales, + initialRoute: widget.initialRoute, + navigatorObservers: navigatorObservers, + onGenerateRoute: (settings) { + final transitions = { + '/${NavigationItem.navLogin.route}': + PageTransition.makePageTransition( + page: const LoginPageView(), + settings: settings, + ), + '/${NavigationItem.navPersonalArea.route}': + PageTransition.makePageTransition( + page: const HomePageView(), + settings: settings, + ), + '/${NavigationItem.navSchedule.route}': + PageTransition.makePageTransition( + page: SchedulePage(), + settings: settings, + ), + '/${NavigationItem.navExams.route}': + PageTransition.makePageTransition( + page: const ExamsPageView(), + settings: settings, + ), + '/${NavigationItem.navStops.route}': + PageTransition.makePageTransition( + page: const BusStopNextArrivalsPage(), + settings: settings, + ), + '/${NavigationItem.navCourseUnits.route}': + PageTransition.makePageTransition( + page: const CourseUnitsPageView(), + settings: settings, + ), + '/${NavigationItem.navLocations.route}': + PageTransition.makePageTransition( + page: const LocationsPage(), + settings: settings, + ), + '/${NavigationItem.navRestaurants.route}': + PageTransition.makePageTransition( + page: const RestaurantPageView(), + settings: settings, + ), + '/${NavigationItem.navCalendar.route}': + PageTransition.makePageTransition( + page: const CalendarPageView(), + settings: settings, + ), + '/${NavigationItem.navLibrary.route}': + PageTransition.makePageTransition( + page: const LibraryPage(), + settings: settings, + ), + '/${NavigationItem.navFaculty.route}': + PageTransition.makePageTransition( + page: const FacultyPageView(), + settings: settings, + ), + '/${NavigationItem.navAcademicPath.route}': + PageTransition.makePageTransition( + page: const AcademicPathPageView(), + settings: settings, + ), + '/${NavigationItem.navTransports.route}': + PageTransition.makePageTransition( + page: const TransportsPageView(), + settings: settings, + ), + '/${NavigationItem.navProfile.route}': + MaterialPageRoute( + builder: (__) => const ProfilePageView(), + ), + '/${NavigationItem.navSettings.route}': + MaterialPageRoute( + builder: (_) => const SettingsPage(), + ), + }; + return transitions[settings.name]; + }, + ), ), ); } diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index 5eceef7f0..d7a7d0dbf 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -361,6 +361,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.10" + device_info_plus: + dependency: transitive + description: + name: device_info_plus + sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 + url: "https://pub.dev" + source: hosted + version: "10.1.2" + device_info_plus_platform_interface: + dependency: transitive + description: + name: device_info_plus_platform_interface + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + url: "https://pub.dev" + source: hosted + version: "7.0.1" diacritic: dependency: "direct main" description: @@ -737,18 +753,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -809,10 +825,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" material_design_icons_flutter: dependency: "direct main" description: @@ -825,10 +841,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mgrs_dart: dependency: transitive description: @@ -902,6 +918,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.8" + os_detect: + dependency: transitive + description: + name: os_detect + sha256: faf3bcf39515e64da8ff76b2f2805b20a6ff47ae515393e535f8579ff91d6b7f + url: "https://pub.dev" + source: hosted + version: "2.0.1" package_config: dependency: transitive description: @@ -1359,26 +1383,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" + sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" url: "https://pub.dev" source: hosted - version: "1.25.2" + version: "1.25.7" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" test_core: dependency: transitive description: name: test_core - sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" + sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.4" timelines: dependency: "direct main" description: @@ -1450,6 +1474,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.2" + upgrader: + dependency: "direct main" + description: + name: upgrader + sha256: a8751904c13f7699bce3b28d8eedb6260e1c25311b75d4b712faeaedd996b7cc + url: "https://pub.dev" + source: hosted + version: "11.2.0" upower: dependency: transitive description: @@ -1562,6 +1594,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + version: + dependency: transitive + description: + name: version + sha256: "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94" + url: "https://pub.dev" + source: hosted + version: "3.0.2" very_good_analysis: dependency: "direct dev" description: @@ -1574,10 +1614,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" watcher: dependency: transitive description: @@ -1618,6 +1658,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.5.4" + win32_registry: + dependency: transitive + description: + name: win32_registry + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" + url: "https://pub.dev" + source: hosted + version: "1.1.5" wkt_parser: dependency: transitive description: @@ -1667,5 +1715,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 220fb7723..882a22af2 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -69,6 +69,7 @@ dependencies: ua_client_hints: ^1.3.1 uni_ui: path: ../uni_ui + upgrader: ^11.2.0 url_launcher: ^6.2.2 workmanager: ^0.5.2 From 288d3814936d019d9dea9a98dfeef1c743b944a2 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Wed, 9 Oct 2024 22:31:04 +0100 Subject: [PATCH 21/35] fixing schedule page scroll --- .../uni_app/lib/view/schedule/schedule.dart | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/packages/uni_app/lib/view/schedule/schedule.dart b/packages/uni_app/lib/view/schedule/schedule.dart index 452674a37..1ce1d8d06 100644 --- a/packages/uni_app/lib/view/schedule/schedule.dart +++ b/packages/uni_app/lib/view/schedule/schedule.dart @@ -133,26 +133,23 @@ class SchedulePageViewState extends State ) { return Container( key: Key('schedule-page-day-column-$day'), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: lectures - .map( - // TODO(thePeras): ScheduleSlot should receive a lecture - // instead of all these parameters. - (lecture) => ScheduleSlot( - subject: lecture.subject, - typeClass: lecture.typeClass, - rooms: lecture.room, - begin: lecture.startTime, - end: lecture.endTime, - occurrId: lecture.occurrId, - teacher: lecture.teacher, - classNumber: lecture.classNumber, - ), - ) - .toList(), - ), + child: ListView( + children: lectures + .map( + // TODO(thePeras): ScheduleSlot should receive a lecture + // instead of all these parameters. + (lecture) => ScheduleSlot( + subject: lecture.subject, + typeClass: lecture.typeClass, + rooms: lecture.room, + begin: lecture.startTime, + end: lecture.endTime, + occurrId: lecture.occurrId, + teacher: lecture.teacher, + classNumber: lecture.classNumber, + ), + ) + .toList(), ), ); } From 82286046eba16cb56cf8f39c39b777bcb21b2426 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Wed, 9 Oct 2024 22:54:10 +0100 Subject: [PATCH 22/35] downgrading upgrader --- packages/uni_app/pubspec.lock | 8 ++++---- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index d7a7d0dbf..f99e1eddb 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -1478,10 +1478,10 @@ packages: dependency: "direct main" description: name: upgrader - sha256: a8751904c13f7699bce3b28d8eedb6260e1c25311b75d4b712faeaedd996b7cc + sha256: d45483694620883107c2f5ca1dff7cdd4237b16810337a9c9c234203eb79eb5f url: "https://pub.dev" source: hosted - version: "11.2.0" + version: "10.3.0" upower: dependency: transitive description: @@ -1715,5 +1715,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0 <4.0.0" - flutter: ">=3.24.0" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 882a22af2..e9f3f8720 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -69,7 +69,7 @@ dependencies: ua_client_hints: ^1.3.1 uni_ui: path: ../uni_ui - upgrader: ^11.2.0 + upgrader: ^10.3.0 url_launcher: ^6.2.2 workmanager: ^0.5.2 From 7013574978a5be678dbab52254aab9d9a20f6704 Mon Sep 17 00:00:00 2001 From: thePeras Date: Wed, 9 Oct 2024 22:03:58 +0000 Subject: [PATCH 23/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 9bdaf190c..27fc726b7 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.17+318 +1.10.0-beta.18+319 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index e9f3f8720..ea1626008 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.17+318 +version: 1.10.0-beta.18+319 environment: sdk: ">=3.4.0 <4.0.0" From 1ede758fb42bdf31499e88841668833399492039 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Wed, 9 Oct 2024 22:21:43 +0100 Subject: [PATCH 24/35] adding in app updates --- packages/uni_app/lib/main.dart | 191 +++++++++++++++++---------------- packages/uni_app/pubspec.lock | 52 ++++++++- packages/uni_app/pubspec.yaml | 1 + 3 files changed, 149 insertions(+), 95 deletions(-) diff --git a/packages/uni_app/lib/main.dart b/packages/uni_app/lib/main.dart index 9956d5e50..410b31835 100644 --- a/packages/uni_app/lib/main.dart +++ b/packages/uni_app/lib/main.dart @@ -50,6 +50,7 @@ import 'package:uni/view/settings/settings.dart'; import 'package:uni/view/theme.dart'; import 'package:uni/view/theme_notifier.dart'; import 'package:uni/view/transports/transports.dart'; +import 'package:upgrader/upgrader.dart'; import 'package:workmanager/workmanager.dart'; SentryEvent? beforeSend(SentryEvent event) { @@ -217,100 +218,104 @@ class ApplicationState extends State { DeviceOrientation.portraitUp, ]); return Consumer2( - builder: (context, themeNotifier, localeNotifier, _) => MaterialApp( - title: 'uni', + builder: (context, themeNotifier, localeNotifier, _) => UpgradeAlert( navigatorKey: Application.navigatorKey, - theme: applicationLightTheme, - darkTheme: applicationDarkTheme, - themeMode: themeNotifier.getTheme(), - locale: localeNotifier.getLocale().localeCode, - localizationsDelegates: const [ - S.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ], - supportedLocales: S.delegate.supportedLocales, - initialRoute: widget.initialRoute, - navigatorObservers: navigatorObservers, - onGenerateRoute: (settings) { - final transitions = { - '/${NavigationItem.navLogin.route}': - PageTransition.makePageTransition( - page: const LoginPageView(), - settings: settings, - ), - '/${NavigationItem.navPersonalArea.route}': - PageTransition.makePageTransition( - page: const HomePageView(), - settings: settings, - ), - '/${NavigationItem.navSchedule.route}': - PageTransition.makePageTransition( - page: SchedulePage(), - settings: settings, - ), - '/${NavigationItem.navExams.route}': - PageTransition.makePageTransition( - page: const ExamsPageView(), - settings: settings, - ), - '/${NavigationItem.navStops.route}': - PageTransition.makePageTransition( - page: const BusStopNextArrivalsPage(), - settings: settings, - ), - '/${NavigationItem.navCourseUnits.route}': - PageTransition.makePageTransition( - page: const CourseUnitsPageView(), - settings: settings, - ), - '/${NavigationItem.navLocations.route}': - PageTransition.makePageTransition( - page: const LocationsPage(), - settings: settings, - ), - '/${NavigationItem.navRestaurants.route}': - PageTransition.makePageTransition( - page: const RestaurantPageView(), - settings: settings, - ), - '/${NavigationItem.navCalendar.route}': - PageTransition.makePageTransition( - page: const CalendarPageView(), - settings: settings, - ), - '/${NavigationItem.navLibrary.route}': - PageTransition.makePageTransition( - page: const LibraryPage(), - settings: settings, - ), - '/${NavigationItem.navFaculty.route}': - PageTransition.makePageTransition( - page: const FacultyPageView(), - settings: settings, - ), - '/${NavigationItem.navAcademicPath.route}': - PageTransition.makePageTransition( - page: const AcademicPathPageView(), - settings: settings, - ), - '/${NavigationItem.navTransports.route}': - PageTransition.makePageTransition( - page: const TransportsPageView(), - settings: settings, - ), - '/${NavigationItem.navProfile.route}': - MaterialPageRoute( - builder: (__) => const ProfilePageView(), - ), - '/${NavigationItem.navSettings.route}': - MaterialPageRoute( - builder: (_) => const SettingsPage(), - ), - }; - return transitions[settings.name]; - }, + showIgnore: false, + child: MaterialApp( + title: 'uni', + navigatorKey: Application.navigatorKey, + theme: applicationLightTheme, + darkTheme: applicationDarkTheme, + themeMode: themeNotifier.getTheme(), + locale: localeNotifier.getLocale().localeCode, + localizationsDelegates: const [ + S.delegate, + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + supportedLocales: S.delegate.supportedLocales, + initialRoute: widget.initialRoute, + navigatorObservers: navigatorObservers, + onGenerateRoute: (settings) { + final transitions = { + '/${NavigationItem.navLogin.route}': + PageTransition.makePageTransition( + page: const LoginPageView(), + settings: settings, + ), + '/${NavigationItem.navPersonalArea.route}': + PageTransition.makePageTransition( + page: const HomePageView(), + settings: settings, + ), + '/${NavigationItem.navSchedule.route}': + PageTransition.makePageTransition( + page: SchedulePage(), + settings: settings, + ), + '/${NavigationItem.navExams.route}': + PageTransition.makePageTransition( + page: const ExamsPageView(), + settings: settings, + ), + '/${NavigationItem.navStops.route}': + PageTransition.makePageTransition( + page: const BusStopNextArrivalsPage(), + settings: settings, + ), + '/${NavigationItem.navCourseUnits.route}': + PageTransition.makePageTransition( + page: const CourseUnitsPageView(), + settings: settings, + ), + '/${NavigationItem.navLocations.route}': + PageTransition.makePageTransition( + page: const LocationsPage(), + settings: settings, + ), + '/${NavigationItem.navRestaurants.route}': + PageTransition.makePageTransition( + page: const RestaurantPageView(), + settings: settings, + ), + '/${NavigationItem.navCalendar.route}': + PageTransition.makePageTransition( + page: const CalendarPageView(), + settings: settings, + ), + '/${NavigationItem.navLibrary.route}': + PageTransition.makePageTransition( + page: const LibraryPage(), + settings: settings, + ), + '/${NavigationItem.navFaculty.route}': + PageTransition.makePageTransition( + page: const FacultyPageView(), + settings: settings, + ), + '/${NavigationItem.navAcademicPath.route}': + PageTransition.makePageTransition( + page: const AcademicPathPageView(), + settings: settings, + ), + '/${NavigationItem.navTransports.route}': + PageTransition.makePageTransition( + page: const TransportsPageView(), + settings: settings, + ), + '/${NavigationItem.navProfile.route}': + MaterialPageRoute( + builder: (__) => const ProfilePageView(), + ), + '/${NavigationItem.navSettings.route}': + MaterialPageRoute( + builder: (_) => const SettingsPage(), + ), + }; + return transitions[settings.name]; + }, + ), ), ); } diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index db6103892..f71ec9052 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -366,6 +366,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.10" + device_info_plus: + dependency: transitive + description: + name: device_info_plus + sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 + url: "https://pub.dev" + source: hosted + version: "10.1.2" + device_info_plus_platform_interface: + dependency: transitive + description: + name: device_info_plus_platform_interface + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + url: "https://pub.dev" + source: hosted + version: "7.0.1" diacritic: dependency: "direct main" description: @@ -915,6 +931,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.8" + os_detect: + dependency: transitive + description: + name: os_detect + sha256: faf3bcf39515e64da8ff76b2f2805b20a6ff47ae515393e535f8579ff91d6b7f + url: "https://pub.dev" + source: hosted + version: "2.0.1" package_config: dependency: transitive description: @@ -927,10 +951,10 @@ packages: dependency: transitive description: name: package_info_plus - sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 + sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef" url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.0.3" package_info_plus_platform_interface: dependency: transitive description: @@ -1487,6 +1511,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.2" + upgrader: + dependency: "direct main" + description: + name: upgrader + sha256: a8751904c13f7699bce3b28d8eedb6260e1c25311b75d4b712faeaedd996b7cc + url: "https://pub.dev" + source: hosted + version: "11.2.0" upower: dependency: transitive description: @@ -1599,6 +1631,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + version: + dependency: transitive + description: + name: version + sha256: "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94" + url: "https://pub.dev" + source: hosted + version: "3.0.2" very_good_analysis: dependency: "direct dev" description: @@ -1663,6 +1703,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.5.5" + win32_registry: + dependency: transitive + description: + name: win32_registry + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" + url: "https://pub.dev" + source: hosted + version: "1.1.5" wkt_parser: dependency: transitive description: diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 4f5589bf7..3396a9928 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -69,6 +69,7 @@ dependencies: ua_client_hints: ^1.3.1 uni_ui: path: ../uni_ui + upgrader: ^11.2.0 url_launcher: ^6.2.2 workmanager: ^0.5.2 From 0209fafe2b9efd550ca542ec88e3d94f1cf46b58 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Wed, 9 Oct 2024 22:54:10 +0100 Subject: [PATCH 25/35] downgrading upgrader --- packages/uni_app/pubspec.lock | 4 ++-- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/uni_app/pubspec.lock b/packages/uni_app/pubspec.lock index f71ec9052..04778b73c 100644 --- a/packages/uni_app/pubspec.lock +++ b/packages/uni_app/pubspec.lock @@ -1515,10 +1515,10 @@ packages: dependency: "direct main" description: name: upgrader - sha256: a8751904c13f7699bce3b28d8eedb6260e1c25311b75d4b712faeaedd996b7cc + sha256: d45483694620883107c2f5ca1dff7cdd4237b16810337a9c9c234203eb79eb5f url: "https://pub.dev" source: hosted - version: "11.2.0" + version: "10.3.0" upower: dependency: transitive description: diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 3396a9928..184225fc4 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -69,7 +69,7 @@ dependencies: ua_client_hints: ^1.3.1 uni_ui: path: ../uni_ui - upgrader: ^11.2.0 + upgrader: ^10.3.0 url_launcher: ^6.2.2 workmanager: ^0.5.2 From 90f22e9bccbc118def6c5e23e540bc4318496df5 Mon Sep 17 00:00:00 2001 From: thePeras Date: Wed, 9 Oct 2024 22:03:58 +0000 Subject: [PATCH 26/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 9bdaf190c..27fc726b7 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.17+318 +1.10.0-beta.18+319 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 184225fc4..e85cf0a07 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.17+318 +version: 1.10.0-beta.18+319 environment: sdk: ">=3.4.0 <4.0.0" From 08dda81077492f72d3cd7d7af50011ec0ef56a25 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Thu, 10 Oct 2024 08:35:44 +0000 Subject: [PATCH 27/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 27fc726b7..a1e899f99 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.18+319 +1.10.0-beta.19+320 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index e85cf0a07..07b56421c 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.18+319 +version: 1.10.0-beta.19+320 environment: sdk: ">=3.4.0 <4.0.0" From b584dc2f7c00bf92da92c05c457c35189feb7e25 Mon Sep 17 00:00:00 2001 From: DGoiana Date: Thu, 10 Oct 2024 08:43:41 +0000 Subject: [PATCH 28/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index a1e899f99..db141b6b9 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.19+320 +1.10.0-beta.20+321 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 07b56421c..51c26a21a 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.19+320 +version: 1.10.0-beta.20+321 environment: sdk: ">=3.4.0 <4.0.0" From 6cc80ce78a49c4d39dbaccd6e1aa57d790f2733d Mon Sep 17 00:00:00 2001 From: DGoiana Date: Thu, 10 Oct 2024 10:09:30 +0000 Subject: [PATCH 29/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index db141b6b9..991f7ea30 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.20+321 +1.10.0-beta.21+322 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 51c26a21a..d083fc69b 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.20+321 +version: 1.10.0-beta.21+322 environment: sdk: ">=3.4.0 <4.0.0" From 699b542d02daeb6538fbd75d80ee9d7f2c9f2434 Mon Sep 17 00:00:00 2001 From: niaefeup-admin Date: Fri, 11 Oct 2024 16:45:43 +0000 Subject: [PATCH 30/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 991f7ea30..95e757be3 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.21+322 +1.10.0-beta.22+324 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index d083fc69b..437b0c037 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.21+322 +version: 1.10.0-beta.22+324 environment: sdk: ">=3.4.0 <4.0.0" From 8a11a691d0704436e05e3a73509ca59394cc69a2 Mon Sep 17 00:00:00 2001 From: Rubem Neto Date: Mon, 14 Oct 2024 14:43:12 +0100 Subject: [PATCH 31/35] Remove copyWith from Course Grade Card --- packages/uni_ui/lib/course_grade_card.dart | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/uni_ui/lib/course_grade_card.dart b/packages/uni_ui/lib/course_grade_card.dart index 0ceb9c263..e004c5ee6 100644 --- a/packages/uni_ui/lib/course_grade_card.dart +++ b/packages/uni_ui/lib/course_grade_card.dart @@ -26,9 +26,7 @@ class CourseGradeCard extends StatelessWidget { children: [ Text( courseName, - style: theme.textTheme.titleLarge?.copyWith( - color: theme.colorScheme.primary, - fontWeight: FontWeight.w600), + style: theme.textTheme.titleLarge, overflow: TextOverflow.ellipsis, ), Row( @@ -37,11 +35,9 @@ class CourseGradeCard extends StatelessWidget { Text( "${ects} ECTS", style: theme.textTheme.bodyLarge - ?.copyWith(color: theme.colorScheme.primary), ), Text("${grade.toInt()}", - style: theme.textTheme.bodyLarge - ?.copyWith(color: theme.colorScheme.primary)) + style: theme.textTheme.bodyLarge) ], ) ], From 19ae1b723d2310dfab32832e0e95ef2ecdb7fc4d Mon Sep 17 00:00:00 2001 From: DGoiana Date: Mon, 14 Oct 2024 16:31:19 +0100 Subject: [PATCH 32/35] fixing casts --- .../parsers/parser_restaurants.dart | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/uni_app/lib/controller/parsers/parser_restaurants.dart b/packages/uni_app/lib/controller/parsers/parser_restaurants.dart index 8a4dc1462..a4c543f70 100644 --- a/packages/uni_app/lib/controller/parsers/parser_restaurants.dart +++ b/packages/uni_app/lib/controller/parsers/parser_restaurants.dart @@ -91,25 +91,30 @@ Restaurant getRestaurantFromGSheets( response.body.indexOf('(') + 1, response.body.lastIndexOf(')'), ); - final parsedJson = - jsonDecode(jsonString) as Map>; + final parsedJson = jsonDecode(jsonString) as Map; final mealsList = []; final format = DateFormat('d/M/y'); - for (final row - in parsedJson['table']?['rows'] as List>) { - final cellList = row['c'] as List>; - if ((cellList[1]['v'] == 'Almoço' && isDinner) || - (cellList[1]['v'] != 'Almoço' && !isDinner)) { + + final table = parsedJson['table'] as Map; + final rows = table['rows'] as List; + + for (final row in rows) { + final cellList = (row as Map)['c'] as List; + if (((cellList[1] as Map)['v'] == 'Almoço' && isDinner) || + ((cellList[1] as Map)['v'] != 'Almoço' && !isDinner)) { continue; } final meal = Meal( - cellList[2]['v'] as String, - cellList[3]['v'] as String, - DayOfWeek.values[format.parseUtc(cellList[0]['f'] as String).weekday - 1], - format.parseUtc(cellList[0]['f'] as String), + (cellList[2] as Map)['v'] as String, + (cellList[3] as Map)['v'] as String, + DayOfWeek.values[format + .parseUtc((cellList[0] as Map)['f'] as String) + .weekday - + 1], + format.parseUtc((cellList[0] as Map)['f'] as String), ); mealsList.add(meal); } From 5874c6fb655736bdf71b4c1bf0cfbb7baba76619 Mon Sep 17 00:00:00 2001 From: thePeras Date: Tue, 15 Oct 2024 13:32:55 +0000 Subject: [PATCH 33/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index 95e757be3..fc641a05a 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.22+324 +1.10.0-beta.23+325 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index 437b0c037..de121f1b2 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.22+324 +version: 1.10.0-beta.23+325 environment: sdk: ">=3.4.0 <4.0.0" From 00dabc7e7348f04ce4b7689627cc17956b77e1ee Mon Sep 17 00:00:00 2001 From: thePeras Date: Tue, 15 Oct 2024 13:40:20 +0000 Subject: [PATCH 34/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index fc641a05a..a50a5bf62 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.23+325 +1.10.0-beta.24+326 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index de121f1b2..fddc35c89 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.23+325 +version: 1.10.0-beta.24+326 environment: sdk: ">=3.4.0 <4.0.0" From e7e3f55d9650a81bdd9b62b4bef5dcb802515bc0 Mon Sep 17 00:00:00 2001 From: niaefeup-admin Date: Wed, 16 Oct 2024 10:47:34 +0000 Subject: [PATCH 35/35] Bump app version [no ci] --- packages/uni_app/app_version.txt | 2 +- packages/uni_app/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt index a50a5bf62..db9c1f2ef 100644 --- a/packages/uni_app/app_version.txt +++ b/packages/uni_app/app_version.txt @@ -1 +1 @@ -1.10.0-beta.24+326 +1.10.0-beta.25+328 diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml index fddc35c89..b6691f978 100644 --- a/packages/uni_app/pubspec.yaml +++ b/packages/uni_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev # To change it manually, override the value in app_version.txt. # The app version code is automatically also bumped by CI. # Do not change it manually. -version: 1.10.0-beta.24+326 +version: 1.10.0-beta.25+328 environment: sdk: ">=3.4.0 <4.0.0"