Skip to content

Commit b8209cd

Browse files
authored
[MERGE] #338 -> develop
[ADD/#338] ์— ํ”Œ๋ฆฌํŠœ๋“œ ์ด๋ฒคํŠธ ์ถ”๊ฐ€
2 parents 77ca8ba + b77aed7 commit b8209cd

File tree

8 files changed

+29
-18
lines changed

8 files changed

+29
-18
lines changed

โ€Žfeature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.ktโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fun StartFilteringRoute(
6969
onLaterClick()
7070
amplitudeTracker.track(
7171
type = EventType.CLICK,
72-
name = "skip_plan"
72+
name = "onboarding_pass"
7373
)
7474
},
7575
buttonState = state.isButtonVisible,

โ€Žfeature/home/src/main/java/com/terning/feature/home/HomeRoute.ktโ€Ž

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@ fun HomeScreen(
180180
amplitudeTracker.track(
181181
type = EventType.CLICK,
182182
name = when (sortBy) {
183-
0 -> "filtered_deadline"
184-
1 -> "filtered_short_term"
185-
2 -> "filtered_long_term"
186-
3 -> "filtered_scraps"
187-
else -> "filtered_hits"
183+
0 -> "in_order_of_deadline"
184+
1 -> "in_order_of_short_term"
185+
2 -> "in_order_of_long_term"
186+
3 -> "in_order_of_scraps"
187+
else -> "in_order_of_hits"
188188
}
189189
)
190190
updateSortBy(sortBy)
@@ -197,10 +197,6 @@ fun HomeScreen(
197197
onDismiss = { changeFilteringSheetState = false },
198198
defaultFilteringInfo = homeFilteringInfo,
199199
onChangeButtonClick = { grade, workingPeriod, year, month, jobType ->
200-
amplitudeTracker.track(
201-
type = EventType.CLICK,
202-
name = "home_filtering_save"
203-
)
204200
viewModel.putFilteringInfo(grade, workingPeriod, year, month, jobType)
205201
changeFilteringSheetState = false
206202
}

โ€Žfeature/home/src/main/java/com/terning/feature/home/component/HomeFilteringScreen.ktโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fun HomeFilteringScreen(
3838
.noRippleClickable {
3939
amplitudeTracker.track(
4040
type = EventType.CLICK,
41-
name = "home_filtering"
41+
name = "filtering"
4242
)
4343
onChangeFilterClick()
4444
},

โ€Žfeature/home/src/main/java/com/terning/feature/home/component/bottomsheet/HomeFilteringBottomSheet.ktโ€Ž

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import androidx.compose.ui.layout.onGloballyPositioned
3030
import androidx.compose.ui.platform.LocalDensity
3131
import androidx.compose.ui.res.stringResource
3232
import androidx.compose.ui.unit.dp
33+
import com.terning.core.analytics.EventType
34+
import com.terning.core.analytics.LocalTracker
3335
import com.terning.core.designsystem.component.bottomsheet.TerningBasicBottomSheet
3436
import com.terning.core.designsystem.component.button.RoundButton
3537
import com.terning.core.designsystem.extension.noRippleClickable
@@ -76,6 +78,8 @@ internal fun HomeFilteringBottomSheet(
7678
)
7779
}
7880

81+
val amplitudeTracker = LocalTracker.current
82+
7983
GetPagerHeight(
8084
onHeightMeasured = {
8185
pageHeight = it
@@ -194,6 +198,18 @@ internal fun HomeFilteringBottomSheet(
194198
startMonth,
195199
jobType
196200
)
201+
amplitudeTracker.track(
202+
type = EventType.CLICK,
203+
name = "home_filtering_save",
204+
properties = mapOf(
205+
"jobType" to jobType,
206+
"grade" to grade,
207+
"workingPeriod" to workingPeriod,
208+
"startYear" to startYear,
209+
"startMonth" to startMonth,
210+
"planSaveAll" to isCheckBoxChecked
211+
)
212+
)
197213
}
198214
},
199215
isEnabled = checkButtonEnable(

โ€Žfeature/search/src/main/java/com/terning/feature/search/search/SearchRoute.ktโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ fun SearchRoute(
9595
navigateToSearchProcess = {
9696
amplitudeTracker.track(
9797
type = EventType.CLICK,
98-
name = "quest_search"
98+
name = "search_search"
9999
)
100100
navigateToSearchProcess()
101101
},
102102
navigateToIntern = navigateToIntern,
103103
onAdvertisementClick = { pageIndex ->
104104
amplitudeTracker.track(
105105
type = EventType.CLICK,
106-
name = "quest_banner"
106+
name = "search_banner"
107107
)
108108
CustomTabsIntent.Builder().build()
109109
.launchUrl(context, bannerList[pageIndex].url.toUri())

โ€Žfeature/search/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.ktโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ fun SearchProcessScreen(
286286
onScrapButtonClicked = {
287287
amplitudeTracker.track(
288288
type = EventType.CLICK,
289-
name = "quest_scrap"
289+
name = "search_scrap"
290290
)
291291
with(searchResultList.itemSnapshotList.items[index]) {
292292
onScrapButtonClicked(this)

โ€Žgradle.propertiesโ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ kotlin.code.style=official
2121
# resources declared in the library itself and none from the library's dependencies,
2222
# thereby reducing the size of the R class for that library
2323
android.nonTransitiveRClass=true
24-
org.gradle.vfs.watch=false
25-
org.gradle.configuration-cache=true
24+
org.gradle.vfs.watch=false

โ€Žgradle/libs.versions.tomlโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
compileSdk = "35"
33
minSdk = "28"
44
targetSdk = "35"
5-
versionName = "1.2.1"
6-
versionCode = "102010"
5+
versionName = "1.2.2"
6+
versionCode = "102020"
77
kotlinCompilerExtensionVersion = "1.5.2"
88
jvmTarget = "1.8"
99

0 commit comments

Comments
ย (0)