From 08327e086c7d77d8e2d34a7a0e1ca4e1016d4904 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Tue, 17 Sep 2024 12:08:36 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[feat]=20#261=20=EB=82=B4=EA=B0=80=20?= =?UTF-8?q?=EC=97=B4=EB=9E=8C=ED=95=9C=20=EC=BD=94=EC=8A=A4=20=EB=B7=B0=20?= =?UTF-8?q?=EC=95=B0=ED=94=8C=EB=A6=AC=ED=8A=9C=EB=93=9C=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=9D=84=20=EC=9C=84=ED=95=9C=20Constraints=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/dateroad/presentation/util/Constraints.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt b/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt index 666c9bd3..e53a3ebb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt @@ -59,3 +59,8 @@ object Pattern { private const val NICKNAME_PATTERN = "^[ㄱ-ㅎ가-힣a-zA-Z0-9]*$" val NICKNAME_REGEX = Regex(NICKNAME_PATTERN) } + +object MyCourseAmplitude { + const val VIEW_PURCHASED_COURSE = "view_purchased_course" + const val CLICK_PURCHASED_BACK = "click_purchased_back" +} \ No newline at end of file From 9aa95017111a1e35bfd195d9d5e2b70dff55fde3 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Tue, 17 Sep 2024 12:16:30 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[feat]=20#261=20=EB=82=B4=EA=B0=80=20?= =?UTF-8?q?=EC=97=B4=EB=9E=8C=ED=95=9C=20=EC=BD=94=EC=8A=A4=20=EB=B7=B0=20?= =?UTF-8?q?=EC=95=B0=ED=94=8C=EB=A6=AC=ED=8A=9C=EB=93=9C=20=ED=8A=B8?= =?UTF-8?q?=EB=9E=98=ED=82=B9=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=8B=AC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/mycourse/MyCourseScreen.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt index a4e86376..7dd83276 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt @@ -29,6 +29,9 @@ import org.sopt.dateroad.presentation.ui.component.view.DateRoadEmptyView import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.dateroad.presentation.util.MyCourseAmplitude.CLICK_PURCHASED_BACK +import org.sopt.dateroad.presentation.util.MyCourseAmplitude.VIEW_PURCHASED_COURSE +import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils import org.sopt.dateroad.presentation.util.view.LoadState import org.sopt.dateroad.ui.theme.DATEROADTheme import org.sopt.dateroad.ui.theme.DateRoadTheme @@ -52,7 +55,10 @@ fun MyCourseRoute( when (myCourseType) { MyCourseType.ENROLL -> viewModel.fetchMyCourseEnroll() - MyCourseType.READ -> viewModel.fetchMyCourseRead() + MyCourseType.READ -> { + viewModel.fetchMyCourseRead() + AmplitudeUtils.trackEvent(eventName = VIEW_PURCHASED_COURSE) + } } } @@ -76,7 +82,10 @@ fun MyCourseRoute( MyCourseScreen( padding = padding, myCourseUiState = uiState, - onIconClick = popBackStack, + onIconClick = { + popBackStack() + AmplitudeUtils.trackEvent(CLICK_PURCHASED_BACK) + }, navigateToEnroll = { courseId -> viewModel.setSideEffect(MyCourseContract.MyCourseSideEffect.NavigateToEnroll(courseId = courseId)) }, navigateToCourseDetail = { courseId -> viewModel.setSideEffect(MyCourseContract.MyCourseSideEffect.NavigateToCourseDetail(courseId = courseId)) } ) From c24f6a125a0a2bbcfd30325f9ee597468e97b169 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Tue, 17 Sep 2024 12:16:42 +0900 Subject: [PATCH 3/4] [feat] #261 ktlintFormat --- .../java/org/sopt/dateroad/presentation/util/Constraints.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt b/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt index e53a3ebb..685bfa86 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt @@ -63,4 +63,4 @@ object Pattern { object MyCourseAmplitude { const val VIEW_PURCHASED_COURSE = "view_purchased_course" const val CLICK_PURCHASED_BACK = "click_purchased_back" -} \ No newline at end of file +} From e7fcf4962dd4865118a2251ad1d902113306b14d Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Tue, 17 Sep 2024 23:48:53 +0900 Subject: [PATCH 4/4] [chore] #261 ktlintFormat --- .../sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt index 397ef710..c17f294d 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt @@ -29,9 +29,9 @@ import org.sopt.dateroad.presentation.ui.component.view.DateRoadEmptyView import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.util.ViewPath.MY_COURSE_READ import org.sopt.dateroad.presentation.util.MyCourseAmplitude.CLICK_PURCHASED_BACK import org.sopt.dateroad.presentation.util.MyCourseAmplitude.VIEW_PURCHASED_COURSE +import org.sopt.dateroad.presentation.util.ViewPath.MY_COURSE_READ import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils import org.sopt.dateroad.presentation.util.view.LoadState import org.sopt.dateroad.ui.theme.DATEROADTheme