feat: 업로드 화질 저하 이슈 해결

android/app/src/main/AndroidManifest.xml

@@ -5,8 +5,12 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
 
     <application
         android:name=".NaagaApplication"

android/app/src/main/java/com/now/naaga/presentation/adventuredetail/AdventureDetailActivity.kt

@@ -15,7 +15,7 @@ import com.now.naaga.databinding.ActivityAdventureDetailBinding
 import com.now.naaga.presentation.adventuredetail.viewpager.ViewPagerAdapter
 import com.now.naaga.presentation.uimodel.model.LetterUiModel
 import com.now.naaga.util.extension.repeatOnStarted
-import com.now.naaga.util.extension.showSnackbarWithEvent
+import com.now.naaga.util.extension.showShortSnackbarWithEvent
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -66,7 +66,7 @@ class AdventureDetailActivity : AppCompatActivity(), AnalyticsDelegate by Defaul
     }
 
     private fun showReRequestSnackbar() {
-        binding.root.showSnackbarWithEvent(
+        binding.root.showShortSnackbarWithEvent(
             message = getString(R.string.snackbar_action_re_request_message),
             actionTitle = getString(R.string.snackbar_action__re_request_title),
         ) { finish() }

android/app/src/main/java/com/now/naaga/presentation/beginadventure/BeginAdventureActivity.kt

@@ -27,7 +27,7 @@ import com.now.naaga.presentation.onadventure.OnAdventureActivity
 import com.now.naaga.presentation.setting.SettingActivity
 import com.now.naaga.presentation.upload.UploadActivity
 import com.now.naaga.util.extension.openSetting
-import com.now.naaga.util.extension.showSnackbarWithEvent
+import com.now.naaga.util.extension.showShortSnackbarWithEvent
 import com.now.naaga.util.extension.showToast
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -116,7 +116,7 @@ class BeginAdventureActivity : AppCompatActivity(), AnalyticsDelegate by Default
     }
 
     private fun showPermissionSnackbar() {
-        binding.root.showSnackbarWithEvent(
+        binding.root.showShortSnackbarWithEvent(
             message = getString(R.string.snackbar_location_message),
             actionTitle = getString(R.string.snackbar_action_title),
             action = { openSetting() },

android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt

@@ -6,12 +6,12 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.location.Location
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
+import android.provider.Settings
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
@@ -20,14 +20,15 @@ import com.google.android.gms.location.LocationServices
 import com.google.android.gms.tasks.CancellationToken
 import com.google.android.gms.tasks.CancellationTokenSource
 import com.google.android.gms.tasks.OnTokenCanceledListener
+import com.google.android.material.snackbar.Snackbar
 import com.now.domain.model.Coordinate
 import com.now.naaga.R
 import com.now.naaga.data.firebase.analytics.AnalyticsDelegate
 import com.now.naaga.data.firebase.analytics.DefaultAnalyticsDelegate
 import com.now.naaga.data.firebase.analytics.UPLOAD_OPEN_CAMERA
 import com.now.naaga.data.throwable.DataThrowable
 import com.now.naaga.databinding.ActivityUploadBinding
-import com.now.naaga.presentation.upload.UploadViewModel.Companion.FILE_EMPTY
+import com.now.naaga.util.BitmapBuilder
 import com.now.naaga.util.extension.openSetting
 import com.now.naaga.util.extension.showSnackbarWithEvent
 import com.now.naaga.util.extension.showToast
@@ -40,43 +41,57 @@ import java.time.LocalDateTime
 class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalyticsDelegate() {
     private lateinit var binding: ActivityUploadBinding
     private val viewModel: UploadViewModel by viewModels()
-
-    private val cameraLauncher = registerForActivityResult(
-        ActivityResultContracts.TakePicturePreview(),
-    ) { bitmap ->
-        if (bitmap != null) {
-            setImage(bitmap)
+    private var imageUri: Uri? = null
+    private val cameraLauncher = registerForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        if (!success) return@registerForActivityResult
+        if (imageUri == null) {
+            showToast(getString(R.string.upload_image_orientation_error))
+            return@registerForActivityResult
         }
+        setImage(requireNotNull(imageUri) { "imageUri가 null입니다" })
     }
 
-    private val requestPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestMultiplePermissions(),
-    ) { permission: Map<String, Boolean> ->
+    private val storagePermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
+            val isGranted: Boolean = permissions.values.all { it }
+            if (!isGranted) {
+                showStoragePermissionSnackBar()
+                return@registerForActivityResult
+            }
+            openCamera()
+        }
 
-        val keys = permission.entries.map { it.key }
-        val isStorageRequest = storagePermissions.any { keys.contains(it) }
-        if (isStorageRequest) {
-            if (permission.entries.map { it.value }.contains(false)) {
-                showPermissionSnackbar(getString(R.string.snackbar_storage_message))
-            } else {
-                openCamera()
+    private val locationPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
+            val isGranted: Boolean = permissions.values.all { true }
+            if (!isGranted) {
+                showLocationPermissionSnackBar()
+                return@registerForActivityResult
             }
-            return@registerForActivityResult
+            setCoordinate()
         }
-        showPermissionSnackbar(getString(R.string.snackbar_location_message))
+
+    private val isStoragePermissionGranted: Boolean
+        get() = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
+            storagePermissionsBelow28.all { checkSelfPermission(it) == PackageManager.PERMISSION_GRANTED }
+        } else {
+            true
+        }
+
+    private val locationSettingLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        setCoordinate()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         binding = ActivityUploadBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         initViewModel()
         subscribe()
-        registerAnalytics(this.lifecycle)
-        setCoordinate()
         setClickListeners()
+        locationPermissionLauncher.launch(locationPermissions)
+        registerAnalytics(this.lifecycle)
     }
 
     private fun initViewModel() {
@@ -115,29 +130,88 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
         }
     }
 
+    private fun setClickListeners() {
+        binding.ivUploadCameraIcon.setOnClickListener {
+            logClickEvent(getViewEntryName(it), UPLOAD_OPEN_CAMERA)
+            openCameraWithPermission()
+        }
+        binding.ivUploadPhoto.setOnClickListener {
+            logClickEvent(getViewEntryName(it), UPLOAD_OPEN_CAMERA)
+            openCameraWithPermission()
+        }
+        binding.ivUploadBack.setOnClickListener {
+            finish()
+        }
+        binding.btnUploadSubmit.setOnClickListener {
+            if (isFormValid().not()) {
+                showToast(getString(R.string.upload_error_insufficient_info_message))
+            } else {
+                viewModel.postPlace()
+            }
+        }
+    }
+
     private fun changeVisibility(view: View, status: Int) {
         view.visibility = status
     }
 
-    private fun showPermissionSnackbar(message: String) {
+    private fun showStoragePermissionSnackBar() {
         binding.root.showSnackbarWithEvent(
-            message = message,
+            message = getString(R.string.snackbar_storage_message),
             actionTitle = getString(R.string.snackbar_action_title),
+            length = Snackbar.LENGTH_LONG,
             action = { openSetting() },
         )
     }
 
+    private fun showLocationPermissionSnackBar() {
+        binding.root.showSnackbarWithEvent(
+            message = getString(R.string.snackbar_location_message),
+            actionTitle = getString(R.string.snackbar_action_title),
+            length = Snackbar.LENGTH_INDEFINITE,
+            action = {
+                val appDetailsIntent = getSettingIntent()
+                locationSettingLauncher.launch(appDetailsIntent)
+            },
+        )
+    }
+
+    private fun getSettingIntent() = Intent(
+        Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+        Uri.parse("package:$packageName"),
+    ).addCategory(Intent.CATEGORY_DEFAULT)
+
+    private fun setImage(uri: Uri) {
+        binding.ivUploadCameraIcon.visibility = View.GONE
+        val bitmap = getBitmap(uri)
+        binding.ivUploadPhoto.setImageBitmap(bitmap)
+        val file = saveFile(bitmap)
+        viewModel.setFile(file)
+    }
+
+    private fun getBitmap(uri: Uri) = BitmapBuilder(uri, contentResolver)
+        .addScaling(RESIZE)
+        .setProperRotate()
+        .build()
+
+    private fun saveFile(bitmap: Bitmap): File {
+        val tempFile = File.createTempFile(System.currentTimeMillis().toString(), ".jpeg", cacheDir)
+        FileOutputStream(tempFile).use {
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it)
+        }
+        return tempFile
+    }
+
     private fun setCoordinate() {
-        if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-            val fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
-            fusedLocationClient.getCurrentLocation(PRIORITY_HIGH_ACCURACY, createCancellationToken())
-                .addOnSuccessListener { location ->
-                    location.let { viewModel.setCoordinate(getCoordinate(location)) }
-                }
-                .addOnFailureListener { }
-        } else {
-            requestPermissionLauncher.launch(locationPermissions)
+        if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_DENIED) {
+            showLocationPermissionSnackBar()
+            return
         }
+        val fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
+        fusedLocationClient.getCurrentLocation(PRIORITY_HIGH_ACCURACY, createCancellationToken())
+            .addOnSuccessListener { location ->
+                location.let { viewModel.setCoordinate(getCoordinate(location)) }
+            }.addOnFailureListener { }
     }
 
     private fun createCancellationToken(): CancellationToken {
@@ -163,80 +237,39 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
         return (number * 10_000).toLong().toDouble() / 10_000
     }
 
-    private fun setClickListeners() {
-        binding.ivUploadCameraIcon.setOnClickListener {
-            logClickEvent(getViewEntryName(it), UPLOAD_OPEN_CAMERA)
-            requestStoragePermission()
-        }
-        binding.ivUploadPhoto.setOnClickListener {
-            logClickEvent(getViewEntryName(it), UPLOAD_OPEN_CAMERA)
-            requestStoragePermission()
-        }
-        binding.ivUploadBack.setOnClickListener {
-            finish()
-        }
-        binding.btnUploadSubmit.setOnClickListener {
-            if (isFormValid().not()) {
-                showToast(getString(R.string.upload_error_insufficient_info_message))
-            } else {
-                viewModel.postPlace()
-            }
+    private fun openCameraWithPermission() {
+        if (!isStoragePermissionGranted) {
+            storagePermissionLauncher.launch(storagePermissionsBelow28)
+            return
         }
-    }
-
-    private fun requestStoragePermission() {
-        val permissionToRequest = storagePermissions.toMutableList()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            return openCamera()
-        }
-
-        requestPermissionLauncher.launch(permissionToRequest.toTypedArray())
+        openCamera()
     }
 
     private fun openCamera() {
-        cameraLauncher.launch(null)
-    }
-
-    private fun setImage(bitmap: Bitmap) {
-        binding.ivUploadCameraIcon.visibility = View.GONE
-        binding.ivUploadPhoto.setImageBitmap(bitmap)
-        val uri = getImageUri(bitmap) ?: Uri.EMPTY
-        val file = makeImageFile(uri)
-        viewModel.setFile(file)
-    }
-
-    private fun makeImageFile(uri: Uri): File {
-        val bitmap = contentResolver.openInputStream(uri).use {
-            BitmapFactory.decodeStream(it)
+        imageUri = createImageUri().getOrElse {
+            Snackbar.make(binding.root, getString(R.string.upload_retry), Snackbar.LENGTH_SHORT).show()
+            return
         }
-        val tempFile = File.createTempFile("image", ".jpeg", cacheDir) ?: FILE_EMPTY
-
-        FileOutputStream(tempFile).use {
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it)
-        }
-        return tempFile
+        cameraLauncher.launch(imageUri)
     }
 
-    private fun getImageUri(bitmap: Bitmap): Uri? {
-        val resolver = applicationContext.contentResolver
-        resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
-            ?.let { imageUri ->
-                val outputStream = resolver.openOutputStream(imageUri)
-                outputStream?.use { stream ->
-                    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream)
-                }
-                return imageUri
-            }
-        return null
+    private fun createImageUri(): Result<Uri> {
+        val imageUri: Uri = contentResolver.insert(
+            MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+            contentValues,
+        ) ?: return Result.failure(IllegalStateException("이미지 uri를 가져오지 못했습니다."))
+        return Result.success(imageUri)
     }
 
     private fun isFormValid(): Boolean {
         return viewModel.isFormValid()
     }
 
     companion object {
-        private val storagePermissions = arrayOf(
+        private const val PRIORITY_HIGH_ACCURACY = 100
+        private const val RESIZE = 500
+        private val storagePermissionsBelow28 = arrayOf(
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
             Manifest.permission.READ_EXTERNAL_STORAGE,
         )
 
@@ -250,8 +283,6 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
             put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
         }
 
-        const val PRIORITY_HIGH_ACCURACY = 100
-
         fun getIntent(context: Context): Intent {
             return Intent(context, UploadActivity::class.java)
         }

android/app/src/main/java/com/now/naaga/presentation/upload/UploadViewModel.kt

@@ -21,7 +21,7 @@ import javax.inject.Inject
 class UploadViewModel @Inject constructor(
     private val placeRepository: PlaceRepository,
 ) : ViewModel() {
-    private var file = FILE_EMPTY
+    private var file: File? = null
 
     val name = MutableLiveData<String>()
 
@@ -43,7 +43,7 @@ class UploadViewModel @Inject constructor(
     }
 
     fun isFormValid(): Boolean {
-        return (file != FILE_EMPTY) && (_coordinate.value != null) && (name.value != null)
+        return (file != null) && (_coordinate.value != null) && (name.value != null)
     }
 
     fun postPlace() {
@@ -55,7 +55,7 @@ class UploadViewModel @Inject constructor(
                         name = name.value.toString(),
                         description = "",
                         coordinate = coordinate,
-                        file = file,
+                        file = file!!,
                     )
                 }.onSuccess {
                     _successUpload.setValue(UploadStatus.SUCCESS)