From d000f6e5a7803ff0d5d75f56b46de98c5872ab0e Mon Sep 17 00:00:00 2001 From: Krille Date: Thu, 5 Jan 2023 18:21:13 +0100 Subject: [PATCH] chore: Update dependencies --- lib/pages/login/login.dart | 4 +- linux/flutter/generated_plugin_registrant.cc | 4 ++ linux/flutter/generated_plugins.cmake | 1 + macos/Flutter/GeneratedPluginRegistrant.swift | 6 ++ pubspec.lock | 56 +++++-------------- pubspec.yaml | 16 +++--- .../flutter/generated_plugin_registrant.cc | 3 + windows/flutter/generated_plugins.cmake | 1 + 8 files changed, 38 insertions(+), 53 deletions(-) diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 8dad28c4..94da9610 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:email_validator/email_validator.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; @@ -250,8 +249,9 @@ class LoginController extends State { extension on String { static final RegExp _phoneRegex = RegExp(r'^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9]*$'); + static final RegExp _emailRegex = RegExp(r'(.+)@(.+)\.(.+)'); - bool get isEmail => EmailValidator.validate(this); + bool get isEmail => _emailRegex.hasMatch(this); bool get isPhoneNumber => _phoneRegex.hasMatch(this); } diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 14d91e18..14a0ae40 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -22,6 +23,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) desktop_lifecycle_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopLifecyclePlugin"); desktop_lifecycle_plugin_register_with_registrar(desktop_lifecycle_registrar); + g_autoptr(FlPluginRegistrar) dynamic_color_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin"); + dynamic_color_plugin_register_with_registrar(dynamic_color_registrar); g_autoptr(FlPluginRegistrar) emoji_picker_flutter_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "EmojiPickerFlutterPlugin"); emoji_picker_flutter_plugin_register_with_registrar(emoji_picker_flutter_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 820f9381..75edb169 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -5,6 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_drop desktop_lifecycle + dynamic_color emoji_picker_flutter file_selector_linux flutter_secure_storage_linux diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 5d5ceb70..0c8c2602 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,13 +10,16 @@ import connectivity_plus import desktop_drop import desktop_lifecycle import device_info_plus +import dynamic_color import emoji_picker_flutter +import flutter_app_badger import flutter_local_notifications import flutter_secure_storage_macos import flutter_web_auth import flutter_webrtc import geolocator_apple import just_audio +import macos_ui import package_info_plus_macos import path_provider_macos import record_macos @@ -33,13 +36,16 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin")) DesktopLifecyclePlugin.register(with: registry.registrar(forPlugin: "DesktopLifecyclePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) + DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin")) EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin")) + FlutterAppBadgerPlugin.register(with: registry.registrar(forPlugin: "FlutterAppBadgerPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin")) FlutterWebAuthPlugin.register(with: registry.registrar(forPlugin: "FlutterWebAuthPlugin")) FlutterWebRTCPlugin.register(with: registry.registrar(forPlugin: "FlutterWebRTCPlugin")) GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin")) + MacOSUiPlugin.register(with: registry.registrar(forPlugin: "MacOSUiPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) RecordMacosPlugin.register(with: registry.registrar(forPlugin: "RecordMacosPlugin")) diff --git a/pubspec.lock b/pubspec.lock index 5fb1403a..d15884e6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: adaptive_dialog url: "https://pub.dartlang.org" source: hosted - version: "1.6.1" + version: "1.8.0+1" analyzer: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: animations url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.7" ansicolor: dependency: transitive description: @@ -57,13 +57,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.3.1" - asn1lib: - dependency: transitive - description: - name: asn1lib - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" async: dependency: transitive description: @@ -161,7 +154,7 @@ packages: name: chewie url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.3.6" cli_dialog: dependency: transitive description: @@ -238,7 +231,7 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" dart_code_metrics: dependency: "direct dev" description: @@ -316,20 +309,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.2.1" - email_validator: - dependency: "direct main" + dynamic_color: + dependency: transitive description: - name: email_validator + name: dynamic_color url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "1.5.4" emoji_picker_flutter: dependency: "direct main" description: name: emoji_picker_flutter url: "https://pub.dartlang.org" source: hosted - version: "1.5.0" + version: "1.5.1" emoji_proposal: dependency: "direct main" description: @@ -344,13 +337,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.9.9" - encrypt: - dependency: "direct main" - description: - name: encrypt - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.1" enhanced_enum: dependency: transitive description: @@ -439,7 +425,7 @@ packages: name: flutter_app_badger url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.5.0" flutter_app_lock: dependency: "direct main" description: @@ -930,7 +916,7 @@ packages: name: macos_ui url: "https://pub.dartlang.org" source: hosted - version: "0.13.1" + version: "1.7.5" markdown: dependency: transitive description: @@ -1253,13 +1239,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.2" - pointycastle: - dependency: transitive - description: - name: pointycastle - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.2" polylabel: dependency: transitive description: @@ -1818,13 +1797,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.2" - very_good_analysis: - dependency: transitive - description: - name: very_good_analysis - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" vibration: dependency: "direct main" description: @@ -1852,14 +1824,14 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.10" video_player_android: dependency: transitive description: name: video_player_android url: "https://pub.dartlang.org" source: hosted - version: "2.3.2" + version: "2.3.10" video_player_avfoundation: dependency: transitive description: @@ -1908,7 +1880,7 @@ packages: name: wakelock url: "https://pub.dartlang.org" source: hosted - version: "0.6.1+2" + version: "0.6.2" wakelock_macos: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 16ad0faa..ea4db187 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,29 +7,27 @@ environment: sdk: ">=2.12.0 <3.0.0" dependencies: - adaptive_dialog: ^1.5.1 - animations: ^2.0.2 + adaptive_dialog: ^1.8.0+1 + animations: ^2.0.7 badges: ^2.0.3 blurhash_dart: ^1.1.0 callkeep: ^0.3.2 - chewie: ^1.2.2 - collection: ^1.15.0-nullsafety.4 + chewie: ^1.3.6 + collection: ^1.16.0 connectivity_plus: ^3.0.2 cupertino_icons: any desktop_drop: ^0.4.0 desktop_lifecycle: ^0.1.0 desktop_notifications: ^0.6.3 device_info_plus: ^8.0.0 - email_validator: ^2.0.1 - emoji_picker_flutter: ^1.5.0 + emoji_picker_flutter: ^1.5.1 emoji_proposal: ^0.0.1 - emojis: ^0.9.0 - encrypt: ^5.0.1 + emojis: ^0.9.9 #fcm_shared_isolate: ^0.1.0 file_picker_cross: ^4.6.0 flutter: sdk: flutter - flutter_app_badger: ^1.3.0 + flutter_app_badger: ^1.5.0 flutter_app_lock: ^3.0.0 flutter_blurhash: ^0.7.0 flutter_cache_manager: ^3.3.0 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 58a4f972..754c8bd9 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -23,6 +24,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("DesktopDropPlugin")); DesktopLifecyclePluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("DesktopLifecyclePlugin")); + DynamicColorPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("DynamicColorPluginCApi")); EmojiPickerFlutterPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("EmojiPickerFlutterPluginCApi")); FlutterWebRTCPluginRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 7217d802..a27216e4 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST connectivity_plus desktop_drop desktop_lifecycle + dynamic_color emoji_picker_flutter flutter_webrtc permission_handler_windows