Skip to content

Commit 010a66c

Browse files
authored
Merge branch 'main' into fix/fix-android-audio-configuration
2 parents 2123f30 + bcaeecb commit 010a66c

23 files changed

+2268
-3345
lines changed

dogfooding/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
namespace = "io.getstream.video.flutter.dogfooding"
4141
}
4242

43-
compileSdkVersion 35
43+
compileSdkVersion 36
4444
ndkVersion = "27.0.12077973"
4545

4646
compileOptions {

dogfooding/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2121
id "com.android.application" version '8.8.0' apply false
22-
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
22+
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
2323
id "com.google.gms.google-services" version "4.4.0" apply false
2424
id "com.google.firebase.crashlytics" version "2.8.1" apply false
2525
}

dogfooding/lib/app/app_content.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ class _StreamDogFoodingAppContentState
100100
if (_userAuthController.currentUser != null) {
101101
_compositeSubscription.clear();
102102
initPushNotificationManagerIfAvailable();
103+
_handleMobileAudioInterruptions();
103104
} else {
104105
_compositeSubscription.clear();
105106
}
106107
});
107108

108109
_tryConsumingIncomingCallFromTerminatedState();
109-
_handleMobileAudioInterruptions();
110110
}
111111

112112
void initPushNotificationManagerIfAvailable() {

dogfooding/linux/flutter/generated_plugin_registrant.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <record_linux/record_linux_plugin.h>
1414
#include <stream_webrtc_flutter/flutter_web_r_t_c_plugin.h>
1515
#include <url_launcher_linux/url_launcher_plugin.h>
16+
#include <volume_controller/volume_controller_plugin.h>
1617

1718
void fl_register_plugins(FlPluginRegistry* registry) {
1819
g_autoptr(FlPluginRegistrar) desktop_drop_registrar =
@@ -36,4 +37,7 @@ void fl_register_plugins(FlPluginRegistry* registry) {
3637
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
3738
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
3839
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
40+
g_autoptr(FlPluginRegistrar) volume_controller_registrar =
41+
fl_plugin_registry_get_registrar_for_plugin(registry, "VolumeControllerPlugin");
42+
volume_controller_plugin_register_with_registrar(volume_controller_registrar);
3943
}

dogfooding/linux/flutter/generated_plugins.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
1010
record_linux
1111
stream_webrtc_flutter
1212
url_launcher_linux
13+
volume_controller
1314
)
1415

1516
list(APPEND FLUTTER_FFI_PLUGIN_LIST

dogfooding/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies:
2828
google_fonts: ^5.1.0
2929
google_sign_in: ^6.2.1
3030
http: ^1.2.2
31-
mobile_scanner: ^7.0.0-rc.2
31+
mobile_scanner: ^7.1.0
3232
package_info_plus: ^8.1.0
3333
path_provider: ^2.1.4
3434
permission_handler: ^12.0.0+1

dogfooding/windows/flutter/generated_plugins.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ list(APPEND FLUTTER_PLUGIN_LIST
1414
media_kit_video
1515
permission_handler_windows
1616
record_windows
17-
screen_brightness_windows
1817
share_plus
1918
stream_webrtc_flutter
2019
thumblr_windows
2120
url_launcher_windows
21+
volume_controller
2222
)
2323

2424
list(APPEND FLUTTER_FFI_PLUGIN_LIST

0 commit comments

Comments
 (0)