From 96e6d76051af830114597b4727cc2aa25cce0618 Mon Sep 17 00:00:00 2001 From: Gabby Gurdin Date: Tue, 16 Apr 2024 15:25:18 -0400 Subject: [PATCH] updates dependencies to match fluffychat, remove unused dependencies --- lib/pages/chat/chat_emoji_picker.dart | 46 +++++---- lib/pages/chat/events/map_bubble.dart | 7 +- lib/pages/dialer/dialer.dart | 15 +-- .../homeserver_picker/homeserver_app_bar.dart | 9 +- pubspec.yaml | 95 ++++++++----------- 5 files changed, 79 insertions(+), 93 deletions(-) diff --git a/lib/pages/chat/chat_emoji_picker.dart b/lib/pages/chat/chat_emoji_picker.dart index 28edafcd7..516084d99 100644 --- a/lib/pages/chat/chat_emoji_picker.dart +++ b/lib/pages/chat/chat_emoji_picker.dart @@ -1,11 +1,10 @@ -import 'package:flutter/material.dart'; - import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; +import 'package:fluffychat/config/themes.dart'; +import 'package:fluffychat/pages/chat/sticker_picker_dialog.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat/sticker_picker_dialog.dart'; import 'chat.dart'; class ChatEmojiPicker extends StatelessWidget { @@ -41,21 +40,30 @@ class ChatEmojiPicker extends StatelessWidget { onEmojiSelected: controller.onEmojiSelected, onBackspacePressed: controller.emojiPickerBackspace, config: Config( - backspaceColor: theme.colorScheme.primary, - bgColor: - Theme.of(context).colorScheme.onInverseSurface, - iconColor: - theme.colorScheme.primary.withOpacity(0.5), - iconColorSelected: theme.colorScheme.primary, - indicatorColor: theme.colorScheme.primary, - noRecents: const NoRecent(), - skinToneDialogBgColor: Color.lerp( - theme.colorScheme.background, - theme.colorScheme.primaryContainer, - 0.75, - )!, - skinToneIndicatorColor: - theme.colorScheme.onBackground, + emojiViewConfig: EmojiViewConfig( + noRecents: const NoRecent(), + backgroundColor: Theme.of(context) + .colorScheme + .onInverseSurface, + ), + bottomActionBarConfig: const BottomActionBarConfig( + enabled: false, + ), + categoryViewConfig: CategoryViewConfig( + backspaceColor: theme.colorScheme.primary, + iconColor: + theme.colorScheme.primary.withOpacity(0.5), + iconColorSelected: theme.colorScheme.primary, + indicatorColor: theme.colorScheme.primary, + ), + skinToneConfig: SkinToneConfig( + dialogBackgroundColor: Color.lerp( + theme.colorScheme.background, + theme.colorScheme.primaryContainer, + 0.75, + )!, + indicatorColor: theme.colorScheme.onBackground, + ), ), ), StickerPickerDialog( diff --git a/lib/pages/chat/events/map_bubble.dart b/lib/pages/chat/events/map_bubble.dart index c441c7d64..d9cea7695 100644 --- a/lib/pages/chat/events/map_bubble.dart +++ b/lib/pages/chat/events/map_bubble.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; - import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; @@ -32,8 +31,8 @@ class MapBubble extends StatelessWidget { children: [ FlutterMap( options: MapOptions( - center: LatLng(latitude, longitude), - zoom: zoom, + initialCenter: LatLng(latitude, longitude), + initialZoom: zoom, ), children: [ TileLayer( @@ -50,7 +49,7 @@ class MapBubble extends StatelessWidget { point: LatLng(latitude, longitude), width: 30, height: 30, - builder: (_) => Transform.translate( + child: Transform.translate( // No idea why the offset has to be like this, instead of -15 // It has been determined by trying out, though, that this yields // the tip of the location pin to be static when zooming. diff --git a/lib/pages/dialer/dialer.dart b/lib/pages/dialer/dialer.dart index a8e5a9202..b6c0a6da3 100644 --- a/lib/pages/dialer/dialer.dart +++ b/lib/pages/dialer/dialer.dart @@ -19,20 +19,19 @@ import 'dart:async'; import 'dart:math'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/widgets/avatar.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; - +import 'package:flutter/services.dart'; import 'package:flutter_foreground_task/flutter_foreground_task.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_webrtc/flutter_webrtc.dart'; import 'package:just_audio/just_audio.dart'; import 'package:matrix/matrix.dart'; -import 'package:vibration/vibration.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/avatar.dart'; import 'pip/pip_view.dart'; class _StreamView extends StatelessWidget { @@ -264,11 +263,7 @@ class MyCallingPage extends State { void _handleCallState(CallState state) { Logs().v('CallingPage::handleCallState: ${state.toString()}'); if ({CallState.kConnected, CallState.kEnded}.contains(state)) { - try { - Vibration.vibrate(duration: 200); - } catch (e) { - Logs().e('[Dialer] could not vibrate for call updates'); - } + HapticFeedback.heavyImpact(); } if (mounted) { diff --git a/lib/pages/homeserver_picker/homeserver_app_bar.dart b/lib/pages/homeserver_picker/homeserver_app_bar.dart index 9ae168f97..060235beb 100644 --- a/lib/pages/homeserver_picker/homeserver_app_bar.dart +++ b/lib/pages/homeserver_picker/homeserver_app_bar.dart @@ -1,12 +1,11 @@ -import 'package:flutter/material.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_typeahead/flutter_typeahead.dart'; - import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/homeserver_picker/public_homeserver.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_typeahead/flutter_typeahead.dart'; + import 'homeserver_bottom_sheet.dart'; import 'homeserver_picker.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 8660a98a2..f8d1260e6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,29 +6,29 @@ description: Learn a language while texting your friends. # Pangea# publish_to: none # On version bump also increase the build number for F-Droid -version: 1.19.1+3530 +version: 1.19.2+3531 environment: sdk: ">=3.0.0 <4.0.0" dependencies: adaptive_dialog: ^2.1.0 - animations: ^2.0.8 - archive: ^3.4.9 + animations: ^2.0.11 + archive: ^3.4.10 async: ^2.11.0 badges: ^3.1.2 blurhash_dart: ^1.2.1 callkeep: ^0.3.2 - chewie: ^1.7.1 - collection: ^1.17.2 + chewie: ^1.8.1 + collection: ^1.18.0 cupertino_icons: any # #Pangea # desktop_drop: ^0.4.4 # Pangea# desktop_notifications: ^0.6.3 - device_info_plus: ^9.1.0 - dynamic_color: ^1.6.8 - emoji_picker_flutter: ^1.6.4 + device_info_plus: ^10.0.1 + dynamic_color: ^1.7.0 + emoji_picker_flutter: ^2.1.1 emoji_proposal: ^0.0.1 emojis: ^0.9.9 #fcm_shared_isolate: ^0.1.0 @@ -36,17 +36,17 @@ dependencies: flutter: sdk: flutter flutter_app_badger: ^1.5.0 - flutter_cache_manager: ^3.3.0 + flutter_cache_manager: ^3.3.1 flutter_file_dialog: ^3.0.2 - flutter_foreground_task: ^6.0.0+1 + flutter_foreground_task: ^6.1.3 flutter_highlighter: ^0.1.1 flutter_html: ^3.0.0-beta.2 flutter_html_table: ^3.0.0-beta.2 flutter_linkify: ^6.0.0 - flutter_local_notifications: ^16.3.2 + flutter_local_notifications: ^17.0.0 flutter_localizations: sdk: flutter - flutter_map: ^4.0.0 + flutter_map: ^6.1.0 flutter_math_fork: ^0.7.2 flutter_olm: 1.3.2 # Keep in sync with scripts/prepare-web.sh ! 1.4.0 does currently not build on Android flutter_openssl_crypto: ^0.3.0 @@ -59,78 +59,70 @@ dependencies: flutter_webrtc: ^0.9.46 future_loading_dialog: ^0.3.0 geolocator: ^7.6.2 - go_router: ^13.1.0 + go_router: ^13.2.2 hive: ^2.2.3 hive_flutter: ^1.1.0 html: ^0.15.4 - http: ^0.13.6 + http: ^1.2.0 image: ^4.1.7 - image_picker: ^1.0.0 + image_picker: ^1.0.7 intl: any - # #Pangea - # just_audio: ^0.9.0 - just_audio: ^0.9.36 - # Pangea# + just_audio: ^0.9.37 keyboard_shortcuts: ^0.1.4 - latlong2: ^0.8.1 + latlong2: ^0.9.1 linkify: ^5.0.0 matrix: ^0.26.1 native_imaging: ^0.1.0 - package_info_plus: ^5.0.1 + package_info_plus: ^6.0.0 pasteboard: ^0.2.0 path: ^1.9.0 - path_provider: ^2.0.9 + path_provider: ^2.1.2 permission_handler: ^11.0.1 pretty_qr_code: ^3.2.1 provider: ^6.0.2 punycode: ^1.0.0 - qr_code_scanner: ^1.0.0 + qr_code_scanner: ^1.0.1 receive_sharing_intent: ^1.4.5 # #Pangea # record: 4.4.4 # Upgrade to 5 currently breaks playing on iOS record: ^5.0.4 # Pangea# scroll_to_index: ^3.0.1 - share_plus: ^7.2.1 + share_plus: ^8.0.2 shared_preferences: ^2.2.0 # Pinned because https://github.com/flutter/flutter/issues/118401 slugify: ^2.0.0 - sqflite_common_ffi: ^2.3.0+4 + sqflite_common_ffi: ^2.3.3 sqlcipher_flutter_libs: ^0.6.1 swipe_to_action: ^0.2.0 tor_detector_web: ^1.1.0 uni_links: ^0.5.1 unifiedpush: ^5.0.1 universal_html: ^2.2.4 - url_launcher: ^6.2.1 - vibration: ^1.8.3 - video_compress: ^3.1.1 - video_player: ^2.8.1 - wakelock_plus: ^1.1.3 + url_launcher: ^6.2.5 + video_compress: ^3.1.2 + video_player: ^2.8.5 + wakelock_plus: ^1.2.2 webrtc_interface: ^1.0.13 # #Pangea - country_picker: ^2.0.20 - csv: ^5.0.2 - desktop_lifecycle: ^0.1.0 - fl_chart: ^0.61.0 - firebase_analytics: ^10.2.1 - firebase_core: ^2.10.0 - firebase_messaging: ^14.4.1 - flutter_app_lock: ^3.0.0 - flutter_dotenv: ^5.0.2 + country_picker: ^2.0.25 + csv: ^6.0.0 + fl_chart: ^0.67.0 + firebase_analytics: ^10.10.2 + firebase_core: ^2.30.0 + firebase_messaging: ^14.8.2 + flutter_dotenv: ^5.1.0 fcm_shared_isolate: path: pangea_packages/fcm_shared_isolate - flutter_svg: ^2.0.0+1 + flutter_svg: ^2.0.10+1 get_storage: ^2.1.1 - in_app_purchase: ^3.1.5 + in_app_purchase: ^3.1.13 jwt_decode: ^0.3.1 - language_tool: ^2.1.1 - matrix_homeserver_recommendations: ^0.3.0 + language_tool: ^2.2.0 open_file: ^3.3.2 - purchases_flutter: ^6.25.0 - sentry_flutter: ^7.4.0 + purchases_flutter: ^6.26.0 + sentry_flutter: ^7.19.0 shimmer: ^3.0.0 - syncfusion_flutter_datepicker: ^23.2.7 - syncfusion_flutter_xlsio: ^23.2.7 + syncfusion_flutter_xlsio: ^25.1.40 # Pangea# dev_dependencies: @@ -219,11 +211,4 @@ dependency_overrides: keyboard_shortcuts: git: url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git - ref: null-safety - # blocked upgrade of package_info_plus for null safety - # https://github.com/creativecreatorormaybenot/wakelock/pull/203 - wakelock_windows: - git: - url: https://github.com/chandrabezzo/wakelock.git - ref: main - path: wakelock_windows/ + ref: null-safety \ No newline at end of file