[feat] #62 set video screen

Author: lsakee

feature/upload/src/main/java/com/record/upload/UploadContract.kt

@@ -15,8 +15,12 @@ data class UploadState(
     val isSelectedDefinedContentSheetOpen: Boolean = false,
     val bucketUrl: String = "",
     val thumbnailUrl: String = "",
+    val locationTextValue: String ="",
+    val contentTextValue: String ="",
 ) : UiState
 
 sealed interface UploadSideEffect : SideEffect {
     data object PopBackStack : UploadSideEffect
+    data object FocusLocation : UploadSideEffect
+    data object FocusContent : UploadSideEffect
 }

feature/upload/src/main/java/com/record/upload/UploadViewModel.kt

@@ -14,47 +14,41 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import java.io.File
 import java.net.URL
-import java.net.URLDecoder
 import javax.inject.Inject
 
 @HiltViewModel
 class UploadViewModel @Inject constructor(
     private val uploadRepository: UploadRepository,
-) :
-    BaseViewModel<UploadState, UploadSideEffect>(UploadState()) {
+) : BaseViewModel<UploadState, UploadSideEffect>(UploadState()) {
+
     fun setSelectedList(selectedContent: String) = intent {
         val newSelectedList = selectedList.toMutableList()
-        if (newSelectedList.contains(selectedContent)) {
+        if (newSelectedList.contains(selectedContent))
             newSelectedList.remove(selectedContent)
-        } else {
+        else
             if (newSelectedList.size < 3) newSelectedList.add(selectedContent)
-        }
         copy(selectedList = newSelectedList)
     }
 
     suspend fun getPresignedUrl() = viewModelScope.launch {
         uploadRepository.getPresignedUrl().onSuccess {
-            Log.d("success", "$it")
             bucket(it.videoUrl, it.imageUrl)
         }.onFailure {
             Log.d("failure", "${it.message}")
         }
     }
 
-    private fun decodeBase64(encodedString: String): String? {
-        val decodedBytes = Base64.decode(encodedString, Base64.DEFAULT)
-        val decodedString = String(decodedBytes, Charsets.UTF_8)
-        return URLDecoder.decode(decodedString, "UTF-8")
-    }
-
     fun uploadVideoToS3Bucket(context: Context, file: File) =
         viewModelScope.launch {
             var a = ""
             var b = ""
-            uploadFileToS3PresignedUrl(uiState.value.bucketUrl, uiState.value.thumbnailUrl, file) { success, message ->
+            uploadFileToS3PresignedUrl(
+                uiState.value.bucketUrl,
+                uiState.value.thumbnailUrl,
+                file
+            ) { success, message ->
                 println(message)
                 a = removeQueryParameters(message)
-                Log.d("messageFile", "$message")
                 if (success) {
                     uploadFileToS3ThumbnailPresignedUrl(
                         context,
@@ -63,7 +57,6 @@ class UploadViewModel @Inject constructor(
                     ) { success, message ->
                         println(message)
                         b = removeQueryParameters(message)
-                        Log.d("messageThumbnail", "$message ")
                         uploadRecord(a, b)
                     }
                 }
@@ -85,16 +78,26 @@ class UploadViewModel @Inject constructor(
             }
         }
 
+    fun updateLocationTextField(locationValue: String) = intent {
+        copy(locationTextValue = locationValue)
+    }
+
+    fun updateContentTextField(contentValue: String) = intent {
+        copy(contentTextValue = contentValue)
+    }
+
     private fun encodingString(contentValue: String): String {
         val bytes = contentValue.toByteArray(Charsets.UTF_8)
         val encodedString = Base64.encodeToString(bytes, Base64.DEFAULT)
         return encodedString
     }
+
     fun removeQueryParameters(urlString: String): String {
         val url = URL(urlString)
         val cleanUrl = URL(url.protocol, url.host, url.port, url.path)
         return cleanUrl.toString()
     }
+
     fun setVideo(video: GalleryVideo) = intent {
         copy(video = video)
     }

feature/upload/src/main/java/com/record/upload/VideoPickerScreen.kt

@@ -27,6 +27,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
@@ -36,13 +38,15 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-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.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -70,6 +74,7 @@ import com.record.upload.component.bottomsheet.DefinedContentBottomSheet
 import com.record.upload.component.bottomsheet.SelectedVideoBottomSheet
 import com.record.upload.extension.GalleryVideo
 import com.record.upload.extension.getAllVideos
+import kotlinx.coroutines.android.awaitFrame
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -84,6 +89,8 @@ fun VideoPickerRoute(
     val state by viewModel.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
+    val locationFocusRequester = remember { FocusRequester() }
+    val contentFocusRequester = remember { FocusRequester() }
 
     BackHandler(true) {
         coroutineScope.launch {
@@ -93,13 +100,21 @@ fun VideoPickerRoute(
 
     LaunchedEffectWithLifecycle {
         viewModel.getPresignedUrl()
-        viewModel.sideEffect.collectLatest { }
     }
 
     LaunchedEffectWithLifecycle {
         viewModel.sideEffect.collectLatest { sideEffect ->
             when (sideEffect) {
                 is UploadSideEffect.PopBackStack -> popBackStack()
+                is UploadSideEffect.FocusLocation -> {
+                    awaitFrame()
+                    locationFocusRequester.requestFocus()
+                }
+
+                is UploadSideEffect.FocusContent -> {
+                    awaitFrame()
+                    contentFocusRequester.requestFocus()
+                }
             }
         }
     }
@@ -119,6 +134,10 @@ fun VideoPickerRoute(
             viewModel.uploadVideoToS3Bucket(context, it)
         },
         onClickBackStack = viewModel::popBackStack,
+        updateLocationTextField = viewModel::updateLocationTextField,
+        updateContentTextField = viewModel::updateContentTextField,
+        locationFocusRequester = locationFocusRequester,
+        contentFocusRequester = locationFocusRequester,
     )
 }
 
@@ -142,6 +161,10 @@ fun VideoPickerScreen(
     onClickContentChip: (String) -> Unit,
     setVideo: (GalleryVideo) -> Unit,
     uploadVideoS3Bucket: (File) -> Unit,
+    updateContentTextField: (String) -> Unit = {},
+    updateLocationTextField: (String) -> Unit = {},
+    locationFocusRequester: FocusRequester = remember { FocusRequester() },
+    contentFocusRequester: FocusRequester = remember { FocusRequester() },
 ) {
     val context = LocalContext.current
     val cameraPermissionState = rememberPermissionState(
@@ -165,9 +188,6 @@ fun VideoPickerScreen(
             ) == PackageManager.PERMISSION_GRANTED,
         )
     }
-    var normalValue by remember {
-        mutableStateOf("")
-    }
     val scope = rememberCoroutineScope()
     val imageLoader = ImageLoader.Builder(context)
         .components {
@@ -322,12 +342,14 @@ fun VideoPickerScreen(
         )
         RecordyBasicTextField(
             modifier = Modifier
-                .padding(horizontal = 16.dp),
+                .padding(horizontal = 16.dp)
+                .focusRequester(locationFocusRequester),
             placeholder = "영상 속 위치는 어디인가요?",
             maxLines = 1,
             maxLength = 10,
-            value = normalValue,
-            onValueChange = { normalValue = it },
+            value = state.locationTextValue,
+            onValueChange = updateLocationTextField,
+            keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Done),
         )
         Text(
             text = "내용",
@@ -342,11 +364,15 @@ fun VideoPickerScreen(
             maxLines = 20,
             maxLength = 300,
             minHeight = 148.dp,
-            value = normalValue,
+            value = state.contentTextValue,
             modifier = Modifier
                 .padding(horizontal = 16.dp)
-                .padding(bottom = 10.dp),
-            onValueChange = { normalValue = it },
+                .padding(bottom = 10.dp)
+                .focusRequester(contentFocusRequester),
+            onValueChange = updateContentTextField,
+            keyboardOptions = KeyboardOptions.Default.copy(
+                imeAction = ImeAction.Done
+            )
         )
         Box(modifier = Modifier.padding(16.dp)) {
             RecordyButton(

feature/upload/src/main/java/com/record/upload/navigation/UploadNavigation.kt

@@ -7,7 +7,6 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import com.record.upload.SelectedVideoRoute
 import com.record.upload.VideoPickerRoute
 
 fun NavController.navigateToUpload() {
@@ -26,14 +25,8 @@ fun NavGraphBuilder.uploadNavGraph(
             popBackStack = popBackStack,
         )
     }
-    composable(route = UploadRoute.SELECTED_VIDEO) {
-        SelectedVideoRoute(
-            paddingValues = padding,
-        )
-    }
 }
 
 object UploadRoute {
     const val ROUTE = "upload"
-    const val SELECTED_VIDEO = "selected-video"
 }