-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #201 from TeamPINGLE/feat-my-group
- Loading branch information
Showing
26 changed files
with
1,184 additions
and
64 deletions.
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
33 changes: 33 additions & 0 deletions
33
app/src/main/java/org/sopt/pingle/data/model/remote/response/ResponseMyGroupDto.kt
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,33 @@ | ||
| package org.sopt.pingle.data.model.remote.response | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
| import org.sopt.pingle.domain.model.MyGroupEntity | ||
|
|
||
| @Serializable | ||
| data class ResponseMyGroupDto( | ||
| @SerialName("id") | ||
| val id: Int, | ||
| @SerialName("keyword") | ||
| val keyword: String, | ||
| @SerialName("name") | ||
| val name: String, | ||
| @SerialName("meetingCount") | ||
| val meetingCount: Int, | ||
| @SerialName("participantCount") | ||
| val participantCount: Int, | ||
| @SerialName("isOwner") | ||
| val isOwner: Boolean, | ||
| @SerialName("code") | ||
| val code: String | ||
| ) { | ||
| fun toResponseMyGroupEntity() = MyGroupEntity( | ||
| id = id, | ||
| keyword = keyword, | ||
| name = name, | ||
| meetingCount = meetingCount.toString(), | ||
| participantCount = participantCount.toString(), | ||
| isOwner = isOwner, | ||
| code = code | ||
| ) | ||
| } |
11 changes: 11 additions & 0 deletions
11
app/src/main/java/org/sopt/pingle/domain/model/MyGroupEntity.kt
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,11 @@ | ||
| package org.sopt.pingle.domain.model | ||
|
|
||
| data class MyGroupEntity( | ||
| var id: Int, | ||
| val keyword: String, | ||
| val name: String, | ||
| val meetingCount: String, | ||
| val participantCount: String, | ||
| val isOwner: Boolean, | ||
| val code: String | ||
| ) |
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
129 changes: 129 additions & 0 deletions
129
app/src/main/java/org/sopt/pingle/presentation/ui/mygroup/MyGroupActivity.kt
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 |
|---|---|---|
| @@ -1,12 +1,141 @@ | ||
| package org.sopt.pingle.presentation.ui.mygroup | ||
|
|
||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import android.view.View | ||
| import androidx.activity.viewModels | ||
| import androidx.lifecycle.flowWithLifecycle | ||
| import androidx.lifecycle.lifecycleScope | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import kotlinx.coroutines.flow.launchIn | ||
| import kotlinx.coroutines.flow.onEach | ||
| import org.sopt.pingle.R | ||
| import org.sopt.pingle.databinding.ActivityMyGroupBinding | ||
| import org.sopt.pingle.domain.model.MyGroupEntity | ||
| import org.sopt.pingle.presentation.type.SnackbarType | ||
| import org.sopt.pingle.presentation.ui.onboarding.OnBoardingActivity | ||
| import org.sopt.pingle.util.base.BindingActivity | ||
| import org.sopt.pingle.util.component.PingleSnackbar | ||
| import org.sopt.pingle.util.context.PINGLE_PLAY_STORE_LINK | ||
| import org.sopt.pingle.util.context.PINGLE_SHARE_CODE | ||
| import org.sopt.pingle.util.context.copyGroupCode | ||
| import org.sopt.pingle.util.context.sharePingle | ||
| import org.sopt.pingle.util.context.stringOf | ||
| import timber.log.Timber | ||
|
|
||
| @AndroidEntryPoint | ||
| class MyGroupActivity : BindingActivity<ActivityMyGroupBinding>(R.layout.activity_my_group) { | ||
|
|
||
| private val viewModel by viewModels<MyGroupViewModel>() | ||
| private lateinit var adapter: MyGroupAdapter | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| binding.myGroupviewModel = viewModel | ||
|
|
||
| initLayout() | ||
| addListeners() | ||
| collectData() | ||
| } | ||
|
|
||
| override fun onDestroy() { | ||
| binding.rvMyGroupSelected.adapter = null | ||
| super.onDestroy() | ||
| } | ||
|
|
||
| private fun initLayout() { | ||
| viewModel.getGroupList() | ||
| binding.toolbarMyGroup.text = stringOf(R.string.my_group_title) | ||
|
|
||
| runCatching { | ||
| adapter = MyGroupAdapter(this@MyGroupActivity::showChangeGroupModal) | ||
| binding.rvMyGroupSelected.adapter = adapter | ||
| adapter.submitList(viewModel.filteredGroupList.value) | ||
| }.onFailure { throwable -> Timber.e(throwable.message) } | ||
| } | ||
|
|
||
| private fun addListeners() { | ||
| with(binding) { | ||
| toolbarMyGroup.ivAllTopbarArrowWithTitleArrowLeft.setOnClickListener { finish() } | ||
| tvMyGroupMoveSelectedGroup.setOnClickListener { navigateToNewGroupInfo() } | ||
| ivMyGroupSelectedMenu.setOnClickListener { showMyGroupMenu() } | ||
| root.setOnClickListener { layoutMyGroupSelectedMenu.visibility = View.INVISIBLE } | ||
| layoutMyGroupSelectedMenuCopy.setOnClickListener { copyGroupCode() } | ||
| layoutMyGroupSelectedMenuShare.setOnClickListener { shareGroupCode() } | ||
| } | ||
| } | ||
|
|
||
| private fun collectData() { | ||
| viewModel.filteredGroupList.flowWithLifecycle(lifecycle).onEach { filteredList -> | ||
| adapter.submitList(filteredList) | ||
| }.launchIn(lifecycleScope) | ||
|
|
||
| viewModel.selectedMyGroup.flowWithLifecycle(lifecycle).onEach { selectedMyGroup -> | ||
| binding.ivMyGroupSelectedOwner.visibility = if (selectedMyGroup?.isOwner == true) View.VISIBLE else View.INVISIBLE | ||
| }.launchIn(lifecycleScope) | ||
| } | ||
|
|
||
| private fun showMyGroupMenu() { | ||
| with(binding) { | ||
| if (layoutMyGroupSelectedMenu.visibility == View.VISIBLE) { | ||
| layoutMyGroupSelectedMenu.visibility = View.INVISIBLE | ||
| } else { | ||
| layoutMyGroupSelectedMenu.visibility = View.VISIBLE | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun showChangeGroupModal(clickedEntity: MyGroupEntity) { | ||
| binding.layoutMyGroupSelectedMenu.visibility = View.INVISIBLE | ||
| MyGroupModalDialogFragment( | ||
| title = getString( | ||
| R.string.my_group_modal_move_question, | ||
| clickedEntity.name | ||
| ), | ||
| buttonText = stringOf(R.string.my_group_modal_change), | ||
| textButtonText = stringOf(R.string.my_group_modal_back), | ||
| clickBtn = { chageToNewGroup(clickedEntity) }, | ||
| clickTextBtn = { } | ||
| ).show(supportFragmentManager, CHANGE_MODAL) | ||
| } | ||
|
|
||
| private fun chageToNewGroup(clickedEntity: MyGroupEntity) { | ||
| viewModel.changeGroupList(clickedEntity) | ||
|
|
||
| PingleSnackbar.makeSnackbar( | ||
| view = binding.root, | ||
| message = stringOf(R.string.my_group_snack_bar_chage_group_complete), | ||
| bottomMarin = SNACKBAR_BOTTOM_MARGIN, | ||
| snackbarType = SnackbarType.GUIDE | ||
| ) | ||
| } | ||
|
|
||
| private fun copyGroupCode() { | ||
| binding.layoutMyGroupSelectedMenu.visibility = View.INVISIBLE | ||
| copyGroupCode(viewModel.getGroupCode()) | ||
| PingleSnackbar.makeSnackbar( | ||
| view = binding.root, | ||
| message = stringOf(R.string.my_group_snack_bar_code_copy_complete), | ||
| bottomMarin = SNACKBAR_BOTTOM_MARGIN, | ||
| snackbarType = SnackbarType.GUIDE | ||
| ) | ||
| } | ||
|
|
||
| private fun shareGroupCode() { | ||
| // TODO 콘텐츠 내용 알려주면 ContextExt와 함께 수정 | ||
| binding.layoutMyGroupSelectedMenu.visibility = View.INVISIBLE | ||
| this.sharePingle(getString(R.string.my_group_share_pingle, viewModel.getGroupName(), PINGLE_SHARE_CODE, viewModel.getGroupCode(), PINGLE_PLAY_STORE_LINK)) | ||
| } | ||
|
|
||
| private fun navigateToNewGroupInfo() { | ||
| Intent(this, OnBoardingActivity::class.java).apply { | ||
| startActivity(this) | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| private const val CHANGE_MODAL = "ChangeGroupModal" | ||
| private const val SNACKBAR_BOTTOM_MARGIN = 57 | ||
| } | ||
| } |
Oops, something went wrong.