Skip to content

Commit 66b931b

Browse files
Merge branch 'develop'
2 parents 711234d + b2555ae commit 66b931b

File tree

172 files changed

+6815
-7169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+6815
-7169
lines changed
3.9 MB
Loading

build-logic/convention/src/main/kotlin/io/getstream/video/KotlinAndroid.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ internal fun Project.configureKotlinAndroid(
2222
compileOptions {
2323
sourceCompatibility = JavaVersion.VERSION_11
2424
targetCompatibility = JavaVersion.VERSION_11
25-
isCoreLibraryDesugaringEnabled = true
2625
}
2726

2827
kotlinOptions {
@@ -43,10 +42,6 @@ internal fun Project.configureKotlinAndroid(
4342
abortOnError = false
4443
}
4544
}
46-
47-
dependencies {
48-
add("coreLibraryDesugaring", libs.findLibrary("desugar").get())
49-
}
5045
}
5146

5247
fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {

buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ object Configuration {
66
const val minSdk = 24
77
const val majorVersion = 0
88
const val minorVersion = 5
9-
const val patchVersion = 1
9+
const val patchVersion = 2
1010
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
11-
const val versionCode = 15
11+
const val versionCode = 16
1212
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
1313
const val artifactGroup = "io.getstream"
14-
const val streamVideoCallGooglePlayVersion = "1.0.5"
14+
const val streamVideoCallGooglePlayVersion = "1.0.6"
15+
const val streamWebRtcVersionName = "1.1.1"
1516
}

demo-app/src/main/generated/baselineProfiles/baseline-prof.txt

Lines changed: 1725 additions & 2334 deletions
Large diffs are not rendered by default.

demo-app/src/main/generated/baselineProfiles/startup-prof.txt

Lines changed: 1725 additions & 2334 deletions
Large diffs are not rendered by default.

demo-app/src/main/kotlin/io/getstream/video/android/DeeplinkingActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import dagger.hilt.android.AndroidEntryPoint
3636
import io.getstream.android.push.permissions.NotificationPermissionManager
3737
import io.getstream.android.push.permissions.NotificationPermissionStatus
3838
import io.getstream.log.taggedLogger
39-
import io.getstream.video.android.compose.theme.base.VideoTheme
39+
import io.getstream.video.android.compose.theme.VideoTheme
4040
import io.getstream.video.android.core.StreamVideo
4141
import io.getstream.video.android.datastore.delegate.StreamUserDataStore
4242
import io.getstream.video.android.model.StreamCallId

demo-app/src/main/kotlin/io/getstream/video/android/DirectCallActivity.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import androidx.compose.ui.Modifier
2828
import androidx.lifecycle.lifecycleScope
2929
import dagger.hilt.android.AndroidEntryPoint
3030
import io.getstream.result.Result
31-
import io.getstream.video.android.compose.theme.base.VideoTheme
31+
import io.getstream.video.android.compose.theme.VideoTheme
3232
import io.getstream.video.android.compose.ui.components.call.ringing.RingingCallContent
3333
import io.getstream.video.android.core.Call
3434
import io.getstream.video.android.core.StreamVideo
@@ -161,6 +161,9 @@ class DirectCallActivity : ComponentActivity() {
161161
},
162162
)
163163
},
164+
onNoAnswerContent = {
165+
leave()
166+
},
164167
onRejectedContent = {
165168
reject(call)
166169
},
@@ -179,6 +182,13 @@ class DirectCallActivity : ComponentActivity() {
179182
}
180183
}
181184
}
185+
private fun leave() {
186+
lifecycleScope.launch(Dispatchers.IO) {
187+
withContext(Dispatchers.Main) {
188+
finish()
189+
}
190+
}
191+
}
182192

183193
companion object {
184194
const val EXTRA_CID: String = "EXTRA_CID"

demo-app/src/main/kotlin/io/getstream/video/android/IncomingCallActivity.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier
2929
import androidx.lifecycle.lifecycleScope
3030
import dagger.hilt.android.AndroidEntryPoint
3131
import io.getstream.result.Result
32-
import io.getstream.video.android.compose.theme.base.VideoTheme
32+
import io.getstream.video.android.compose.theme.VideoTheme
3333
import io.getstream.video.android.compose.ui.components.call.ringing.RingingCallContent
3434
import io.getstream.video.android.core.StreamVideo
3535
import io.getstream.video.android.core.call.state.AcceptCall
@@ -140,6 +140,12 @@ class IncomingCallActivity : ComponentActivity() {
140140
},
141141
)
142142
},
143+
onNoAnswerContent = {
144+
LaunchedEffect(key1 = call) {
145+
call.leave()
146+
finish()
147+
}
148+
},
143149
onRejectedContent = {
144150
LaunchedEffect(key1 = call) {
145151
call.reject()

demo-app/src/main/kotlin/io/getstream/video/android/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import androidx.lifecycle.repeatOnLifecycle
2626
import com.google.firebase.analytics.FirebaseAnalytics
2727
import dagger.hilt.android.AndroidEntryPoint
2828
import io.getstream.video.android.analytics.FirebaseEvents
29-
import io.getstream.video.android.compose.theme.base.VideoTheme
29+
import io.getstream.video.android.compose.theme.VideoTheme
3030
import io.getstream.video.android.datastore.delegate.StreamUserDataStore
3131
import io.getstream.video.android.tooling.util.StreamFlavors
3232
import io.getstream.video.android.ui.AppNavHost

demo-app/src/main/kotlin/io/getstream/video/android/tooling/ui/ExceptionTraceScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import androidx.compose.ui.text.font.FontWeight
4747
import androidx.compose.ui.unit.dp
4848
import androidx.compose.ui.unit.sp
4949
import io.getstream.video.android.R
50-
import io.getstream.video.android.compose.theme.base.VideoTheme
50+
import io.getstream.video.android.compose.theme.VideoTheme
5151
import io.getstream.video.android.compose.ui.components.base.StreamButton
5252
import io.getstream.video.android.tooling.extensions.toast
5353

0 commit comments

Comments
 (0)