[Feature/qr] QR코드 인식 및 사진 불러오기 기능 작업 #314
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package com.teampophory.pophory.feature.home.add | ||
|
|
||
| import android.app.Activity.RESULT_CANCELED | ||
| import android.app.Activity.RESULT_OK | ||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.activity.result.ActivityResultLauncher | ||
| import androidx.activity.result.PickVisualMediaRequest | ||
| import androidx.activity.result.contract.ActivityResultContracts | ||
| import androidx.fragment.app.activityViewModels | ||
| import com.google.android.material.bottomsheet.BottomSheetDialogFragment | ||
| import com.teampophory.pophory.databinding.BottomSheetHomeAddPhotoBinding | ||
| import com.teampophory.pophory.feature.home.HomeViewModel | ||
| import com.teampophory.pophory.feature.home.photo.AddPhotoActivity | ||
| import com.teampophory.pophory.feature.qr.QRActivity | ||
|
|
||
| class AddPhotoBottomSheet : BottomSheetDialogFragment() { | ||
|
|
||
| private var _binding: BottomSheetHomeAddPhotoBinding? = null | ||
| private val binding get() = _binding!! | ||
|
|
||
| private val viewModel by activityViewModels<HomeViewModel>() | ||
| private lateinit var imagePicker: ActivityResultLauncher<PickVisualMediaRequest> | ||
| private lateinit var addPhotoResultLauncher: ActivityResultLauncher<Intent> | ||
| private lateinit var qrActivityResultLauncher: ActivityResultLauncher<Intent> | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View { | ||
| _binding = BottomSheetHomeAddPhotoBinding.inflate(inflater, container, false) | ||
| return binding.root | ||
| } | ||
|
|
||
| override fun onAttach(context: Context) { | ||
| super.onAttach(context) | ||
|
|
||
| imagePicker = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri -> | ||
| val currentAlbumPosition = viewModel.homeState.value.currentAlbumPosition | ||
| val albumItem = viewModel.homeState.value.currentAlbums?.getOrNull(currentAlbumPosition) | ||
| if (uri != null && albumItem != null) { | ||
| val intent = AddPhotoActivity.getIntent(context, uri.toString(), albumItem) | ||
| addPhotoResultLauncher.launch(intent) | ||
|
Comment on lines
+40
to
+48
There was a problem hiding this comment.
|
||
| } | ||
| } | ||
|
Comment on lines
+46
to
+50
There was a problem hiding this comment. 이렇게 구현되면 사진 추가 화면에서 제출 안하고 바로 뒤로가기 했을때 이 BottomSheet 그대로 보이지 않나? There was a problem hiding this comment. 맞습니다 백버튼 누르면 RESULT_CANCELED을 발생시키고 dismiss시키는 방향으로 수정하겠습니다! |
||
|
|
||
| qrActivityResultLauncher = | ||
| registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { | ||
| if (it.resultCode == RESULT_OK) { | ||
| val uriString = it.data?.getStringExtra("downloaded_image_uri") | ||
| val currentAlbumPosition = viewModel.homeState.value.currentAlbumPosition | ||
| val albumItem = | ||
| viewModel.homeState.value.currentAlbums?.getOrNull(currentAlbumPosition) | ||
| if (uriString != null && albumItem != null) { | ||
| val intent = AddPhotoActivity.getIntent(context, uriString, albumItem) | ||
| addPhotoResultLauncher.launch(intent) | ||
| } | ||
| } | ||
| if (it.resultCode == RESULT_CANCELED) { | ||
| dismiss() | ||
| } | ||
| } | ||
|
|
||
| addPhotoResultLauncher = | ||
| registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { | ||
| if (it.resultCode == RESULT_OK) { | ||
| viewModel.eventAlbumCountUpdate() | ||
| dismiss() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
| initListMenuViews() | ||
| } | ||
|
|
||
| private fun initListMenuViews() { | ||
| with(binding) { | ||
| layoutQr.setOnClickListener { | ||
| val intent = Intent(context, QRActivity::class.java) | ||
| qrActivityResultLauncher.launch(intent) | ||
| } | ||
| layoutGallery.setOnClickListener { | ||
| imagePicker.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)) | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
| override fun onDestroyView() { | ||
| _binding = null | ||
| super.onDestroyView() | ||
| } | ||
|
|
||
| companion object { | ||
| val TAG: String = AddPhotoBottomSheet::class.java.simpleName | ||
|
There was a problem hiding this comment. 이게 const를 붙이면 뒤의 값이 constant하지 않다고 오류가 나옵니다! |
||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,70 @@ | ||||||
| package com.teampophory.pophory.feature.qr | ||||||
|
|
||||||
| import android.app.DownloadManager | ||||||
| import android.content.BroadcastReceiver | ||||||
| import android.content.Context | ||||||
| import android.content.Intent | ||||||
| import android.content.IntentFilter | ||||||
| import android.net.Uri | ||||||
| import android.os.Environment | ||||||
| import android.webkit.CookieManager | ||||||
| import android.webkit.URLUtil | ||||||
|
|
||||||
| class ImageDownloader() { | ||||||
| fun downloadImageFromUrl(context: Context, url: String, callback: (Uri?) -> Unit) { | ||||||
| val request = createDownloadRequest(context, url) | ||||||
| val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager | ||||||
|
There was a problem hiding this comment.
Suggested change
이렇게 하셔도 됩니다. |
||||||
| val downloadID = downloadManager.enqueue(request) | ||||||
| setupDownloadCompletionReceiver(context, downloadID, callback) | ||||||
| } | ||||||
|
|
||||||
| private fun createDownloadRequest(context: Context, url: String): DownloadManager.Request { | ||||||
| return DownloadManager.Request(Uri.parse(url)).apply { | ||||||
| setMimeType("image/jpeg") | ||||||
| val cookies = CookieManager.getInstance().getCookie(url) | ||||||
| addRequestHeader("cookie", cookies) | ||||||
| setDescription("Downloading image...") | ||||||
| setTitle(URLUtil.guessFileName(url, null, "image/jpeg")) | ||||||
| allowScanningByMediaScanner() | ||||||
| setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) | ||||||
| setDestinationInExternalPublicDir( | ||||||
| Environment.DIRECTORY_DOWNLOADS, | ||||||
| URLUtil.guessFileName(url, null, "image/jpeg") | ||||||
| ) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private fun setupDownloadCompletionReceiver( | ||||||
| context: Context, | ||||||
| downloadID: Long, | ||||||
| callback: (Uri?) -> Unit | ||||||
| ) { | ||||||
| val receiver = object : BroadcastReceiver() { | ||||||
|
There was a problem hiding this comment. Receiver 다른 곳에다가 만들자. 함수 하나가 가지고 있는 역할 때문에 클래스가 가지고 있는 역할이 너무 많아지게 되는 것 같아 |
||||||
| override fun onReceive(context: Context?, intent: Intent?) { | ||||||
| val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) | ||||||
| if (downloadID == id) { | ||||||
| val downloadManager = | ||||||
| context?.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager | ||||||
| val query = DownloadManager.Query().setFilterById(downloadID) | ||||||
| val cursor = downloadManager.query(query) | ||||||
| if (cursor.moveToFirst()) { | ||||||
| val columnIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS) | ||||||
| if (DownloadManager.STATUS_SUCCESSFUL == cursor.getInt(columnIndex)) { | ||||||
| val uriString = | ||||||
| cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)) | ||||||
| cursor.close() | ||||||
| uriString?.let { | ||||||
| callback(Uri.parse(it)) | ||||||
| return | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| cursor.close() | ||||||
|
There was a problem hiding this comment. downloadManager.query(query).use {
// safe usage
}query가 closable이어서 이런식으로 활용가능 할 것 같음. 이게 좀 더 안전하게 closable 객체 메모리 할당 해제할 수 있으니까 참고해보면 될 것 같습니다. |
||||||
| callback(null) | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| context.registerReceiver(receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)) | ||||||
| } | ||||||
| } | ||||||
|
There was a problem hiding this comment. unRegisterReceiver 는 어디서 하고있는지 확인해주셔야할 것 같아요 There was a problem hiding this comment. unRegisterReceiver가 없습니다 추가하겠습니다! |
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이거 삭제!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
삭제!!