[refactor] #62 delete unnecessary code & separate extension

Author: lsakee

core/common/src/main/java/com/record/common/util/EncodingUtil.kt

@@ -14,3 +14,9 @@ fun toUTF8(input: String): String {
 
     return base64EncodedString
 }
+
+fun encodingString(contentValue: String): String {
+    val bytes = contentValue.toByteArray(Charsets.UTF_8)
+    val encodedString = android.util.Base64.encodeToString(bytes, android.util.Base64.DEFAULT)
+    return encodedString
+}

feature/upload/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     implementation("com.github.AbedElazizShe:LightCompressor:1.3.2")
     implementation(projects.domain.upload)
     implementation(projects.domain.keyword)
+    implementation(projects.core.common)
     implementation("com.amazonaws:aws-android-sdk-mobile-client:2.13.5")
     implementation("com.amazonaws:aws-android-sdk-cognito:2.13.5")
     implementation("com.amazonaws:aws-android-sdk-s3:2.13.5")

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

@@ -1,8 +1,8 @@
 package com.record.upload
 
-import android.util.Base64
 import android.util.Log
 import androidx.lifecycle.viewModelScope
+import com.record.common.util.encodingString
 import com.record.designsystem.component.snackbar.SnackBarType
 import com.record.keyword.repository.KeywordRepository
 import com.record.ui.base.BaseViewModel
@@ -12,7 +12,6 @@ import com.record.upload.repository.UploadRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import java.io.File
-import java.net.URL
 import javax.inject.Inject
 
 @HiltViewModel
@@ -54,15 +53,15 @@ class UploadViewModel @Inject constructor(
             }
         }
 
-    fun uploadRecord(a: String, b: String) {
+    fun uploadRecord(videoS3Url: String, thumbnailS3Url: String) {
         viewModelScope.launch {
             uploadRepository.uploadRecord(
                 videoInfo = VideoInfo(
                     location = uiState.value.locationTextValue,
                     content = uiState.value.contentTextValue,
                     keywords = encodingString(uiState.value.selectedList.joinToString(separator = ",")).trim(),
-                    videoUrl = a,
-                    previewUrl = b,
+                    videoUrl = videoS3Url,
+                    previewUrl = thumbnailS3Url,
                 ),
             ).onSuccess {
                 Log.d("testUpload", "upload")
@@ -80,18 +79,6 @@ class UploadViewModel @Inject constructor(
         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

@@ -130,9 +130,7 @@ fun VideoPickerRoute(
         state = state,
         onClickContentChip = viewModel::setSelectedList,
         onClickVideo = viewModel::setVideo,
-        uploadVideoS3Bucket = {
-            viewModel.uploadVideoToS3Bucket(context, it)
-        },
+        uploadVideoS3Bucket = viewModel::uploadVideoToS3Bucket,
         locationFocusRequester = locationFocusRequester,
         contentFocusRequester = locationFocusRequester,
         updateLocationTextField = viewModel::updateLocationTextField,

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

@@ -25,10 +25,10 @@ fun getAllVideos(
     val uriExternal: Uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
     val projection = arrayOf(
         MediaStore.Video.VideoColumns.DATA,
-        MediaStore.Video.VideoColumns.DISPLAY_NAME, // 이름
-        MediaStore.Video.VideoColumns.SIZE, // 크기
+        MediaStore.Video.VideoColumns.DISPLAY_NAME,
+        MediaStore.Video.VideoColumns.SIZE,
         MediaStore.Video.VideoColumns.DATE_TAKEN,
-        MediaStore.Video.VideoColumns.DATE_ADDED, // 추가된 날짜
+        MediaStore.Video.VideoColumns.DATE_ADDED,
         MediaStore.Video.VideoColumns._ID,
     )
     val resolver = context.contentResolver
@@ -94,6 +94,12 @@ fun getVideoDuration(context: Context, uri: Uri): Long {
     }
 }
 
+fun formatDuration(durationMillis: Long): String {
+    val minutes = (durationMillis / 1000) / 60
+    val seconds = (durationMillis / 1000) % 60
+    return String.format("%d:%02d", minutes, seconds)
+}
+
 data class GalleryVideo(
     val id: Long,
     val filepath: String,
@@ -152,9 +158,3 @@ fun compressVideo(context: Context, videoUri: Uri, name: String, onSuccess: (Str
         )
     }
 }
-
-fun formatDuration(durationMillis: Long): String {
-    val minutes = (durationMillis / 1000) / 60
-    val seconds = (durationMillis / 1000) % 60
-    return String.format("%d:%02d", minutes, seconds)
-}