Internal Camera 구현 및 실행 [#110]

app/src/main/AndroidManifest.xml

@@ -4,6 +4,13 @@
     <!-- To use IP camera for external camera type-->
     <!-- TODO: need to check to move this permission to presenter module -->
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" android:maxSdkVersion="32"  />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
 
     <application
         android:name=".MainApplication"

data/src/main/java/com/foke/together/data/repository/AppPreferencesRepository.kt

@@ -88,7 +88,7 @@ class AppPreferencesRepository @Inject constructor(
             it.internalCameraCaptureMode
         }
 
-    override suspend fun setInterenalCameraCaptureMode(
+    override suspend fun setInternalCameraCaptureMode(
         @IntRange(from = 0, to = 2) captureMode: Int
     ) {
         appPreferences.updateData {
@@ -98,20 +98,6 @@ class AppPreferencesRepository @Inject constructor(
         }
     }
 
-    override fun getInternalCameraAspectRatio(): Flow<Int> =
-        appPreferencesFlow.map {
-            it.internalCameraAspectRatio
-        }
-
-    override suspend fun setInterenalCameraAspectRatio(
-        @IntRange(from = -1, to = 1) aspectRatio: Int
-    ) {
-        appPreferences.updateData {
-            it.toBuilder()
-                .setInternalCameraAspectRatio(aspectRatio)
-                .build()
-        }
-    }
 
     override suspend fun clearAll() {
         appPreferences.updateData {

domain/src/main/java/com/foke/together/domain/interactor/GeneratePhotoFrameUseCaseV1.kt

@@ -3,6 +3,7 @@ package com.foke.together.domain.interactor
 import android.content.Context
 import android.graphics.Bitmap
 import android.net.Uri
+import com.foke.together.domain.interactor.entity.CameraSourceType
 import com.foke.together.domain.output.ImageRepositoryInterface
 import com.foke.together.util.AppPolicy
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -16,7 +17,7 @@ class GeneratePhotoFrameUseCaseV1 @Inject constructor(
     // 촬영한 이미지 리스트 관리
     // TODO: 추후 세션 관리와 엮어서 처리하기
     @Deprecated("Not in use")
-    fun getCapturedImageListUri(): List<Uri> = imageRepositoryInterface.getCachedImageUriList()
+    fun getCapturedImageListUri(sourceType: CameraSourceType): List<Uri> = imageRepositoryInterface.getCachedImageUriList(sourceType)
     @Deprecated("Not in use")
     suspend fun clearCapturedImageList() = imageRepositoryInterface.clearCacheDir()
 

domain/src/main/java/com/foke/together/domain/interactor/GetInternalCameraPreviewUseCase.kt → domain/src/main/java/com/foke/together/domain/interactor/InternalCameraUseCase.kt

@@ -9,26 +9,35 @@ import androidx.lifecycle.LifecycleOwner
 import com.foke.together.domain.output.InternalCameraRepositoryInterface
 import javax.inject.Inject
 
-class GetInternalCameraPreviewUseCase @Inject constructor(
+class InternalCameraUseCase @Inject constructor(
     private val internalCameraRepository: InternalCameraRepositoryInterface,
 ) {
-    suspend operator fun invoke(
+    suspend fun initial(
         context: Context,
-        previewView: PreviewView,
         lifecycleOwner: LifecycleOwner,
+        previewView : PreviewView,
         cameraSelector: CameraSelector,
-        imageAnalysis: ImageAnalysis?,
+        imageAnalyzer: ImageAnalysis.Analyzer?,
         @IntRange(from = 0, to = 2) captureMode: Int,
         @IntRange(from = 0, to = 3) flashMode: Int,
-        @IntRange(from = -1, to = 1) aspectRatio: Int
-    ) = internalCameraRepository.showCameraPreview(
+    ) = internalCameraRepository.initial(
         context = context,
         lifecycleOwner = lifecycleOwner,
-        previewView = previewView,
-        selector = cameraSelector,
-        imageAnalysis = imageAnalysis,
         captureMode = captureMode,
         flashMode = flashMode,
-        aspectRatio = aspectRatio
+        selector = cameraSelector,
+        imageAnalyzer = imageAnalyzer,
+        previewView = previewView,
+    )
+
+    suspend fun capture(
+        context: Context,
+        fileName : String,
+    ) = internalCameraRepository.capture(
+        context = context,
+        fileName = fileName
     )
+    suspend fun release(
+        context: Context
+    ) = internalCameraRepository.release(context)
 }

domain/src/main/java/com/foke/together/domain/output/AppPreferenceInterface.kt

@@ -24,14 +24,9 @@ interface AppPreferenceInterface {
     )
 
     fun getInternalCameraCaptureMode(): Flow<Int>
-    suspend fun setInterenalCameraCaptureMode(
+    suspend fun setInternalCameraCaptureMode(
         @IntRange(from = 0, to = 2) captureMode: Int
     )
 
-    fun getInternalCameraAspectRatio(): Flow<Int>
-    suspend fun setInterenalCameraAspectRatio(
-        @IntRange(from = -1, to = 1) aspectRatio: Int
-    )
-
     suspend fun clearAll()
 }

domain/src/main/java/com/foke/together/domain/output/ImageRepositoryInterface.kt

@@ -2,14 +2,16 @@ package com.foke.together.domain.output
 
 import android.graphics.Bitmap
 import android.net.Uri
+import com.foke.together.domain.interactor.entity.CameraSourceType
 import com.foke.together.domain.interactor.entity.CutFrameTypeV1
 
 interface ImageRepositoryInterface {
     fun getCutFrameType(): CutFrameTypeV1
     suspend fun setCutFrameType(type: Int)
     // 촬영한 사진들 모음
     suspend fun cachingImage(image: Bitmap, fileName: String) : Uri
-    fun getCachedImageUriList() : List<Uri>
+
+    fun getCachedImageUriList(sourceType: CameraSourceType) : List<Uri>
     suspend fun clearCacheDir()
 
     // 완성된 프레임 모음

domain/src/main/java/com/foke/together/domain/output/InternalCameraRepositoryInterface.kt

@@ -5,20 +5,22 @@ import android.graphics.Bitmap
 import androidx.annotation.IntRange
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.ImageAnalysis
-import androidx.camera.core.ImageCapture
 import androidx.camera.view.PreviewView
 import androidx.lifecycle.LifecycleOwner
 
 interface InternalCameraRepositoryInterface {
-    suspend fun capture(context: Context): Result<Bitmap>
-    suspend fun showCameraPreview(
+    suspend fun capture(
+        context: Context,
+        fileName : String,
+    )
+    suspend fun initial(
         context: Context,
         lifecycleOwner: LifecycleOwner,
-        previewView: PreviewView,
+        previewView : PreviewView,
         selector : CameraSelector,
-        imageAnalysis: ImageAnalysis?,
         @IntRange(from = 0, to = 2) captureMode: Int,
         @IntRange(from = 0, to = 3) flashMode: Int,
-        @IntRange(from = -1, to = 1) aspectRatio: Int
+        imageAnalyzer: ImageAnalysis.Analyzer?,
     )
+    suspend fun release(context: Context)
 }

external/src/main/java/com/foke/together/external/repository/ImageRepository.kt

@@ -4,11 +4,15 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.ImageDecoder
 import android.net.Uri
+import android.provider.MediaStore
+import com.foke.together.domain.interactor.GetCameraSourceTypeUseCase
+import com.foke.together.domain.interactor.entity.CameraSourceType
 import com.foke.together.domain.interactor.entity.CutFrameTypeV1
 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.map
 import javax.inject.Inject
 
 class ImageRepository @Inject constructor(
@@ -25,12 +29,53 @@ class ImageRepository @Inject constructor(
         return ImageFileUtil.cacheBitmap(context, image, fileName)
     }
 
-    override fun getCachedImageUriList(): List<Uri> {
+    override fun getCachedImageUriList(sourceType: CameraSourceType): List<Uri> {
         var uriList = mutableListOf<Uri>()
-        context.cacheDir.listFiles().forEach {
-            if(it.name.contains(AppPolicy.CAPTURED_FOUR_CUT_IMAGE_NAME)){
-                // capture로 시작하는 파일만 반환
-                uriList.add(Uri.fromFile(it))
+        when(sourceType){
+            CameraSourceType.EXTERNAL ->  {
+                context.cacheDir.listFiles().forEach {
+                    if(it.name.contains(AppPolicy.CAPTURED_FOUR_CUT_IMAGE_NAME)){
+                        // capture로 시작하는 파일만 반환
+                        uriList.add(Uri.fromFile(it))
+                    }
+                }
+            }
+            CameraSourceType.INTERNAL -> {
+                val projection = arrayOf(
+                    MediaStore.Images.Media._ID,
+                    MediaStore.Images.Media.DISPLAY_NAME,
+                    MediaStore.Images.Media.DATE_ADDED
+                )
+                val selection = "${MediaStore.Images.Media.RELATIVE_PATH} LIKE ?"
+                val selectionArgs = arrayOf("%Pictures/4cuts/backup%")
+                val sortOrder = "${MediaStore.Images.Media.DATE_ADDED} DESC"
+
+                val cursor = context.contentResolver.query(
+                    MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                    projection,
+                    selection,
+                    selectionArgs,
+                    sortOrder
+                )
+
+                cursor?.use {
+                    val idColumn = it.getColumnIndexOrThrow(MediaStore.Images.Media._ID)
+                    val latestUris = mutableListOf<Uri>()
+
+                    var count = 0
+                    while (it.moveToNext() && count < AppPolicy.CAPTURE_COUNT) {
+                        val id = it.getLong(idColumn)
+                        val contentUri = Uri.withAppendedPath(
+                            MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                            id.toString()
+                        )
+                        latestUris.add(contentUri)
+                        count++
+                    }
+
+                    latestUris.reverse()
+                    uriList.addAll(latestUris)
+                }
             }
         }
         return uriList