diff --git a/external/src/main/java/com/foke/together/external/repository/ImageRepository.kt b/external/src/main/java/com/foke/together/external/repository/ImageRepository.kt index e9e264d..88dd731 100644 --- a/external/src/main/java/com/foke/together/external/repository/ImageRepository.kt +++ b/external/src/main/java/com/foke/together/external/repository/ImageRepository.kt @@ -7,6 +7,7 @@ import android.net.Uri import android.provider.MediaStore import com.foke.together.domain.interactor.entity.CutFrameType import com.foke.together.domain.output.ImageRepositoryInterface +import com.foke.together.util.AppPolicy import com.foke.together.util.ImageFileUtil import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.Flow @@ -32,7 +33,7 @@ class ImageRepository @Inject constructor( override fun getCachedImageUriList(): List { var uriList = mutableListOf() context.cacheDir.listFiles().forEach { - if(it.name.contains("capture")){ + if(it.name.contains(AppPolicy.CAPTURED_FOUR_CUT_IMAGE_NAME)){ // capture로 시작하는 파일만 반환 uriList.add(Uri.fromFile(it)) } diff --git a/presenter/src/main/java/com/foke/together/presenter/viewmodel/CameraViewModel.kt b/presenter/src/main/java/com/foke/together/presenter/viewmodel/CameraViewModel.kt index dd7aa07..57f72c2 100644 --- a/presenter/src/main/java/com/foke/together/presenter/viewmodel/CameraViewModel.kt +++ b/presenter/src/main/java/com/foke/together/presenter/viewmodel/CameraViewModel.kt @@ -49,7 +49,7 @@ class CameraViewModel @Inject constructor( override fun onFinish() { viewModelScope.launch { val bitmap = graphicsLayer.toImageBitmap().asAndroidBitmap() - generatePhotoFrameUseCase.saveGraphicsLayerImage(bitmap, "capture_${_captureCount.value}") + generatePhotoFrameUseCase.saveGraphicsLayerImage(bitmap, "${AppPolicy.CAPTURED_FOUR_CUT_IMAGE_NAME}_${_captureCount.value}") _progressState.floatValue = 1f if (_captureCount.intValue < AppPolicy.CAPTURE_COUNT) { _captureCount.intValue += 1 diff --git a/presenter/src/main/java/com/foke/together/presenter/viewmodel/GenerateSingleRowImageViewModel.kt b/presenter/src/main/java/com/foke/together/presenter/viewmodel/GenerateSingleRowImageViewModel.kt index b55a793..682c72a 100644 --- a/presenter/src/main/java/com/foke/together/presenter/viewmodel/GenerateSingleRowImageViewModel.kt +++ b/presenter/src/main/java/com/foke/together/presenter/viewmodel/GenerateSingleRowImageViewModel.kt @@ -7,6 +7,7 @@ import androidx.lifecycle.ViewModel import com.foke.together.domain.interactor.GeneratePhotoFrameUseCase import com.foke.together.domain.interactor.entity.CutFrameType import com.foke.together.util.AppLog +import com.foke.together.util.AppPolicy import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject @@ -21,8 +22,7 @@ class GenerateSingleRowImageViewModel @Inject constructor( suspend fun generateImage(graphicsLayer: GraphicsLayer) { val bitmap = graphicsLayer.toImageBitmap().asAndroidBitmap() - val finalExternalImageUri = generatePhotoFrameUseCase.saveGraphicsLayerImage(bitmap, "final_single_row") - val finalInternalImageUri = generatePhotoFrameUseCase.saveFinalImage(bitmap, "final_single_row") - AppLog.d("GenerateImageViewModel", "generateTwoRowImage" ,"twoRow: $finalExternalImageUri") + val finalCachedImageUri = generatePhotoFrameUseCase.saveGraphicsLayerImage(bitmap, AppPolicy.SINGLE_ROW_FINAL_IMAGE_NAME) + AppLog.d("GenerateImageViewModel", "generateTwoRowImage" ,"twoRow: $finalCachedImageUri") } } \ No newline at end of file diff --git a/presenter/src/main/java/com/foke/together/presenter/viewmodel/GenerateTwoRowImageViewModel.kt b/presenter/src/main/java/com/foke/together/presenter/viewmodel/GenerateTwoRowImageViewModel.kt index 46ac53d..47850f1 100644 --- a/presenter/src/main/java/com/foke/together/presenter/viewmodel/GenerateTwoRowImageViewModel.kt +++ b/presenter/src/main/java/com/foke/together/presenter/viewmodel/GenerateTwoRowImageViewModel.kt @@ -7,6 +7,7 @@ import androidx.lifecycle.ViewModel import com.foke.together.domain.interactor.GeneratePhotoFrameUseCase import com.foke.together.domain.interactor.entity.CutFrameType import com.foke.together.util.AppLog +import com.foke.together.util.AppPolicy import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject @@ -21,8 +22,7 @@ class GenerateTwoRowImageViewModel @Inject constructor( suspend fun generateImage(graphicsLayer: GraphicsLayer) { val bitmap = graphicsLayer.toImageBitmap().asAndroidBitmap() - val finalExternalImageUri = generatePhotoFrameUseCase.saveGraphicsLayerImage(bitmap, "final_two_row") - val finalInternalImageUri = generatePhotoFrameUseCase.saveFinalImage(bitmap, "final_two_row") + val finalExternalImageUri = generatePhotoFrameUseCase.saveGraphicsLayerImage(bitmap, AppPolicy.TWO_ROW_FINAL_IMAGE_NAME) AppLog.d("GenerateImageViewModel", "generateTwoRowImage" ,"twoRow: $finalExternalImageUri") } } \ No newline at end of file diff --git a/presenter/src/main/java/com/foke/together/presenter/viewmodel/ShareViewModel.kt b/presenter/src/main/java/com/foke/together/presenter/viewmodel/ShareViewModel.kt index 75c0c9f..8c3c404 100644 --- a/presenter/src/main/java/com/foke/together/presenter/viewmodel/ShareViewModel.kt +++ b/presenter/src/main/java/com/foke/together/presenter/viewmodel/ShareViewModel.kt @@ -28,6 +28,6 @@ class ShareViewModel @Inject constructor( } fun downloadImage() { - + } } \ No newline at end of file diff --git a/util/src/main/java/com/foke/together/util/AppPolicy.kt b/util/src/main/java/com/foke/together/util/AppPolicy.kt index 0840de4..059a48c 100644 --- a/util/src/main/java/com/foke/together/util/AppPolicy.kt +++ b/util/src/main/java/com/foke/together/util/AppPolicy.kt @@ -20,4 +20,8 @@ object AppPolicy { const val CAPTURE_INTERVAL = 10000L const val CAPTURE_COUNT = 4 const val COUNTDOWN_INTERVAL = 10L + + const val CAPTURED_FOUR_CUT_IMAGE_NAME = "capture" + const val SINGLE_ROW_FINAL_IMAGE_NAME = "final_single_row" + const val TWO_ROW_FINAL_IMAGE_NAME = "final_two_row" } \ No newline at end of file