diff --git a/packages/app/android/app/build.gradle b/packages/app/android/app/build.gradle index a2e0bbe9..3685eb19 100644 --- a/packages/app/android/app/build.gradle +++ b/packages/app/android/app/build.gradle @@ -46,7 +46,7 @@ android { applicationId "de.provokateurin.neon" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/packages/app/android/app/src/main/AndroidManifest.xml b/packages/app/android/app/src/main/AndroidManifest.xml index 197488d0..13370a0c 100644 --- a/packages/app/android/app/src/main/AndroidManifest.xml +++ b/packages/app/android/app/src/main/AndroidManifest.xml @@ -3,6 +3,15 @@ + + + + + + + + + appImplementations = { @@ -12,4 +13,5 @@ final Set appImplementations = { NewsApp(), NotesApp(), NotificationsApp(), + SpreedApp(), }; diff --git a/packages/app/linux/flutter/generated_plugin_registrant.cc b/packages/app/linux/flutter/generated_plugin_registrant.cc index 9db402be..4e10e193 100644 --- a/packages/app/linux/flutter/generated_plugin_registrant.cc +++ b/packages/app/linux/flutter/generated_plugin_registrant.cc @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -20,6 +21,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); file_selector_plugin_register_with_registrar(file_selector_linux_registrar); + g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin"); + flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar); g_autoptr(FlPluginRegistrar) screen_retriever_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin"); screen_retriever_plugin_register_with_registrar(screen_retriever_registrar); diff --git a/packages/app/linux/flutter/generated_plugins.cmake b/packages/app/linux/flutter/generated_plugins.cmake index eb1257c1..a62b6231 100644 --- a/packages/app/linux/flutter/generated_plugins.cmake +++ b/packages/app/linux/flutter/generated_plugins.cmake @@ -5,6 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST dynamic_color file_selector_linux + flutter_webrtc screen_retriever tray_manager url_launcher_linux diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index 9895f3ec..6074aff5 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -193,6 +193,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.6" + dart_webrtc: + dependency: transitive + description: + name: dart_webrtc + sha256: "5897a3bdd6c7fded07e80e250260ca4c9cd61f9080911aa308b516e1206745a9" + url: "https://pub.dev" + source: hosted + version: "1.1.3" dbus: dependency: transitive description: @@ -209,6 +217,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.3" + diffutil_dart: + dependency: transitive + description: + name: diffutil_dart + sha256: e0297e4600b9797edff228ed60f4169a778ea357691ec98408fa3b72994c7d06 + url: "https://pub.dev" + source: hosted + version: "3.0.0" dynamic_color: dependency: transitive description: @@ -224,6 +240,14 @@ packages: relative: true source: path version: "1.0.0" + equatable: + dependency: transitive + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" fake_async: dependency: transitive description: @@ -324,6 +348,23 @@ packages: url: "https://pub.dev" source: hosted version: "3.3.1" + flutter_chat_types: + dependency: transitive + description: + name: flutter_chat_types + sha256: e285b588f6d19d907feb1f6d912deaf22e223656769c34093b64e1c59b094fb9 + url: "https://pub.dev" + source: hosted + version: "3.6.2" + flutter_chat_ui: + dependency: transitive + description: + path: "." + ref: ab50f411da781a078fc3c5197f14bbf9614d001c + resolved-ref: ab50f411da781a078fc3c5197f14bbf9614d001c + url: "https://github.com/flyerhq/flutter_chat_ui" + source: git + version: "1.6.9" flutter_driver: dependency: transitive description: flutter @@ -345,6 +386,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0-beta.2" + flutter_link_previewer: + dependency: transitive + description: + name: flutter_link_previewer + sha256: "007069e60f42419fb59872beb7a3cc3ea21e9f1bdff5d40239f376fa62ca9f20" + url: "https://pub.dev" + source: hosted + version: "3.2.2" + flutter_linkify: + dependency: transitive + description: + name: flutter_linkify + sha256: "74669e06a8f358fee4512b4320c0b80e51cffc496607931de68d28f099254073" + url: "https://pub.dev" + source: hosted + version: "6.0.0" flutter_local_notifications: dependency: transitive description: @@ -432,6 +489,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_webrtc: + dependency: transitive + description: + name: flutter_webrtc + sha256: "8522e9f347aed9f03ec591d05fc286a698c1b11a1a6d3e994e92727d24c6f352" + url: "https://pub.dev" + source: hosted + version: "0.9.46" flutter_zxing: dependency: transitive description: @@ -602,6 +667,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" + linkify: + dependency: transitive + description: + name: linkify + sha256: "4139ea77f4651ab9c315b577da2dd108d9aa0bd84b5d03d33323f1970c645832" + url: "https://pub.dev" + source: hosted + version: "5.0.0" list_counter: dependency: transitive description: @@ -715,6 +788,13 @@ packages: relative: true source: path version: "1.0.0" + neon_spreed: + dependency: "direct main" + description: + path: "../neon/neon_spreed" + relative: true + source: path + version: "1.0.0" nested: dependency: transitive description: @@ -874,6 +954,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.1" + photo_view: + dependency: transitive + description: + name: photo_view + sha256: "8036802a00bae2a78fc197af8a158e3e2f7b500561ed23b4c458107685e645bb" + url: "https://pub.dev" + source: hosted + version: "0.14.0" platform: dependency: transitive description: @@ -882,6 +970,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" + platform_detect: + dependency: transitive + description: + name: platform_detect + sha256: "08f4ee79c0e1c4858d37e06b22352a3ebdef5466b613749a3adb03e703d4f5b0" + url: "https://pub.dev" + source: hosted + version: "2.0.11" plugin_platform_interface: dependency: transitive description: @@ -994,6 +1090,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.1.9" + scroll_to_index: + dependency: transitive + description: + name: scroll_to_index + sha256: b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176 + url: "https://pub.dev" + source: hosted + version: "3.0.1" scrollable_positioned_list: dependency: transitive description: @@ -1382,6 +1486,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + visibility_detector: + dependency: transitive + description: + name: visibility_detector + sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420 + url: "https://pub.dev" + source: hosted + version: "0.4.0+2" vm_service: dependency: transitive description: @@ -1422,6 +1534,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + webrtc_interface: + dependency: transitive + description: + name: webrtc_interface + sha256: "2efbd3e4e5ebeb2914253bcc51dafd3053c4b87b43f3076c74835a9deecbae3a" + url: "https://pub.dev" + source: hosted + version: "1.1.2" webview_flutter: dependency: transitive description: diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml index 0c430432..dc696a5b 100644 --- a/packages/app/pubspec.yaml +++ b/packages/app/pubspec.yaml @@ -33,6 +33,10 @@ dependencies: git: url: https://github.com/nextcloud/neon path: packages/neon/neon_notifications + neon_spreed: + git: + url: https://github.com/nextcloud/neon + path: packages/neon/neon_spreed universal_io: any vector_graphics: any diff --git a/packages/app/pubspec_overrides.yaml b/packages/app/pubspec_overrides.yaml index 98da95b6..2bef6261 100644 --- a/packages/app/pubspec_overrides.yaml +++ b/packages/app/pubspec_overrides.yaml @@ -1,4 +1,4 @@ -# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_dashboard,neon_files,neon_lints,neon_news,neon_notes,neon_notifications,nextcloud,sort_box +# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_dashboard,neon_files,neon_lints,neon_news,neon_notes,neon_notifications,neon_spreed,nextcloud,sort_box dependency_overrides: dynamite_runtime: path: ../dynamite/dynamite_runtime @@ -18,6 +18,8 @@ dependency_overrides: path: ../neon/neon_notes neon_notifications: path: ../neon/neon_notifications + neon_spreed: + path: ../neon/neon_spreed nextcloud: path: ../nextcloud sort_box: diff --git a/packages/neon/neon_spreed/pubspec_overrides.yaml b/packages/neon/neon_spreed/pubspec_overrides.yaml index 3bec69c6..e247d2d9 100644 --- a/packages/neon/neon_spreed/pubspec_overrides.yaml +++ b/packages/neon/neon_spreed/pubspec_overrides.yaml @@ -1,4 +1,4 @@ -# melos_managed_dependency_overrides: dynamite_runtime,neon,nextcloud,sort_box,neon_lints +# melos_managed_dependency_overrides: dynamite_runtime,neon,neon_lints,nextcloud,sort_box dependency_overrides: dynamite_runtime: path: ../../dynamite/dynamite_runtime