From 579853492d8ee6792bb985dcb6e82f1b18bb90b4 Mon Sep 17 00:00:00 2001 From: Gian <47775302+gpunto@users.noreply.github.com> Date: Thu, 30 Oct 2025 16:14:06 +0100 Subject: [PATCH 1/4] Configure Spotless through the convention plugins --- .editorconfig | 5 +- benchmark/build.gradle.kts | 15 +----- build-logic/convention/build.gradle.kts | 1 - .../main/kotlin/SpotlessConventionPlugin.kt | 49 +------------------ build.gradle.kts | 8 +++ demo-app/build.gradle.kts | 2 - gradle/libs.versions.toml | 4 +- spotless/copyright.kt | 16 ------ spotless/copyright.kts | 15 ------ spotless/copyright.xml | 16 ------ stream-video-android-core/build.gradle.kts | 1 - .../build.gradle.kts | 1 - .../build.gradle.kts | 1 - .../build.gradle.kts | 1 - stream-video-android-ui-core/build.gradle.kts | 1 - stream-video-android-ui-xml/build.gradle.kts | 1 - tutorials/tutorial-audio/build.gradle.kts | 2 - .../tutorial-livestream/build.gradle.kts | 2 - tutorials/tutorial-ringing/build.gradle.kts | 3 -- tutorials/tutorial-video/build.gradle.kts | 2 - 20 files changed, 17 insertions(+), 129 deletions(-) delete mode 100644 spotless/copyright.kt delete mode 100644 spotless/copyright.kts delete mode 100644 spotless/copyright.xml diff --git a/.editorconfig b/.editorconfig index f37e5e5e404..d1181ad6329 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,8 +3,9 @@ root = true # Most of the standard properties are supported max_line_length=100 +[*.{java,kt,kts}] +ktlint_standard_max-line-length=disabled # don't use wildcard for Java/Kotlin imports -[*.{java,kt}] wildcard_import_limit = 999 ij_kotlin_name_count_to_use_star_import = 999 -ij_kotlin_name_count_to_use_star_import_for_members = 999 \ No newline at end of file +ij_kotlin_name_count_to_use_star_import_for_members = 999 diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 015e5deef2e..12c21793935 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -15,11 +15,9 @@ */ import io.getstream.video.configureFlavors -@Suppress("DSL_SCOPE_VIOLATION") plugins { - id(libs.plugins.android.test.get().pluginId) - id(libs.plugins.kotlin.android.get().pluginId) - id(libs.plugins.baseline.profile.get().pluginId) + alias(libs.plugins.stream.android.test) + alias(libs.plugins.baseline.profile) id("io.getstream.spotless") } @@ -27,15 +25,6 @@ android { namespace = "io.getstream.video.android.benchmark" compileSdk = libs.versions.compileSdk.get().toInt() - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } - - kotlinOptions { - jvmTarget = "11" - } - defaultConfig { minSdk = libs.versions.minSdk.get().toInt() targetSdk = libs.versions.targetSdk.get().toInt() diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index b41e20baf5f..4fcdbd341a6 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -9,7 +9,6 @@ java { targetCompatibility = JavaVersion.VERSION_17 } -@Suppress("DSL_SCOPE_VIOLATION") dependencies { compileOnly(libs.android.gradlePlugin) compileOnly(libs.kotlin.gradlePlugin) diff --git a/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt b/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt index e4b0ee4fd02..184e3f68642 100644 --- a/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt @@ -1,55 +1,8 @@ -import com.diffplug.gradle.spotless.SpotlessExtension -import com.diffplug.spotless.kotlin.KotlinConstants import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.kotlin.dsl.configure +// TODO [G.] remove class SpotlessConventionPlugin : Plugin { override fun apply(target: Project) { - with(target) { - pluginManager.apply("com.diffplug.spotless") - - extensions.configure { - kotlin { - target("**/*.kt") - targetExclude( - "**/build/**/*.kt", // Build directory - "**/generated/**" // OpenAPI generated code - ) - ktlint() - .editorConfigOverride( - mapOf( - "ktlint_standard_max-line-length" to "disabled" - ) - ) - trimTrailingWhitespace() - endWithNewline() - licenseHeaderFile(rootProject.file("$rootDir/spotless/copyright.kt")) - } - format("openapiGenerated") { - target("**/*.kt") - targetExclude("**/build/**/*.kt", "**/generated/**") - trimTrailingWhitespace() - endWithNewline() - licenseHeaderFile(rootProject.file("$rootDir/spotless/copyright.kt"), - KotlinConstants.LICENSE_HEADER_DELIMITER) - } - format("kts") { - target("**/*.kts") - targetExclude("**/build/**/*.kts") - // Look for the first line that doesn't have a block comment (assumed to be the license) - licenseHeaderFile( - rootProject.file("spotless/copyright.kts"), - "(^(?![\\/ ]\\*).*$)" - ) - } - format("xml") { - target("**/*.xml") - targetExclude("**/build/**/*.xml") - // Look for the first XML tag that isn't a comment ( diff --git a/stream-video-android-core/build.gradle.kts b/stream-video-android-core/build.gradle.kts index 35af273dec5..bf7352a510e 100644 --- a/stream-video-android-core/build.gradle.kts +++ b/stream-video-android-core/build.gradle.kts @@ -22,7 +22,6 @@ plugins { alias(libs.plugins.maven.publish) id("io.getstream.video.android.library") id("io.getstream.video.generateServices") - id("io.getstream.spotless") id(libs.plugins.kotlin.serialization.get().pluginId) id(libs.plugins.kotlin.parcelize.get().pluginId) id(libs.plugins.wire.get().pluginId) diff --git a/stream-video-android-filters-video/build.gradle.kts b/stream-video-android-filters-video/build.gradle.kts index 96c19596418..9aac20755f8 100644 --- a/stream-video-android-filters-video/build.gradle.kts +++ b/stream-video-android-filters-video/build.gradle.kts @@ -19,7 +19,6 @@ import io.getstream.video.android.Configuration plugins { alias(libs.plugins.maven.publish) id("io.getstream.video.android.library") - id("io.getstream.spotless") } android { diff --git a/stream-video-android-previewdata/build.gradle.kts b/stream-video-android-previewdata/build.gradle.kts index 5c025c51caa..2c5d4b56ef6 100644 --- a/stream-video-android-previewdata/build.gradle.kts +++ b/stream-video-android-previewdata/build.gradle.kts @@ -19,7 +19,6 @@ import io.getstream.video.android.Configuration plugins { alias(libs.plugins.maven.publish) id("io.getstream.video.android.library") - id("io.getstream.spotless") } android { diff --git a/stream-video-android-ui-compose/build.gradle.kts b/stream-video-android-ui-compose/build.gradle.kts index 0acb0d33bfd..4f2020e78ff 100644 --- a/stream-video-android-ui-compose/build.gradle.kts +++ b/stream-video-android-ui-compose/build.gradle.kts @@ -19,7 +19,6 @@ import io.getstream.video.android.Configuration plugins { alias(libs.plugins.maven.publish) id("io.getstream.video.android.library.compose") - id("io.getstream.spotless") } android { diff --git a/stream-video-android-ui-core/build.gradle.kts b/stream-video-android-ui-core/build.gradle.kts index bd4b4f52229..e8db1adee3e 100644 --- a/stream-video-android-ui-core/build.gradle.kts +++ b/stream-video-android-ui-core/build.gradle.kts @@ -19,7 +19,6 @@ import io.getstream.video.android.Configuration plugins { alias(libs.plugins.maven.publish) id("io.getstream.video.android.library") - id("io.getstream.spotless") } android { diff --git a/stream-video-android-ui-xml/build.gradle.kts b/stream-video-android-ui-xml/build.gradle.kts index 95b778e8403..488545a5abb 100644 --- a/stream-video-android-ui-xml/build.gradle.kts +++ b/stream-video-android-ui-xml/build.gradle.kts @@ -19,7 +19,6 @@ import io.getstream.video.android.Configuration plugins { alias(libs.plugins.maven.publish) id("io.getstream.video.android.library") - id("io.getstream.spotless") } android { diff --git a/tutorials/tutorial-audio/build.gradle.kts b/tutorials/tutorial-audio/build.gradle.kts index ddf22be4c63..e3fdfff5b56 100644 --- a/tutorials/tutorial-audio/build.gradle.kts +++ b/tutorials/tutorial-audio/build.gradle.kts @@ -15,10 +15,8 @@ */ @file:Suppress("UnstableApiUsage") -@Suppress("DSL_SCOPE_VIOLATION") plugins { id("io.getstream.video.android.application.compose") - id("io.getstream.spotless") } android { diff --git a/tutorials/tutorial-livestream/build.gradle.kts b/tutorials/tutorial-livestream/build.gradle.kts index e4c54432ff0..ddeaf6cdb5f 100644 --- a/tutorials/tutorial-livestream/build.gradle.kts +++ b/tutorials/tutorial-livestream/build.gradle.kts @@ -15,10 +15,8 @@ */ @file:Suppress("UnstableApiUsage") -@Suppress("DSL_SCOPE_VIOLATION") plugins { id("io.getstream.video.android.application.compose") - id("io.getstream.spotless") } android { diff --git a/tutorials/tutorial-ringing/build.gradle.kts b/tutorials/tutorial-ringing/build.gradle.kts index e1122117d4e..461f973fae9 100644 --- a/tutorials/tutorial-ringing/build.gradle.kts +++ b/tutorials/tutorial-ringing/build.gradle.kts @@ -15,11 +15,8 @@ */ @file:Suppress("UnstableApiUsage") -@Suppress("DSL_SCOPE_VIOLATION") plugins { id("io.getstream.video.android.application.compose") - id("io.getstream.spotless") - id("com.google.gms.google-services") } diff --git a/tutorials/tutorial-video/build.gradle.kts b/tutorials/tutorial-video/build.gradle.kts index 47b95626bca..60dafceb3ef 100644 --- a/tutorials/tutorial-video/build.gradle.kts +++ b/tutorials/tutorial-video/build.gradle.kts @@ -15,10 +15,8 @@ */ @file:Suppress("UnstableApiUsage") -@Suppress("DSL_SCOPE_VIOLATION") plugins { id("io.getstream.video.android.application.compose") - id("io.getstream.spotless") } android { From 72226363b8f6647a0d2994fbdbace1409567d47b Mon Sep 17 00:00:00 2001 From: Gian <47775302+gpunto@users.noreply.github.com> Date: Thu, 30 Oct 2025 17:14:04 +0100 Subject: [PATCH 2/4] Remove SpotlessConventionPlugin --- benchmark/build.gradle.kts | 15 +------------- build-logic/convention/build.gradle.kts | 6 +++--- .../main/kotlin/DemoFlavorConventionPlugin.kt | 19 ++++++++++++++++++ .../main/kotlin/SpotlessConventionPlugin.kt | 8 -------- .../kotlin/io/getstream/video/DemoFlavor.kt | 20 +++++++++++-------- demo-app/build.gradle.kts | 4 +--- gradle/libs.versions.toml | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 build-logic/convention/src/main/kotlin/DemoFlavorConventionPlugin.kt delete mode 100644 build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 12c21793935..27bab61787f 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import io.getstream.video.configureFlavors - plugins { alias(libs.plugins.stream.android.test) alias(libs.plugins.baseline.profile) - id("io.getstream.spotless") + id("io.getstream.video.android.demoflavor") } android { @@ -51,17 +49,6 @@ android { } } - // Use the same flavor dimensions as the application to allow generating Baseline Profiles on prod, - // which is more close to what will be shipped to users (no fake data), but has ability to run the - // benchmarks on demo, so we benchmark on stable data. - configureFlavors(this) { flavor -> - buildConfigField( - "String", - "APP_FLAVOR_SUFFIX", - "\"${flavor.applicationIdSuffix ?: ""}\"" - ) - } - targetProjectPath = ":demo-app" testOptions.managedDevices.devices { diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 4fcdbd341a6..0290acae97b 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -34,9 +34,9 @@ gradlePlugin { id = "io.getstream.video.android.library" implementationClass = "AndroidLibraryConventionPlugin" } - register("spotless") { - id = "io.getstream.spotless" - implementationClass = "SpotlessConventionPlugin" + register("demoFlavorConvention") { + id = "io.getstream.video.android.demoflavor" + implementationClass = "DemoFlavorConventionPlugin" } } } diff --git a/build-logic/convention/src/main/kotlin/DemoFlavorConventionPlugin.kt b/build-logic/convention/src/main/kotlin/DemoFlavorConventionPlugin.kt new file mode 100644 index 00000000000..90abed6f1ed --- /dev/null +++ b/build-logic/convention/src/main/kotlin/DemoFlavorConventionPlugin.kt @@ -0,0 +1,19 @@ +import com.android.build.api.dsl.ApplicationExtension +import com.android.build.api.dsl.TestExtension +import io.getstream.video.configureFlavors +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.kotlin.dsl.configure + +class DemoFlavorConventionPlugin : Plugin { + override fun apply(target: Project) { + with(target) { + pluginManager.withPlugin("com.android.application") { + extensions.configure(::configureFlavors) + } + pluginManager.withPlugin("com.android.test") { + extensions.configure(::configureFlavors) + } + } + } +} diff --git a/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt b/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt deleted file mode 100644 index 184e3f68642..00000000000 --- a/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt +++ /dev/null @@ -1,8 +0,0 @@ -import org.gradle.api.Plugin -import org.gradle.api.Project - -// TODO [G.] remove -class SpotlessConventionPlugin : Plugin { - override fun apply(target: Project) { - } -} diff --git a/build-logic/convention/src/main/kotlin/io/getstream/video/DemoFlavor.kt b/build-logic/convention/src/main/kotlin/io/getstream/video/DemoFlavor.kt index 2afda388747..1c530284fcb 100644 --- a/build-logic/convention/src/main/kotlin/io/getstream/video/DemoFlavor.kt +++ b/build-logic/convention/src/main/kotlin/io/getstream/video/DemoFlavor.kt @@ -20,20 +20,24 @@ enum class VideoDemoFlavor(val dimension: FlavorDimension, val applicationIdSuff production(FlavorDimension.contentType), } -fun configureFlavors( +internal fun configureFlavors( commonExtension: CommonExtension<*, *, *, *, *, *>, - flavorConfigurationBlock: ProductFlavor.(flavor: VideoDemoFlavor) -> Unit = {} ) { commonExtension.apply { flavorDimensions += "environment" productFlavors { - VideoDemoFlavor.values().forEach { - create(it.name) { + VideoDemoFlavor.values().forEach { flavor -> + create(flavor.name) { dimension = "environment" - flavorConfigurationBlock(this, it) + buildConfigField( + "String", + "APP_FLAVOR_SUFFIX", + "\"${flavor.applicationIdSuffix.orEmpty()}\"", + ) + if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) { - if (it.applicationIdSuffix != null) { - applicationIdSuffix = it.applicationIdSuffix + if (flavor.applicationIdSuffix != null) { + applicationIdSuffix = flavor.applicationIdSuffix } } proguardFiles("benchmark-rules.pro") @@ -41,4 +45,4 @@ fun configureFlavors( } } } -} \ No newline at end of file +} diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 02c4241236e..a57467d4e8e 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -21,12 +21,12 @@ import com.github.triplet.gradle.androidpublisher.ResolutionStrategy import io.getstream.video.FlavorDimension import io.getstream.video.VideoDemoFlavor import io.getstream.video.android.Configuration -import io.getstream.video.configureFlavors import java.io.FileInputStream import java.util.Properties plugins { id("io.getstream.video.android.application.compose") + id("io.getstream.video.android.demoflavor") id("com.google.gms.google-services") id(libs.plugins.firebase.crashlytics.get().pluginId) id(libs.plugins.kotlin.serialization.get().pluginId) @@ -91,8 +91,6 @@ android { } } - configureFlavors(this) - buildTypes { getByName("debug") { versionNameSuffix = "-DEBUG" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 68f15e4f549..6136de49a5b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ cameraCamera2 = "1.3.4" kover = "0.8.3" sonarqube = "6.0.1.5171" spotless = "6.21.0" -streamConventions = "local-test" +streamConventions = "0.3.0" mavenPublish = "0.34.0" kotlin = "1.9.25" ksp = "1.9.25-1.0.20" From 6edcb536a54ac717172cfe5c89e7370d265df51d Mon Sep 17 00:00:00 2001 From: Gian <47775302+gpunto@users.noreply.github.com> Date: Fri, 7 Nov 2025 14:49:42 +0100 Subject: [PATCH 3/4] Apply Spotless with new configuration --- benchmark/src/main/AndroidManifest.xml | 20 +++++++++---------- demo-app/build.gradle.kts | 14 +++++++------ demo-app/lint-baseline.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_background.xml | 20 +++++++++---------- .../src/development/res/values/strings.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_background.xml | 20 +++++++++---------- .../src/e2etesting/res/values/strings.xml | 20 +++++++++---------- demo-app/src/main/AndroidManifest.xml | 20 +++++++++---------- .../main/res/drawable/google_button_logo.xml | 20 +++++++++---------- .../src/main/res/drawable/ic_blur_off.xml | 20 +++++++++---------- demo-app/src/main/res/drawable/ic_blur_on.xml | 20 +++++++++---------- .../main/res/drawable/ic_default_avatar.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_background.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_foreground.xml | 20 +++++++++---------- .../src/main/res/drawable/ic_layout_grid.xml | 20 +++++++++---------- .../main/res/drawable/ic_layout_spotlight.xml | 20 +++++++++---------- demo-app/src/main/res/drawable/ic_mic.xml | 20 +++++++++---------- demo-app/src/main/res/drawable/ic_scan_qr.xml | 20 +++++++++---------- .../drawable/ic_stream_video_meeting_logo.xml | 20 +++++++++---------- .../src/main/res/layout/activity_main.xml | 20 +++++++++---------- .../res/mipmap-anydpi-v26/ic_launcher.xml | 20 +++++++++---------- .../mipmap-anydpi-v26/ic_launcher_round.xml | 20 +++++++++---------- demo-app/src/main/res/values/colors.xml | 20 +++++++++---------- demo-app/src/main/res/values/strings.xml | 20 +++++++++---------- demo-app/src/main/res/values/themes.xml | 20 +++++++++---------- .../main/res/xml/network_security_config.xml | 20 +++++++++---------- .../src/production/res/values/strings.xml | 20 +++++++++---------- demo-app/src/staging/res/values/strings.xml | 20 +++++++++---------- .../build.gradle.kts | 4 +++- stream-video-android-core/build.gradle.kts | 9 ++++++--- .../src/androidTest/AndroidManifest.xml | 20 +++++++++---------- .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_call.xml | 20 +++++++++---------- .../stream_video_ic_cancel_screenshare.xml | 20 +++++++++---------- .../stream_video_ic_live_notification.xml | 20 +++++++++---------- .../drawable/stream_video_ic_screenshare.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_user.xml | 20 +++++++++---------- .../drawable/stream_video_ic_user_group.xml | 20 +++++++++---------- .../src/main/res/values/ids.xml | 20 +++++++++---------- .../src/main/res/values/strings.xml | 20 +++++++++---------- .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../build.gradle.kts | 1 - .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../src/main/res/values/strings.xml | 20 +++++++++---------- .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../res/drawable/stream_video_call_sample.xml | 20 +++++++++---------- .../drawable/stream_video_ic_arrow_back.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_call.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_call_end.xml | 20 +++++++++---------- .../drawable/stream_video_ic_camera_flip.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_close.xml | 20 +++++++++---------- .../drawable/stream_video_ic_fullscreen.xml | 20 +++++++++---------- .../stream_video_ic_fullscreen_exit.xml | 20 +++++++++---------- .../drawable/stream_video_ic_join_call.xml | 20 +++++++++---------- .../stream_video_ic_landscape_mode.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_leave.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_live.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_message.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_mic_off.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_mic_on.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_options.xml | 20 +++++++++---------- .../drawable/stream_video_ic_participants.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_play.xml | 20 +++++++++---------- .../stream_video_ic_portrait_mode.xml | 20 +++++++++---------- .../stream_video_ic_preview_avatar.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_reaction.xml | 20 +++++++++---------- .../stream_video_ic_screensharing.xml | 20 +++++++++---------- .../res/drawable/stream_video_ic_selected.xml | 20 +++++++++---------- .../drawable/stream_video_ic_speaker_off.xml | 20 +++++++++---------- .../drawable/stream_video_ic_speaker_on.xml | 20 +++++++++---------- .../drawable/stream_video_ic_videocam_off.xml | 20 +++++++++---------- .../drawable/stream_video_ic_videocam_on.xml | 20 +++++++++---------- .../stream_video_content_participant.xml | 20 +++++++++---------- .../src/main/res/values-night/colors.xml | 20 +++++++++---------- .../src/main/res/values/colors-legacy.xml | 20 +++++++++---------- .../src/main/res/values/colors.xml | 20 +++++++++---------- .../src/main/res/values/dimens-legacy.xml | 20 +++++++++---------- .../src/main/res/values/dimens.xml | 20 +++++++++---------- .../src/main/res/values/strings.xml | 20 +++++++++---------- stream-video-android-ui-xml/build.gradle.kts | 1 - stream-video-android-ui-xml/lint-baseline.xml | 20 +++++++++---------- .../src/main/AndroidManifest.xml | 20 +++++++++---------- ...tream_video_bg_active_call_participant.xml | 20 +++++++++---------- .../stream_video_bg_call_control_option.xml | 20 +++++++++---------- .../drawable/stream_video_bg_call_option.xml | 20 +++++++++---------- .../stream_video_bg_call_participant_name.xml | 20 +++++++++---------- .../stream_video_rect_active_speaker.xml | 20 +++++++++---------- .../drawable/stream_video_rect_controls.xml | 20 +++++++++---------- .../stream_video_rect_controls_landscape.xml | 20 +++++++++---------- .../res/layout/stream_video_activity_call.xml | 20 +++++++++---------- .../layout/stream_video_item_participant.xml | 20 +++++++++---------- .../layout/stream_video_view_call_app_bar.xml | 20 +++++++++---------- .../layout/stream_video_view_call_details.xml | 20 +++++++++---------- .../stream_video_view_call_participant.xml | 20 +++++++++---------- .../stream_video_view_control_button.xml | 20 +++++++++---------- ...stream_video_view_floating_participant.xml | 20 +++++++++---------- .../stream_video_view_incoming_call.xml | 20 +++++++++---------- .../stream_video_view_outgoing_call.xml | 20 +++++++++---------- .../layout/stream_video_view_screen_share.xml | 20 +++++++++---------- .../main/res/menu/stream_video_call_menu.xml | 20 +++++++++---------- .../main/res/values/stream_video_attrs.xml | 20 +++++++++---------- .../values/stream_video_attrs_avatar_view.xml | 20 +++++++++---------- .../stream_video_attrs_call_app_bar.xml | 20 +++++++++---------- ...stream_video_attrs_call_container_view.xml | 20 +++++++++---------- .../stream_video_attrs_call_content_view.xml | 20 +++++++++---------- .../stream_video_attrs_call_controls_view.xml | 20 +++++++++---------- .../stream_video_attrs_call_details_view.xml | 20 +++++++++---------- ...ream_video_attrs_call_participant_view.xml | 20 +++++++++---------- .../stream_video_attrs_control_button.xml | 20 +++++++++---------- .../stream_video_attrs_incoming_call_view.xml | 20 +++++++++---------- .../stream_video_attrs_outgoing_call_view.xml | 20 +++++++++---------- ...am_video_attrs_picture_in_picture_view.xml | 20 +++++++++---------- .../stream_video_attrs_screen_share.xml | 20 +++++++++---------- .../main/res/values/stream_video_colors.xml | 20 +++++++++---------- .../src/main/res/values/styles.xml | 20 +++++++++---------- tutorials/tutorial-audio/.idea/gradle.xml | 20 +++++++++---------- tutorials/tutorial-audio/.idea/misc.xml | 20 +++++++++---------- .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_background.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_foreground.xml | 20 +++++++++---------- .../res/mipmap-anydpi-v26/ic_launcher.xml | 20 +++++++++---------- .../mipmap-anydpi-v26/ic_launcher_round.xml | 20 +++++++++---------- .../src/main/res/values/colors.xml | 20 +++++++++---------- .../src/main/res/values/strings.xml | 20 +++++++++---------- .../src/main/res/values/themes.xml | 20 +++++++++---------- .../src/main/res/xml/backup_rules.xml | 20 +++++++++---------- .../main/res/xml/data_extraction_rules.xml | 20 +++++++++---------- .../tutorial-livestream/.idea/gradle.xml | 20 +++++++++---------- tutorials/tutorial-livestream/.idea/misc.xml | 20 +++++++++---------- .../tutorial-livestream/.idea/workspace.xml | 20 +++++++++---------- .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_background.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_foreground.xml | 20 +++++++++---------- .../res/mipmap-anydpi-v26/ic_launcher.xml | 20 +++++++++---------- .../mipmap-anydpi-v26/ic_launcher_round.xml | 20 +++++++++---------- .../src/main/res/values/colors.xml | 20 +++++++++---------- .../src/main/res/values/strings.xml | 20 +++++++++---------- .../src/main/res/values/themes.xml | 20 +++++++++---------- .../src/main/res/xml/backup_rules.xml | 20 +++++++++---------- .../main/res/xml/data_extraction_rules.xml | 20 +++++++++---------- tutorials/tutorial-ringing/build.gradle.kts | 8 ++++---- .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_background.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_foreground.xml | 20 +++++++++---------- .../res/drawable/round_call_missed_24.xml | 20 +++++++++---------- .../res/mipmap-anydpi-v26/ic_launcher.xml | 20 +++++++++---------- .../mipmap-anydpi-v26/ic_launcher_round.xml | 20 +++++++++---------- .../src/main/res/values/colors.xml | 20 +++++++++---------- .../src/main/res/values/strings.xml | 20 +++++++++---------- .../src/main/res/values/themes.xml | 20 +++++++++---------- .../src/main/res/xml/backup_rules.xml | 20 +++++++++---------- .../main/res/xml/data_extraction_rules.xml | 20 +++++++++---------- .../main/res/xml/network_security_config.xml | 20 +++++++++---------- .../src/main/AndroidManifest.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_background.xml | 20 +++++++++---------- .../res/drawable/ic_launcher_foreground.xml | 20 +++++++++---------- .../res/mipmap-anydpi-v26/ic_launcher.xml | 20 +++++++++---------- .../mipmap-anydpi-v26/ic_launcher_round.xml | 20 +++++++++---------- .../src/main/res/values/colors.xml | 20 +++++++++---------- .../src/main/res/values/strings.xml | 20 +++++++++---------- .../src/main/res/values/themes.xml | 20 +++++++++---------- .../src/main/res/xml/backup_rules.xml | 20 +++++++++---------- .../main/res/xml/data_extraction_rules.xml | 20 +++++++++---------- 164 files changed, 1601 insertions(+), 1596 deletions(-) diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml index 526090f6750..d758c643d95 100644 --- a/benchmark/src/main/AndroidManifest.xml +++ b/benchmark/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index a57467d4e8e..d69dbbc09eb 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -105,7 +105,7 @@ android { baselineProfile.automaticGenerationDuringBuild = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" + "proguard-rules.pro", ) signingConfig = signingConfigs.getByName("release") } @@ -140,7 +140,9 @@ android { } playConfigs { - val serviceAccountCredentialsFile: File = rootProject.file(".sign/service-account-credentials.json") + val serviceAccountCredentialsFile: File = rootProject.file( + ".sign/service-account-credentials.json", + ) if (serviceAccountCredentialsFile.exists()) { register("productionRelease") { enabled.set(true) @@ -196,7 +198,7 @@ androidComponents { it.versionName.set( it.versionCode.map { playVersionCode -> "${Configuration.streamVideoCallGooglePlayVersion} ($playVersionCode)" - } + }, ) } @@ -214,10 +216,8 @@ dependencies { implementation(project(":stream-video-android-filters-video")) compileOnly(project(":stream-video-android-previewdata")) - implementation(libs.androidx.media.media) - implementation(libs.androidx.media.media) // Noise Cancellation @@ -278,7 +278,9 @@ dependencies { implementation(libs.moshi.kotlin) // Play - implementation(libs.play.install.referrer) // Used to extract the meeting link from demo flow after install + implementation( + libs.play.install.referrer, + ) // Used to extract the meeting link from demo flow after install implementation(libs.play.auth) implementation(libs.play.app.update.ktx) diff --git a/demo-app/lint-baseline.xml b/demo-app/lint-baseline.xml index 5adba98c6cb..490bd830c2c 100644 --- a/demo-app/lint-baseline.xml +++ b/demo-app/lint-baseline.xml @@ -1,18 +1,18 @@ diff --git a/demo-app/src/development/res/drawable/ic_launcher_background.xml b/demo-app/src/development/res/drawable/ic_launcher_background.xml index 702cad2f3be..ad446e227fb 100644 --- a/demo-app/src/development/res/drawable/ic_launcher_background.xml +++ b/demo-app/src/development/res/drawable/ic_launcher_background.xml @@ -1,18 +1,18 @@ Stream Video Calls (Development) diff --git a/demo-app/src/e2etesting/res/drawable/ic_launcher_background.xml b/demo-app/src/e2etesting/res/drawable/ic_launcher_background.xml index 702cad2f3be..ad446e227fb 100644 --- a/demo-app/src/e2etesting/res/drawable/ic_launcher_background.xml +++ b/demo-app/src/e2etesting/res/drawable/ic_launcher_background.xml @@ -1,18 +1,18 @@ Stream Video Calls (E2E Testing) diff --git a/demo-app/src/main/AndroidManifest.xml b/demo-app/src/main/AndroidManifest.xml index 57a51bfeda0..ef7453ae9e9 100644 --- a/demo-app/src/main/AndroidManifest.xml +++ b/demo-app/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/demo-app/src/main/res/drawable/google_button_logo.xml b/demo-app/src/main/res/drawable/google_button_logo.xml index cb435e1a46a..237b0635f4b 100644 --- a/demo-app/src/main/res/drawable/google_button_logo.xml +++ b/demo-app/src/main/res/drawable/google_button_logo.xml @@ -1,18 +1,18 @@ diff --git a/demo-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 501062b68df..c8d4dfe50d4 100644 --- a/demo-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/demo-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,18 +1,18 @@ diff --git a/demo-app/src/main/res/values/colors.xml b/demo-app/src/main/res/values/colors.xml index c833d2a6668..3b2845714fc 100644 --- a/demo-app/src/main/res/values/colors.xml +++ b/demo-app/src/main/res/values/colors.xml @@ -1,18 +1,18 @@ #FFBB86FC diff --git a/demo-app/src/main/res/values/strings.xml b/demo-app/src/main/res/values/strings.xml index 8fd99a9348a..4b76451dbb9 100644 --- a/demo-app/src/main/res/values/strings.xml +++ b/demo-app/src/main/res/values/strings.xml @@ -1,18 +1,18 @@ getstream.io diff --git a/demo-app/src/main/res/values/themes.xml b/demo-app/src/main/res/values/themes.xml index 5df71706bf5..e51a75d7bf6 100644 --- a/demo-app/src/main/res/values/themes.xml +++ b/demo-app/src/main/res/values/themes.xml @@ -1,18 +1,18 @@ diff --git a/demo-app/src/main/res/xml/network_security_config.xml b/demo-app/src/main/res/xml/network_security_config.xml index b57fed92391..9ea0f58cb5a 100644 --- a/demo-app/src/main/res/xml/network_security_config.xml +++ b/demo-app/src/main/res/xml/network_security_config.xml @@ -1,18 +1,18 @@ diff --git a/demo-app/src/production/res/values/strings.xml b/demo-app/src/production/res/values/strings.xml index 3f96204c07f..dcc21da7722 100644 --- a/demo-app/src/production/res/values/strings.xml +++ b/demo-app/src/production/res/values/strings.xml @@ -1,18 +1,18 @@ Stream Video Calls diff --git a/demo-app/src/staging/res/values/strings.xml b/demo-app/src/staging/res/values/strings.xml index af38a2f471f..6bdbb590d43 100644 --- a/demo-app/src/staging/res/values/strings.xml +++ b/demo-app/src/staging/res/values/strings.xml @@ -1,18 +1,18 @@ Stream Video Calls (Staging) diff --git a/metrics/stream-video-android-metrics/build.gradle.kts b/metrics/stream-video-android-metrics/build.gradle.kts index 1ca69234b96..2caeaf7a636 100644 --- a/metrics/stream-video-android-metrics/build.gradle.kts +++ b/metrics/stream-video-android-metrics/build.gradle.kts @@ -74,5 +74,7 @@ dependencies { "stream-video-android-ui-xml-streamImplementation"(project(":stream-video-android-ui-xml")) "stream-video-android-ui-compose-baselineImplementation"(project(":stream-video-android-core")) - "stream-video-android-ui-compose-streamImplementation"(project(":stream-video-android-ui-compose")) + "stream-video-android-ui-compose-streamImplementation"( + project(":stream-video-android-ui-compose"), + ) } diff --git a/stream-video-android-core/build.gradle.kts b/stream-video-android-core/build.gradle.kts index bf7352a510e..eeb7212e355 100644 --- a/stream-video-android-core/build.gradle.kts +++ b/stream-video-android-core/build.gradle.kts @@ -66,7 +66,11 @@ android { buildConfigField("Integer", "STREAM_VIDEO_VERSION_MAJOR", "${Configuration.majorVersion}") buildConfigField("Integer", "STREAM_VIDEO_VERSION_MINOR", "${Configuration.minorVersion}") buildConfigField("Integer", "STREAM_VIDEO_VERSION_PATCH", "${Configuration.patchVersion}") - buildConfigField("String", "STREAM_WEBRTC_VERSION", "\"${Configuration.streamWebRtcVersionName}\"") + buildConfigField( + "String", + "STREAM_WEBRTC_VERSION", + "\"${Configuration.streamWebRtcVersionName}\"", + ) } buildFeatures { @@ -176,10 +180,9 @@ dependencies { implementation(libs.stream.push.delegate) api(libs.stream.push.permissions) - //jetpack telecom + // jetpack telecom implementation(libs.androidx.telecom) - // datastore api(libs.androidx.datastore) api(libs.androidx.datastore.core) diff --git a/stream-video-android-core/src/androidTest/AndroidManifest.xml b/stream-video-android-core/src/androidTest/AndroidManifest.xml index 20d244cfd9f..5e749771d4c 100644 --- a/stream-video-android-core/src/androidTest/AndroidManifest.xml +++ b/stream-video-android-core/src/androidTest/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-core/src/main/AndroidManifest.xml b/stream-video-android-core/src/main/AndroidManifest.xml index 1997ca33883..760b2a6cb67 100644 --- a/stream-video-android-core/src/main/AndroidManifest.xml +++ b/stream-video-android-core/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-core/src/main/res/values/strings.xml b/stream-video-android-core/src/main/res/values/strings.xml index 5baa56addc2..ea04666f318 100644 --- a/stream-video-android-core/src/main/res/values/strings.xml +++ b/stream-video-android-core/src/main/res/values/strings.xml @@ -1,18 +1,18 @@ Accept diff --git a/stream-video-android-filters-video/src/main/AndroidManifest.xml b/stream-video-android-filters-video/src/main/AndroidManifest.xml index 7dbf29a6c2a..e86a479f5ad 100644 --- a/stream-video-android-filters-video/src/main/AndroidManifest.xml +++ b/stream-video-android-filters-video/src/main/AndroidManifest.xml @@ -1,17 +1,17 @@ \ No newline at end of file diff --git a/stream-video-android-previewdata/src/main/AndroidManifest.xml b/stream-video-android-previewdata/src/main/AndroidManifest.xml index 7dbf29a6c2a..e86a479f5ad 100644 --- a/stream-video-android-previewdata/src/main/AndroidManifest.xml +++ b/stream-video-android-previewdata/src/main/AndroidManifest.xml @@ -1,17 +1,17 @@ \ No newline at end of file diff --git a/stream-video-android-ui-compose/build.gradle.kts b/stream-video-android-ui-compose/build.gradle.kts index 4f2020e78ff..aec680a5fd4 100644 --- a/stream-video-android-ui-compose/build.gradle.kts +++ b/stream-video-android-ui-compose/build.gradle.kts @@ -77,7 +77,6 @@ dependencies { testImplementation(libs.turbine) testImplementation(libs.robolectric) testImplementation(libs.kotlin.test.junit) - } mavenPublishing { diff --git a/stream-video-android-ui-compose/src/main/AndroidManifest.xml b/stream-video-android-ui-compose/src/main/AndroidManifest.xml index 4f1ab250cff..62722f2490e 100644 --- a/stream-video-android-ui-compose/src/main/AndroidManifest.xml +++ b/stream-video-android-ui-compose/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ Calling... diff --git a/stream-video-android-ui-core/src/main/AndroidManifest.xml b/stream-video-android-ui-core/src/main/AndroidManifest.xml index 7dbf29a6c2a..e86a479f5ad 100644 --- a/stream-video-android-ui-core/src/main/AndroidManifest.xml +++ b/stream-video-android-ui-core/src/main/AndroidManifest.xml @@ -1,17 +1,17 @@ \ No newline at end of file diff --git a/stream-video-android-ui-core/src/main/res/drawable/stream_video_call_sample.xml b/stream-video-android-ui-core/src/main/res/drawable/stream_video_call_sample.xml index 760309c9ebf..8ecd639ce4d 100644 --- a/stream-video-android-ui-core/src/main/res/drawable/stream_video_call_sample.xml +++ b/stream-video-android-ui-core/src/main/res/drawable/stream_video_call_sample.xml @@ -1,18 +1,18 @@ @color/stream_video_text_high_emphasis_dark diff --git a/stream-video-android-ui-core/src/main/res/values/colors-legacy.xml b/stream-video-android-ui-core/src/main/res/values/colors-legacy.xml index 5cc49f8627f..9d6bf459c95 100644 --- a/stream-video-android-ui-core/src/main/res/values/colors-legacy.xml +++ b/stream-video-android-ui-core/src/main/res/values/colors-legacy.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-core/src/main/res/values/colors.xml b/stream-video-android-ui-core/src/main/res/values/colors.xml index 55d9da7b294..7dc1d40a292 100644 --- a/stream-video-android-ui-core/src/main/res/values/colors.xml +++ b/stream-video-android-ui-core/src/main/res/values/colors.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-core/src/main/res/values/dimens-legacy.xml b/stream-video-android-ui-core/src/main/res/values/dimens-legacy.xml index 244d9826721..f5f4c8666ac 100644 --- a/stream-video-android-ui-core/src/main/res/values/dimens-legacy.xml +++ b/stream-video-android-ui-core/src/main/res/values/dimens-legacy.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-core/src/main/res/values/dimens.xml b/stream-video-android-ui-core/src/main/res/values/dimens.xml index e6bf9e03280..d8678a45f5a 100644 --- a/stream-video-android-ui-core/src/main/res/values/dimens.xml +++ b/stream-video-android-ui-core/src/main/res/values/dimens.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-core/src/main/res/values/strings.xml b/stream-video-android-ui-core/src/main/res/values/strings.xml index 66ea3fac5cd..23f345b6a47 100644 --- a/stream-video-android-ui-core/src/main/res/values/strings.xml +++ b/stream-video-android-ui-core/src/main/res/values/strings.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/build.gradle.kts b/stream-video-android-ui-xml/build.gradle.kts index 488545a5abb..09f7f03bdf0 100644 --- a/stream-video-android-ui-xml/build.gradle.kts +++ b/stream-video-android-ui-xml/build.gradle.kts @@ -59,7 +59,6 @@ dependencies { implementation(libs.landscapist.coil) implementation(libs.stream.log) - } mavenPublishing { diff --git a/stream-video-android-ui-xml/lint-baseline.xml b/stream-video-android-ui-xml/lint-baseline.xml index e17d525566b..ef3b0acdbb0 100644 --- a/stream-video-android-ui-xml/lint-baseline.xml +++ b/stream-video-android-ui-xml/lint-baseline.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/AndroidManifest.xml b/stream-video-android-ui-xml/src/main/AndroidManifest.xml index 5166b2d72be..37a29918ac8 100644 --- a/stream-video-android-ui-xml/src/main/AndroidManifest.xml +++ b/stream-video-android-ui-xml/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/drawable/stream_video_bg_call_control_option.xml b/stream-video-android-ui-xml/src/main/res/drawable/stream_video_bg_call_control_option.xml index 0b46dfcca19..0025ae58029 100644 --- a/stream-video-android-ui-xml/src/main/res/drawable/stream_video_bg_call_control_option.xml +++ b/stream-video-android-ui-xml/src/main/res/drawable/stream_video_bg_call_control_option.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/drawable/stream_video_rect_controls.xml b/stream-video-android-ui-xml/src/main/res/drawable/stream_video_rect_controls.xml index 25d1215ee7c..7e17fb12812 100644 --- a/stream-video-android-ui-xml/src/main/res/drawable/stream_video_rect_controls.xml +++ b/stream-video-android-ui-xml/src/main/res/drawable/stream_video_rect_controls.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/drawable/stream_video_rect_controls_landscape.xml b/stream-video-android-ui-xml/src/main/res/drawable/stream_video_rect_controls_landscape.xml index 5396fb2834c..55fbdd8ddc6 100644 --- a/stream-video-android-ui-xml/src/main/res/drawable/stream_video_rect_controls_landscape.xml +++ b/stream-video-android-ui-xml/src/main/res/drawable/stream_video_rect_controls_landscape.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/layout/stream_video_activity_call.xml b/stream-video-android-ui-xml/src/main/res/layout/stream_video_activity_call.xml index b155e406bb8..d3c75c3ae0f 100644 --- a/stream-video-android-ui-xml/src/main/res/layout/stream_video_activity_call.xml +++ b/stream-video-android-ui-xml/src/main/res/layout/stream_video_activity_call.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/layout/stream_video_view_floating_participant.xml b/stream-video-android-ui-xml/src/main/res/layout/stream_video_view_floating_participant.xml index 83b2826bc7f..a7369fc7128 100644 --- a/stream-video-android-ui-xml/src/main/res/layout/stream_video_view_floating_participant.xml +++ b/stream-video-android-ui-xml/src/main/res/layout/stream_video_view_floating_participant.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_avatar_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_avatar_view.xml index 9db0caffd7f..762f3b69459 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_avatar_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_avatar_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_app_bar.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_app_bar.xml index 24fc709c110..a53fe7fb1bf 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_app_bar.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_app_bar.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_container_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_container_view.xml index 05b8621f717..b437123938d 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_container_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_container_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_content_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_content_view.xml index 63eb1acd127..205bb8cc17e 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_content_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_content_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_controls_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_controls_view.xml index 9be83f89d11..f77dcce9671 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_controls_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_controls_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_details_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_details_view.xml index f679cfaa6fb..498888eb861 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_details_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_details_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_participant_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_participant_view.xml index 4ed08a28b2a..9f26a1c55e5 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_participant_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_call_participant_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_control_button.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_control_button.xml index 1d58a6ef762..ffb69e979f9 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_control_button.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_control_button.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_incoming_call_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_incoming_call_view.xml index a0833f52374..5a088d8d4d4 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_incoming_call_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_incoming_call_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_outgoing_call_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_outgoing_call_view.xml index c4370feccc4..c278ff5a2db 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_outgoing_call_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_outgoing_call_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_picture_in_picture_view.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_picture_in_picture_view.xml index dd72a78c7af..3920637de5a 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_picture_in_picture_view.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_picture_in_picture_view.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_screen_share.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_screen_share.xml index 478a81fad1b..c5cb686ad66 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_screen_share.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_attrs_screen_share.xml @@ -1,18 +1,18 @@ diff --git a/stream-video-android-ui-xml/src/main/res/values/stream_video_colors.xml b/stream-video-android-ui-xml/src/main/res/values/stream_video_colors.xml index 6fdbf45df85..a7cda8979c4 100644 --- a/stream-video-android-ui-xml/src/main/res/values/stream_video_colors.xml +++ b/stream-video-android-ui-xml/src/main/res/values/stream_video_colors.xml @@ -1,18 +1,18 @@ #000000 diff --git a/stream-video-android-ui-xml/src/main/res/values/styles.xml b/stream-video-android-ui-xml/src/main/res/values/styles.xml index a2a4b451beb..5e02a159978 100644 --- a/stream-video-android-ui-xml/src/main/res/values/styles.xml +++ b/stream-video-android-ui-xml/src/main/res/values/styles.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-audio/.idea/gradle.xml b/tutorials/tutorial-audio/.idea/gradle.xml index 9cb7cbf180c..37fdf7dd24a 100644 --- a/tutorials/tutorial-audio/.idea/gradle.xml +++ b/tutorials/tutorial-audio/.idea/gradle.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-audio/.idea/misc.xml b/tutorials/tutorial-audio/.idea/misc.xml index 0d2d1b51d1d..65c4256b91c 100644 --- a/tutorials/tutorial-audio/.idea/misc.xml +++ b/tutorials/tutorial-audio/.idea/misc.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-audio/src/main/AndroidManifest.xml b/tutorials/tutorial-audio/src/main/AndroidManifest.xml index daa982e368f..86a95652601 100644 --- a/tutorials/tutorial-audio/src/main/AndroidManifest.xml +++ b/tutorials/tutorial-audio/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-audio/src/main/res/drawable/ic_launcher_background.xml b/tutorials/tutorial-audio/src/main/res/drawable/ic_launcher_background.xml index fc44ecb816d..ff0234ed01e 100644 --- a/tutorials/tutorial-audio/src/main/res/drawable/ic_launcher_background.xml +++ b/tutorials/tutorial-audio/src/main/res/drawable/ic_launcher_background.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-audio/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/tutorials/tutorial-audio/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 182e8f82abd..0d7243a04fb 100644 --- a/tutorials/tutorial-audio/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/tutorials/tutorial-audio/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-audio/src/main/res/values/colors.xml b/tutorials/tutorial-audio/src/main/res/values/colors.xml index c833d2a6668..3b2845714fc 100644 --- a/tutorials/tutorial-audio/src/main/res/values/colors.xml +++ b/tutorials/tutorial-audio/src/main/res/values/colors.xml @@ -1,18 +1,18 @@ #FFBB86FC diff --git a/tutorials/tutorial-audio/src/main/res/values/strings.xml b/tutorials/tutorial-audio/src/main/res/values/strings.xml index 753940bc801..e7001dfadc7 100644 --- a/tutorials/tutorial-audio/src/main/res/values/strings.xml +++ b/tutorials/tutorial-audio/src/main/res/values/strings.xml @@ -1,18 +1,18 @@ tutorial-audio diff --git a/tutorials/tutorial-audio/src/main/res/values/themes.xml b/tutorials/tutorial-audio/src/main/res/values/themes.xml index 03e526b1a86..a25fde753ff 100644 --- a/tutorials/tutorial-audio/src/main/res/values/themes.xml +++ b/tutorials/tutorial-audio/src/main/res/values/themes.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-audio/src/main/res/xml/backup_rules.xml b/tutorials/tutorial-audio/src/main/res/xml/backup_rules.xml index a97c6b06185..b4bc6646681 100644 --- a/tutorials/tutorial-audio/src/main/res/xml/backup_rules.xml +++ b/tutorials/tutorial-audio/src/main/res/xml/backup_rules.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-livestream/.idea/gradle.xml b/tutorials/tutorial-livestream/.idea/gradle.xml index 9cb7cbf180c..37fdf7dd24a 100644 --- a/tutorials/tutorial-livestream/.idea/gradle.xml +++ b/tutorials/tutorial-livestream/.idea/gradle.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-livestream/.idea/misc.xml b/tutorials/tutorial-livestream/.idea/misc.xml index 0d2d1b51d1d..65c4256b91c 100644 --- a/tutorials/tutorial-livestream/.idea/misc.xml +++ b/tutorials/tutorial-livestream/.idea/misc.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-livestream/.idea/workspace.xml b/tutorials/tutorial-livestream/.idea/workspace.xml index aaac6b1a334..65203dc9326 100644 --- a/tutorials/tutorial-livestream/.idea/workspace.xml +++ b/tutorials/tutorial-livestream/.idea/workspace.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-livestream/src/main/AndroidManifest.xml b/tutorials/tutorial-livestream/src/main/AndroidManifest.xml index 8d8fe5da213..756d0bd519d 100644 --- a/tutorials/tutorial-livestream/src/main/AndroidManifest.xml +++ b/tutorials/tutorial-livestream/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-livestream/src/main/res/drawable/ic_launcher_background.xml b/tutorials/tutorial-livestream/src/main/res/drawable/ic_launcher_background.xml index fc44ecb816d..ff0234ed01e 100644 --- a/tutorials/tutorial-livestream/src/main/res/drawable/ic_launcher_background.xml +++ b/tutorials/tutorial-livestream/src/main/res/drawable/ic_launcher_background.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-livestream/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/tutorials/tutorial-livestream/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 182e8f82abd..0d7243a04fb 100644 --- a/tutorials/tutorial-livestream/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/tutorials/tutorial-livestream/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-livestream/src/main/res/values/colors.xml b/tutorials/tutorial-livestream/src/main/res/values/colors.xml index c833d2a6668..3b2845714fc 100644 --- a/tutorials/tutorial-livestream/src/main/res/values/colors.xml +++ b/tutorials/tutorial-livestream/src/main/res/values/colors.xml @@ -1,18 +1,18 @@ #FFBB86FC diff --git a/tutorials/tutorial-livestream/src/main/res/values/strings.xml b/tutorials/tutorial-livestream/src/main/res/values/strings.xml index 00dc1b33f61..4d4483e883f 100644 --- a/tutorials/tutorial-livestream/src/main/res/values/strings.xml +++ b/tutorials/tutorial-livestream/src/main/res/values/strings.xml @@ -1,18 +1,18 @@ tutorial-livestream diff --git a/tutorials/tutorial-livestream/src/main/res/values/themes.xml b/tutorials/tutorial-livestream/src/main/res/values/themes.xml index 0b1d6e7bc24..02cf3476ba1 100644 --- a/tutorials/tutorial-livestream/src/main/res/values/themes.xml +++ b/tutorials/tutorial-livestream/src/main/res/values/themes.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-livestream/src/main/res/xml/backup_rules.xml b/tutorials/tutorial-livestream/src/main/res/xml/backup_rules.xml index a97c6b06185..b4bc6646681 100644 --- a/tutorials/tutorial-livestream/src/main/res/xml/backup_rules.xml +++ b/tutorials/tutorial-livestream/src/main/res/xml/backup_rules.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-ringing/build.gradle.kts b/tutorials/tutorial-ringing/build.gradle.kts index 461f973fae9..22a4d8ad3fc 100644 --- a/tutorials/tutorial-ringing/build.gradle.kts +++ b/tutorials/tutorial-ringing/build.gradle.kts @@ -21,15 +21,15 @@ plugins { } android { - //namespace = "io.getstream.video.android.tutorial.video" + // namespace = "io.getstream.video.android.tutorial.video" namespace = "io.getstream.android.samples.ringingcall" - //namespace = "io.getstream.video.android" + // namespace = "io.getstream.video.android" compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - //applicationId = "io.getstream.video.android.tutorial.video" + // applicationId = "io.getstream.video.android.tutorial.video" applicationId = "io.getstream.android.samples.ringingcall" - //applicationId = "io.getstream.video.android" + // applicationId = "io.getstream.video.android" minSdk = libs.versions.minSdk.get().toInt() targetSdk = libs.versions.targetSdk.get().toInt() versionCode = 1 diff --git a/tutorials/tutorial-ringing/src/main/AndroidManifest.xml b/tutorials/tutorial-ringing/src/main/AndroidManifest.xml index 3c14a000875..c539dfac827 100644 --- a/tutorials/tutorial-ringing/src/main/AndroidManifest.xml +++ b/tutorials/tutorial-ringing/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-ringing/src/main/res/drawable/ic_launcher_background.xml b/tutorials/tutorial-ringing/src/main/res/drawable/ic_launcher_background.xml index fc44ecb816d..ff0234ed01e 100644 --- a/tutorials/tutorial-ringing/src/main/res/drawable/ic_launcher_background.xml +++ b/tutorials/tutorial-ringing/src/main/res/drawable/ic_launcher_background.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-ringing/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/tutorials/tutorial-ringing/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 182e8f82abd..0d7243a04fb 100644 --- a/tutorials/tutorial-ringing/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/tutorials/tutorial-ringing/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-ringing/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/tutorials/tutorial-ringing/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 182e8f82abd..0d7243a04fb 100644 --- a/tutorials/tutorial-ringing/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/tutorials/tutorial-ringing/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-ringing/src/main/res/values/colors.xml b/tutorials/tutorial-ringing/src/main/res/values/colors.xml index c833d2a6668..3b2845714fc 100644 --- a/tutorials/tutorial-ringing/src/main/res/values/colors.xml +++ b/tutorials/tutorial-ringing/src/main/res/values/colors.xml @@ -1,18 +1,18 @@ #FFBB86FC diff --git a/tutorials/tutorial-ringing/src/main/res/values/strings.xml b/tutorials/tutorial-ringing/src/main/res/values/strings.xml index 7e9b6bc682f..74c201e9d0d 100644 --- a/tutorials/tutorial-ringing/src/main/res/values/strings.xml +++ b/tutorials/tutorial-ringing/src/main/res/values/strings.xml @@ -1,18 +1,18 @@ tutorial-ringing diff --git a/tutorials/tutorial-ringing/src/main/res/values/themes.xml b/tutorials/tutorial-ringing/src/main/res/values/themes.xml index d14f8a0d039..25aaa6c8911 100644 --- a/tutorials/tutorial-ringing/src/main/res/values/themes.xml +++ b/tutorials/tutorial-ringing/src/main/res/values/themes.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-ringing/src/main/res/xml/backup_rules.xml b/tutorials/tutorial-ringing/src/main/res/xml/backup_rules.xml index a97c6b06185..b4bc6646681 100644 --- a/tutorials/tutorial-ringing/src/main/res/xml/backup_rules.xml +++ b/tutorials/tutorial-ringing/src/main/res/xml/backup_rules.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-ringing/src/main/res/xml/network_security_config.xml b/tutorials/tutorial-ringing/src/main/res/xml/network_security_config.xml index b57fed92391..9ea0f58cb5a 100644 --- a/tutorials/tutorial-ringing/src/main/res/xml/network_security_config.xml +++ b/tutorials/tutorial-ringing/src/main/res/xml/network_security_config.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-video/src/main/AndroidManifest.xml b/tutorials/tutorial-video/src/main/AndroidManifest.xml index 02bcc03ffc1..251d8d764bb 100644 --- a/tutorials/tutorial-video/src/main/AndroidManifest.xml +++ b/tutorials/tutorial-video/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-video/src/main/res/drawable/ic_launcher_background.xml b/tutorials/tutorial-video/src/main/res/drawable/ic_launcher_background.xml index fc44ecb816d..ff0234ed01e 100644 --- a/tutorials/tutorial-video/src/main/res/drawable/ic_launcher_background.xml +++ b/tutorials/tutorial-video/src/main/res/drawable/ic_launcher_background.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-video/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/tutorials/tutorial-video/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 182e8f82abd..0d7243a04fb 100644 --- a/tutorials/tutorial-video/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/tutorials/tutorial-video/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-video/src/main/res/values/colors.xml b/tutorials/tutorial-video/src/main/res/values/colors.xml index c833d2a6668..3b2845714fc 100644 --- a/tutorials/tutorial-video/src/main/res/values/colors.xml +++ b/tutorials/tutorial-video/src/main/res/values/colors.xml @@ -1,18 +1,18 @@ #FFBB86FC diff --git a/tutorials/tutorial-video/src/main/res/values/strings.xml b/tutorials/tutorial-video/src/main/res/values/strings.xml index 18fb663e210..ab2bd543b3e 100644 --- a/tutorials/tutorial-video/src/main/res/values/strings.xml +++ b/tutorials/tutorial-video/src/main/res/values/strings.xml @@ -1,18 +1,18 @@ tutorial-video diff --git a/tutorials/tutorial-video/src/main/res/values/themes.xml b/tutorials/tutorial-video/src/main/res/values/themes.xml index d14f8a0d039..25aaa6c8911 100644 --- a/tutorials/tutorial-video/src/main/res/values/themes.xml +++ b/tutorials/tutorial-video/src/main/res/values/themes.xml @@ -1,18 +1,18 @@ diff --git a/tutorials/tutorial-video/src/main/res/xml/backup_rules.xml b/tutorials/tutorial-video/src/main/res/xml/backup_rules.xml index a97c6b06185..b4bc6646681 100644 --- a/tutorials/tutorial-video/src/main/res/xml/backup_rules.xml +++ b/tutorials/tutorial-video/src/main/res/xml/backup_rules.xml @@ -1,18 +1,18 @@ From 0b166b27183769780a6cb4d24fa027d0cdce678e Mon Sep 17 00:00:00 2001 From: Gian <47775302+gpunto@users.noreply.github.com> Date: Tue, 25 Nov 2025 13:13:15 +0100 Subject: [PATCH 4/4] Remove tutorial-audio .idea folder --- tutorials/tutorial-audio/.gitignore | 7 +----- tutorials/tutorial-audio/.idea/.gitignore | 3 --- tutorials/tutorial-audio/.idea/gradle.xml | 28 ----------------------- tutorials/tutorial-audio/.idea/misc.xml | 25 -------------------- 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 tutorials/tutorial-audio/.idea/.gitignore delete mode 100644 tutorials/tutorial-audio/.idea/gradle.xml delete mode 100644 tutorials/tutorial-audio/.idea/misc.xml diff --git a/tutorials/tutorial-audio/.gitignore b/tutorials/tutorial-audio/.gitignore index aa724b77071..10cfdbfaf8e 100644 --- a/tutorials/tutorial-audio/.gitignore +++ b/tutorials/tutorial-audio/.gitignore @@ -1,12 +1,7 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml +/.idea .DS_Store /build /captures diff --git a/tutorials/tutorial-audio/.idea/.gitignore b/tutorials/tutorial-audio/.idea/.gitignore deleted file mode 100644 index 26d33521af1..00000000000 --- a/tutorials/tutorial-audio/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/tutorials/tutorial-audio/.idea/gradle.xml b/tutorials/tutorial-audio/.idea/gradle.xml deleted file mode 100644 index 37fdf7dd24a..00000000000 --- a/tutorials/tutorial-audio/.idea/gradle.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tutorials/tutorial-audio/.idea/misc.xml b/tutorials/tutorial-audio/.idea/misc.xml deleted file mode 100644 index 65c4256b91c..00000000000 --- a/tutorials/tutorial-audio/.idea/misc.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - \ No newline at end of file