Skip to content

Commit 898fdf0

Browse files
committed
Merge branch 'develop'
2 parents 281a6ef + d4dcd7d commit 898fdf0

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

stream-video-android-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/call/controls/actions/ReactionAction.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public fun ReactionAction(
5858
modifier = Modifier
5959
.padding(12.dp)
6060
.clickable(enabled = enabled) { onCallAction(Reaction) },
61-
tint = Color.White,
6261
painter = painterResource(id = R.drawable.stream_video_ic_reaction),
6362
contentDescription = stringResource(R.string.stream_video_call_controls_reaction),
6463
)

stream-video-android-core/api/stream-video-android-core.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,6 @@ public abstract interface class io/getstream/video/android/core/StreamVideo : io
729729
public abstract fun connectAsync (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
730730
public abstract fun createDevice (Lio/getstream/android/push/PushDevice;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
731731
public abstract fun deleteDevice (Lio/getstream/video/android/model/Device;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
732-
public fun devToken (Ljava/lang/String;)Ljava/lang/String;
733732
public abstract fun getContext ()Landroid/content/Context;
734733
public abstract fun getEdges (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
735734
public abstract fun getState ()Lio/getstream/video/android/core/ClientState;
@@ -745,6 +744,7 @@ public abstract interface class io/getstream/video/android/core/StreamVideo : io
745744
}
746745

747746
public final class io/getstream/video/android/core/StreamVideo$Companion {
747+
public final fun devToken (Ljava/lang/String;)Ljava/lang/String;
748748
public final fun instance ()Lio/getstream/video/android/core/StreamVideo;
749749
public final fun instanceOrNull ()Lio/getstream/video/android/core/StreamVideo;
750750
public final fun isInstalled ()Z

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideo.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ public interface StreamVideo : NotificationHandler {
215215
internalStreamVideo?.cleanup()
216216
internalStreamVideo = null
217217
}
218-
}
219218

220-
/**
221-
* Generate a developer token that can be used to connect users while the app is using a development environment.
222-
*
223-
* @param userId the desired id of the user to be connected.
224-
*/
225-
public fun devToken(userId: String): String = TokenUtils.devToken(userId)
219+
/**
220+
* Generate a developer token that can be used to connect users while the app is using a development environment.
221+
*
222+
* @param userId the desired id of the user to be connected.
223+
*/
224+
public fun devToken(userId: String): String = TokenUtils.devToken(userId)
225+
}
226226

227227
public fun cleanup()
228228
}

0 commit comments

Comments
 (0)