Merge branch 'braid/dependency-overrides' into 'main'

chore: remove dependency overrides

See merge request famedly/fluffychat!1017
This commit is contained in:
Krille Fear 2022-10-17 10:50:04 +00:00
commit 43f1a1e28a
3 changed files with 19 additions and 35 deletions

View File

@ -87,6 +87,7 @@ class CallKeepManager {
VoipPlugin? _voipPlugin;
String get appName => 'FluffyChat';
Future<bool> get hasPhoneAccountEnabled async =>
await _callKeep.hasPhoneAccount();
@ -106,6 +107,7 @@ class CallKeepManager {
'additionalPermissions': [''],
};
bool setupDone = false;
Future<void> showCallkitIncoming(CallSession call) async {
if (!setupDone) {
await _callKeep.setup(
@ -246,8 +248,8 @@ class CallKeepManager {
),
const Divider(),
ListTile(
onTap: () =>
FlutterForegroundTask.openSystemAlertWindowSettings(true),
onTap: () => FlutterForegroundTask.openSystemAlertWindowSettings(
forceOpen: true),
title: Text(L10n.of(context)!.appearOnTop),
subtitle: Text(L10n.of(context)!.appearOnTopDetails),
trailing: const Icon(Icons.file_upload_rounded),

View File

@ -203,7 +203,7 @@ packages:
name: connectivity_plus
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "2.3.9"
connectivity_plus_linux:
dependency: transitive
description:
@ -217,7 +217,7 @@ packages:
name: connectivity_plus_macos
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.1"
version: "1.2.6"
connectivity_plus_platform_interface:
dependency: transitive
description:
@ -226,21 +226,19 @@ packages:
source: hosted
version: "1.2.0"
connectivity_plus_web:
dependency: "direct overridden"
dependency: transitive
description:
path: "packages/connectivity_plus/connectivity_plus_web"
ref: a04401cb48abe92d138c0e9288b360739994a9e9
resolved-ref: a04401cb48abe92d138c0e9288b360739994a9e9
url: "https://github.com/TheOneWithTheBraid/plus_plugins.git"
source: git
version: "1.2.1"
name: connectivity_plus_web
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.5"
connectivity_plus_windows:
dependency: transitive
description:
name: connectivity_plus_windows
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.2.2"
convert:
dependency: transitive
description:
@ -548,12 +546,10 @@ packages:
flutter_foreground_task:
dependency: "direct main"
description:
path: "."
ref: "td/forceOpenOnTop"
resolved-ref: b5f429acbcddb8267d77dd2d76032357d78a725d
url: "https://github.com/Techno-Disaster/flutter_foreground_task.git"
source: git
version: "3.8.2"
name: flutter_foreground_task
url: "https://pub.dartlang.org"
source: hosted
version: "3.10.0"
flutter_highlight:
dependency: transitive
description:
@ -1555,7 +1551,7 @@ packages:
name: shared_preferences_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.12"
version: "2.0.14"
shared_preferences_ios:
dependency: transitive
description:

View File

@ -16,7 +16,7 @@ dependencies:
callkeep: ^0.3.2
chewie: ^1.2.2
collection: ^1.15.0-nullsafety.4
connectivity_plus: ^2.2.0
connectivity_plus: ^2.3.9
cupertino_icons: any
desktop_drop: ^0.3.2
desktop_lifecycle: ^0.1.0
@ -36,7 +36,7 @@ dependencies:
flutter_app_lock: ^2.0.0
flutter_blurhash: ^0.7.0
flutter_cache_manager: ^3.3.0
flutter_foreground_task: ^3.8.2
flutter_foreground_task: ^3.10.0
flutter_local_notifications: ^9.7.0
flutter_localizations:
sdk: flutter
@ -148,23 +148,9 @@ msix_config:
install_certificate: false
dependency_overrides:
# Necessary for webRTC on web.
# Fix for stream fallback for unsupported browsers:
# Upstream pull request: https://github.com/fluttercommunity/plus_plugins/pull/746
connectivity_plus_web:
git:
url: https://github.com/TheOneWithTheBraid/plus_plugins.git
ref: a04401cb48abe92d138c0e9288b360739994a9e9
path: packages/connectivity_plus/connectivity_plus_web
# Until all dependencies are compatible. Missing: file_picker_cross, flutter_matrix_html
ffi: ^2.0.0
# upstream request at https://github.com/Dev-hwang/flutter_foreground_task/pull/102
flutter_foreground_task:
git:
url: https://github.com/Techno-Disaster/flutter_foreground_task.git
ref: td/forceOpenOnTop
# fake secure storage plugin for Windows
# See: https://gitlab.com/gitlab-com/gl-infra/reliability/-/issues/15161
flutter_secure_storage_windows: