From 7333b060ba181fcc99b2d61c0094080eb2441798 Mon Sep 17 00:00:00 2001 From: gaeun Date: Fri, 21 Jul 2023 09:53:55 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[FEAT/#67]=20projectId=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=9D=BC=20popUp=EC=B0=BD=20content=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../puzzling/puzzlingaos/presentation/home/HomeFragment.kt | 4 +++- .../puzzlingaos/presentation/home/HomeViewModel.kt | 7 ++++--- .../puzzlingaos/presentation/mypage/MyPageFragment.kt | 4 +++- .../presentation/mypage/MyRetrospectViewModel.kt | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeFragment.kt b/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeFragment.kt index 0905bf48..319effc8 100644 --- a/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeFragment.kt +++ b/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeFragment.kt @@ -36,7 +36,9 @@ class HomeFragment : } private fun getPopupContent() { - viewModel.getProjectWeekCycle() + viewModel.selectedProjectId.observe(this) { + viewModel.getProjectWeekCycle(it) + } viewModel.retroWeek.observe(this) { val reviewCycleText = "매주 ${it?.projectReviewCycle} \n 회고를 작성해주세요" diff --git a/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt b/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt index 79c17e06..9d8a73c3 100644 --- a/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt +++ b/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt @@ -11,6 +11,7 @@ import com.puzzling.puzzlingaos.domain.entity.Project import com.puzzling.puzzlingaos.domain.repository.MyBoardRepository import com.puzzling.puzzlingaos.domain.repository.ProjectRepository import com.puzzling.puzzlingaos.util.UserInfo +import com.puzzling.puzzlingaos.util.UserInfo.GET_PROJECT_ID import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject @@ -51,7 +52,7 @@ class HomeViewModel @Inject constructor( val selectedProjectName: LiveData get() = _selectedProjectName - private val _selectedProjectId = MutableLiveData() + private val _selectedProjectId = MutableLiveData(GET_PROJECT_ID) val selectedProjectId: LiveData get() = _selectedProjectId @@ -104,9 +105,9 @@ class HomeViewModel @Inject constructor( return selectedProject?.projectId } - fun getProjectWeekCycle() = viewModelScope.launch { + fun getProjectWeekCycle(projectId: Int) = viewModelScope.launch { kotlin.runCatching { - projectRepository.getProjectWeekCycle(UserInfo.GET_PROJECT_ID) + projectRepository.getProjectWeekCycle(projectId) }.onSuccess { response -> _retroWeek.value = response.data Log.d("회고 주기", "$response") diff --git a/app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyPageFragment.kt index 5baeb345..de22f998 100644 --- a/app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyPageFragment.kt +++ b/app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyPageFragment.kt @@ -44,7 +44,9 @@ class MyPageFragment : BaseFragment(R.layout.fragment_my_ super.onViewCreated(view, savedInstanceState) viewModel = ViewModelProvider(requireActivity())[MyRetrospectViewModel::class.java] viewModel.getMyProjectList() - viewModel.getProjectWeekCycle() + homeViewModel.selectedProjectId.observe(this) { + viewModel.getProjectWeekCycle(it) + } initAdapter() showPopupMessage() diff --git a/app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyRetrospectViewModel.kt b/app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyRetrospectViewModel.kt index 05a8e8cf..e5c32fe5 100644 --- a/app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyRetrospectViewModel.kt +++ b/app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyRetrospectViewModel.kt @@ -68,9 +68,9 @@ class MyRetrospectViewModel @Inject constructor( } } - fun getProjectWeekCycle() = viewModelScope.launch { + fun getProjectWeekCycle(projectId: Int) = viewModelScope.launch { kotlin.runCatching { - projectRepository.getProjectWeekCycle(GET_PROJECT_ID) + projectRepository.getProjectWeekCycle(projectId) }.onSuccess { response -> _retroWeek.value = response.data Log.d("회고 주기", "$response") From 27e3ee6c875cb5bebba2f811827b40d88d9ed368 Mon Sep 17 00:00:00 2001 From: gaeun Date: Fri, 21 Jul 2023 18:07:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[UI]=20=ED=9A=8C=EA=B3=A0=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20=EB=B7=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/activity_detail_retro.xml | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/layout/activity_detail_retro.xml b/app/src/main/res/layout/activity_detail_retro.xml index df6c2c22..648594d3 100644 --- a/app/src/main/res/layout/activity_detail_retro.xml +++ b/app/src/main/res/layout/activity_detail_retro.xml @@ -26,21 +26,22 @@ android:id="@+id/tv_detailRetro_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="10dp" android:layout_gravity="center" + android:layout_marginTop="10dp" android:gravity="center" android:text="프로젝트1" android:textAppearance="@style/Kor.Heading4" tools:ignore="NotSibling" /> + + android:layout_marginTop="10dp" + android:layout_marginEnd="8dp" + android:background="@color/transparent" + android:src="@drawable/ic_cancel" /> @@ -49,12 +50,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" - android:layout_marginStart="23dp" android:layout_marginTop="12dp" android:text="2023년 7월" android:textAppearance="@style/Kor.Heading2" android:textColor="@color/black_000" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintBottom_toTopOf="@id/tl_detailRetro_week" + app:layout_constraintStart_toStartOf="@id/tl_detailRetro_week" app:layout_constraintTop_toBottomOf="@id/tb_detailRetro_main" /> + app:tabSelectedTextColor="@color/white_000" + app:tabTextAppearance="@style/Kor.Body2.Bold" + app:tabTextColor="@color/gray_400"> @@ -161,7 +162,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tl_detailRetro_date"/> + app:layout_constraintTop_toBottomOf="@id/tl_detailRetro_date" /> From 9f182ef6ff5af03411c1dd65057b5614c66c8836 Mon Sep 17 00:00:00 2001 From: gaeun Date: Fri, 21 Jul 2023 18:10:00 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=20default=20value=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt b/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt index 9d8a73c3..1f0493fc 100644 --- a/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt +++ b/app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt @@ -48,7 +48,7 @@ class HomeViewModel @Inject constructor( val isProjectNameSelected: LiveData get() = _isProjectNameSelected - private val _selectedProjectName = MutableLiveData("PUZZLING") + private val _selectedProjectName = MutableLiveData("찌릿") val selectedProjectName: LiveData get() = _selectedProjectName