From 7bb2e66ab188252217c3cf1d512ff4406be7efbf Mon Sep 17 00:00:00 2001 From: Krille Date: Tue, 7 Feb 2023 16:38:02 +0100 Subject: [PATCH] refactor: Update dependencies --- lib/utils/voip_plugin.dart | 4 - lib/widgets/unread_rooms_badge.dart | 36 ++++---- macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- pubspec.lock | 92 +++++++++---------- pubspec.yaml | 12 +-- 5 files changed, 73 insertions(+), 73 deletions(-) diff --git a/lib/utils/voip_plugin.dart b/lib/utils/voip_plugin.dart index 2accf7a2..1f996856 100644 --- a/lib/utils/voip_plugin.dart +++ b/lib/utils/voip_plugin.dart @@ -98,10 +98,6 @@ class VoipPlugin with WidgetsBindingObserver implements WebRTCDelegate { @override MediaDevices get mediaDevices => webrtc_impl.navigator.mediaDevices; - @override - // remove this from sdk once callkeep is stable - bool get isBackgroud => false; - @override bool get isWeb => kIsWeb; diff --git a/lib/widgets/unread_rooms_badge.dart b/lib/widgets/unread_rooms_badge.dart index 3c8fc6c3..e4d33e31 100644 --- a/lib/widgets/unread_rooms_badge.dart +++ b/lib/widgets/unread_rooms_badge.dart @@ -32,25 +32,29 @@ class UnreadRoomsBadge extends StatelessWidget { .where(filter) .where((r) => (r.isUnread || r.membership == Membership.invite)) .length; - return b.Badge( + return Align( alignment: Alignment.bottomRight, - badgeContent: Text( - unreadCount.toString(), - style: TextStyle( - color: Theme.of(context).colorScheme.onPrimary, - fontSize: 12, + child: b.Badge( + badgeStyle: b.BadgeStyle( + badgeColor: Theme.of(context).colorScheme.primary, + elevation: 4, + borderSide: BorderSide( + color: Theme.of(context).colorScheme.background, + width: 2, + ), ), + badgeContent: Text( + unreadCount.toString(), + style: TextStyle( + color: Theme.of(context).colorScheme.onPrimary, + fontSize: 12, + ), + ), + showBadge: unreadCount != 0, + badgeAnimation: const b.BadgeAnimation.scale(), + position: badgePosition, + child: child, ), - showBadge: unreadCount != 0, - animationType: b.BadgeAnimationType.scale, - badgeColor: Theme.of(context).colorScheme.primary, - position: badgePosition, - elevation: 4, - borderSide: BorderSide( - color: Theme.of(context).colorScheme.background, - width: 2, - ), - child: child, ); }); } diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index b5c1f2c1..aced5cbd 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -25,7 +25,7 @@ import package_info_plus_macos import path_provider_foundation import record_macos import share_plus_macos -import shared_preferences_macos +import shared_preferences_foundation import sqflite import url_launcher_macos import video_compress diff --git a/pubspec.lock b/pubspec.lock index 8e0342f2..31c1a329 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: d976d24314f193899a3079b14fe336215a63a3b1e1c3743eabba8f83e049e9a9 + sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201" url: "https://pub.dev" source: hosted - version: "49.0.0" + version: "52.0.0" adaptive_dialog: dependency: "direct main" description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: analyzer - sha256: "40ba2c6d2ab41a66476f8f1f099da6be0795c1b47221f5e2c5f8ad6048cdffae" + sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.4.0" analyzer_plugin: dependency: transitive description: @@ -85,10 +85,10 @@ packages: dependency: "direct main" description: name: badges - sha256: "727580d938b7a1ff47ea42df730d581415606b4224cfa708671c10287f8d3fe6" + sha256: "461031a60efbb95276f52107f63d5d45008b5ca1eb7f8ca440cadda9ec2143b0" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.2" base58check: dependency: transitive description: @@ -237,10 +237,10 @@ packages: dependency: transitive description: name: cross_file - sha256: f71079978789bc2fe78d79227f1f8cfe195b31bbd8db2399b0d15a4b96fb843b + sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" url: "https://pub.dev" source: hosted - version: "0.3.3+2" + version: "0.3.3+4" crypto: dependency: transitive description: @@ -269,10 +269,18 @@ packages: dependency: "direct dev" description: name: dart_code_metrics - sha256: "219607f5abbf4c0d254ca39ee009f9ff28df91c40aef26718fde15af6b7a6c24" + sha256: bb4ec5e729788dde5f7e8e9df4c05ec3b78532a5763e635337153ce40085514b url: "https://pub.dev" source: hosted - version: "4.21.3" + version: "5.5.1" + dart_code_metrics_presets: + dependency: transitive + description: + name: dart_code_metrics_presets + sha256: "43dc1fdcb424fc3aa79964304d09eeda4f199351c52cdc854f8228a9d0296b60" + url: "https://pub.dev" + source: hosted + version: "1.1.0" dart_style: dependency: transitive description: @@ -349,10 +357,10 @@ packages: dependency: "direct main" description: name: dynamic_color - sha256: "0ff251e8a31f54adde9ab4d4b301c94df46dcd34e4fbd6d7623631ed174b205e" + sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b url: "https://pub.dev" source: hosted - version: "1.6.0" + version: "1.6.2" emoji_picker_flutter: dependency: "direct main" description: @@ -543,10 +551,10 @@ packages: dependency: "direct main" description: name: flutter_foreground_task - sha256: "5eb81adfd98c77f4d4803ae80d7e0573fd35f706fce6aaa7376656a15ba2d1e0" + sha256: a19d6a8aa469e886dc4e8caf8b6394611302374a872adff249aee0ba4664d0b0 url: "https://pub.dev" source: hosted - version: "3.10.0" + version: "4.0.0" flutter_highlight: dependency: transitive description: @@ -770,10 +778,10 @@ packages: dependency: "direct main" description: name: flutter_typeahead - sha256: "9ed8fe6412ba4c1196c0cada258f476b42361d59e3c831e406ce263ba229ec1d" + sha256: "73eb76fa640ea630e2d957e7b469ab2b91e4da6c4950d6032fab7009275637b7" url: "https://pub.dev" source: hosted - version: "4.3.2" + version: "4.3.3" flutter_web_auth: dependency: "direct main" description: @@ -869,10 +877,10 @@ packages: dependency: "direct main" description: name: handy_window - sha256: "57fb3c5623cf6e750135235fd44116bf9517f2d6a3043bbb8d9581917bcb08ab" + sha256: e840f9e9e62bd6a94acdb792ced3c8660538ae7826cdf3a0e6a27bbcc349fdef url: "https://pub.dev" source: hosted - version: "0.1.9" + version: "0.3.0" highlight: dependency: transitive description: @@ -965,10 +973,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: "39c013200046d14c58b71dc4fa3d00e425fc9c699d589136cd3ca018727c0493" + sha256: "8ffb14b43713d7c43fb21299cc18181cc5b39bd3ea1cc427a085c6400fe5aa52" url: "https://pub.dev" source: hosted - version: "0.8.6+6" + version: "0.8.6+7" image_picker_platform_interface: dependency: transitive description: @@ -1107,10 +1115,10 @@ packages: dependency: transitive description: name: macos_ui - sha256: f4581e71b7b06e0d8daa0696fcd5a26677d53a9dbb87ae681d5617829292194b + sha256: "2b31858b56d44e807cf192c58cf6660b584c997f4746496d4892a903c1c27a49" url: "https://pub.dev" source: hosted - version: "1.7.6" + version: "1.9.1" markdown: dependency: transitive description: @@ -1139,10 +1147,10 @@ packages: dependency: "direct main" description: name: matrix - sha256: "4c69e3e6fb75703b8dec9cde5196bfc46c8f54ea7301681624fdb590b34852b8" + sha256: "175bab5d2b836635485a575540037fd23ece47d17ee2451d0840b6f7279e324b" url: "https://pub.dev" source: hosted - version: "0.15.13" + version: "0.16.0" matrix_api_lite: dependency: transitive description: @@ -1251,10 +1259,10 @@ packages: dependency: transitive description: name: olm - sha256: cf10282cff694b6eff9727f5d7ace0741771113cad6582f04e8682cce4160768 + sha256: "37948a6576949256f3ee1d0063d5b408634ff7e452b9a5c2f6410f9d7ced1c20" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" package_config: dependency: transitive description: @@ -1715,10 +1723,10 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "76917b7d4b9526b2ba416808a7eb9fb2863c1a09cf63ec85f1453da240fa818a" + sha256: "5949029e70abe87f75cfe59d17bf5c397619c4b74a099b10116baeb34786fad9" url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.0.17" shared_preferences_android: dependency: transitive description: @@ -1727,14 +1735,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.15" - shared_preferences_ios: + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_ios - sha256: "585a14cefec7da8c9c2fb8cd283a3bb726b4155c0952afe6a0caaa7b2272de34" + name: shared_preferences_foundation + sha256: "2b55c18636a4edc529fa5cd44c03d3f3100c00513f518c5127c951978efcccd0" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.3" shared_preferences_linux: dependency: transitive description: @@ -1743,14 +1751,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.3" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - sha256: "81b6a60b2d27020eb0fc41f4cebc91353047309967901a79ee8203e40c42ed46" - url: "https://pub.dev" - source: hosted - version: "2.0.5" shared_preferences_platform_interface: dependency: transitive description: @@ -1888,10 +1888,10 @@ packages: dependency: transitive description: name: tint - sha256: d856019547532d4ea24171f554b319081c004c37741e7946eae30cb09f24e1c7 + sha256: "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" tor_detector_web: dependency: "direct main" description: @@ -2008,10 +2008,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809" + sha256: e8f2efc804810c0f2f5b485f49e7942179f56eabcfe81dce3387fec4bb55876b url: "https://pub.dev" source: hosted - version: "6.1.8" + version: "6.1.9" url_launcher_android: dependency: transitive description: @@ -2024,10 +2024,10 @@ packages: dependency: transitive description: name: url_launcher_ios - sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3 + sha256: "0a5af0aefdd8cf820dd739886efb1637f1f24489900204f50984634c07a54815" url: "https://pub.dev" source: hosted - version: "6.0.18" + version: "6.1.0" url_launcher_linux: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7892f7ce..0d1bd472 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: adaptive_dialog: ^1.8.0+1 animations: ^2.0.7 - badges: ^2.0.3 + badges: ^3.0.2 blurhash_dart: ^1.1.0 callkeep: ^0.3.2 chewie: ^1.3.6 @@ -32,7 +32,7 @@ dependencies: flutter_app_lock: ^3.0.0 flutter_blurhash: ^0.7.0 flutter_cache_manager: ^3.3.0 - flutter_foreground_task: ^3.10.0 + flutter_foreground_task: ^4.0.0 flutter_local_notifications: ^12.0.2 flutter_localizations: sdk: flutter @@ -48,7 +48,7 @@ dependencies: git: https://github.com/radzio-it/flutter-webrtc.git future_loading_dialog: ^0.2.3 geolocator: ^7.6.2 - handy_window: ^0.1.9 + handy_window: ^0.3.0 hive: ^2.2.3 hive_flutter: ^1.1.0 http: ^0.13.4 @@ -59,7 +59,7 @@ dependencies: just_audio_mpv: ^0.1.6 keyboard_shortcuts: ^0.1.4 latlong2: ^0.8.1 - matrix: ^0.15.12 + matrix: ^0.16.0 matrix_homeserver_recommendations: ^0.3.0 matrix_link_text: ^1.0.2 native_imaging: ^0.1.0 @@ -75,7 +75,7 @@ dependencies: record: ^4.4.4 scroll_to_index: ^3.0.1 share_plus: ^4.0.10+1 - shared_preferences: 2.0.15 # Pinned because https://github.com/flutter/flutter/issues/118401 + shared_preferences: ^2.0.17 # Pinned because https://github.com/flutter/flutter/issues/118401 slugify: ^2.0.0 swipe_to_action: ^0.2.0 tor_detector_web: ^1.1.0 @@ -91,7 +91,7 @@ dependencies: webrtc_interface: ^1.0.10 dev_dependencies: - dart_code_metrics: ^4.10.1 + dart_code_metrics: ^5.5.1 flutter_lints: ^2.0.1 flutter_native_splash: ^2.0.3+1 flutter_test: