diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7fc522b..fa6f24e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "com.bunbeauty.fakelivestream"
         minSdk = 27
         targetSdk = 34
-        versionCode = 152
-        versionName = "1.5.2"
+        versionCode = 160
+        versionName = "1.6.0"
         multiDexEnabled = true
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -65,12 +65,12 @@ android {
 
 dependencies {
     implementation("com.android.support:multidex:1.0.3")
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.13.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
 
     // Compose
-    implementation("androidx.activity:activity-compose:1.8.2")
-    implementation(platform("androidx.compose:compose-bom:2023.08.00"))
+    implementation("androidx.activity:activity-compose:1.9.0")
+    implementation(platform("androidx.compose:compose-bom:2024.04.01"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
@@ -87,9 +87,9 @@ dependencies {
     implementation("io.coil-kt:coil-compose:2.5.0")
 
     // Camera
-    implementation("androidx.camera:camera-camera2:1.3.2")
-    implementation("androidx.camera:camera-lifecycle:1.3.2")
-    implementation("androidx.camera:camera-view:1.3.2")
+    implementation("androidx.camera:camera-camera2:1.3.3")
+    implementation("androidx.camera:camera-lifecycle:1.3.3")
+    implementation("androidx.camera:camera-view:1.3.3")
 
     // ViewModel
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
@@ -103,8 +103,8 @@ dependencies {
     implementation("com.google.accompanist:accompanist-permissions:0.34.0")
 
     // Media3
-    implementation("androidx.media3:media3-ui:1.3.0")
-    implementation("androidx.media3:media3-exoplayer:1.3.0")
+    implementation("androidx.media3:media3-ui:1.3.1")
+    implementation("androidx.media3:media3-exoplayer:1.3.1")
 
     // Firebase
     implementation(platform("com.google.firebase:firebase-bom:32.7.3"))
@@ -116,6 +116,9 @@ dependencies {
 
     // Image Cropping
     implementation("com.vanniktech:android-image-cropper:4.5.0")
+
+    // Immutable collections
+    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7")
 }
 
 kapt {
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/common/presentation/BaseViewModel.kt b/app/src/main/java/com/bunbeauty/fakelivestream/common/presentation/BaseViewModel.kt
index 5f1bdf6..63615cd 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/common/presentation/BaseViewModel.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/common/presentation/BaseViewModel.kt
@@ -16,6 +16,8 @@ abstract class BaseViewModel<S : Base.State, A : Base.Action, E : Base.Event>(
 ) : ViewModel() {
 
     protected val mutableState = MutableStateFlow(initState())
+    protected val currentState: S
+        get() = mutableState.value
     val state: StateFlow<S> = mutableState.asStateFlow()
 
     private val mutableEvent = Channel<E>()
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/components/bottomsheet/FakeLiveBottomSheet.kt b/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/components/bottomsheet/FakeLiveBottomSheet.kt
index dd32158..511d632 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/components/bottomsheet/FakeLiveBottomSheet.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/components/bottomsheet/FakeLiveBottomSheet.kt
@@ -48,7 +48,11 @@ fun FakeLiveBottomSheet(
         windowInsets = windowInsets,
         modifier = modifier
     ) {
-        Column(modifier = Modifier.navigationBarsPadding()) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .navigationBarsPadding()
+        ) {
             content()
         }
     }
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/components/bottomsheet/FakeLiveBottomSheetContent.kt b/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/components/bottomsheet/FakeLiveBottomSheetContent.kt
new file mode 100644
index 0000000..ee22ad7
--- /dev/null
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/components/bottomsheet/FakeLiveBottomSheetContent.kt
@@ -0,0 +1,42 @@
+package com.bunbeauty.fakelivestream.common.ui.components.bottomsheet
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Divider
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.bunbeauty.fakelivestream.common.ui.theme.FakeLiveStreamTheme
+
+@Composable
+fun ColumnScope.FakeLiveBottomSheetContent(
+    @StringRes titleResId: Int,
+    content: @Composable () -> Unit
+) {
+    Text(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(
+                top = 16.dp,
+                bottom = 12.dp
+            ),
+        text = stringResource(titleResId),
+        color = FakeLiveStreamTheme.colors.onSurface,
+        style = FakeLiveStreamTheme.typography.titleMedium,
+        textAlign = TextAlign.Center
+    )
+    Divider(
+        modifier = Modifier.fillMaxWidth(),
+        thickness = 0.5.dp,
+        color = FakeLiveStreamTheme.colors.border
+    )
+    Column(modifier = Modifier.padding(horizontal = 16.dp)) {
+        content()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/theme/Color.kt b/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/theme/Color.kt
index 4f1d6d1..84fc2ef 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/theme/Color.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/theme/Color.kt
@@ -7,7 +7,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
 
 val White = Color(0xFFFFFFFF)
-val Black = Color(0xFF000000)
+val Black200 = Color(0xFF000000)
+val Black100 = Color(0xFF1A1A1A)
 val Gray400 = Color(0xFF262626)
 val Gray300 = Color(0xFF6D6D6D)
 val Gray200 = Color(0xFF888888)
@@ -21,10 +22,12 @@ val Amber = Color(0xFFFFBF00)
 @Stable
 class ColorScheme(
     interactive: Color,
+    important: Color,
     icon: Color,
     iconVariant: Color,
     surface: Color,
     surfaceVariant: Color,
+    selectedSurface: Color,
     onSurface: Color,
     onSurfaceVariant: Color,
     background: Color,
@@ -37,6 +40,9 @@ class ColorScheme(
     var interactive by mutableStateOf(interactive)
         internal set
 
+    var important by mutableStateOf(important)
+        internal set
+
     var icon by mutableStateOf(icon)
         internal set
 
@@ -49,6 +55,9 @@ class ColorScheme(
     var surfaceVariant by mutableStateOf(surfaceVariant)
         internal set
 
+    var selectedSurface by mutableStateOf(selectedSurface)
+        internal set
+
     var onSurface by mutableStateOf(onSurface)
         internal set
 
@@ -73,10 +82,12 @@ class ColorScheme(
 
     fun copy(
         interactive: Color = this.interactive,
+        important: Color = this.important,
         icon: Color = this.icon,
         iconVariant: Color = this.iconVariant,
         surface: Color = this.surface,
         surfaceVariant: Color = this.surfaceVariant,
+        selectedSurface: Color = this.selectedSurface,
         onSurface: Color = this.onSurface,
         onSurfaceVariant: Color = this.onSurfaceVariant,
         background: Color = this.background,
@@ -86,10 +97,12 @@ class ColorScheme(
         instagram: InstagramColors = this.instagram,
     ): ColorScheme = ColorScheme(
         interactive = interactive,
+        important = important,
         icon = icon,
         iconVariant = iconVariant,
         surface = surface,
         surfaceVariant = surfaceVariant,
+        selectedSurface = selectedSurface,
         onSurface = onSurface,
         onSurfaceVariant = onSurfaceVariant,
         background = background,
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/theme/Theme.kt b/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/theme/Theme.kt
index 1da2961..ba8386a 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/theme/Theme.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/common/ui/theme/Theme.kt
@@ -10,15 +10,17 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
 
 private val DarkColorScheme = ColorScheme(
+    important = Scarlet,
     interactive = Blue,
     icon = White,
     iconVariant = Gray200,
-    surface = Black,
+    surface = Black200,
     surfaceVariant = Gray400,
+    selectedSurface = Black100,
     onSurface = White,
     onSurfaceVariant = Gray200,
     background = White,
-    onBackground = Black,
+    onBackground = Black200,
     border = Gray300,
     borderVariant = Gray100,
     instagram = InstagramColors(
@@ -31,14 +33,16 @@ private val DarkColorScheme = ColorScheme(
 
 private val LightColorScheme = ColorScheme(
     interactive = Blue,
+    important = Scarlet,
     icon = White,
     iconVariant = Gray200,
-    surface = Black,
+    surface = Black200,
     surfaceVariant = Gray400,
+    selectedSurface = Black100,
     onSurface = White,
     onSurfaceVariant = Gray200,
     background = White,
-    onBackground = Black,
+    onBackground = Black200,
     border = Gray300,
     borderVariant = Gray100,
     instagram = InstagramColors(
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/data/user/UserRepository.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/data/user/UserRepository.kt
index 0aa3c78..8d58dd2 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/data/user/UserRepository.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/data/user/UserRepository.kt
@@ -3,19 +3,19 @@ package com.bunbeauty.fakelivestream.features.stream.data.user
 import com.bunbeauty.fakelivestream.features.stream.data.comment.PictureStore
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlin.random.Random
 
 @Singleton
 class UserRepository @Inject constructor() {
 
-    private val pictureStore = PictureStore()
+    private val commentPictureStore = PictureStore()
+    private val questionPictureStore = PictureStore()
 
-    fun getPictureName(): String? {
-        return if (Random.nextInt(10) == 0) {
-            null
-        } else {
-            pictureStore.getNext()
-        }
+    fun getCommentPictureName(): String {
+        return commentPictureStore.getNext()
+    }
+
+    fun getQuestionPictureName(): String {
+        return questionPictureStore.getNext()
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetCommentsDelayUseCase.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetCommentsDelayUseCase.kt
new file mode 100644
index 0000000..f022b2f
--- /dev/null
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetCommentsDelayUseCase.kt
@@ -0,0 +1,16 @@
+package com.bunbeauty.fakelivestream.features.stream.domain
+
+import javax.inject.Inject
+import kotlin.random.Random
+
+class GetCommentsDelayUseCase @Inject constructor() {
+
+    operator fun invoke(viewersCount: Int): Long {
+        return if (viewersCount < 1000) {
+            Random.nextLong(1_000, 2_000)
+        } else {
+            Random.nextLong(500, 1_000)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetCommentsUseCase.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetCommentsUseCase.kt
index 0095081..c1366ea 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetCommentsUseCase.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetCommentsUseCase.kt
@@ -3,6 +3,7 @@ package com.bunbeauty.fakelivestream.features.stream.domain
 import com.bunbeauty.fakelivestream.features.stream.data.user.UserRepository
 import com.bunbeauty.fakelivestream.features.stream.domain.model.Comment
 import javax.inject.Inject
+import kotlin.random.Random
 
 class GetCommentsUseCase @Inject constructor(
     private val userRepository: UserRepository,
@@ -10,10 +11,22 @@ class GetCommentsUseCase @Inject constructor(
     private val getRandomUsernameUseCase: GetRandomUsernameUseCase,
 ) {
 
-    operator fun invoke(count: Int): List<Comment> {
+    operator fun invoke(viewersCount: Int): List<Comment> {
+        val count = if (viewersCount < 1000) {
+            1
+        } else {
+            val maxCommentCount = (viewersCount / 1_000).coerceIn(2, 5)
+            Random.nextInt(1, maxCommentCount)
+        }
+
         return List(count) {
+            val picture = if (Random.nextInt(10) == 0) {
+                null
+            } else {
+                userRepository.getCommentPictureName()
+            }
             Comment(
-                picture = userRepository.getPictureName(),
+                picture = picture,
                 username = getRandomUsernameUseCase(),
                 text = getRandomCommentText(),
             )
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetQuestionUseCase.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetQuestionUseCase.kt
new file mode 100644
index 0000000..72c0b5e
--- /dev/null
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetQuestionUseCase.kt
@@ -0,0 +1,29 @@
+package com.bunbeauty.fakelivestream.features.stream.domain
+
+import com.bunbeauty.fakelivestream.features.stream.data.user.UserRepository
+import com.bunbeauty.fakelivestream.features.stream.domain.model.Question
+import java.util.UUID
+import javax.inject.Inject
+
+private const val QUESTION_LIMIT = 3
+
+class GetQuestionUseCase @Inject constructor(
+    private val userRepository: UserRepository,
+    private val getRandomCommentText: GetRandomCommentTextUseCase,
+    private val getRandomUsernameUseCase: GetRandomUsernameUseCase,
+) {
+
+    operator fun invoke(questionCount: Int): Question? {
+        if (questionCount >= QUESTION_LIMIT) {
+            return null
+        }
+
+        return  Question(
+            uuid = UUID.randomUUID().toString(),
+            picture = userRepository.getQuestionPictureName(),
+            username = getRandomUsernameUseCase(),
+            text = getRandomCommentText(type = CommentType.QUESTION),
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetRandomCommentTextUseCase.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetRandomCommentTextUseCase.kt
index dc6bfa8..9d4b62d 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetRandomCommentTextUseCase.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/GetRandomCommentTextUseCase.kt
@@ -9,11 +9,18 @@ class GetRandomCommentTextUseCase @Inject constructor(
     private val commentRepository: CommentRepository,
 ) {
 
+    operator fun invoke(type: CommentType): String {
+        return buildTextComment(
+            type = type,
+            withEmoji = false
+        )
+    }
+
     operator fun invoke(): String {
         return when (Random.nextInt(CommentType.entries.size + 2)) {
             0 -> buildEmojiString(maxCount = 5)
             1 -> buildSymbolString()
-            else -> buildTextComment()
+            else -> buildTextComment(type = randomType())
         }
     }
 
@@ -30,8 +37,10 @@ class GetRandomCommentTextUseCase @Inject constructor(
         }
     }
 
-    private fun buildTextComment(): String {
-        val type = randomType()
+    private fun buildTextComment(
+        type: CommentType,
+        withEmoji: Boolean = true,
+    ): String {
         var comment = commentRepository.getNextComment(type)
         comment = when (type) {
             CommentType.ONE_LETTER,
@@ -57,7 +66,7 @@ class GetRandomCommentTextUseCase @Inject constructor(
             }
         }
 
-        return if (Random.nextBoolean()) {
+        return if (withEmoji && Random.nextBoolean()) {
             comment.addRandomEmoji()
         } else {
             comment
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/model/Question.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/model/Question.kt
new file mode 100644
index 0000000..e2982ea
--- /dev/null
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/domain/model/Question.kt
@@ -0,0 +1,8 @@
+package com.bunbeauty.fakelivestream.features.stream.domain.model
+
+data class Question(
+    val uuid: String,
+    val picture: String?,
+    val username: String,
+    val text: String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/presentation/Stream.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/presentation/Stream.kt
index ed8fd00..b42ceab 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/presentation/Stream.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/presentation/Stream.kt
@@ -3,6 +3,7 @@ package com.bunbeauty.fakelivestream.features.stream.presentation
 import android.net.Uri
 import com.bunbeauty.fakelivestream.common.presentation.Base
 import com.bunbeauty.fakelivestream.features.stream.domain.model.Comment
+import com.bunbeauty.fakelivestream.features.stream.domain.model.Question
 
 interface Stream {
 
@@ -12,32 +13,59 @@ interface Stream {
         val viewersCount: Int,
         val comments: List<Comment>,
         val reactionCount: Int,
+        val questionState: QuestionState,
         val startStreamTimeMillis: Long,
         val isCameraEnabled: Boolean,
         val isCameraFront: Boolean,
         val showJoinRequests: Boolean,
         val showInvite: Boolean,
-        val showQuestions: Boolean,
         val showDirect: Boolean,
-    ): Base.State
+    ) : Base.State
 
-    sealed interface Action: Base.Action {
-        data object CameraClick: Action
-        data object SwitchCameraClick: Action
-        data object ShowJoinRequests: Action
-        data object HideJoinRequests: Action
-        data object ShowInvite: Action
-        data object HideInvite: Action
-        data object ShowQuestions: Action
-        data object HideQuestions: Action
-        data object ShowDirect: Action
-        data object HideDirect: Action
-        data object Start: Action
-        data object Stop: Action
-        data object FinishStreamClick: Action
+    data class QuestionState(
+        val show: Boolean,
+        val questions: List<SelectableQuestion>,
+        val unreadQuestionCount: Int?,
+        val currentQuestionToAnswer: SelectableQuestion?,
+    ) {
+        val isEmpty: Boolean = questions.isEmpty()
+        val notAnsweredQuestions = questions.filterNot { question ->
+            question.isAnswered
+        }
+        val answeredQuestions = questions.filter { question ->
+            question.isAnswered
+        }
+        val selectedQuestion: SelectableQuestion? = questions.find { question ->
+            question.isSelected
+        }
     }
 
-    sealed interface Event: Base.Event {
-        data class GoBack(val durationInSeconds: Int): Event
+    data class SelectableQuestion(
+        val question: Question,
+        val isAnswered: Boolean,
+        val isSelected: Boolean,
+    )
+
+    sealed interface Action : Base.Action {
+        data object CameraClick : Action
+        data object SwitchCameraClick : Action
+        data object ShowJoinRequests : Action
+        data object HideJoinRequests : Action
+        data object ShowInvite : Action
+        data object HideInvite : Action
+        data object ShowQuestions : Action
+        data object HideQuestions : Action
+        data class ClickQuestion(val uuid: String) : Action
+        data class DeleteQuestion(val uuid: String) : Action
+        data object CloseCurrentQuestion : Action
+        data object ShowDirect : Action
+        data object HideDirect : Action
+        data object Start : Action
+        data object Stop : Action
+        data object FinishStreamClick : Action
+    }
+
+    sealed interface Event : Base.Event {
+        data class GoBack(val durationInSeconds: Int) : Event
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/presentation/StreamViewModel.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/presentation/StreamViewModel.kt
index 7a2ace6..6e2281b 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/presentation/StreamViewModel.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/presentation/StreamViewModel.kt
@@ -8,9 +8,11 @@ import com.bunbeauty.fakelivestream.features.domain.GetImageUriFlowUseCase
 import com.bunbeauty.fakelivestream.features.domain.GetUsernameUseCase
 import com.bunbeauty.fakelivestream.features.domain.GetViewerCountUseCase
 import com.bunbeauty.fakelivestream.features.stream.CameraUtil
+import com.bunbeauty.fakelivestream.features.stream.domain.GetCommentsDelayUseCase
 import com.bunbeauty.fakelivestream.features.stream.domain.GetCommentsUseCase
+import com.bunbeauty.fakelivestream.features.stream.domain.GetQuestionUseCase
+import com.bunbeauty.fakelivestream.features.stream.domain.model.Question
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
@@ -23,7 +25,9 @@ class StreamViewModel @Inject constructor(
     private val getImageUriFlowUseCase: GetImageUriFlowUseCase,
     private val getUsernameUseCase: GetUsernameUseCase,
     private val getViewerCountUseCase: GetViewerCountUseCase,
-    private val getComments: GetCommentsUseCase,
+    private val getCommentsUseCase: GetCommentsUseCase,
+    private val getCommentsDelayUseCase: GetCommentsDelayUseCase,
+    private val getQuestionUseCase: GetQuestionUseCase,
     private val analyticsManager: AnalyticsManager,
     private val cameraUtil: CameraUtil,
 ) : BaseViewModel<Stream.State, Stream.Action, Stream.Event>(
@@ -34,21 +38,31 @@ class StreamViewModel @Inject constructor(
             viewersCount = 0,
             comments = emptyList(),
             reactionCount = 0,
+            questionState = Stream.QuestionState(
+                show = false,
+                questions = emptyList(),
+                unreadQuestionCount = null,
+                currentQuestionToAnswer = null,
+            ),
             startStreamTimeMillis = System.currentTimeMillis(),
             isCameraEnabled = cameraUtil.hasCamera(),
             isCameraFront = cameraUtil.hasFrontCamera(),
             showJoinRequests = false,
             showInvite = false,
-            showQuestions = false,
             showDirect = false,
         )
     }
 ) {
 
     init {
-        getAvatar()
-        getUsername()
-        getViewerCount()
+        setupAvatar()
+        setupUsername()
+        setupViewerCount()
+
+        startGenerateReactions()
+        startGenerateViewersCount()
+        startGenerateComments()
+        startGenerateQuestions()
     }
 
     override fun onAction(action: Stream.Action) {
@@ -68,6 +82,7 @@ class StreamViewModel @Inject constructor(
                     }
                 }
             }
+
             Stream.Action.CameraClick -> {
                 if (cameraUtil.hasCamera()) {
                     setState {
@@ -75,6 +90,7 @@ class StreamViewModel @Inject constructor(
                     }
                 }
             }
+
             Stream.Action.ShowJoinRequests -> {
                 setState {
                     copy(showJoinRequests = true)
@@ -101,13 +117,71 @@ class StreamViewModel @Inject constructor(
 
             Stream.Action.ShowQuestions -> {
                 setState {
-                    copy(showQuestions = true)
+                    copy(
+                        questionState = questionState.copy(
+                            show = true,
+                            unreadQuestionCount = null
+                        )
+                    )
                 }
             }
 
             Stream.Action.HideQuestions -> {
                 setState {
-                    copy(showQuestions = false)
+                    copy(
+                        questionState = questionState.copy(
+                            show = false,
+                            currentQuestionToAnswer = questionState.selectedQuestion
+                        )
+                    )
+                }
+            }
+
+            is Stream.Action.ClickQuestion -> {
+                setState {
+                    copy(
+                        questionState = questionState.copy(
+                            questions = questionState.questions.map { question ->
+                                question.copy(
+                                    isSelected = if (question.question.uuid == action.uuid) {
+                                        !question.isSelected
+                                    } else {
+                                        false
+                                    },
+                                    isAnswered = question.isAnswered ||
+                                        (question.question.uuid == questionState.currentQuestionToAnswer?.question?.uuid)
+                                )
+                            },
+                            currentQuestionToAnswer = null,
+                        )
+                    )
+                }
+            }
+
+            is Stream.Action.DeleteQuestion -> {
+                setState {
+                    copy(
+                        questionState = questionState.copy(
+                            questions = questionState.questions.filter { question ->
+                                question.question.uuid != action.uuid
+                            }
+                        )
+                    )
+                }
+            }
+
+            Stream.Action.CloseCurrentQuestion -> {
+                setState {
+                    copy(
+                        questionState = questionState.copy(
+                            questions = questionState.questions.map { question ->
+                                question.copy(
+                                    isSelected = false,
+                                    isAnswered = question.isAnswered || question.isSelected
+                                )
+                            }
+                        )
+                    )
                 }
             }
 
@@ -142,52 +216,46 @@ class StreamViewModel @Inject constructor(
         }
     }
 
-    private fun getAvatar() {
+    private fun setupAvatar() {
         setState {
             copy(imageUri = getImageUriFlowUseCase().firstOrNull()?.toUri())
         }
     }
 
-    private fun getUsername() {
+    private fun setupUsername() {
         setState {
             copy(username = getUsernameUseCase())
         }
     }
 
-    private fun getViewerCount() {
+    private fun setupViewerCount() {
         viewModelScope.launch {
-            val viewerCount = getViewerCountUseCase()
             setState {
-                copy(viewersCount = viewerCount.min)
+                copy(viewersCount = getViewerCountUseCase().min)
             }
-
-            startGenerateReactions(viewerCount = viewerCount.min)
-            startGenerateViewersCount(
-                min = viewerCount.min,
-                max = viewerCount.max
-            )
-            startGenerateComments()
         }
     }
 
-    private fun startGenerateReactions(viewerCount: Int) {
+    private fun startGenerateReactions() {
         viewModelScope.launch {
             delay(5_000)
+            val viewerCount = getViewerCountUseCase()
             setState {
                 copy(
-                    reactionCount = min(10, viewerCount / 100 + 1)
+                    reactionCount = min(10, viewerCount.min / 100 + 1)
                 )
             }
         }
     }
 
-    private fun startGenerateViewersCount(min: Int, max: Int) {
-        viewModelScope.launch(Dispatchers.Default) {
+    private fun startGenerateViewersCount() {
+        viewModelScope.launch {
             delay(1_000)
 
-            val onePercent = (max - min) / 100
+            val viewerCount = getViewerCountUseCase()
+            val onePercent = (viewerCount.max - viewerCount.min) / 100
             val step = min(onePercent, Random.nextInt(200, 800))
-            val median = min + (max - min) / 2
+            val median = viewerCount.min + (viewerCount.max - viewerCount.min) / 2
             while (true) {
                 val delayMillis = Random.nextLong(2_000, 4_000)
                 delay(delayMillis)
@@ -215,21 +283,8 @@ class StreamViewModel @Inject constructor(
     private fun startGenerateComments() {
         viewModelScope.launch {
             while (true) {
-                val viewersCount = mutableState.value.viewersCount
-                val commentCount = if (viewersCount < 1000) {
-                    1
-                } else {
-                    val maxCommentCount = (viewersCount / 1_000).coerceIn(2, 5)
-                    Random.nextInt(1, maxCommentCount)
-                }
-
-                val newComments = getComments(count = commentCount)
-
-                val delayMillis = if (viewersCount < 1000) {
-                    Random.nextLong(1_000, 2_000)
-                } else {
-                    Random.nextLong(500, 1_000)
-                }
+                val newComments = getCommentsUseCase(viewersCount = currentState.viewersCount)
+                val delayMillis = getCommentsDelayUseCase(viewersCount = currentState.viewersCount)
                 delay(delayMillis)
 
                 setState {
@@ -241,6 +296,41 @@ class StreamViewModel @Inject constructor(
         }
     }
 
+    private fun startGenerateQuestions() {
+        viewModelScope.launch {
+            delay(5_000)
+            while (true) {
+                val questionCount = currentState.questionState.notAnsweredQuestions.size
+                val newQuestion = getQuestionUseCase(questionCount = questionCount)
+                if (newQuestion != null) {
+                    handleNewQuestion(question = newQuestion)
+                }
+
+                delay(Random.nextLong(20_000, 50_000))
+            }
+        }
+    }
+
+    private fun handleNewQuestion(question: Question) {
+        val newQuestion = Stream.SelectableQuestion(
+            question = question,
+            isSelected = false,
+            isAnswered = false,
+        )
+        setState {
+            copy(
+                questionState = questionState.copy(
+                    questions = questionState.questions + newQuestion,
+                    unreadQuestionCount = if (questionState.show) {
+                        null
+                    } else {
+                        (questionState.unreadQuestionCount ?: 0) + 1
+                    }
+                ),
+            )
+        }
+    }
+
     private fun getStreamDurationInSeconds(): Int {
         val start = mutableState.value.startStreamTimeMillis
         val finish = System.currentTimeMillis()
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/StreamScreen.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/StreamScreen.kt
index 684a7ac..c5daaad 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/StreamScreen.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/StreamScreen.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Badge
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -32,10 +33,13 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextOverflow.Companion.Ellipsis
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
@@ -43,6 +47,13 @@ import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import com.bunbeauty.fakelivestream.R
+import com.bunbeauty.fakelivestream.common.ui.LocalePreview
+import com.bunbeauty.fakelivestream.common.ui.blurTop
+import com.bunbeauty.fakelivestream.common.ui.clickableWithoutIndication
+import com.bunbeauty.fakelivestream.common.ui.components.CachedImage
+import com.bunbeauty.fakelivestream.common.ui.components.ImageSource
+import com.bunbeauty.fakelivestream.common.ui.theme.FakeLiveStreamTheme
+import com.bunbeauty.fakelivestream.common.ui.theme.bold
 import com.bunbeauty.fakelivestream.features.stream.presentation.Stream
 import com.bunbeauty.fakelivestream.features.stream.presentation.StreamViewModel
 import com.bunbeauty.fakelivestream.features.stream.view.ui.AnimatedReaction
@@ -50,13 +61,10 @@ import com.bunbeauty.fakelivestream.features.stream.view.ui.AvatarImage
 import com.bunbeauty.fakelivestream.features.stream.view.ui.CameraComponent
 import com.bunbeauty.fakelivestream.features.stream.view.ui.EmptyBottomSheet
 import com.bunbeauty.fakelivestream.features.stream.view.ui.FiltersRow
+import com.bunbeauty.fakelivestream.features.stream.view.ui.QuestionState
+import com.bunbeauty.fakelivestream.features.stream.view.ui.QuestionUi
+import com.bunbeauty.fakelivestream.features.stream.view.ui.QuestionsBottomSheet
 import com.bunbeauty.fakelivestream.features.stream.view.ui.VideoComponent
-import com.bunbeauty.fakelivestream.common.ui.LocalePreview
-import com.bunbeauty.fakelivestream.common.ui.blurTop
-import com.bunbeauty.fakelivestream.common.ui.clickableWithoutIndication
-import com.bunbeauty.fakelivestream.common.ui.components.CachedImage
-import com.bunbeauty.fakelivestream.common.ui.components.ImageSource
-import com.bunbeauty.fakelivestream.common.ui.theme.FakeLiveStreamTheme
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
@@ -200,10 +208,16 @@ fun StreamContent(
                                 }
                             )
                         }
-                        Comments(
+                        Column(
                             modifier = Modifier.align(Alignment.BottomStart),
-                            comments = state.comments,
-                        )
+                        ) {
+                            Comments(comments = state.comments)
+                            CurrentQuestion(
+                                modifier = Modifier.padding(top = 16.dp),
+                                question = state.selectedQuestion,
+                                onAction = onAction
+                            )
+                        }
                     }
                 }
 
@@ -217,7 +231,10 @@ fun StreamContent(
                 }
             }
             Column {
-                BottomPanel(onAction = onAction)
+                BottomPanel(
+                    unreadQuestionCount = state.unreadQuestionCount,
+                    onAction = onAction
+                )
                 if (showFilters) {
                     FiltersRow()
                 }
@@ -239,10 +256,9 @@ fun StreamContent(
         )
 
         QuestionsBottomSheet(
-            show = state.showQuestions,
-            onDismiss = {
-                onAction(Stream.Action.HideQuestions)
-            }
+            show = state.questionState != QuestionState.Hidden,
+            questionState = state.questionState,
+            onAction = onAction,
         )
 
         DirectBottomSheet(
@@ -419,6 +435,70 @@ private fun Comments(
     }
 }
 
+@Composable
+private fun CurrentQuestion(
+    question: QuestionUi?,
+    onAction: (Stream.Action) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    question ?: return
+
+    Box(
+        modifier = modifier
+            .clip(RoundedCornerShape(8.dp))
+            .background(FakeLiveStreamTheme.colors.surface.copy(alpha = 0.8f))
+    ) {
+        Row(
+            modifier = Modifier.padding(12.dp),
+            horizontalArrangement = spacedBy(12.dp),
+        ) {
+            CachedImage(
+                modifier = Modifier
+                    .size(32.dp)
+                    .clip(CircleShape),
+                imageSource = question.picture,
+                cacheKey = question.username,
+                contentDescription = "Question avatar",
+            )
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = stringResource(R.string.stream_question_title),
+                    color = FakeLiveStreamTheme.colors.onSurface,
+                    style = FakeLiveStreamTheme.typography.titleSmall,
+                )
+
+                val usernameStyle = FakeLiveStreamTheme.typography.titleSmall
+                val annotatedString = remember(question) {
+                    buildAnnotatedString {
+                        withStyle(style = usernameStyle.toSpanStyle()) {
+                            append("${question.username}  ")
+                        }
+                        append(question.text)
+                    }
+                }
+                Text(
+                    modifier = Modifier.padding(top = 2.dp),
+                    text = annotatedString,
+                    color = FakeLiveStreamTheme.colors.onSurface,
+                    style = FakeLiveStreamTheme.typography.bodySmall,
+                )
+            }
+        }
+        Icon(
+            modifier = Modifier
+                .align(Alignment.TopEnd)
+                .padding(10.dp)
+                .size(12.dp)
+                .clickableWithoutIndication {
+                    onAction(Stream.Action.CloseCurrentQuestion)
+                },
+            imageVector = ImageVector.vectorResource(R.drawable.ic_close),
+            contentDescription = "Close",
+            tint = FakeLiveStreamTheme.colors.icon,
+        )
+    }
+}
+
 @Composable
 private fun CommentItem(
     comment: CommentUi,
@@ -453,6 +533,7 @@ private fun CommentItem(
 
 @Composable
 private fun BottomPanel(
+    unreadQuestionCount: Int?,
     onAction: (Stream.Action) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -511,15 +592,32 @@ private fun BottomPanel(
             iconResId = R.drawable.ic_invite,
             contentDescription = "Invite",
         )
-        ActionIcon(
-            modifier = Modifier.clickableWithoutIndication(
-                onClick = {
-                    onAction(Stream.Action.ShowQuestions)
+        Box {
+            ActionIcon(
+                modifier = Modifier
+                    .padding(end = 4.dp)
+                    .clickableWithoutIndication(
+                        onClick = {
+                            onAction(Stream.Action.ShowQuestions)
+                        }
+                    ),
+                iconResId = R.drawable.ic_question,
+                contentDescription = "Question",
+            )
+            unreadQuestionCount?.let {
+                Badge(
+                    modifier = Modifier.align(Alignment.TopEnd),
+                    containerColor = FakeLiveStreamTheme.colors.important,
+                    contentColor = FakeLiveStreamTheme.colors.onSurface
+                ) {
+                    Text(
+                        text = unreadQuestionCount.toString(),
+                        color = FakeLiveStreamTheme.colors.onSurface,
+                        style = FakeLiveStreamTheme.typography.bodySmall.bold
+                    )
                 }
-            ),
-            iconResId = R.drawable.ic_question,
-            contentDescription = "Question",
-        )
+            }
+        }
         ActionIcon(
             modifier = Modifier.clickableWithoutIndication(
                 onClick = {
@@ -576,21 +674,6 @@ private fun InviteBottomSheet(
     }
 }
 
-@Composable
-private fun QuestionsBottomSheet(
-    show: Boolean,
-    onDismiss: () -> Unit,
-) {
-    if (show) {
-        EmptyBottomSheet(
-            onDismissRequest = onDismiss,
-            titleResId = R.string.stream_questions_title,
-            bodyResId = R.string.stream_questions_body,
-            descriptionResId = R.string.stream_questions_description,
-        )
-    }
-}
-
 @Composable
 private fun DirectBottomSheet(
     show: Boolean,
@@ -610,41 +693,51 @@ private fun DirectBottomSheet(
 @Composable
 private fun StreamScreenPreview() {
     FakeLiveStreamTheme {
-        StreamContent(
-            state = ViewState(
-                image = ImageSource.ResId(R.drawable.img_default_avatar),
-                username = "long_user_name",
-                viewersCount = ViewersCountUi.Thousands(
-                    thousands = "10",
-                    hundreds = "4",
-                ),
-                comments = listOf(
-                    CommentUi(
-                        picture = ImageSource.ResId(R.drawable.img_default_avatar),
-                        username = "username1",
-                        text = "Text 1",
+        Box(modifier = Modifier.background(Color.White)) {
+            StreamContent(
+                state = ViewState(
+                    image = ImageSource.ResId(R.drawable.img_default_avatar),
+                    username = "long_user_name",
+                    viewersCount = ViewersCountUi.Thousands(
+                        thousands = "10",
+                        hundreds = "4",
                     ),
-                    CommentUi(
-                        picture = ImageSource.ResId(R.drawable.img_default_avatar),
-                        username = "username2",
-                        text = "Text 2",
+                    comments = listOf(
+                        CommentUi(
+                            picture = ImageSource.ResId(R.drawable.img_default_avatar),
+                            username = "username1",
+                            text = "Text 1",
+                        ),
+                        CommentUi(
+                            picture = ImageSource.ResId(R.drawable.img_default_avatar),
+                            username = "username2",
+                            text = "Text 2",
+                        ),
+                        CommentUi(
+                            picture = ImageSource.ResId(R.drawable.img_default_avatar),
+                            username = "username3",
+                            text = "Text 3",
+                        ),
                     ),
-                    CommentUi(
+                    reactionCount = 10,
+                    mode = Mode.CAMERA,
+                    isCameraEnabled = true,
+                    isCameraFront = true,
+                    showJoinRequests = false,
+                    showInvite = false,
+                    questionState = QuestionState.Hidden,
+                    unreadQuestionCount = 1,
+                    selectedQuestion = QuestionUi(
+                        uuid = "",
                         picture = ImageSource.ResId(R.drawable.img_default_avatar),
-                        username = "username3",
-                        text = "Text 3",
+                        username = "username",
+                        text = "Question?",
+                        isSelected = true,
                     ),
+                    showDirect = false,
                 ),
-                reactionCount = 10,
-                mode = Mode.CAMERA,
-                isCameraEnabled = true,
-                isCameraFront = true,
-                showJoinRequests = false,
-                showInvite = false,
-                showQuestions = false,
-                showDirect = false,
-            ),
-            onAction = {},
-        )
+                onAction = {},
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/StreamStateMapper.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/StreamStateMapper.kt
index 3032f24..e841ea8 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/StreamStateMapper.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/StreamStateMapper.kt
@@ -2,8 +2,12 @@ package com.bunbeauty.fakelivestream.features.stream.view
 
 import com.bunbeauty.fakelivestream.BuildConfig
 import com.bunbeauty.fakelivestream.R
-import com.bunbeauty.fakelivestream.features.stream.presentation.Stream
 import com.bunbeauty.fakelivestream.common.ui.components.ImageSource
+import com.bunbeauty.fakelivestream.features.stream.domain.model.Comment
+import com.bunbeauty.fakelivestream.features.stream.presentation.Stream
+import com.bunbeauty.fakelivestream.features.stream.view.ui.QuestionState
+import com.bunbeauty.fakelivestream.features.stream.view.ui.QuestionUi
+import kotlinx.collections.immutable.toImmutableList
 
 fun Stream.State.toViewState(): ViewState {
     return ViewState(
@@ -24,15 +28,7 @@ fun Stream.State.toViewState(): ViewState {
             )
         },
         comments = comments.map { comment ->
-            CommentUi(
-                picture = if (comment.picture == null) {
-                    ImageSource.ResId(R.drawable.img_default_avatar)
-                } else {
-                    ImageSource.ResName(comment.picture)
-                },
-                username = comment.username,
-                text = comment.text,
-            )
+            comment.toCommentUi()
         },
         reactionCount = reactionCount,
         mode = if (BuildConfig.SHOW_CAMERA) Mode.CAMERA else Mode.VIDEO,
@@ -40,7 +36,50 @@ fun Stream.State.toViewState(): ViewState {
         isCameraFront = isCameraFront,
         showJoinRequests = showJoinRequests,
         showInvite = showInvite,
-        showQuestions = showQuestions,
+        questionState = if (questionState.show) {
+            if (questionState.isEmpty) {
+                QuestionState.Empty
+            } else {
+                QuestionState.NotEmpty(
+                    notAnsweredQuestions = questionState.notAnsweredQuestions.map { question ->
+                        question.toQuestionUi()
+                    }.toImmutableList(),
+                    answeredQuestions = questionState.answeredQuestions.map { question ->
+                        question.toQuestionUi()
+                    }.toImmutableList(),
+                )
+            }
+        } else {
+            QuestionState.Hidden
+        },
+        unreadQuestionCount = questionState.unreadQuestionCount,
+        selectedQuestion = questionState.selectedQuestion?.toQuestionUi(),
         showDirect = showDirect,
     )
+}
+
+private fun Comment.toCommentUi(): CommentUi {
+    return CommentUi(
+        picture = if (picture == null) {
+            ImageSource.ResId(R.drawable.img_default_avatar)
+        } else {
+            ImageSource.ResName(picture)
+        },
+        username = username,
+        text = text,
+    )
+}
+
+private fun Stream.SelectableQuestion.toQuestionUi(): QuestionUi {
+    return QuestionUi(
+        uuid = question.uuid,
+        picture = if (question.picture == null) {
+            ImageSource.ResId(R.drawable.img_default_avatar)
+        } else {
+            ImageSource.ResName(question.picture)
+        },
+        username = question.username,
+        text = question.text,
+        isSelected = isSelected,
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ViewState.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ViewState.kt
index 2f26632..dcdda30 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ViewState.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ViewState.kt
@@ -2,6 +2,8 @@ package com.bunbeauty.fakelivestream.features.stream.view
 
 import androidx.compose.runtime.Immutable
 import com.bunbeauty.fakelivestream.common.ui.components.ImageSource
+import com.bunbeauty.fakelivestream.features.stream.view.ui.QuestionState
+import com.bunbeauty.fakelivestream.features.stream.view.ui.QuestionUi
 
 @Immutable
 data class ViewState(
@@ -15,7 +17,9 @@ data class ViewState(
     val isCameraFront: Boolean,
     val showJoinRequests: Boolean,
     val showInvite: Boolean,
-    val showQuestions: Boolean,
+    val questionState: QuestionState,
+    val unreadQuestionCount: Int?,
+    val selectedQuestion: QuestionUi?,
     val showDirect: Boolean,
 )
 
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/EmptyBottomSheet.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/EmptyBottomSheet.kt
index 631e59d..c1389d7 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/EmptyBottomSheet.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/EmptyBottomSheet.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Divider
 import androidx.compose.material.Text
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
@@ -16,6 +15,7 @@ import androidx.compose.ui.unit.dp
 import com.bunbeauty.fakelivestream.R
 import com.bunbeauty.fakelivestream.common.ui.LocalePreview
 import com.bunbeauty.fakelivestream.common.ui.components.bottomsheet.FakeLiveBottomSheet
+import com.bunbeauty.fakelivestream.common.ui.components.bottomsheet.FakeLiveBottomSheetContent
 import com.bunbeauty.fakelivestream.common.ui.theme.FakeLiveStreamTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -31,7 +31,7 @@ fun EmptyBottomSheet(
         modifier = modifier,
         onDismissRequest = onDismissRequest
     ) {
-        Content(
+        EmptyBottomSheetContent(
             titleResId = titleResId,
             bodyResId = bodyResId,
             descriptionResId = descriptionResId,
@@ -40,59 +40,53 @@ fun EmptyBottomSheet(
 }
 
 @Composable
-private fun ColumnScope.Content(
+private fun ColumnScope.EmptyBottomSheetContent(
     @StringRes titleResId: Int,
     @StringRes bodyResId: Int,
     @StringRes descriptionResId: Int,
+) {
+    FakeLiveBottomSheetContent(titleResId = titleResId) {
+        EmptyBottomSheetContent(
+            bodyResId = bodyResId,
+            descriptionResId = descriptionResId,
+        )
+    }
+}
+
+@Composable
+fun ColumnScope.EmptyBottomSheetContent(
+    @StringRes bodyResId: Int,
+    @StringRes descriptionResId: Int,
 ) {
     Text(
         modifier = Modifier
-            .fillMaxWidth()
-            .padding(
-                top = 16.dp,
-                bottom = 12.dp
-            ),
-        text = stringResource(titleResId),
+            .padding(top = 100.dp)
+            .fillMaxWidth(),
+        text = stringResource(bodyResId),
         color = FakeLiveStreamTheme.colors.onSurface,
-        style = FakeLiveStreamTheme.typography.titleMedium,
+        style = FakeLiveStreamTheme.typography.titleLarge,
         textAlign = TextAlign.Center
     )
-    Divider(
-        modifier = Modifier.fillMaxWidth(),
-        thickness = 0.5.dp,
-        color = FakeLiveStreamTheme.colors.border
+    Text(
+        modifier = Modifier
+            .padding(
+                top = 16.dp,
+                bottom = 100.dp
+            )
+            .fillMaxWidth(),
+        text = stringResource(descriptionResId),
+        color = FakeLiveStreamTheme.colors.onSurfaceVariant,
+        style = FakeLiveStreamTheme.typography.bodyMedium,
+        textAlign = TextAlign.Center
     )
-    Column(modifier = Modifier.padding(16.dp)) {
-        Text(
-            modifier = Modifier
-                .padding(top = 100.dp)
-                .fillMaxWidth(),
-            text = stringResource(bodyResId),
-            color = FakeLiveStreamTheme.colors.onSurface,
-            style = FakeLiveStreamTheme.typography.titleLarge,
-            textAlign = TextAlign.Center
-        )
-        Text(
-            modifier = Modifier
-                .padding(
-                    top = 16.dp,
-                    bottom = 100.dp
-                )
-                .fillMaxWidth(),
-            text = stringResource(descriptionResId),
-            color = FakeLiveStreamTheme.colors.onSurfaceVariant,
-            style = FakeLiveStreamTheme.typography.bodyMedium,
-            textAlign = TextAlign.Center
-        )
-    }
 }
 
 @LocalePreview
 @Composable
-fun EmptyBottomSheetPreview() {
+private fun EmptyBottomSheetPreview() {
     FakeLiveStreamTheme {
         Column {
-            Content(
+            EmptyBottomSheetContent(
                 titleResId = R.string.stream_questions_title,
                 bodyResId = R.string.stream_questions_body,
                 descriptionResId = R.string.stream_questions_description,
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/QuestionBottomSheet.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/QuestionBottomSheet.kt
new file mode 100644
index 0000000..ed4cdcd
--- /dev/null
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/QuestionBottomSheet.kt
@@ -0,0 +1,306 @@
+package com.bunbeauty.fakelivestream.features.stream.view.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import com.bunbeauty.fakelivestream.R
+import com.bunbeauty.fakelivestream.common.ui.LocalePreview
+import com.bunbeauty.fakelivestream.common.ui.clickableWithoutIndication
+import com.bunbeauty.fakelivestream.common.ui.components.CachedImage
+import com.bunbeauty.fakelivestream.common.ui.components.ImageSource
+import com.bunbeauty.fakelivestream.common.ui.components.bottomsheet.FakeLiveBottomSheet
+import com.bunbeauty.fakelivestream.common.ui.components.bottomsheet.FakeLiveBottomSheetContent
+import com.bunbeauty.fakelivestream.common.ui.theme.FakeLiveStreamTheme
+import com.bunbeauty.fakelivestream.common.ui.theme.bold
+import com.bunbeauty.fakelivestream.features.stream.presentation.Stream
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+
+@Immutable
+sealed interface QuestionState {
+    @Immutable
+    data object Hidden : QuestionState
+
+    @Immutable
+    data object Empty : QuestionState
+
+    @Immutable
+    data class NotEmpty(
+        val notAnsweredQuestions: ImmutableList<QuestionUi>,
+        val answeredQuestions: ImmutableList<QuestionUi>,
+    ) : QuestionState
+}
+
+@Immutable
+data class QuestionUi(
+    val uuid: String,
+    val picture: ImageSource<*>,
+    val username: String,
+    val text: String,
+    val isSelected: Boolean,
+)
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun QuestionsBottomSheet(
+    show: Boolean,
+    questionState: QuestionState,
+    onAction: (Stream.Action) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    if (show) {
+        FakeLiveBottomSheet(
+            modifier = modifier,
+            onDismissRequest = {
+                onAction(Stream.Action.HideQuestions)
+            }
+        ) {
+            QuestionsContent(
+                questionState = questionState,
+                onAction = onAction,
+            )
+        }
+    }
+}
+
+@Composable
+private fun ColumnScope.QuestionsContent(
+    questionState: QuestionState,
+    onAction: (Stream.Action) -> Unit
+) {
+    FakeLiveBottomSheetContent(titleResId = R.string.stream_questions_title) {
+        when (questionState) {
+            QuestionState.Empty -> {
+                EmptyBottomSheetContent(
+                    bodyResId = R.string.stream_questions_body,
+                    descriptionResId = R.string.stream_questions_description,
+                )
+            }
+
+            is QuestionState.NotEmpty -> {
+                LazyColumn(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(320.dp),
+                    verticalArrangement = spacedBy(8.dp),
+                    contentPadding = PaddingValues(vertical = 16.dp)
+                ) {
+                    if (questionState.notAnsweredQuestions.isNotEmpty()) {
+                        item(key = "tapToAnswerText") {
+                            Text(
+                                modifier = Modifier.fillMaxWidth(),
+                                text = stringResource(R.string.stream_questions_tap_to_answer),
+                                color = FakeLiveStreamTheme.colors.onSurface,
+                                style = FakeLiveStreamTheme.typography.titleMedium,
+                            )
+                        }
+                        item(key = "everyoneWatchingText") {
+                            Text(
+                                modifier = Modifier.fillMaxWidth(),
+                                text = stringResource(R.string.stream_questions_everyone_watching),
+                                color = FakeLiveStreamTheme.colors.onSurfaceVariant,
+                                style = FakeLiveStreamTheme.typography.bodyMedium,
+                            )
+                        }
+                        items(
+                            items = questionState.notAnsweredQuestions,
+                            key = { question -> question.uuid }
+                        ) { question ->
+                            QuestionItem(
+                                question = question,
+                                onAction = onAction,
+                            )
+                        }
+                    }
+                    if (questionState.answeredQuestions.isNotEmpty()) {
+                        item(key = "answeredQuestionsText") {
+                            Text(
+                                modifier = Modifier.fillMaxWidth(),
+                                text = stringResource(R.string.stream_questions_answered),
+                                color = FakeLiveStreamTheme.colors.onSurface,
+                                style = FakeLiveStreamTheme.typography.titleMedium,
+                            )
+                        }
+                        items(
+                            items = questionState.answeredQuestions,
+                            key = { question -> question.uuid }
+                        ) { question ->
+                            QuestionItem(
+                                question = question,
+                                onAction = onAction,
+                            )
+                        }
+                    }
+                }
+            }
+
+            else -> Unit
+        }
+    }
+}
+
+@Composable
+private fun QuestionItem(
+    question: QuestionUi,
+    onAction: (Stream.Action) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val borderColor = if (question.isSelected) {
+        FakeLiveStreamTheme.colors.interactive
+    } else {
+        FakeLiveStreamTheme.colors.border
+    }
+    val backgroundColor = if (question.isSelected) {
+        FakeLiveStreamTheme.colors.selectedSurface
+    } else {
+        Color.Transparent
+    }
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .border(
+                width = 1.dp,
+                color = borderColor,
+                shape = RoundedCornerShape(2.dp)
+            )
+            .background(
+                color = backgroundColor,
+                shape = RoundedCornerShape(2.dp)
+            )
+            .padding(horizontal = 8.dp)
+            .padding(top = 12.dp, bottom = 16.dp)
+            .clickableWithoutIndication {
+                onAction(
+                    Stream.Action.ClickQuestion(
+                        uuid = question.uuid
+                    )
+                )
+            },
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        CachedImage(
+            modifier = Modifier
+                .size(32.dp)
+                .clip(CircleShape),
+            imageSource = question.picture,
+            cacheKey = question.username,
+            contentDescription = "Comment avatar",
+        )
+        Column(
+            modifier = Modifier.padding(start = 12.dp),
+            verticalArrangement = spacedBy(4.dp)
+        ) {
+            val usernameStyle = FakeLiveStreamTheme.typography.titleSmall
+            val annotatedString = remember(question) {
+                buildAnnotatedString {
+                    withStyle(style = usernameStyle.toSpanStyle()) {
+                        append("${question.username}  ")
+                    }
+                    append(question.text)
+                }
+            }
+            Text(
+                modifier = Modifier.padding(top = 4.dp),
+                text = annotatedString,
+                color = FakeLiveStreamTheme.colors.onSurface,
+                style = FakeLiveStreamTheme.typography.bodySmall,
+            )
+            Row(horizontalArrangement = spacedBy(16.dp)) {
+                Text(
+                    modifier = Modifier.clickableWithoutIndication {
+                        onAction(Stream.Action.DeleteQuestion(question.uuid))
+                    },
+                    text = stringResource(R.string.stream_questions_delete),
+                    color = FakeLiveStreamTheme.colors.onSurfaceVariant,
+                    style = FakeLiveStreamTheme.typography.bodySmall.bold,
+                )
+                Text(
+                    modifier = Modifier.clickableWithoutIndication {
+                        onAction(Stream.Action.DeleteQuestion(question.uuid))
+                    },
+                    text = stringResource(R.string.stream_questions_report),
+                    color = FakeLiveStreamTheme.colors.onSurfaceVariant,
+                    style = FakeLiveStreamTheme.typography.bodySmall.bold,
+                )
+            }
+        }
+    }
+}
+
+@LocalePreview
+@Composable
+private fun EmptyQuestionsBottomSheetPreview() {
+    FakeLiveStreamTheme {
+        Column {
+            QuestionsContent(
+                questionState = QuestionState.Empty,
+                onAction = {}
+            )
+        }
+    }
+}
+
+@LocalePreview
+@Composable
+private fun NotEmptyQuestionsBottomSheetPreview() {
+    FakeLiveStreamTheme {
+        Column {
+            QuestionsContent(
+                questionState = QuestionState.NotEmpty(
+                    notAnsweredQuestions = persistentListOf(
+                        QuestionUi(
+                            uuid = "1",
+                            picture = ImageSource.ResId(R.drawable.a1),
+                            username = "user.name",
+                            text = "short question",
+                            isSelected = true,
+                        ),
+                        QuestionUi(
+                            uuid = "2",
+                            picture = ImageSource.ResId(R.drawable.a2),
+                            username = "user.name2",
+                            text = "Looooooooooooooooooooooooooooooooooooo ooooo ooo ooong question",
+
+                            isSelected = false,
+                        ),
+                    ),
+                    answeredQuestions = persistentListOf(
+                        QuestionUi(
+                            uuid = "3",
+                            picture = ImageSource.ResId(R.drawable.a3),
+                            username = "user.name3",
+                            text = "short question",
+                            isSelected = false,
+                        ),
+                    )
+                ),
+                onAction = {},
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/VideoComponent.kt b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/VideoComponent.kt
index 6b846da..8efd286 100644
--- a/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/VideoComponent.kt
+++ b/app/src/main/java/com/bunbeauty/fakelivestream/features/stream/view/ui/VideoComponent.kt
@@ -1,5 +1,7 @@
 package com.bunbeauty.fakelivestream.features.stream.view.ui
 
+import android.content.ContentResolver
+import android.net.Uri
 import androidx.annotation.OptIn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -9,18 +11,21 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.datasource.RawResourceDataSource
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerView
 import com.bunbeauty.fakelivestream.R
 
-@OptIn(UnstableApi::class) @Composable
+@OptIn(UnstableApi::class)
+@Composable
 fun VideoComponent(
     modifier: Modifier = Modifier
 ) {
     val localContext = LocalContext.current
     val exoPlayer = remember {
-        val videoUri = RawResourceDataSource.buildRawResourceUri(R.raw.video)
+        val videoUri = Uri.Builder()
+            .scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
+            .path(R.raw.video.toString())
+            .build()
         ExoPlayer.Builder(localContext).build()
             .apply {
                 setMediaItem(MediaItem.fromUri(videoUri))
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 5b6ac4a..c99306f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -10,6 +10,8 @@
     <string name="stream_live">AO VIVO</string>
     <string name="stream_thousands_viewers_count">%s.%sK</string>
     <string name="stream_add_comment">Adicione um comentário…</string>
+    <string name="stream_question_title">Pergunta</string>
+
     <string name="required_camera_permisseon_title">Permitir que %s acesse sua câmera</string>
     <string name="required_camera_permisseon_body">Isso permite iniciar o Ao Vivo.
         Você pode alterar isso a qualquer momento nas configurações do seu dispositivo.</string>
@@ -38,6 +40,11 @@
     <string name="stream_questions_title">Perguntas</string>
     <string name="stream_questions_body">Sem perguntas ainda</string>
     <string name="stream_questions_description">Qualquer pessoa assistindo pode enviar e ver perguntas aqui.</string>
+    <string name="stream_questions_tap_to_answer">Toque em uma pergunta para responder</string>
+    <string name="stream_questions_answered">Perguntas respondidas</string>
+    <string name="stream_questions_everyone_watching">Todos que assistem verão na tela.</string>
+    <string name="stream_questions_delete">Eliminar</string>
+    <string name="stream_questions_report">Denunciar</string>
 
     <string name="stream_direct_title">Direto</string>
     <string name="stream_direct_body">Direto não disponível</string>
@@ -186,4 +193,100 @@
         <item>Relatável e autêntico, seu conteúdo parece uma conexão genuína</item>
     </string-array>
 
+    <string-array name="question_comments">
+        <item>Como foi seu dia?</item>
+        <item>Como você está?</item>
+        <item>Como está seu humor?</item>
+        <item>O que te inspira?</item>
+        <item>O que você gosta de fazer no seu tempo livre?</item>
+        <item>Quais são seus hobbies?</item>
+        <item>Qual foi a última série que você assistiu?</item>
+        <item>Qual foi o último evento ou ocasião que você se lembra?</item>
+        <item>O que você mais gosta no seu trabalho/estudos?</item>
+        <item>Como foi seu fim de semana?</item>
+        <item>Qual é o seu superpoder?</item>
+        <item>Que habilidade você gostaria de aprender em breve?</item>
+        <item>Qual é sua série ou filme favorito no momento?</item>
+        <item>Você ouviu algo legal recentemente?</item>
+        <item>Que tipo de música você ouve?</item>
+        <item>O que você faz à noite?</item>
+        <item>Em que jogos você gosta de jogar?</item>
+        <item>O que você vai fazer depois da transmissão?</item>
+        <item>Cinema ou sofá em casa?</item>
+        <item>Qual foi o último fato interessante que você aprendeu?</item>
+        <item>Há algo sobre o qual você sonha?</item>
+        <item>Você já foi a um concerto?</item>
+        <item>Sobre o que você sonha?</item>
+        <item>Você está esperando algum lançamento?</item>
+        <item>Em qual filme você gostaria de atuar?</item>
+        <item>Recomende um livro</item>
+        <item>Recomende uma série</item>
+        <item>Recomende um filme divertido</item>
+        <item>Recomende um filme gentil</item>
+        <item>Para onde você gostaria de viajar?</item>
+        <item>Que livro você acha que todos deveriam ler?</item>
+        <item>Onde você gostaria de morar?</item>
+        <item>Como você relaxa?</item>
+        <item>O que te motiva?</item>
+        <item>Qual filme ou livro teve o maior impacto em você?</item>
+        <item>Se você pudesse escolher qualquer profissão sem se preocupar com dinheiro, o que seria?</item>
+        <item>Há algo que você sempre quis tentar?</item>
+        <item>Qual é a sua estação do ano favorita?</item>
+        <item>Que evento deixou a maior marca em sua vida?</item>
+        <item>Quais três coisas você levaria para uma ilha deserta?</item>
+        <item>Você gostaria de visitar o passado?</item>
+        <item>Você gosta de cozinhar?</item>
+        <item>Você prefere dar ou receber presentes?</item>
+        <item>O que fazer em um dia chuvoso?</item>
+        <item>Se você pudesse mudar um evento em sua vida, qual seria?</item>
+        <item>Descreva o dia perfeito</item>
+        <item>Qual é a sua memória mais feliz da infância?</item>
+        <item>O que mais te motiva todos os dias?</item>
+        <item>O que te motiva a acordar pela manhã?</item>
+        <item>Se você pudesse obter a resposta para qualquer pergunta, qual seria?</item>
+        <item>O que é mais importante na vida?</item>
+        <item>O que você queria ser quando crescesse?</item>
+        <item>Qual é o seu feriado favorito?</item>
+        <item>Qual é o prato mais incomum que você já experimentou?</item>
+        <item>Qual país ou cultura você acha mais interessante e por quê?</item>
+        <item>Você tem um lugar favorito?</item>
+        <item>Você tem metas para o ano?</item>
+        <item>Se você pudesse escolher qualquer talento, qual você gostaria de ter?</item>
+        <item>Você tem um talismã?</item>
+        <item>Qual gênero de música ou filmes você considera mais subestimado?</item>
+        <item>Qual é o seu aplicativo favorito?</item>
+        <item>Qual é o seu site favorito?</item>
+        <item>Você gosta de correr riscos?</item>
+        <item>Você tem animais de estimação?</item>
+        <item>Descreva-se em três palavras</item>
+        <item>Você prefere o verão ou o inverno?</item>
+        <item>Que língua você gostaria de saber? Por quê?</item>
+        <item>Qual é o seu lugar favorito?</item>
+        <item>Você tem plantas em casa?</item>
+        <item>O que você mais gosta no lugar onde mora agora?</item>
+        <item>Fale sobre seus hobbies</item>
+        <item>Se você pudesse conhecer qualquer personagem de um livro/filme, quem seria?</item>
+        <item>Que conselho você gostaria de dar a todas as pessoas na Terra?</item>
+        <item>Você prefere aventura ou relaxamento?</item>
+        <item>Você é uma pessoa matutina ou noturna?</item>
+        <item>Qual foi o melhor presente que você já recebeu?</item>
+        <item>O que você pensa sobre viagens espaciais?</item>
+        <item>Café ou chá?</item>
+        <item>Livros ou filmes?</item>
+        <item>Cães ou gatos?</item>
+        <item>Pizza ou sushi?</item>
+        <item>Filmes em casa ou no cinema?</item>
+        <item>Você gosta de festas?</item>
+        <item>Você prefere filmes ou séries?</item>
+        <item>Quais gêneros de filmes você gosta?</item>
+        <item>Quais gêneros musicais você gosta?</item>
+        <item>Você prefere clima quente ou frio?</item>
+        <item>Você prefere lazer ativo ou relaxamento?</item>
+        <item>Você prefere doce ou salgado?</item>
+        <item>Você prefere planejar com antecedência ou viver espontaneamente?</item>
+        <item>Jogos de tabuleiro ou videogames?</item>
+        <item>Você prefere passar tempo em companhia ou sozinho?</item>
+        <item>Você gosta de café?</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fd34b83..afae9dd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -9,6 +9,8 @@
     <string name="stream_live">ПРЯМОЙ ЭФИР</string>
     <string name="stream_thousands_viewers_count">%s,%s тыс.</string>
     <string name="stream_add_comment">Добавьте комментарий…</string>
+    <string name="stream_question_title">Вопрос</string>
+
     <string name="required_camera_permisseon_title">Разрешите %s to доступ к камере</string>
     <string name="required_camera_permisseon_body">Это позволит начть стрим.
         Выбор в любое время можно изменить в настройках устройства.</string>
@@ -37,6 +39,11 @@
     <string name="stream_questions_title">Вопросы</string>
     <string name="stream_questions_body">Вопросов пока нет</string>
     <string name="stream_questions_description">Все зрители могут отправлять и видеть здесь вопросы.</string>
+    <string name="stream_questions_tap_to_answer">Нажмите на вопрос, чтобы ответить</string>
+    <string name="stream_questions_answered">Отвеченные вопросы</string>
+    <string name="stream_questions_everyone_watching">Все, кто смотрит, увидят его на экране.</string>
+    <string name="stream_questions_delete">Удалить</string>
+    <string name="stream_questions_report">Пожаловаться</string>
 
     <string name="stream_direct_title">Поделитесь</string>
     <string name="stream_direct_body">Поделиться недоступно</string>
@@ -227,133 +234,100 @@
         <item>Спасибо за ответы на вопросы зрителей, это делает стрим еще интереснее</item>
     </string-array>
 
-    <string-array name="question_comments" tools:ignore="InconsistentArrays">
-        <item>Как ты выбираешь тему для своего следующего видео?</item>
-        <item>Есть ли у тебя любимый персонаж или тема, которую ты часто включаешь в свои видео?</item>
-        <item>Какую камеру ты используешь для съемок?</item>
-        <item>Каким образом ты поддерживаешь вовлеченность зрителей?</item>
-        <item>Сколько времени ты тратишь на монтаж одного видео?</item>
-        <item>Есть ли у тебя какие-то традиции перед началом съемок?</item>
-        <item>Какие темы тебе интересно было бы рассмотреть в будущих видео?</item>
-        <item>Как ты выбираешь музыку для своих видео?</item>
-        <item>Как часто ты взаимодействуешь с комментариями зрителей?</item>
-        <item>Какие советы по монтажу ты мог бы поделиться с новичками?</item>
-        <item>Как ты относишься к трендам в мире контент-создания?</item>
-        <item>Есть ли у тебя любимый момент из всех своих видео?</item>
-        <item>Каким образом ты формируешь идеи для своих роликов?</item>
-        <item>Что, по-твоему, является ключевым для успешного контент-создания?</item>
-        <item>Как ты поддерживаешь баланс между креативностью и регулярностью публикаций?</item>
-        <item>Какую роль играют твои зрители в формировании контента?</item>
-        <item>Есть ли у тебя кинематографические вдохновители или образцы?</item>
-        <item>Как ты принимаешь решение о сотрудничестве с другими контент-создателями?</item>
-        <item>Что, по-твоему, является наиболее трудным в процессе создания контента?</item>
-        <item>Какие темы ты бы хотел рассмотреть в будущем?</item>
-        <item>Какую часть процесса создания контента ты находишь наиболее увлекательной?</item>
-        <item>Какое оборудование ты рекомендовал бы начинающим контент-создателям?</item>
-        <item>Есть ли у тебя любимая реакция или комментарий зрителей?</item>
-        <item>Каким образом ты избегаешь рутины в своем творчестве?</item>
-        <item>Как важна для тебя обратная связь от зрителей?</item>
-        <item>Есть ли у тебя любимый период в истории твоего канала?</item>
-        <item>Какие темы вызывают у тебя наибольший энтузиазм?</item>
-        <item>Как ты выбираешь заголовки для своих видео?</item>
-        <item>Какие сложности ты испытываешь в процессе создания контента?</item>
-        <item>Как ты поддерживаешь креативный настрой в трудные периоды?</item>
-        <item>Что, по-твоему, делает твой контент уникальным?</item>
-        <item>Какие изменения ты заметил в своем стиле с момента начала канала?</item>
-        <item>Есть ли у тебя любимый проект, который ты особенно любишь?</item>
-        <item>Какой совет ты бы дал себе на старте своего творческого пути?</item>
-        <item>Какую роль социальные сети играют в продвижении твоего контента?</item>
-        <item>Как ты выбираешь образ для видео? Есть ли у тебя какие-то символы или эмблемы?</item>
-        <item>Есть ли у тебя личные традиции в связи с праздниками, которые ты отмечаешь в контенте?</item>
-        <item>Какое место или обстановка являются наиболее вдохновляющими для твоего творчества?</item>
-        <item>Какие технологии ты используешь для взаимодействия со своей аудиторией вне платформы контента?</item>
-        <item>Каким образом ты измеряешь успех своих видео? Есть ли у тебя какие-то ключевые показатели?</item>
-        <item>Есть ли у тебя предпочтения по форматам видео? Например, интервью, обзоры, рассказы и т.д.</item>
-        <item>Какие темы или вызовы ты считаешь наиболее важными для обсуждения в сообществе контент-создателей?</item>
-        <item>Как ты подбираешь музыку для своих видео? Есть ли у тебя предпочтения в жанрах?</item>
-        <item>Есть ли у тебя какие-то необычные источники вдохновения для создания контента?</item>
-        <item>Какую реакцию от зрителей ты считаешь наиболее ценной?</item>
-        <item>Каким образом ты взаимодействуешь с сообществом своих зрителей вне платформы?</item>
-        <item>Какую тему или вызов ты считаешь самым интересным для дискуссии среди контент-создателей?</item>
-        <item>Как ты решаешь, какой контент будет наиболее интересен для твоей аудитории?</item>
-        <item>Каким образом ты планируешь свой контент? Используешь ли какие-то инструменты или систему?</item>
-        <item>Есть ли у тебя планы на развитие своего контента в будущем?</item>
-        <item>Твои зрители влияют на выбор темы?</item>
-        <item>Какой формат видео тебе нравится больше всего?</item>
-        <item>Сколько времени уходит на подготовку контента?</item>
-        <item>Как часто меняешь стиль монтажа?</item>
-        <item>Любимый способ взаимодействия с фанатами?</item>
-        <item>Что вдохновляет тебя кроме контента?</item>
-        <item>Есть ли у тебя регулярный график публикаций?</item>
-        <item>Как ты решаешь, что видео готово к публикации?</item>
-        <item>Что делаешь, чтобы перезарядить творческие энергии?</item>
-        <item>Ты предпочитаешь скрипт или импровизацию в видео?</item>
-        <item>Самый неожиданный вопрос от зрителей?</item>
-        <item>Есть ли у тебя свои личные мемы из видео?</item>
-        <item>Какую книгу или фильм ты рекомендуешь сейчас?</item>
-        <item>Какие темы тебе приходится избегать в контенте?</item>
-        <item>Твой самый успешный контент — это сюрприз или план?</item>
-        <item>Есть ли у тебя мантра или лозунг в творчестве?</item>
-        <item>Ты предпочитаешь снимать днем или ночью?</item>
-        <item>Что важнее: контент или вовлеченность аудитории?</item>
-        <item>Сколько времени занимает создание одного видео?</item>
-        <item>Твои друзья или семья участвуют в видеоинтересах?</item>
-        <item>Ты сначала придумываешь название или контент?</item>
-        <item>Как ты борешься с креативным стагнацией?</item>
-        <item>Что ты думаешь о тематических стримах?</item>
-        <item>Какие твои планы на следующий месяц?</item>
-        <item>Твои зрители влияют на твой стиль?</item>
-        <item>Что больше всего ценится в сообществе?</item>
-        <item>Ты больше любишь снимать один или в компании?</item>
-        <item>Какие инструменты ты используешь для аналитики?</item>
-        <item>Какую роль играет юмор в твоих видео?</item>
-        <item>Сколько времени уходит на ответы в комментариях?</item>
-        <item>Ты предпочитаешь темные или светлые темы?</item>
-        <item>Какие твои рекорды или достижения в контенте?</item>
-        <item>Какие тренды тебе не нравятся в мире контент-создания?</item>
-        <item>Твой самый большой творческий провал?</item>
-        <item>Как часто ты пересматриваешь свои старые видео?</item>
-        <item>Есть ли у тебя ритуалы перед началом стрима?</item>
-        <item>Что тебе нравится больше всего в процессе монтажа?</item>
-        <item>Ты делаешь паузы между проектами или работаешь постоянно?</item>
-        <item>Что было бы твоим идеальным видеоинструментом?</item>
-        <item>Какие темы ты избегаешь в своих видео?</item>
-        <item>Твой самый удачный эксперимент в контенте?</item>
-        <item>Как ты относишься к анонимной критике?</item>
-        <item>Как часто проверяешь комментарии под видео?</item>
-        <item>Ты делаешь влоги на ходу или сценаризируешь?</item>
-        <item>Есть ли у тебя неизведанные форматы видео, которые хотелось бы попробовать?</item>
-        <item>Что тебя мотивирует делать контент каждый день?</item>
-        <item>Как ты выбираешь обложку для своих видео?</item>
-        <item>Твой самый большой творческий вызов на данный момент?</item>
-        <item>Твои зрители предлагают идеи для видео?</item>
-        <item>Какова твоя цель на текущий год в контент-создании?</item>
-        <item>Твоя самая популярная тема видео?</item>
-        <item>Любимая камера для съемок?</item>
-        <item>Как часто стримишь в неделю?</item>
-        <item>Что тебя вдохновляет для контента?</item>
-        <item>Какова твоя цель на текущий месяц?</item>
-        <item>Самый интересный комментарий от зрителя?</item>
-        <item>Любимый вид контента для производства?</item>
-        <item>Твой секрет успешного взаимодействия с подписчиками?</item>
-        <item>Есть ли у тебя темы, которых ты избегаешь?</item>
-        <item>Твои зрители влияют на изменения в контенте?</item>
-        <item>Лучший момент, который ты запомнил из стрима?</item>
-        <item>Твоя основная идея за кадром?</item>
-        <item>Как часто ты вносишь новые элементы в контент?</item>
-        <item>Как ты выбираешь музыку для своих видео?</item>
-        <item>Твой самый ценный опыт в контент-создании?</item>
-        <item>Какова твоя мечта относительно своего контента?</item>
-        <item>Самый необычный запрос от зрителей?</item>
-        <item>Какие темы тебе интересны за пределами твоего канала?</item>
-        <item>Твой лучший совет для новичков в контент-создании?</item>
-        <item>Сколько времени уходит на ответы в комментариях?</item>
-        <item>Где?</item>
-        <item>Как?</item>
-        <item>Каво?</item>
-        <item>Каког?</item>
-        <item>Поч?</item>
-        <item>Почему?</item>
+    <string-array name="question_comments">
+        <item>Как день?</item>
+        <item>Как дела?</item>
+        <item>Как настроение?</item>
+        <item>Что тебя вдохновляет?</item>
+        <item>Чем ты любишь заниматься в свободное время?</item>
+        <item>Какие у тебя хобби?</item>
+        <item>Какой последний сериал смотрел?</item>
+        <item>Какое последнее мероприятие или событие тебе запомнилось?</item>
+        <item>Что тебе больше всего нравится в вашей работе/учебе?</item>
+        <item>Как выходные?</item>
+        <item>Какая твоя супер способность?</item>
+        <item>Какой навык хотел бы освоить в ближайшем будущем?</item>
+        <item>Какой твой любимый сериал или фильм сейчас?</item>
+        <item>Слушал что-нибудь крутое недавно?</item>
+        <item>Какую музыку ты слушаешь?</item>
+        <item>Чем ты занимаешься по вечерам?</item>
+        <item>В какие игры ты любишь играть?</item>
+        <item>Что будешь делать после стрима?</item>
+        <item>Кинотеатр или дома на диване?</item>
+        <item>Какой последний интересный факт ты узнал?</item>
+        <item>Есть ли что-то, о чем ты мечтаешь?</item>
+        <item>Ты когда-нибудь был на концерте?</item>
+        <item>О чем ты мечтаешь?</item>
+        <item>Ждешь какой-нибудь релиз?</item>
+        <item>В каком фильме ты бы хотел сняться?</item>
+        <item>Посоветуй книгу</item>
+        <item>Посоветуй сериальчик</item>
+        <item>Посоветуй веселый фильм</item>
+        <item>Посоветуй добрый фильм</item>
+        <item>Куда бы ты отправился в путешествие?</item>
+        <item>Какую книгу ты считаешь должен прочитать каждый?</item>
+        <item>Где бы ты хотел жить?</item>
+        <item>Как ты расслабляешься?</item>
+        <item>Что тебя мотивирует?</item>
+        <item>Какой фильм или книга оказали на тебя самое большое впечатление?</item>
+        <item>Если бы ты мог выбрать любую профессию, не беспокоясь о деньгах, что бы это было?</item>
+        <item>Есть ли что-то, что ты всегда хотел попробовать?</item>
+        <item>Любимое время года</item>
+        <item>Какое  событие оставило в твоей жизни наибольший след?</item>
+        <item>Какие три вещи ты бы взял с собой на необитаемый остров?</item>
+        <item>Хотел бы побывать в прошлом?</item>
+        <item>Ты любишь готовить?</item>
+        <item>Ты больше любить дарить или получать подарки?</item>
+        <item>Что делать в дождливый день?</item>
+        <item>Если бы ты мог изменить одно событие в своей жизни, что бы это было?</item>
+        <item>Опиши идеальный день</item>
+        <item>Какое твоё самое счастливое воспоминание из детства?</item>
+        <item>Что тебя больше всего мотивирует каждый день?</item>
+        <item>Что мотивирует тебя вставать по утрам?</item>
+        <item>Если бы ты мог получить ответ на любой вопрос, какой бы вопрос ты задал?</item>
+        <item>Что самое главное в жизни?</item>
+        <item>Кем ты хотел стать, когда вырастешь?</item>
+        <item>Какой твой любимый праздник?</item>
+        <item>Какое самое необычное блюдо ты когда-либо пробовал?</item>
+        <item>Какую страну или культуру ты находишь наиболее интересной и почему?</item>
+        <item>У тебя есть любимое место?</item>
+        <item>Есть цели на год?</item>
+        <item>Если бы ты мог выбрать любой талант, какой бы ты хотел иметь?</item>
+        <item>У тебя есть талисман?</item>
+        <item>Какой жанр музыки или фильмов ты считаешь наиболее недооценённым?</item>
+        <item>Какое твое любимое приложение?</item>
+        <item>Какой твой любимый сайт?</item>
+        <item>Ты любишь рисковать?</item>
+        <item>У тебя есть домашние животные?</item>
+        <item>Опиши себя тремя словами</item>
+        <item>Ты больше любишь лето или зиму?</item>
+        <item>Какой язык ты хотел бы знать? Почему?</item>
+        <item>Какое твое любимое место?</item>
+        <item>У тебя есть домашние растения?</item>
+        <item>Что тебе больше всего нравится в том месте, где ты живешь сейчас?</item>
+        <item>Расскажи про свои хобби</item>
+        <item>Если бы ты мог встретить любого персонажа из книги/фильма, кто бы это был?</item>
+        <item>Какой совет ты хотел бы дать каждому человеку на Земле?</item>
+        <item>Что ты предпочитаешь: приключение или отдых?</item>
+        <item>Ты жаворонок или сова?</item>
+        <item>Какой лучший подарок ты когда-либо получал?</item>
+        <item>Что ты думаешь о космических путешествиях?</item>
+        <item>Кофе или чай?</item>
+        <item>Книги или фильмы?</item>
+        <item>Собаки или кошки?</item>
+        <item>Пицца или суши?</item>
+        <item>Фильмы дома или в кино?</item>
+        <item>Ты любишь вечеринки?</item>
+        <item>Тебе больше нравятся фильмы или сериалы?</item>
+        <item>Какие жанры фильмов тебе нравятся?</item>
+        <item>Какие музыкальные жанры ты любишь?</item>
+        <item>Ты больше любишь горячий или холодный климат?</item>
+        <item>Ты любишь больше активный отдых или релакс?</item>
+        <item>Предпочитаешь ли ты сладкое или соленое?</item>
+        <item>Предпочитаешь ли ты планировать заранее или жить спонтанно?</item>
+        <item>Настольные игры или видеоигры?</item>
+        <item>Любишь ли ты больше проводить время в компании или наедине?</item>
+        <item>Ты любишь кофе?</item>
     </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a4f7e8..045ac2b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,8 @@
     <string name="stream_live">LIVE</string>
     <string name="stream_thousands_viewers_count">%s.%sK</string>
     <string name="stream_add_comment">Add comment…</string>
+    <string name="stream_question_title">Question</string>
+
     <string name="required_camera_permisseon_title">Allow %s to access your camera</string>
     <string name="required_camera_permisseon_body">This lets you start the Live.
         You can change this anytime in your device settings.</string>
@@ -38,6 +40,11 @@
     <string name="stream_questions_title">Questions</string>
     <string name="stream_questions_body">No Questions Yet</string>
     <string name="stream_questions_description">Anyone watching can send and see questions here.</string>
+    <string name="stream_questions_tap_to_answer">Tap a Question to Answer</string>
+    <string name="stream_questions_answered">Answered questions</string>
+    <string name="stream_questions_everyone_watching">Everyone watching will see it on screen.</string>
+    <string name="stream_questions_delete">Delete</string>
+    <string name="stream_questions_report">Report</string>
 
     <string name="stream_direct_title">Direct</string>
     <string name="stream_direct_body">Direct not available</string>
@@ -214,57 +221,100 @@
         <item>Relatable and authentic, your content feels like a genuine connection</item>
     </string-array>
 
-    <string-array name="question_comments" tools:ignore="InconsistentArrays">
-        <item>What inspired your latest video?</item>
-        <item>How do you stay creative and motivated?</item>
-        <item>Any exciting projects or collaborations?</item>
-        <item>Favorite part about creating content?</item>
-        <item>Behind-the-scenes moment from your latest video?</item>
-        <item>How do you handle creative challenges?</item>
-        <item>Future content topic or theme you\'re eager about?</item>
-        <item>Tips for aspiring content creators?</item>
-        <item>How do you engage with your audience?</item>
-        <item>Most rewarding aspect of being a content creator?</item>
-        <item>Any favorite tools or apps for content creation?</item>
-        <item>What\'s your go-to source of inspiration?</item>
-        <item>How do you balance creativity with consistency?</item>
-        <item>What\'s the most memorable comment you\'ve received?</item>
-        <item>Any upcoming events or milestones to celebrate?</item>
-        <item>How has your content evolved over time?</item>
-        <item>Do you have a specific routine before filming?</item>
-        <item>Any advice for overcoming creative blocks?</item>
-        <item>What platforms do you find most engaging for your content?</item>
-        <item>How do you decide on the topics for your videos?</item>
-        <item>Can you share a funny or unexpected moment during filming?</item>
-        <item>What\'s your favorite aspect of interacting with your audience?</item>
-        <item>How do you approach balancing work and personal life?</item>
-        <item>Do you have a dream project you\'d love to work on?</item>
-        <item>What\'s the most challenging part of content creation for you?</item>
-        <item>How do you choose music for your videos?</item>
-        <item>Is there a specific goal you\'re working towards currently?</item>
-        <item>Do you prefer scripted or spontaneous content?</item>
-        <item>How do you stay updated on trends in your content niche?</item>
-        <item>What impact do you hope your content has on viewers?</item>
-        <item>Your favorite video you\'ve ever made?</item>
-        <item>Preferred editing software?</item>
-        <item>How often do you post content?</item>
-        <item>Top tip for new creators?</item>
-        <item>Ideal collaboration partner?</item>
-        <item>Favorite camera for filming?</item>
-        <item>Biggest lesson in content creation?</item>
-        <item>Best moment with your audience?</item>
-        <item>Current favorite content trend?</item>
-        <item>Next big goal for your channel?</item>
-        <item>Your quick fix for creative blocks?</item>
-        <item>Top source for content ideas?</item>
-        <item>Preferred filming location?</item>
-        <item>Your favorite video genre to create?</item>
-        <item>How do you unwind after filming?</item>
-        <item>Most used social media platform?</item>
-        <item>Preferred video length?</item>
-        <item>Biggest challenge you\'ve overcome?</item>
-        <item>Any content creation rituals?</item>
-        <item>Favorite part of the editing process?</item>
+    <string-array name="question_comments">
+        <item>How\'s your day?</item>
+        <item>How are you doing?</item>
+        <item>How are you feeling?</item>
+        <item>What inspires you?</item>
+        <item>What do you like to do in your free time?</item>
+        <item>What hobbies do you have?</item>
+        <item>What was the last series you watched?</item>
+        <item>What was the last event or occasion you remember?</item>
+        <item>What do you like most about your work/studies?</item>
+        <item>How was your weekend?</item>
+        <item>What\'s your superpower?</item>
+        <item>What skill would you like to learn in the near future?</item>
+        <item>What\'s your favorite series or movie right now?</item>
+        <item>Have you listened to anything cool recently?</item>
+        <item>What music do you listen to?</item>
+        <item>What do you do in the evenings?</item>
+        <item>What games do you like to play?</item>
+        <item>What will you do after the stream?</item>
+        <item>Cinema or couch at home?</item>
+        <item>What\'s the last interesting fact you learned?</item>
+        <item>Is there something you dream about?</item>
+        <item>Have you ever been to a concert?</item>
+        <item>What do you dream about?</item>
+        <item>Are you waiting for any releases?</item>
+        <item>In which movie would you like to act?</item>
+        <item>Recommend a book</item>
+        <item>Recommend a series</item>
+        <item>Recommend a fun movie</item>
+        <item>Recommend a kind movie</item>
+        <item>Where would you go on a trip?</item>
+        <item>What book do you think everyone should read?</item>
+        <item>Where would you like to live?</item>
+        <item>How do you relax?</item>
+        <item>What motivates you?</item>
+        <item>Which movie or book had the greatest impact on you?</item>
+        <item>If you could choose any profession without worrying about money, what would it be?</item>
+        <item>Is there something you\'ve always wanted to try?</item>
+        <item>Favorite season?</item>
+        <item>What event left the biggest mark on your life?</item>
+        <item>What three things would you take with you to a deserted island?</item>
+        <item>Would you like to visit the past?</item>
+        <item>Do you like to cook?</item>
+        <item>Do you prefer giving or receiving gifts?</item>
+        <item>What to do on a rainy day?</item>
+        <item>If you could change one event in your life, what would it be?</item>
+        <item>Describe the perfect day</item>
+        <item>What is your happiest childhood memory?</item>
+        <item>What motivates you the most every day?</item>
+        <item>What motivates you to get up in the morning?</item>
+        <item>If you could get an answer to any question, what would you ask?</item>
+        <item>What\'s the most important thing in life?</item>
+        <item>What did you want to be when you grew up?</item>
+        <item>What\'s your favorite holiday?</item>
+        <item>What\'s the most unusual dish you\'ve ever tried?</item>
+        <item>Which country or culture do you find most interesting and why?</item>
+        <item>Do you have a favorite place?</item>
+        <item>Do you have goals for the year?</item>
+        <item>If you could choose any talent, what would you want?</item>
+        <item>Do you have a talisman?</item>
+        <item>What genre of music or movies do you think is most underrated?</item>
+        <item>What\'s your favorite app?</item>
+        <item>What\'s your favorite website?</item>
+        <item>Do you like to take risks?</item>
+        <item>Do you have pets?</item>
+        <item>Describe yourself in three words</item>
+        <item>Do you prefer summer or winter?</item>
+        <item>What language would you like to know? Why?</item>
+        <item>What is your favorite place?</item>
+        <item>Do you have house plants?</item>
+        <item>What do you like most about the place where you live now?</item>
+        <item>Tell about your hobbies</item>
+        <item>If you could meet any character from a book/movie, who would it be?</item>
+        <item>What advice would you give to every person on Earth?</item>
+        <item>Do you prefer adventure or relaxation?</item>
+        <item>Are you a morning person or a night owl?</item>
+        <item>What\'s the best gift you\'ve ever received?</item>
+        <item>What do you think about space travel?</item>
+        <item>Coffee or tea?</item>
+        <item>Books or movies?</item>
+        <item>Dogs or cats?</item>
+        <item>Pizza or sushi?</item>
+        <item>Movies at home or in the cinema?</item>
+        <item>Do you like parties?</item>
+        <item>Do you prefer movies or series?</item>
+        <item>What movie genres do you like?</item>
+        <item>What music genres do you like?</item>
+        <item>Do you prefer hot or cold weather?</item>
+        <item>Do you prefer active leisure or relaxation?</item>
+        <item>Do you prefer sweet or salty?</item>
+        <item>Do you prefer to plan in advance or live spontaneously?</item>
+        <item>Board games or video games?</item>
+        <item>Do you prefer to spend time in company or alone?</item>
+        <item>Do you like coffee?</item>
     </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/video/res/raw/video.MP4 b/app/src/video/res/raw/video.MP4
new file mode 100644
index 0000000..ab0cb17
Binary files /dev/null and b/app/src/video/res/raw/video.MP4 differ
diff --git a/app/src/video/res/raw/video.mp4 b/app/src/video/res/raw/video.mp4
deleted file mode 100644
index 9414a2a..0000000
Binary files a/app/src/video/res/raw/video.mp4 and /dev/null differ