[feat] #62 limited video durationd

Author: lsakee

feature/upload/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     implementation("com.google.accompanist:accompanist-systemuicontroller:0.24.13-rc")
     implementation("com.github.AbedElazizShe:LightCompressor:1.3.2")
     implementation(projects.domain.upload)
+    implementation(projects.domain.keyword)
     implementation("com.arthenica:mobile-ffmpeg-full-gpl:4.4")
     implementation("com.amazonaws:aws-android-sdk-mobile-client:2.13.5")
     implementation("com.amazonaws:aws-android-sdk-cognito:2.13.5")

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.Base64
 import android.util.Log
 import androidx.lifecycle.viewModelScope
+import com.record.keyword.repository.KeywordRepository
 import com.record.ui.base.BaseViewModel
 import com.record.upload.extension.GalleryVideo
 import com.record.upload.extension.uploadFileToS3PresignedUrl
@@ -19,8 +20,14 @@ import javax.inject.Inject
 @HiltViewModel
 class UploadViewModel @Inject constructor(
     private val uploadRepository: UploadRepository,
-) : BaseViewModel<UploadState, UploadSideEffect>(UploadState()) {
+    private val keywordRepository: KeywordRepository,
 
+) : BaseViewModel<UploadState, UploadSideEffect>(UploadState()) {
+    fun getKeyWordList() = viewModelScope.launch {
+        keywordRepository.getKeywords().onSuccess {
+            intent { copy(contentList = it.keywords) }
+        }
+    }
     fun setSelectedList(selectedContent: String) = intent {
         val newSelectedList = selectedList.toMutableList()
         if (newSelectedList.contains(selectedContent)) {
@@ -66,12 +73,11 @@ class UploadViewModel @Inject constructor(
 
     fun uploadRecord(a: String, b: String) =
         viewModelScope.launch {
-            Log.d("test", "${uiState.value.selectedList}")
             uploadRepository.uploadRecord(
                 videoInfo = VideoInfo(
                     location = uiState.value.locationTextValue,
                     content = uiState.value.contentTextValue,
-                    keywords = encodingString("감각적인,강렬한,귀여운").trim(),
+                    keywords = encodingString(uiState.value.selectedList.joinToString(separator = ",")).trim(),
                     videoUrl = a,
                     previewUrl = b,
                 ),

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

@@ -99,6 +99,7 @@ fun VideoPickerRoute(
 
     LaunchedEffectWithLifecycle {
         viewModel.getPresignedUrl()
+        viewModel.getKeyWordList()
     }
 
     LaunchedEffectWithLifecycle {
@@ -369,9 +370,6 @@ fun VideoPickerScreen(
                 .padding(bottom = 10.dp)
                 .focusRequester(contentFocusRequester),
             onValueChange = updateContentTextField,
-            keyboardOptions = KeyboardOptions.Default.copy(
-                imeAction = ImeAction.Done,
-            ),
         )
         Box(modifier = Modifier.padding(16.dp)) {
             RecordyButton(
@@ -424,20 +422,7 @@ fun VideoPickerScreen(
         sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
         isSheetOpen = state.isSelectedDefinedContentSheetOpen,
         onDismissRequest = hideIsSelectedDefinedContentSheetOpen,
-        contentList = listOf(
-            "asdsadasdasda",
-            "asdasdb",
-            "asdasdc",
-            "dasd",
-            "asdsadasdasda",
-            "asdasdbasd",
-            "asdasdc12312",
-            "dasd124123",
-            "asdsada124sdasda",
-            "asd124asdb",
-            "asda3sdc",
-            "das1d",
-        ),
+        contentList = state.contentList,
         selectedList = state.selectedList,
         onClickContentChip = onClickContentChip,
     )

feature/upload/src/main/java/com/record/upload/component/bottomsheet/DefinedContentBottomSheet.kt

@@ -1,6 +1,5 @@
 package com.record.upload.component.bottomsheet
 
-import android.util.Log
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -95,9 +94,7 @@ fun DefinedContentBottomSheet(
                     .align(Alignment.CenterHorizontally),
                 text = "적용하기",
                 enabled = if (selectedList.isNotEmpty()) true else false,
-                onClick = {
-                    if (selectedList.isNotEmpty()) Log.d("enable btn", "true") else Log.d("disable btn", "false")
-                },
+                onClick = onDismissRequest,
             )
         }
     }

feature/upload/src/main/java/com/record/upload/extension/UploadExtension.kt

@@ -69,17 +69,19 @@ fun getAllVideos(
                 val date = cursor.getString(dateColumn)
                 val contentUri = ContentUris.withAppendedId(uriExternal, id)
                 val duration = getVideoDuration(context, contentUri)
-                galleryVideoList.add(
-                    GalleryVideo(
-                        id,
-                        filepath = filepath,
-                        uri = contentUri,
-                        name = name,
-                        date = date ?: "",
-                        size = size,
-                        duration = duration,
-                    ),
-                )
+                if (duration <= 15000) {
+                    galleryVideoList.add(
+                        GalleryVideo(
+                            id,
+                            filepath = filepath,
+                            uri = contentUri,
+                            name = name,
+                            date = date ?: "",
+                            size = size,
+                            duration = duration,
+                        ),
+                    )
+                }
             } while (cursor.moveToNext())
         }
     }