From cdf1c421f7d131226f0a509ce39e397641c2b765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20K=C3=B6rber?= <56073945+jakobkoerber@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:13:19 +0100 Subject: [PATCH 1/2] Bump Dependencies, Update Protos --- .gitignore | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 2 +- ios/Podfile.lock | 134 +++---- .../apis/google/protobuf/empty.pb.dart | 2 - .../apis/google/protobuf/timestamp.pb.dart | 4 +- pubspec.lock | 377 +++++++++--------- pubspec.yaml | 15 +- 8 files changed, 271 insertions(+), 267 deletions(-) diff --git a/.gitignore b/.gitignore index 1233cc24..0bc25a71 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 348c409e..afa1e8eb 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 69a41be9..28065e5a 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.7.3' apply false + id "com.android.application" version '8.8.0' apply false id "org.jetbrains.kotlin.android" version "1.9.20" apply false id "org.jetbrains.kotlin.plugin.serialization" version "2.0.21" apply false id "com.google.gms.google-services" version "4.4.2" apply false diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7a72740e..b37daa6c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,37 +1,37 @@ PODS: - device_info_plus (0.0.1): - Flutter - - Firebase/CoreOnly (11.4.0): - - FirebaseCore (= 11.4.0) - - Firebase/Crashlytics (11.4.0): + - Firebase/CoreOnly (11.6.0): + - FirebaseCore (~> 11.6.0) + - Firebase/Crashlytics (11.6.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 11.4.0) - - Firebase/RemoteConfig (11.4.0): + - FirebaseCrashlytics (~> 11.6.0) + - Firebase/RemoteConfig (11.6.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 11.4.0) - - firebase_core (3.8.1): - - Firebase/CoreOnly (= 11.4.0) + - FirebaseRemoteConfig (~> 11.6.0) + - firebase_core (3.10.1): + - Firebase/CoreOnly (= 11.6.0) - Flutter - - firebase_crashlytics (4.2.0): - - Firebase/Crashlytics (= 11.4.0) + - firebase_crashlytics (4.3.1): + - Firebase/Crashlytics (= 11.6.0) - firebase_core - Flutter - - firebase_remote_config (5.2.0): - - Firebase/RemoteConfig (= 11.4.0) + - firebase_remote_config (5.3.1): + - Firebase/RemoteConfig (= 11.6.0) - firebase_core - Flutter - - FirebaseABTesting (11.4.0): - - FirebaseCore (~> 11.0) - - FirebaseCore (11.4.0): - - FirebaseCoreInternal (~> 11.0) + - FirebaseABTesting (11.6.0): + - FirebaseCore (~> 11.6.0) + - FirebaseCore (11.6.0): + - FirebaseCoreInternal (~> 11.6.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.4.1): - - FirebaseCore (~> 11.0) + - FirebaseCoreExtension (11.6.0): + - FirebaseCore (~> 11.6.0) - FirebaseCoreInternal (11.6.0): - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseCrashlytics (11.4.0): - - FirebaseCore (~> 11.4) + - FirebaseCrashlytics (11.6.0): + - FirebaseCore (~> 11.6.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfigInterop (~> 11.0) - FirebaseSessions (~> 11.0) @@ -39,30 +39,30 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (11.4.0): - - FirebaseCore (~> 11.0) + - FirebaseInstallations (11.6.0): + - FirebaseCore (~> 11.6.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (11.4.0): + - FirebaseRemoteConfig (11.6.0): - FirebaseABTesting (~> 11.0) - - FirebaseCore (~> 11.0) + - FirebaseCore (~> 11.6.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfigInterop (~> 11.0) - FirebaseSharedSwift (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseRemoteConfigInterop (11.6.0) - - FirebaseSessions (11.4.0): - - FirebaseCore (~> 11.4) - - FirebaseCoreExtension (~> 11.4) + - FirebaseRemoteConfigInterop (11.7.0) + - FirebaseSessions (11.6.0): + - FirebaseCore (~> 11.6.0) + - FirebaseCoreExtension (~> 11.6.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (11.6.0) + - FirebaseSharedSwift (11.7.0) - Flutter (1.0.0) - flutter_native_splash (2.4.3): - Flutter @@ -122,21 +122,21 @@ PODS: - sqflite_darwin (0.0.4): - Flutter - FlutterMacOS - - sqlite3 (3.47.1): - - sqlite3/common (= 3.47.1) - - sqlite3/common (3.47.1) - - sqlite3/dbstatvtab (3.47.1): + - sqlite3 (3.48.0): + - sqlite3/common (= 3.48.0) + - sqlite3/common (3.48.0) + - sqlite3/dbstatvtab (3.48.0): - sqlite3/common - - sqlite3/fts5 (3.47.1): + - sqlite3/fts5 (3.48.0): - sqlite3/common - - sqlite3/perf-threadsafe (3.47.1): + - sqlite3/perf-threadsafe (3.48.0): - sqlite3/common - - sqlite3/rtree (3.47.1): + - sqlite3/rtree (3.48.0): - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - FlutterMacOS - - sqlite3 (~> 3.47.1) + - sqlite3 (~> 3.48.0) - sqlite3/dbstatvtab - sqlite3/fts5 - sqlite3/perf-threadsafe @@ -234,45 +234,45 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/video_player_avfoundation/darwin" SPEC CHECKSUMS: - device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342 - Firebase: cf1b19f21410b029b6786a54e9764a0cacad3c99 - firebase_core: 418aed674e9a0b8b6088aec16cde82a811f6261f - firebase_crashlytics: 757e252772ed3dd37c07638f9fcd4dceb5f101c8 - firebase_remote_config: 015a36be218a38943c2273d63b33bc983b3d7bb6 - FirebaseABTesting: aef1719704fade00b200827e7973f352efc4caee - FirebaseCore: e0510f1523bc0eb21653cac00792e1e2bd6f1771 - FirebaseCoreExtension: f1bc67a4702931a7caa097d8e4ac0a1b0d16720e + device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe + Firebase: 374a441a91ead896215703a674d58cdb3e9d772b + firebase_core: d3deb82d05dac4bc13190f9d1770787fd6a1cda4 + firebase_crashlytics: 4c7c77cf1825b70b031fef62e99441c3a423eaa2 + firebase_remote_config: 6098e2aa252ed19471973710fdee82ae735b42a7 + FirebaseABTesting: 663ece168d2d65a31f71603d71937e326020a887 + FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa + FirebaseCoreExtension: 2d77d6430c16cf43ca2b04608302ed02b3598361 FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2 - FirebaseCrashlytics: 41bbdd2b514a8523cede0c217aee6ef7ecf38401 - FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414 - FirebaseRemoteConfig: 7655681d02417bc9b287338edb9d721ff79e1a4a - FirebaseRemoteConfigInterop: e75e348953352a000331eb77caf01e424248e176 - FirebaseSessions: 3f56f177d9e53a85021d16b31f9a111849d1dd8b - FirebaseSharedSwift: a4e5dfca3e210633bb3a3dfb94176c019211948b + FirebaseCrashlytics: b21c665fb50138766480bce73ebdb1aa30f7f300 + FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c + FirebaseRemoteConfig: ee5161282c4e857ad81c0197cd8baec9d5dfef0e + FirebaseRemoteConfigInterop: ca12abf9da0003efd3a476b2dff4f7a04fd31b4f + FirebaseSessions: 9529d14180868e29a8da164b3a729c036204918b + FirebaseSharedSwift: a45efd84d60ebbfdcdbaebc66948af3630459e62 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_native_splash: e8a1e01082d97a8099d973f919f57904c925008a - flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 - geolocator_apple: 9bcea1918ff7f0062d98345d238ae12718acfbc1 + flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145 + flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13 + geolocator_apple: 1560c3c875af2a412242c7a923e15d0d401966ff Google-Maps-iOS-Utils: 66d6de12be1ce6d3742a54661e7a79cb317a9321 - google_maps_flutter_ios: e31555a04d1986ab130f2b9f24b6cdc861acc6d3 + google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57 - map_launcher: 5fde49ac9a52672bf99da746599f507b4490d7b5 + home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f + map_launcher: fe43bda6720bb73c12fcc1bdd86123ff49a4d4d6 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4 - path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 + package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 - quick_actions_ios: 56f3cbaa71e94f212838d1f9fe354bd0734779bf - shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 - sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d - sqlite3: 1e522f0938463e44b7faf50393b40bdc1e1e456d - sqlite3_flutter_libs: 1b4e98da20ebd4e9b1240269b78cdcf492dbe9f3 - url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe - video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 + quick_actions_ios: 4b07fb49d8d8f3518d7565fbb7a91014067a7d82 + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 + sqlite3: 3da10a59910c809fb584a93aa46a3f05b785e12e + sqlite3_flutter_libs: c26d86af4ad88f1465dc4e07e6dc6931eef228e4 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b PODFILE CHECKSUM: f5f6fa56ec332013222699049ea868939deda084 diff --git a/lib/base/networking/apis/google/protobuf/empty.pb.dart b/lib/base/networking/apis/google/protobuf/empty.pb.dart index fb65fac9..05ae77c7 100644 --- a/lib/base/networking/apis/google/protobuf/empty.pb.dart +++ b/lib/base/networking/apis/google/protobuf/empty.pb.dart @@ -20,8 +20,6 @@ import 'package:protobuf/protobuf.dart' as $pb; /// service Foo { /// rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty); /// } -/// -/// The JSON representation for `Empty` is empty JSON object `{}`. class Empty extends $pb.GeneratedMessage { factory Empty() => create(); Empty._() : super(); diff --git a/lib/base/networking/apis/google/protobuf/timestamp.pb.dart b/lib/base/networking/apis/google/protobuf/timestamp.pb.dart index 85f80767..ea44b44e 100644 --- a/lib/base/networking/apis/google/protobuf/timestamp.pb.dart +++ b/lib/base/networking/apis/google/protobuf/timestamp.pb.dart @@ -65,7 +65,6 @@ import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin; /// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) /// .setNanos((int) ((millis % 1000) * 1000000)).build(); /// -/// /// Example 5: Compute Timestamp from Java `Instant.now()`. /// /// Instant now = Instant.now(); @@ -74,7 +73,6 @@ import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin; /// Timestamp.newBuilder().setSeconds(now.getEpochSecond()) /// .setNanos(now.getNano()).build(); /// -/// /// Example 6: Compute Timestamp from current time in Python. /// /// timestamp = Timestamp() @@ -104,7 +102,7 @@ import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin; /// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with /// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use /// the Joda Time's [`ISODateTimeFormat.dateTime()`]( -/// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D +/// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime() /// ) to obtain a formatter capable of generating timestamps in this format. class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { factory Timestamp({ diff --git a/pubspec.lock b/pubspec.lock index d14e31cc..ec4bd238 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,39 +5,31 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "72.0.0" + version: "76.0.0" _flutterfire_internals: dependency: transitive description: name: _flutterfire_internals - sha256: eae3133cbb06de9205899b822e3897fc6a8bc278ad4c944b4ce612689369694b + sha256: e4f2a7ef31b0ab2c89d2bde35ef3e6e6aff1dce5e66069c6540b0e9cfe33ee6b url: "https://pub.dev" source: hosted - version: "1.3.47" + version: "1.3.50" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: transitive description: name: analyzer - sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 - url: "https://pub.dev" - source: hosted - version: "6.7.0" - analyzer_plugin: - dependency: transitive - description: - name: analyzer_plugin - sha256: "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "0.11.3" + version: "6.11.0" ansicolor: dependency: transitive description: @@ -50,10 +42,10 @@ packages: dependency: transitive description: name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "4.0.2" args: dependency: transitive description: @@ -106,50 +98,50 @@ packages: dependency: transitive description: name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_config: dependency: transitive description: name: build_config - sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" build_daemon: dependency: transitive description: name: build_daemon - sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.0.3" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.3" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573" url: "https://pub.dev" source: hosted - version: "2.4.13" + version: "2.4.14" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" url: "https://pub.dev" source: hosted - version: "7.3.2" + version: "8.0.0" built_collection: dependency: transitive description: @@ -162,10 +154,10 @@ packages: dependency: transitive description: name: built_value - sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" url: "https://pub.dev" source: hosted - version: "8.9.2" + version: "8.9.3" cached_network_image: dependency: "direct main" description: @@ -242,10 +234,10 @@ packages: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" convert: dependency: transitive description: @@ -282,26 +274,26 @@ packages: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "3.0.1" device_info_plus: dependency: "direct main" description: name: device_info_plus - sha256: f545ffbadee826f26f2e1a0f0cbd667ae9a6011cc0f77c0f8f00a969655e6e95 + sha256: b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544 url: "https://pub.dev" source: hosted - version: "11.1.1" + version: "11.2.1" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" dio: dependency: "direct main" description: @@ -322,18 +314,18 @@ packages: dependency: "direct main" description: name: drift - sha256: c2d073d35ad441730812f4ea05b5dd031fb81c5f9786a4f5fb77ecd6307b6f74 + sha256: "76f23535e19a9f2be92f954e74d8802e96f526e5195d7408c1a20f6659043941" url: "https://pub.dev" source: hosted - version: "2.22.1" + version: "2.24.0" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: f4ab5d6976b1e31551ceb82ff597a505bda7818ff4f7be08a1da9d55eb6e730c + sha256: d1d90b0d55b22de412b77186f3bf3179a4b7e2acc4c8fb3a7aaf28a01abc194b url: "https://pub.dev" source: hosted - version: "2.22.1" + version: "2.24.0" easy_localization: dependency: "direct main" description: @@ -378,66 +370,66 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: fef81a53ba1ca618def1f8bef4361df07968434e62cb204c1fb90bb880a03da2 + sha256: d851c1ca98fd5a4c07c747f8c65dacc2edd84a4d9ac055d32a5f0342529069f5 url: "https://pub.dev" source: hosted - version: "3.8.1" + version: "3.10.1" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: b94b217e3ad745e784960603d33d99471621ecca151c99c670869b76e50ad2a6 + sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf url: "https://pub.dev" source: hosted - version: "5.3.1" + version: "5.4.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "9e69806bb3d905aeec3c1242e0e1475de6ea6d48f456af29d598fb229a2b4e5e" + sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b url: "https://pub.dev" source: hosted - version: "2.18.2" + version: "2.19.0" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics - sha256: e235c8452d5622fc271404592388fde179e4b62c50e777ad3c8c3369296104ed + sha256: f3e8fc2ffc7b43b18e9a533976b4cef6af3021b7aabc4115ab9ff11dd24ca15d url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.3.1" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "4ddadf44ed0a202f3acad053f12c083877940fa8cc1a9f747ae09e1ef4372160" + sha256: ed90e2971d20989bcec77e99eda7d24d4b08f45053525c9189e1386e2ced0ef3 url: "https://pub.dev" source: hosted - version: "3.7.0" + version: "3.8.1" firebase_remote_config: dependency: "direct main" description: name: firebase_remote_config - sha256: e377fd519e73baf5afae343da8c8a0a88b506cfbf2ea8ceb7614a8793d9a7083 + sha256: eb72d934d60b0aa4cbec8810989ab3fdb1fad8f708cd76085a178b3f65e4bd5f url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "5.3.1" firebase_remote_config_platform_interface: dependency: transitive description: name: firebase_remote_config_platform_interface - sha256: "95755bcab41c7c9c28ac92aefc1eb4c79ffcc7565e94833cb1e7a2c9320ba53f" + sha256: "8418c26567fb1cb0776733125ade49800a5770eba99b113cfe1e8641a8b726a7" url: "https://pub.dev" source: hosted - version: "1.4.47" + version: "1.4.49" firebase_remote_config_web: dependency: transitive description: name: firebase_remote_config_web - sha256: "09ff1f3db2120e798530354dd77c49e6596d88eadcfe366eb3a083c2dd5d7cb0" + sha256: "640c573a6d957658d9f4c3ba01fdd537a0c348c05a4f943cb3476b58dc292155" url: "https://pub.dev" source: hosted - version: "1.7.5" + version: "1.7.7" fixnum: dependency: transitive description: @@ -464,7 +456,7 @@ packages: description: path: "." ref: master - resolved-ref: "6689dc52d5a915f9f223f2553c8f8b88f66b2820" + resolved-ref: "113618a20644abc0c5c74ea86866bd676284c707" url: "https://github.com/mchome/flutter_colorpicker.git" source: git version: "1.1.0" @@ -494,18 +486,18 @@ packages: dependency: "direct main" description: name: flutter_native_splash - sha256: "1152ab0067ca5a2ebeb862fe0a762057202cceb22b7e62692dcbabf6483891bb" + sha256: "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398" + sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e" url: "https://pub.dev" source: hosted - version: "2.0.23" + version: "2.0.24" flutter_riverpod: dependency: "direct main" description: @@ -518,26 +510,26 @@ packages: dependency: "direct main" description: name: flutter_secure_storage - sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0" + sha256: "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea" url: "https://pub.dev" source: hosted - version: "9.2.2" + version: "9.2.4" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux - sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b" + sha256: bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos - sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81" + sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" flutter_secure_storage_platform_interface: dependency: transitive description: @@ -574,10 +566,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123" + sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.0.17" flutter_test: dependency: "direct dev" description: flutter @@ -648,10 +640,10 @@ packages: dependency: "direct main" description: name: get_it - sha256: c49895c1ecb0ee2a0ec568d39de882e2c299ba26355aa6744ab1001f98cebd15 + sha256: f126a3e286b7f5b578bf436d5592968706c4c1de28a228b870ce375d9f743103 url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.0.3" glob: dependency: transitive description: @@ -664,10 +656,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539" + sha256: "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d" url: "https://pub.dev" source: hosted - version: "14.6.2" + version: "14.6.3" google_identity_services_web: dependency: transitive description: @@ -696,10 +688,10 @@ packages: dependency: transitive description: name: google_maps_flutter_android - sha256: bccf64ccbb2ea672dc62a61177b315a340af86b0228564484b023657544a3fd5 + sha256: "1b69fbb3ab76e7a7dfcf25e60f32f81ae5d9b88285343eecb5479116d54be869" url: "https://pub.dev" source: hosted - version: "2.14.11" + version: "2.14.12" google_maps_flutter_ios: dependency: transitive description: @@ -745,17 +737,18 @@ packages: description: path: "." ref: master - resolved-ref: eec18f632982da4c3d83f8fa39a428d05e011fef + resolved-ref: e6340e48d7f250c2c0259709ef27cc5365fe694d url: "https://github.com/jakobkoerber/grpc-dart.git" source: git version: "4.0.2-wip" home_widget: dependency: "direct main" description: - name: home_widget - sha256: b313e3304c0429669fddf1286e1fbf61a64b873f38ba30b3eb890ef0d7560b12 - url: "https://pub.dev" - source: hosted + path: "packages/home_widget" + ref: main + resolved-ref: bef7e0d76dd3294f138835d91095d45f8531370e + url: "https://github.com/jakobkoerber/home_widget.git" + source: git version: "0.7.0" html: dependency: "direct main" @@ -769,42 +762,42 @@ packages: dependency: transitive description: name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.3.0" http2: dependency: transitive description: name: http2 - sha256: "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d" + sha256: "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" http_multi_server: dependency: transitive description: name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" http_parser: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.2" image: dependency: transitive description: name: image - sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6" url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.5.2" intl: dependency: "direct main" description: @@ -841,26 +834,26 @@ packages: dependency: "direct main" description: name: json_serializable - sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c + sha256: b0a98230538fe5d0b60a22fb6bf1b6cb03471b53e3324ff6069c591679dd59c9 url: "https://pub.dev" source: hosted - version: "6.9.0" + version: "6.9.3" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -881,10 +874,10 @@ packages: dependency: "direct dev" description: name: lints - sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.1.1" logging: dependency: transitive description: @@ -897,18 +890,18 @@ packages: dependency: "direct main" description: name: lottie - sha256: fa39707f36786707b01eca7626d2c16c32aa603b3f3a146518518458847dc127 + sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.3.1" macros: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" map_launcher: dependency: "direct main" description: @@ -969,26 +962,26 @@ packages: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" package_info_plus: dependency: "direct main" description: name: package_info_plus - sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce + sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790" url: "https://pub.dev" source: hosted - version: "8.1.1" + version: "8.1.3" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 + sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" path: dependency: "direct main" description: @@ -1133,6 +1126,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" protobuf: dependency: "direct main" description: @@ -1145,18 +1146,18 @@ packages: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.5.0" qr: dependency: transitive description: @@ -1169,10 +1170,10 @@ packages: dependency: "direct main" description: name: quick_actions - sha256: "2c1d9a91f3218b4e987a7e1e95ba0415b7f48a2cb3ffacc027a1e3d3c117223f" + sha256: "7e35dd6a21f5bbd21acf6899039eaf85001a5ac26d52cbd6a8a2814505b90798" url: "https://pub.dev" source: hosted - version: "1.0.8" + version: "1.1.0" quick_actions_android: dependency: transitive description: @@ -1233,26 +1234,26 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" + sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.3.5" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" + sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5" url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.4.2" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" + sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" url: "https://pub.dev" source: hosted - version: "2.5.3" + version: "2.5.4" shared_preferences_linux: dependency: transitive description: @@ -1289,10 +1290,10 @@ packages: dependency: transitive description: name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.2" shelf_packages_handler: dependency: transitive description: @@ -1329,23 +1330,23 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_gen: dependency: transitive description: name: source_gen - sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "2.0.0" source_helper: dependency: transitive description: name: source_helper - sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" url: "https://pub.dev" source: hosted - version: "1.3.4" + version: "1.3.5" source_map_stack_trace: dependency: transitive description: @@ -1358,10 +1359,10 @@ packages: dependency: transitive description: name: source_maps - sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" url: "https://pub.dev" source: hosted - version: "0.10.12" + version: "0.10.13" source_span: dependency: transitive description: @@ -1406,10 +1407,10 @@ packages: dependency: transitive description: name: sqflite_darwin - sha256: "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474" + sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.1+1" sqflite_platform_interface: dependency: transitive description: @@ -1422,34 +1423,34 @@ packages: dependency: "direct main" description: name: sqlite3 - sha256: cb7f4e9dc1b52b1fa350f7b3d41c662e75fc3d399555fa4e5efcf267e9a4fbb5 + sha256: "35d3726fe18ab1463403a5cc8d97dbc81f2a0b08082e8173851363fcc97b6627" url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.7.2" sqlite3_flutter_libs: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: "636b0fe8a2de894e5455572f6cbbc458f4ffecfe9f860b79439e27041ea4f0b9" + sha256: "50a7e3f294c741d3142eed0ff228e38498334e11e0ccb9d73e0496e005949e44" url: "https://pub.dev" source: hosted - version: "0.5.27" + version: "0.5.29" sqlparser: dependency: transitive description: name: sqlparser - sha256: "4cad4b2c5f63dc9ea1a8dcffb58cf762322bea5dd8836870164a65e913bdae41" + sha256: "27dd0a9f0c02e22ac0eb42a23df9ea079ce69b52bb4a3b478d64e0ef34a263ee" url: "https://pub.dev" source: hosted - version: "0.40.0" + version: "0.41.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" state_notifier: dependency: transitive description: @@ -1470,50 +1471,50 @@ packages: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" syncfusion_flutter_calendar: dependency: "direct main" description: name: syncfusion_flutter_calendar - sha256: "20118a598cf5ae5b7ec84fa364e2b51070800f078466158fcd25864e1b5a2cfd" + sha256: dc21cdbd3ffea97445a8b4477648fcde65b1fd1629085fca85780ca794d61462 url: "https://pub.dev" source: hosted - version: "27.2.5" + version: "28.1.41" syncfusion_flutter_charts: dependency: "direct main" description: name: syncfusion_flutter_charts - sha256: "6b05bd7eab479d033ee74e64dcbd9f879c65396e0963407bb1ac9e52af2b54b2" + sha256: "52e8923e439818f6880fd5406b2c2e84d823398565e50b22e6c4dc634639a6cb" url: "https://pub.dev" source: hosted - version: "27.2.5" + version: "28.1.41" syncfusion_flutter_core: dependency: "direct main" description: name: syncfusion_flutter_core - sha256: "325f519ce4ad8edd81811c21b853d72018529e353584490824da0555156ba076" + sha256: "324e6d370de025e5594c60fa60665efa700f34009c2b7859d05e843c357cd5c8" url: "https://pub.dev" source: hosted - version: "27.2.5" + version: "28.1.41" syncfusion_flutter_datepicker: dependency: "direct main" description: name: syncfusion_flutter_datepicker - sha256: "2177e49eb8a1c0fce7081e40f5613c986d00e5e63cbeb98a6012f65ca156bfc7" + sha256: "1bfd7e819bcca8dfa3c6216972bfe32abf7b4086236f3d2c88fbfefcfe821136" url: "https://pub.dev" source: hosted - version: "27.2.5" + version: "28.1.41" synchronized: dependency: transitive description: @@ -1534,26 +1535,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" url: "https://pub.dev" source: hosted - version: "1.25.7" + version: "1.25.8" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" test_core: dependency: transitive description: name: test_core - sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.5" timeago: dependency: "direct main" description: @@ -1566,18 +1567,18 @@ packages: dependency: transitive description: name: timezone - sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" + sha256: ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d url: "https://pub.dev" source: hosted - version: "0.9.4" + version: "0.10.0" timing: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" typed_data: dependency: transitive description: @@ -1646,18 +1647,18 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" + sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.0" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4" + sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" uuid: dependency: "direct main" description: @@ -1678,10 +1679,10 @@ packages: dependency: transitive description: name: vector_graphics_codec - sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" url: "https://pub.dev" source: hosted - version: "1.1.12" + version: "1.1.13" vector_graphics_compiler: dependency: transitive description: @@ -1710,18 +1711,18 @@ packages: dependency: transitive description: name: video_player_android - sha256: "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898" + sha256: "7018dbcb395e2bca0b9a898e73989e67c0c4a5db269528e1b036ca38bcca0d0b" url: "https://pub.dev" source: hosted - version: "2.7.16" + version: "2.7.17" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - sha256: f498e44a547a3572a928fa30ac8760e127d5e5fc86b81b10b0d56300866322f3 + sha256: "8a4e73a3faf2b13512978a43cf1cdda66feeeb900a0527f1fbfd7b19cf3458d3" url: "https://pub.dev" source: hosted - version: "2.6.4" + version: "2.6.7" video_player_platform_interface: dependency: transitive description: @@ -1742,18 +1743,18 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" watcher: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" web: dependency: transitive description: @@ -1774,10 +1775,10 @@ packages: dependency: transitive description: name: web_socket_channel - sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" webkit_inspection_protocol: dependency: transitive description: @@ -1790,10 +1791,10 @@ packages: dependency: transitive description: name: win32 - sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69" + sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29" url: "https://pub.dev" source: hosted - version: "5.9.0" + version: "5.10.0" win32_registry: dependency: transitive description: @@ -1823,18 +1824,18 @@ packages: description: path: "." ref: master - resolved-ref: "6120a04a6e7cc7edecae69fcb9cc966fde4d6f23" + resolved-ref: "16be22e34b678c6f27b1754188df94b6e8499935" url: "https://github.com/jakobkoerber/xml2json.git" source: git - version: "6.2.5" + version: "6.2.6" yaml: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" sdks: - dart: ">=3.5.0 <4.0.0" - flutter: ">=3.24.0" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml index d66f8faf..050a63f1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: campus_flutter description: "TUM Campus App" publish_to: 'none' -version: 5.1.3+1 +version: 5.2.0+1 environment: sdk: '>=3.2.3 <4.0.0' @@ -38,10 +38,10 @@ dependencies: auto_size_text: ^3.0.0 quick_actions: ^1.0.7 flutter_native_splash: ^2.2.19 - syncfusion_flutter_core: ^27.1.48 - syncfusion_flutter_calendar: ^27.1.48 - syncfusion_flutter_charts: ^27.1.48 - syncfusion_flutter_datepicker: ^27.1.48 + syncfusion_flutter_core: ^28.1.41 + syncfusion_flutter_calendar: ^28.1.41 + syncfusion_flutter_charts: ^28.1.41 + syncfusion_flutter_datepicker: ^28.1.41 google_maps_flutter: ^2.5.3 video_player: ^2.6.1 barcode_widget: ^2.0.4 @@ -90,6 +90,11 @@ dependency_overrides: git: url: https://github.com/jakobkoerber/flutter_linkify ref: master + home_widget: + git: + url: https://github.com/jakobkoerber/home_widget.git + ref: main + path: packages/home_widget dev_dependencies: # code generation From caf720628456935f20952d18fde9464ebafa2bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20K=C3=B6rber?= <56073945+jakobkoerber@users.noreply.github.com> Date: Thu, 23 Jan 2025 17:20:30 +0100 Subject: [PATCH 2/2] Restructure Studies Tab to incorporate Theses Offers --- assets/translations/de.json | 3 +- assets/translations/en.json | 3 +- lib/base/routing/router.dart | 17 +++- lib/base/routing/routes.dart | 3 + .../screen/grades_screen.dart | 19 ++++ .../screen/lectures_screen.dart | 19 ++++ .../screen/studies_screen.dart | 88 +++++++------------ .../screen/theses_screen.dart | 18 ++++ .../view/grade/widget/grades_widget_view.dart | 29 ++++++ .../basic_lecture_info_row_view.dart | 0 .../basic_lecture_info_view.dart | 4 +- .../detailed_lecture_info_row_view.dart | 0 .../detailed_lecture_info_view.dart | 4 +- .../lectureDetail/lecture_details_view.dart | 8 +- .../lectureDetail/lecture_info_card_view.dart | 0 .../lectureDetail/lecture_links_view.dart | 2 +- .../lecture_meeting_info_view.dart | 4 +- .../lecture/widget/lectures_widget_view.dart | 29 ++++++ .../view/studies_card_view.dart | 36 ++++++++ .../theses/widget/theses_widget_view.dart | 28 ++++++ 20 files changed, 246 insertions(+), 68 deletions(-) create mode 100644 lib/studiesComponent/screen/grades_screen.dart create mode 100644 lib/studiesComponent/screen/lectures_screen.dart create mode 100644 lib/studiesComponent/screen/theses_screen.dart create mode 100644 lib/studiesComponent/view/grade/widget/grades_widget_view.dart rename lib/studiesComponent/view/{ => lecture}/lectureDetail/basic_lecture_info_row_view.dart (100%) rename lib/studiesComponent/view/{ => lecture}/lectureDetail/basic_lecture_info_view.dart (92%) rename lib/studiesComponent/view/{ => lecture}/lectureDetail/detailed_lecture_info_row_view.dart (100%) rename lib/studiesComponent/view/{ => lecture}/lectureDetail/detailed_lecture_info_view.dart (84%) rename lib/studiesComponent/view/{ => lecture}/lectureDetail/lecture_details_view.dart (93%) rename lib/studiesComponent/view/{ => lecture}/lectureDetail/lecture_info_card_view.dart (100%) rename lib/studiesComponent/view/{ => lecture}/lectureDetail/lecture_links_view.dart (92%) rename lib/studiesComponent/view/{ => lecture}/lectureDetail/lecture_meeting_info_view.dart (87%) create mode 100644 lib/studiesComponent/view/lecture/widget/lectures_widget_view.dart create mode 100644 lib/studiesComponent/view/studies_card_view.dart create mode 100644 lib/studiesComponent/view/theses/widget/theses_widget_view.dart diff --git a/assets/translations/de.json b/assets/translations/de.json index 4a306098..91ac9ffb 100644 --- a/assets/translations/de.json +++ b/assets/translations/de.json @@ -234,5 +234,6 @@ "more": "Mehr", "visibility": "Sichtbarkeit", "utilizationAt": "Auslastung bei {}%", - "showStudentCardPicture": "Student Card Bild zeigen" + "showStudentCardPicture": "Student Card Bild zeigen", + "theses": "Abschlussarbeiten" } diff --git a/assets/translations/en.json b/assets/translations/en.json index 5508127a..4339cea2 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -234,5 +234,6 @@ "more": "More", "visibility": "Visibility", "utilizationAt": "Utilization at {}%", - "showStudentCardPicture": "Show Student Card Picture" + "showStudentCardPicture": "Show Student Card Picture", + "theses": "Theses" } diff --git a/lib/base/routing/router.dart b/lib/base/routing/router.dart index 5c0b8b87..ecc0931d 100644 --- a/lib/base/routing/router.dart +++ b/lib/base/routing/router.dart @@ -36,8 +36,11 @@ import 'package:campus_flutter/searchComponent/viewModels/search_viewmodel.dart' import 'package:campus_flutter/searchComponent/views/search_scaffold.dart'; import 'package:campus_flutter/settingsComponent/views/settings_scaffold.dart'; import 'package:campus_flutter/studiesComponent/model/lecture.dart'; +import 'package:campus_flutter/studiesComponent/screen/grades_screen.dart'; +import 'package:campus_flutter/studiesComponent/screen/lectures_screen.dart'; import 'package:campus_flutter/studiesComponent/screen/studies_screen.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/lecture_details_view.dart'; +import 'package:campus_flutter/studiesComponent/screen/theses_screen.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/lecture_details_view.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; @@ -154,6 +157,18 @@ final _router = GoRouter( ), ], ), + GoRoute( + path: grades, + builder: (context, state) => const GradesScreen(), + ), + GoRoute( + path: lectures, + builder: (context, state) => const LecturesScreen(), + ), + GoRoute( + path: theses, + builder: (context, state) => const ThesesScreen(), + ), GoRoute( path: lectureDetails, builder: (context, state) => LectureDetailsScaffold( diff --git a/lib/base/routing/routes.dart b/lib/base/routing/routes.dart index 60700284..e69b3dba 100644 --- a/lib/base/routing/routes.dart +++ b/lib/base/routing/routes.dart @@ -12,7 +12,10 @@ const fullScreenImage = "/fullScreenImage"; /// Studies tab const studies = "/studies"; +const grades = "/grades"; +const lectures = "/lectures"; const lectureDetails = "/lectureDetails"; +const theses = "/theses"; /// Calendar tab const calendar = "/calendar"; diff --git a/lib/studiesComponent/screen/grades_screen.dart b/lib/studiesComponent/screen/grades_screen.dart new file mode 100644 index 00000000..d8fa2b7b --- /dev/null +++ b/lib/studiesComponent/screen/grades_screen.dart @@ -0,0 +1,19 @@ +import 'package:campus_flutter/base/util/custom_back_button.dart'; +import 'package:campus_flutter/studiesComponent/view/grade/grades_view.dart'; +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; + +class GradesScreen extends StatelessWidget { + const GradesScreen({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + leading: CustomBackButton(), + title: Text(context.tr("grades")), + ), + body: GradesView(), + ); + } +} diff --git a/lib/studiesComponent/screen/lectures_screen.dart b/lib/studiesComponent/screen/lectures_screen.dart new file mode 100644 index 00000000..6a88caec --- /dev/null +++ b/lib/studiesComponent/screen/lectures_screen.dart @@ -0,0 +1,19 @@ +import 'package:campus_flutter/base/util/custom_back_button.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectures_view.dart'; +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; + +class LecturesScreen extends StatelessWidget { + const LecturesScreen({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + leading: CustomBackButton(), + title: Text(context.tr("lectures")), + ), + body: LecturesView(), + ); + } +} diff --git a/lib/studiesComponent/screen/studies_screen.dart b/lib/studiesComponent/screen/studies_screen.dart index fcb37a3a..feb0e821 100644 --- a/lib/studiesComponent/screen/studies_screen.dart +++ b/lib/studiesComponent/screen/studies_screen.dart @@ -1,8 +1,11 @@ -import 'package:campus_flutter/base/extensions/context.dart'; -import 'package:campus_flutter/studiesComponent/view/grade/grades_view.dart'; -import 'package:campus_flutter/studiesComponent/view/lecture/lectures_view.dart'; +import 'package:campus_flutter/base/routing/routes.dart'; +import 'package:campus_flutter/studiesComponent/view/grade/widget/grades_widget_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/widget/lectures_widget_view.dart'; +import 'package:campus_flutter/studiesComponent/view/studies_card_view.dart'; +import 'package:campus_flutter/studiesComponent/view/theses/widget/theses_widget_view.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; class StudiesScreen extends StatefulWidget { const StudiesScreen({super.key}); @@ -12,62 +15,39 @@ class StudiesScreen extends StatefulWidget { } class _StudiesScreenState extends State { - int selectedPage = 0; - PageController pageController = PageController(); - - final List pages = const [ - GradesView(), - LecturesView(), - ]; - - @override - void dispose() { - pageController.dispose(); - super.dispose(); - } - @override Widget build(BuildContext context) { - return Column( - children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: context.padding), - child: SizedBox( - width: double.infinity, - child: SegmentedButton( - showSelectedIcon: false, - segments: [ - ButtonSegment(value: 0, label: Text(context.tr("grades"))), - ButtonSegment(value: 1, label: Text(context.tr("lectures"))), - ], - selected: { - selectedPage, + return LayoutBuilder( + builder: (context, constraints) { + return Column( + children: [ + StudiesCardView( + title: context.tr("grades"), + body: GradesWidgetView(), + height: constraints.maxHeight / 3, + onTap: () { + context.push(grades); + }, + ), + StudiesCardView( + title: context.tr("lectures"), + body: LecturesWidgetView(), + height: constraints.maxHeight / 3, + onTap: () { + context.push(lectures); }, - onSelectionChanged: (selection) { - setState(() { - selectedPage = selection.first; - }); - pageController.animateToPage( - selectedPage, - duration: const Duration(milliseconds: 300), - curve: Curves.easeInOut, - ); + ), + StudiesCardView( + title: context.tr("theses"), + body: ThesesWidgetView(), + height: constraints.maxHeight / 3, + onTap: () { + context.push(theses); }, ), - ), - ), - Expanded( - child: PageView( - controller: pageController, - onPageChanged: (page) { - setState(() { - selectedPage = page; - }); - }, - children: pages, - ), - ), - ], + ], + ); + }, ); } } diff --git a/lib/studiesComponent/screen/theses_screen.dart b/lib/studiesComponent/screen/theses_screen.dart new file mode 100644 index 00000000..6636ffe7 --- /dev/null +++ b/lib/studiesComponent/screen/theses_screen.dart @@ -0,0 +1,18 @@ +import 'package:campus_flutter/base/util/custom_back_button.dart'; +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; + +class ThesesScreen extends StatelessWidget { + const ThesesScreen({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + leading: CustomBackButton(), + title: Text(context.tr("theses")), + ), + body: Text("Theses"), + ); + } +} diff --git a/lib/studiesComponent/view/grade/widget/grades_widget_view.dart b/lib/studiesComponent/view/grade/widget/grades_widget_view.dart new file mode 100644 index 00000000..bc22cb52 --- /dev/null +++ b/lib/studiesComponent/view/grade/widget/grades_widget_view.dart @@ -0,0 +1,29 @@ +import 'package:campus_flutter/studiesComponent/viewModel/grade_viewmodel.dart'; +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +class GradesWidgetView extends ConsumerStatefulWidget { + const GradesWidgetView({super.key}); + + @override + ConsumerState createState() => + _GradesWidgetViewState(); +} + +class _GradesWidgetViewState extends ConsumerState { + @override + void initState() { + ref.read(gradeViewModel).fetch(false); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Center( + child: Text( + context.tr("grades"), + ), + ); + } +} diff --git a/lib/studiesComponent/view/lectureDetail/basic_lecture_info_row_view.dart b/lib/studiesComponent/view/lecture/lectureDetail/basic_lecture_info_row_view.dart similarity index 100% rename from lib/studiesComponent/view/lectureDetail/basic_lecture_info_row_view.dart rename to lib/studiesComponent/view/lecture/lectureDetail/basic_lecture_info_row_view.dart diff --git a/lib/studiesComponent/view/lectureDetail/basic_lecture_info_view.dart b/lib/studiesComponent/view/lecture/lectureDetail/basic_lecture_info_view.dart similarity index 92% rename from lib/studiesComponent/view/lectureDetail/basic_lecture_info_view.dart rename to lib/studiesComponent/view/lecture/lectureDetail/basic_lecture_info_view.dart index 7d4147b6..923895c0 100644 --- a/lib/studiesComponent/view/lectureDetail/basic_lecture_info_view.dart +++ b/lib/studiesComponent/view/lecture/lectureDetail/basic_lecture_info_view.dart @@ -2,9 +2,9 @@ import 'package:campus_flutter/base/routing/routes.dart'; import 'package:campus_flutter/base/util/speaker.dart'; import 'package:campus_flutter/studiesComponent/model/lecture.dart'; import 'package:campus_flutter/studiesComponent/model/lecture_details.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/basic_lecture_info_row_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/basic_lecture_info_row_view.dart'; import 'package:campus_flutter/base/extensions/context.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/lecture_info_card_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/lecture_info_card_view.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/studiesComponent/view/lectureDetail/detailed_lecture_info_row_view.dart b/lib/studiesComponent/view/lecture/lectureDetail/detailed_lecture_info_row_view.dart similarity index 100% rename from lib/studiesComponent/view/lectureDetail/detailed_lecture_info_row_view.dart rename to lib/studiesComponent/view/lecture/lectureDetail/detailed_lecture_info_row_view.dart diff --git a/lib/studiesComponent/view/lectureDetail/detailed_lecture_info_view.dart b/lib/studiesComponent/view/lecture/lectureDetail/detailed_lecture_info_view.dart similarity index 84% rename from lib/studiesComponent/view/lectureDetail/detailed_lecture_info_view.dart rename to lib/studiesComponent/view/lecture/lectureDetail/detailed_lecture_info_view.dart index e99d9f35..6aee3d79 100644 --- a/lib/studiesComponent/view/lectureDetail/detailed_lecture_info_view.dart +++ b/lib/studiesComponent/view/lecture/lectureDetail/detailed_lecture_info_view.dart @@ -1,6 +1,6 @@ import 'package:campus_flutter/studiesComponent/model/lecture_details.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/detailed_lecture_info_row_view.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/lecture_info_card_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/detailed_lecture_info_row_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/lecture_info_card_view.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; diff --git a/lib/studiesComponent/view/lectureDetail/lecture_details_view.dart b/lib/studiesComponent/view/lecture/lectureDetail/lecture_details_view.dart similarity index 93% rename from lib/studiesComponent/view/lectureDetail/lecture_details_view.dart rename to lib/studiesComponent/view/lecture/lectureDetail/lecture_details_view.dart index bda7df57..bf6a1519 100644 --- a/lib/studiesComponent/view/lectureDetail/lecture_details_view.dart +++ b/lib/studiesComponent/view/lecture/lectureDetail/lecture_details_view.dart @@ -9,10 +9,10 @@ import 'package:campus_flutter/base/util/color_picker_view.dart'; import 'package:campus_flutter/calendarComponent/views/visibility_button_view.dart'; import 'package:campus_flutter/studiesComponent/model/lecture.dart'; import 'package:campus_flutter/studiesComponent/model/lecture_details.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/basic_lecture_info_view.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/detailed_lecture_info_view.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/lecture_links_view.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/lecture_meeting_info_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/basic_lecture_info_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/detailed_lecture_info_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/lecture_links_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/lecture_meeting_info_view.dart'; import 'package:campus_flutter/studiesComponent/viewModel/lecture_details_viewmodel.dart'; import 'package:campus_flutter/base/extensions/context.dart'; import 'package:easy_localization/easy_localization.dart'; diff --git a/lib/studiesComponent/view/lectureDetail/lecture_info_card_view.dart b/lib/studiesComponent/view/lecture/lectureDetail/lecture_info_card_view.dart similarity index 100% rename from lib/studiesComponent/view/lectureDetail/lecture_info_card_view.dart rename to lib/studiesComponent/view/lecture/lectureDetail/lecture_info_card_view.dart diff --git a/lib/studiesComponent/view/lectureDetail/lecture_links_view.dart b/lib/studiesComponent/view/lecture/lectureDetail/lecture_links_view.dart similarity index 92% rename from lib/studiesComponent/view/lectureDetail/lecture_links_view.dart rename to lib/studiesComponent/view/lecture/lectureDetail/lecture_links_view.dart index acdacea2..92cfa5bc 100644 --- a/lib/studiesComponent/view/lectureDetail/lecture_links_view.dart +++ b/lib/studiesComponent/view/lecture/lectureDetail/lecture_links_view.dart @@ -1,6 +1,6 @@ import 'package:campus_flutter/base/util/hyperlink_text.dart'; import 'package:campus_flutter/studiesComponent/model/lecture_details.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/lecture_info_card_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/lecture_info_card_view.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; diff --git a/lib/studiesComponent/view/lectureDetail/lecture_meeting_info_view.dart b/lib/studiesComponent/view/lecture/lectureDetail/lecture_meeting_info_view.dart similarity index 87% rename from lib/studiesComponent/view/lectureDetail/lecture_meeting_info_view.dart rename to lib/studiesComponent/view/lecture/lectureDetail/lecture_meeting_info_view.dart index a1e17068..0e97b261 100644 --- a/lib/studiesComponent/view/lectureDetail/lecture_meeting_info_view.dart +++ b/lib/studiesComponent/view/lecture/lectureDetail/lecture_meeting_info_view.dart @@ -1,7 +1,7 @@ import 'package:campus_flutter/base/routing/routes.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/lecture_info_card_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/lecture_info_card_view.dart'; import 'package:campus_flutter/studiesComponent/viewModel/lecture_details_viewmodel.dart'; -import 'package:campus_flutter/studiesComponent/view/lectureDetail/basic_lecture_info_row_view.dart'; +import 'package:campus_flutter/studiesComponent/view/lecture/lectureDetail/basic_lecture_info_row_view.dart'; import 'package:campus_flutter/base/extensions/context.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; diff --git a/lib/studiesComponent/view/lecture/widget/lectures_widget_view.dart b/lib/studiesComponent/view/lecture/widget/lectures_widget_view.dart new file mode 100644 index 00000000..c3119475 --- /dev/null +++ b/lib/studiesComponent/view/lecture/widget/lectures_widget_view.dart @@ -0,0 +1,29 @@ +import 'package:campus_flutter/studiesComponent/viewModel/lecture_viewmodel.dart'; +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +class LecturesWidgetView extends ConsumerStatefulWidget { + const LecturesWidgetView({super.key}); + + @override + ConsumerState createState() => + _LecturesWidgetViewState(); +} + +class _LecturesWidgetViewState extends ConsumerState { + @override + void initState() { + ref.read(lectureViewModel).fetch(false); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Center( + child: Text( + context.tr("lectures"), + ), + ); + } +} diff --git a/lib/studiesComponent/view/studies_card_view.dart b/lib/studiesComponent/view/studies_card_view.dart new file mode 100644 index 00000000..9824569f --- /dev/null +++ b/lib/studiesComponent/view/studies_card_view.dart @@ -0,0 +1,36 @@ +import 'package:campus_flutter/homeComponent/view/widget/widget_frame_view.dart'; +import 'package:flutter/material.dart'; + +class StudiesCardView extends StatelessWidget { + const StudiesCardView({ + super.key, + required this.title, + required this.body, + required this.height, + required this.onTap, + }); + + final String title; + final Widget body; + final double height; + final void Function() onTap; + + @override + Widget build(BuildContext context) { + return SizedBox( + height: height, + width: double.maxFinite, + child: WidgetFrameView( + title: title, + child: Expanded( + child: InkWell( + onTap: onTap, + child: Card( + child: body, + ), + ), + ), + ), + ); + } +} diff --git a/lib/studiesComponent/view/theses/widget/theses_widget_view.dart b/lib/studiesComponent/view/theses/widget/theses_widget_view.dart new file mode 100644 index 00000000..7ed1ac4a --- /dev/null +++ b/lib/studiesComponent/view/theses/widget/theses_widget_view.dart @@ -0,0 +1,28 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +class ThesesWidgetView extends ConsumerStatefulWidget { + const ThesesWidgetView({super.key}); + + @override + ConsumerState createState() => + _ThesesWidgetViewState(); +} + +class _ThesesWidgetViewState extends ConsumerState { + @override + void initState() { + // TODO: fetch available theses offers + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Center( + child: Text( + context.tr("theses"), + ), + ); + } +}