Feature/#102 refactor createshortgame

app/src/main/AndroidManifest.xml

@@ -86,11 +86,6 @@
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name=".presentation.shortgame.missiondetailcreate.MissionDetailCreateActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.UNIAOS.GrayStatusBar" />
         <activity
             android:name=".presentation.history.HistoryActivity"
             android:exported="false"

app/src/main/java/sopt/uni/data/entity/shortgame/MissionCategory.kt

@@ -5,20 +5,26 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MissionCategory(
-    @SerialName("description")
-    val description: String,
     @SerialName("expectedTime")
     val expectedTime: Int,
     @SerialName("id")
     val id: Int,
+    @SerialName("title")
+    val title: String,
+    @SerialName("description")
+    val description: String,
+    @SerialName("rule")
+    val rule: String,
+    @SerialName("tip")
+    val tip: String,
+    @SerialName("example")
+    val example: String,
     @SerialName("image")
     val image: String,
     @SerialName("level")
     val level: Int,
     @SerialName("missionType")
     val missionType: String,
-    @SerialName("tip")
-    val tip: String,
-    @SerialName("title")
-    val title: String,
+    @SerialName("missionTool")
+    val missionTool: String,
 )

app/src/main/java/sopt/uni/data/entity/shortgame/MissionContent.kt

@@ -9,8 +9,8 @@ data class MissionContent(
     val content: String,
     @SerialName("id")
     val id: Int,
-    @SerialName("image")
-    val image: String,
+    @SerialName("recommendTime")
+    val recommendTime: String?,
     @SerialName("missionCategory")
     val missionCategory: MissionCategory,
 )

app/src/main/java/sopt/uni/data/entity/shortgame/MissionExample.kt

@@ -9,4 +9,6 @@ data class MissionExample(
     val id: Int,
     @SerialName("content")
     val content: String,
+    @SerialName("recommend_time")
+    val recommendTime: String?
 )

app/src/main/java/sopt/uni/data/source/remote/response/ResponseShortGameResultDto.kt

@@ -9,5 +9,5 @@ data class ResponseShortGameResultDto(
     @SerialName("myRoundMission")
     val myRoundMission: RoundMission,
     @SerialName("partnerRoundMission")
-    val partnerRoundMission: RoundMission?,
+    val partnerRoundMission: RoundMission? = null,
 )

app/src/main/java/sopt/uni/presentation/shortgame/createshortgame/CreateShortGameActivity.kt

@@ -1,64 +1,31 @@
 package sopt.uni.presentation.shortgame.createshortgame
 
 import android.content.Context
-import android.content.Intent
 import android.graphics.Rect
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.inputmethod.InputMethodManager
-import android.widget.Button
 import android.widget.EditText
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
-import androidx.databinding.BindingAdapter
 import dagger.hilt.android.AndroidEntryPoint
 import sopt.uni.R
 import sopt.uni.databinding.ActivityCreateShortGameBinding
-import sopt.uni.presentation.entity.MissionIdPosition
-import sopt.uni.presentation.shortgame.createshortgame.dialog.CreateShortGameDialogFragment
-import sopt.uni.presentation.shortgame.missiondetailcreate.MissionDetailCreateActivity
-import sopt.uni.presentation.shortgame.missionrecord.MissionRecordActivity
-import sopt.uni.util.ItemDecorations
+import sopt.uni.presentation.shortgame.missiondetailcreate.MissionDetailCreateFragment
 import sopt.uni.util.binding.BindingActivity
-import sopt.uni.util.extension.parcelable
-import sopt.uni.util.extension.setOnSingleClickListener
 
 @AndroidEntryPoint
 class CreateShortGameActivity :
     BindingActivity<ActivityCreateShortGameBinding>(R.layout.activity_create_short_game) {
 
-    private val viewModel: CreateShortGameViewModel by viewModels()
-
-    private val activityLauncher =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            if (it.resultCode == RESULT_OK) {
-                val data =
-                    it.data?.parcelable<MissionIdPosition>(MissionDetailCreateActivity.MISSION_ID_POSITION) as MissionIdPosition
-                selectItem(data.id, data.position)
-            }
-        }
+    private val shortGameFragment by lazy { ShortGameFragment.newInstance() }
+    private val missionDetailCreateFragment by lazy { MissionDetailCreateFragment.newInstance() }
 
-    private val missionAdapter by lazy {
-        MissionCategoryAdapter(
-            goToMissionDetailClickListener = { missionIdPosition ->
-                val intent = Intent(this, MissionDetailCreateActivity::class.java)
-                intent.putExtra(MissionDetailCreateActivity.MISSION_ID_POSITION, missionIdPosition)
-                activityLauncher.launch(intent)
-            },
-            selectMissionClickListener = { missionIdPosition ->
-                selectItem(missionIdPosition.id, missionIdPosition.position)
-            },
-        )
-    }
+    private val viewModel: CreateShortGameViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
         binding.viewModel = viewModel
-        setViewModelObserve()
-        setAdapter()
-        setClickListener()
+        changeFragment(getString(R.string.label_short_game))
     }
 
     // 화면 클릭하여 키보드 숨기기 및 포커스 제거
@@ -79,115 +46,29 @@ class CreateShortGameActivity :
         return super.dispatchTouchEvent(event)
     }
 
-    override fun onBackPressed() {
-        exitDialog()
-    }
+    fun changeFragment(tag: String) {
+        val fragmentManager = supportFragmentManager
+        val fragment = fragmentManager.findFragmentByTag(tag) ?: when (tag) {
+            getString(R.string.label_mission_detail) -> missionDetailCreateFragment
+            getString(R.string.label_short_game) -> shortGameFragment
+            else -> null
+        } ?: return
 
-    private fun setAdapter() {
-        binding.rvMission.adapter = missionAdapter
-        binding.rvMission.addItemDecoration(ItemDecorations(0, 9, 0, 9))
-    }
+        if (fragment.isVisible) return
 
-    private fun setViewModelObserve() {
-        viewModel.missionList.observe(this) {
-            missionAdapter.submitList(it)
-        }
-        viewModel.isCreateSuccess.observe(this) {
-            if (it) {
-                MissionRecordActivity.start(
-                    this,
-                    viewModel.roundGameId.value
-                        ?: return@observe,
-                )
-                finish()
-            }
-        }
-    }
+        val transaction = fragmentManager.beginTransaction()
 
-    private fun setClickListener() {
-        binding.apply {
-            ivClose.setOnSingleClickListener {
-                exitDialog()
+        fragmentManager.fragments.filter { it.isVisible }
+            .forEach {
+                transaction.hide(it)
             }
-            btnCreate.setOnSingleClickListener {
-                createDialog()
-            }
-        }
-    }
 
-    private fun exitDialog() {
-        CreateShortGameDialogFragment().apply {
-            titleText =
-                [email protected](R.string.create_short_game_exit_dialog_title)
-            bodyText =
-                [email protected](R.string.create_short_game_exit_dialog_body)
-            confirmButtonText =
-                [email protected](R.string.create_short_game_exit_dialog_exit)
-            dismissButtonText =
-                [email protected](R.string.dialog_cancel_text)
-            confirmClickListener = {
-                finish()
-                this.dismiss()
-            }
-            dismissClickListener = {
-                this.dismiss()
-            }
-        }.show(supportFragmentManager, "")
-    }
-
-    private fun createDialog() {
-        CreateShortGameDialogFragment().apply {
-            titleText =
-                [email protected](R.string.create_short_game_create_dialog_title)
-            bodyText =
-                [email protected](R.string.create_short_game_create_dialog_body)
-            confirmButtonText =
-                [email protected](R.string.create_short_game_create_dialog_create)
-            dismissButtonText =
-                [email protected](R.string.dialog_cancel_text)
-            confirmClickListener = {
-                viewModel.createShortGame()
-                this.dismiss()
-            }
-            dismissClickListener = {
-                this.dismiss()
-            }
-        }.show(supportFragmentManager, "")
-    }
-
-    private fun selectItem(id: Int, position: Int) {
-        missionAdapter.setSelectedItem(position)
-        viewModel.setSelectedMissionId(id)
-    }
-
-    companion object {
-        private const val MAX_LENGTH = 54
-
-        @JvmStatic
-        @BindingAdapter("setContentLength")
-        fun setContentLength(view: TextView, length: Int) {
-            if (length > MAX_LENGTH) {
-                view.setTextColor(view.context.getColor(R.color.Red_500))
-            } else {
-                view.setTextColor(view.context.getColor(R.color.Gray_200))
-            }
-            view.text = "$length/$MAX_LENGTH"
+        if (fragment.isAdded) {
+            transaction.show(fragment)
+        } else {
+            transaction.add(R.id.fcv_create_short_game, fragment, tag)
         }
 
-        @JvmStatic
-        @BindingAdapter("setContentLength")
-        fun setWishContent(view: EditText, length: Int) {
-            if (length > MAX_LENGTH && view.isFocused) {
-                view.background = view.context.getDrawable(R.drawable.bg_wish_edit_text_error)
-            } else {
-                view.background = view.context.getDrawable(R.drawable.bg_wish_edit_text)
-            }
-        }
-
-        @JvmStatic
-        @BindingAdapter("setContentLength")
-        fun setButtonEnable(view: Button, length: Int) {
-            view.isEnabled = length <= MAX_LENGTH
-        }
+        transaction.commit()
     }
 }

app/src/main/java/sopt/uni/presentation/shortgame/createshortgame/CreateShortGameViewModel.kt

@@ -1,5 +1,6 @@
 package sopt.uni.presentation.shortgame.createshortgame
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.map
@@ -13,15 +14,19 @@ import javax.inject.Inject
 @HiltViewModel
 class CreateShortGameViewModel @Inject constructor(private val shortGameRepository: ShortGameRepository) :
     ViewModel() {
-    private val _selectedMissionId = MutableLiveData<Int>()
-    val selectedMissionId = _selectedMissionId
+    private val _missionId = MutableLiveData<Int>()
+    val missionId = _missionId
 
     private val _roundGameId = MutableLiveData<Int>()
     val roundGameId = _roundGameId
 
     private val _missionList = MutableLiveData<List<MissionDetail>>()
     val missionList = _missionList
 
+    val missionDetail: LiveData<MissionDetail?> = missionId.map { id ->
+        missionList.value?.find { it.id == id }
+    }
+
     val wishContent = MutableLiveData<String>("")
 
     val contentLength = wishContent.map {
@@ -39,7 +44,6 @@ class CreateShortGameViewModel @Inject constructor(private val shortGameReposito
         viewModelScope.launch {
             shortGameRepository.getMissionCategory().onSuccess {
                 _missionList.postValue(it)
-                selectedMissionId.postValue(it[0].id)
             }.onFailure {
                 // TODO: 실패시 예외처리
             }
@@ -49,7 +53,7 @@ class CreateShortGameViewModel @Inject constructor(private val shortGameReposito
     fun createShortGame() {
         viewModelScope.launch {
             shortGameRepository.createShortGame(
-                selectedMissionId.value ?: return@launch,
+                missionId.value ?: return@launch,
                 wishContent.value ?: "",
             ).onSuccess {
                 _roundGameId.value = it.roundGameId
@@ -61,6 +65,6 @@ class CreateShortGameViewModel @Inject constructor(private val shortGameReposito
     }
 
     fun setSelectedMissionId(missionId: Int) {
-        _selectedMissionId.value = missionId
+        _missionId.value = missionId
     }
 }

app/src/main/java/sopt/uni/presentation/shortgame/createshortgame/MissionCategoryAdapter.kt

@@ -5,19 +5,16 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.ListAdapter
 import sopt.uni.data.entity.shortgame.MissionDetail
 import sopt.uni.databinding.ItemMissionBinding
-import sopt.uni.presentation.entity.MissionIdPosition
 import sopt.uni.util.extension.ItemDiffCallback
 
 class MissionCategoryAdapter(
-    private val goToMissionDetailClickListener: (MissionIdPosition) -> Unit,
-    private val selectMissionClickListener: (MissionIdPosition) -> Unit,
+    private val selectMissionClickListener: (Int) -> Unit,
 ) : ListAdapter<MissionDetail, MissionViewHolder>(
     ItemDiffCallback<MissionDetail>(
         onContentsTheSame = { old, new -> old == new },
         onItemsTheSame = { old, new -> old == new },
     ),
 ) {
-    private var selectedPosition = 0
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MissionViewHolder {
         val binding =
             ItemMissionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -27,17 +24,7 @@ class MissionCategoryAdapter(
     override fun onBindViewHolder(holder: MissionViewHolder, position: Int) {
         holder.onBind(
             getItem(position),
-            position == selectedPosition,
-            position,
-            goToMissionDetailClickListener,
             selectMissionClickListener,
         )
     }
-
-    fun setSelectedItem(position: Int) {
-        val prevPosition = selectedPosition
-        selectedPosition = position
-        notifyItemChanged(prevPosition)
-        notifyItemChanged(selectedPosition)
-    }
 }