Merge branch 'develop'

GetStream · Oct 31, 2023 · 898fdf0 · 898fdf0
2 parents 281a6ef + d4dcd7d
commit 898fdf0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.../io/getstream/video/android/compose/ui/components/call/controls/actions/ReactionAction.kt b/.../io/getstream/video/android/compose/ui/components/call/controls/actions/ReactionAction.kt
@@ -58,7 +58,6 @@ public fun ReactionAction(
             modifier = Modifier
                 .padding(12.dp)
                 .clickable(enabled = enabled) { onCallAction(Reaction) },
-            tint = Color.White,
             painter = painterResource(id = R.drawable.stream_video_ic_reaction),
             contentDescription = stringResource(R.string.stream_video_call_controls_reaction),
         )

diff --git a/stream-video-android-core/api/stream-video-android-core.api b/stream-video-android-core/api/stream-video-android-core.api
@@ -729,7 +729,6 @@ public abstract interface class io/getstream/video/android/core/StreamVideo : io
 	public abstract fun connectAsync (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun createDevice (Lio/getstream/android/push/PushDevice;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun deleteDevice (Lio/getstream/video/android/model/Device;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun devToken (Ljava/lang/String;)Ljava/lang/String;
 	public abstract fun getContext ()Landroid/content/Context;
 	public abstract fun getEdges (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	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
 }
 
 public final class io/getstream/video/android/core/StreamVideo$Companion {
+	public final fun devToken (Ljava/lang/String;)Ljava/lang/String;
 	public final fun instance ()Lio/getstream/video/android/core/StreamVideo;
 	public final fun instanceOrNull ()Lio/getstream/video/android/core/StreamVideo;
 	public final fun isInstalled ()Z

diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideo.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideo.kt
@@ -215,14 +215,14 @@ public interface StreamVideo : NotificationHandler {
             internalStreamVideo?.cleanup()
             internalStreamVideo = null
         }
-    }
 
-    /**
-     * Generate a developer token that can be used to connect users while the app is using a development environment.
-     *
-     * @param userId the desired id of the user to be connected.
-     */
-    public fun devToken(userId: String): String = TokenUtils.devToken(userId)
+        /**
+         * Generate a developer token that can be used to connect users while the app is using a development environment.
+         *
+         * @param userId the desired id of the user to be connected.
+         */
+        public fun devToken(userId: String): String = TokenUtils.devToken(userId)
+    }
 
     public fun cleanup()
 }