[feat] detail_image / 뷰모델 기초 변수 생성 (#90)

TeamPhotoSurfer · Jul 22, 2022 · ee292a2 · ee292a2
1 parent 4e306ec
commit ee292a2
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 12 deletions.
diff --git a/...search-result/src/main/java/com/photosurfer/android/search_result/SearchResultActivity.kt b/...search-result/src/main/java/com/photosurfer/android/search_result/SearchResultActivity.kt
@@ -1,9 +1,8 @@
 package com.photosurfer.android.search_result
 
-import android.content.ContentValues.TAG
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.Gravity
 import android.widget.PopupMenu
 import androidx.activity.viewModels
@@ -17,6 +16,7 @@ import com.photosurfer.android.domain.entity.SerializeTagInfoList
 import com.photosurfer.android.domain.entity.TagInfo
 import com.photosurfer.android.domain.entity.ThumbnailInfo
 import com.photosurfer.android.search_result.databinding.ActivitySearchResultBinding
+import com.photosurfer.android.search_result.detailimage.DetailImageActivity
 import com.photosurfer.android.search_result.viewModel.SearchResultViewModel
 
 class SearchResultActivity :
@@ -113,10 +113,12 @@ class SearchResultActivity :
     private fun onItemClick(thumbnail: ThumbnailInfo, position: Int) {
         when (binding.currentViewType ?: TagResultViewType.DEFAULT) {
             TagResultViewType.DEFAULT -> {
-                // TODO 창환~~ 미정이뷰 Navigate 로직 넣어조
                 val thumbnailId: Int =
                     viewModel.thumbnail.value?.get(position)?.id ?: throw IllegalStateException()
-                Log.d(TAG, "onItemClick: $thumbnailId")
+                val intent = Intent(this, DetailImageActivity::class.java).apply {
+                    putExtra(PHOTO_ID, thumbnailId)
+                }
+                startActivity(intent)
             }
             TagResultViewType.SELECT -> {
                 thumbnail.isChecked = !thumbnail.isChecked
@@ -157,4 +159,8 @@ class SearchResultActivity :
             popupMenu.show()
         }
     }
-}
+
+    companion object {
+        const val PHOTO_ID = "PHOTO_ID"
+    }
+}
diff --git a/...lt/src/main/java/com/photosurfer/android/search_result/detailimage/DetailImageActivity.kt b/...lt/src/main/java/com/photosurfer/android/search_result/detailimage/DetailImageActivity.kt
@@ -2,24 +2,41 @@ package com.photosurfer.android.search_result.detailimage
 
 import android.content.Context
 import android.os.Bundle
-import android.view.ContextThemeWrapper
 import android.view.Gravity
-import android.view.MenuItem
-import android.widget.ImageView
 import android.widget.PopupMenu
-import androidx.core.content.ContentProviderCompat.requireContext
 import com.photosurfer.android.core.base.BaseActivity
 import com.photosurfer.android.search_result.R
+import com.photosurfer.android.search_result.SearchResultActivity.Companion.PHOTO_ID
 import com.photosurfer.android.search_result.databinding.ActivityDetailImageBinding
+import kotlin.properties.Delegates
 
 class DetailImageActivity :
     BaseActivity<ActivityDetailImageBinding>(R.layout.activity_detail_image) {
+
+    var photoId by Delegates.notNull<Int>()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         onClickMenu()
+        initExtraData()
+//        startImageViewer()
+    }
+
+    private fun initExtraData(){
+        photoId = intent.getIntExtra(PHOTO_ID,-1)
     }
 
+//    private fun startImageViewer() {
+//        binding.ivDetail.setOnClickListener {
+//            StfalconImageViewerUtil.initImageViewer(
+//                this,
+//                binding.ivDetail,
+//                listOf(imgUrl),
+//                0
+//            )
+//        }
+//    }
 
     private fun onClickMenu() {
         binding.btnMore.setOnClickListener {
@@ -43,6 +60,7 @@ class DetailImageActivity :
     }
 
     companion object {
+        const val START = "START"
         const val ADD = "ADD"
         const val DELETE = "DELETE"
         const val ADJUST = "ADJUST"

diff --git a/...ult/src/main/java/com/photosurfer/android/search_result/detailimage/DetailImageAdapter.kt b/...ult/src/main/java/com/photosurfer/android/search_result/detailimage/DetailImageAdapter.kt
@@ -7,12 +7,13 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.photosurfer.android.domain.entity.TagInfo
 import com.photosurfer.android.search_result.detailimage.DetailImageActivity.Companion.ADD
+import com.photosurfer.android.search_result.detailimage.DetailImageActivity.Companion.START
 import com.photosurfer.android.shared.databinding.ItemMutableChipDetailBinding
 
 class DetailImageAdapter() :
     ListAdapter<TagInfo, DetailImageAdapter.DetailImageViewHolder>(MutableChipComparator()) {
 
-    private var processState = ADD
+    private var processState = START
 
     fun updateProcessState(state: String) {
         processState = state

diff --git a/...t/src/main/java/com/photosurfer/android/search_result/detailimage/DetailImageViewModel.kt b/...t/src/main/java/com/photosurfer/android/search_result/detailimage/DetailImageViewModel.kt
@@ -10,7 +10,9 @@ import javax.inject.Inject
 @HiltViewModel
 class DetailImageViewModel @Inject constructor() : BaseViewModel(){
 
-    private val _tagInfoList = MutableLiveData<TagInfo>()
-    val tagInfoList: LiveData<TagInfo> = _tagInfoList
+    private val _tagInfoList = MutableLiveData<List<TagInfo>>()
+    val tagInfoList: LiveData<List<TagInfo>> = _tagInfoList
 
+    private val _imageUrl = MutableLiveData<String>()
+    val imageUrl: LiveData<String> = _imageUrl
 }