Skip to content

Commit

Permalink
[MERGE] #338 -> develop
Browse files Browse the repository at this point in the history
[ADD/#338] ์— ํ”Œ๋ฆฌํŠœ๋“œ ์ด๋ฒคํŠธ ์ถ”๊ฐ€
  • Loading branch information
leeeyubin authored Feb 25, 2025
2 parents 77ca8ba + b77aed7 commit b8209cd
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fun StartFilteringRoute(
onLaterClick()
amplitudeTracker.track(
type = EventType.CLICK,
name = "skip_plan"
name = "onboarding_pass"
)
},
buttonState = state.isButtonVisible,
Expand Down
14 changes: 5 additions & 9 deletions feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ fun HomeScreen(
amplitudeTracker.track(
type = EventType.CLICK,
name = when (sortBy) {
0 -> "filtered_deadline"
1 -> "filtered_short_term"
2 -> "filtered_long_term"
3 -> "filtered_scraps"
else -> "filtered_hits"
0 -> "in_order_of_deadline"
1 -> "in_order_of_short_term"
2 -> "in_order_of_long_term"
3 -> "in_order_of_scraps"
else -> "in_order_of_hits"
}
)
updateSortBy(sortBy)
Expand All @@ -197,10 +197,6 @@ fun HomeScreen(
onDismiss = { changeFilteringSheetState = false },
defaultFilteringInfo = homeFilteringInfo,
onChangeButtonClick = { grade, workingPeriod, year, month, jobType ->
amplitudeTracker.track(
type = EventType.CLICK,
name = "home_filtering_save"
)
viewModel.putFilteringInfo(grade, workingPeriod, year, month, jobType)
changeFilteringSheetState = false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fun HomeFilteringScreen(
.noRippleClickable {
amplitudeTracker.track(
type = EventType.CLICK,
name = "home_filtering"
name = "filtering"
)
onChangeFilterClick()
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.terning.core.analytics.EventType
import com.terning.core.analytics.LocalTracker
import com.terning.core.designsystem.component.bottomsheet.TerningBasicBottomSheet
import com.terning.core.designsystem.component.button.RoundButton
import com.terning.core.designsystem.extension.noRippleClickable
Expand Down Expand Up @@ -76,6 +78,8 @@ internal fun HomeFilteringBottomSheet(
)
}

val amplitudeTracker = LocalTracker.current

GetPagerHeight(
onHeightMeasured = {
pageHeight = it
Expand Down Expand Up @@ -194,6 +198,18 @@ internal fun HomeFilteringBottomSheet(
startMonth,
jobType
)
amplitudeTracker.track(
type = EventType.CLICK,
name = "home_filtering_save",
properties = mapOf(
"jobType" to jobType,
"grade" to grade,
"workingPeriod" to workingPeriod,
"startYear" to startYear,
"startMonth" to startMonth,
"planSaveAll" to isCheckBoxChecked
)
)
}
},
isEnabled = checkButtonEnable(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ fun SearchRoute(
navigateToSearchProcess = {
amplitudeTracker.track(
type = EventType.CLICK,
name = "quest_search"
name = "search_search"
)
navigateToSearchProcess()
},
navigateToIntern = navigateToIntern,
onAdvertisementClick = { pageIndex ->
amplitudeTracker.track(
type = EventType.CLICK,
name = "quest_banner"
name = "search_banner"
)
CustomTabsIntent.Builder().build()
.launchUrl(context, bannerList[pageIndex].url.toUri())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ fun SearchProcessScreen(
onScrapButtonClicked = {
amplitudeTracker.track(
type = EventType.CLICK,
name = "quest_scrap"
name = "search_scrap"
)
with(searchResultList.itemSnapshotList.items[index]) {
onScrapButtonClicked(this)
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
org.gradle.vfs.watch=false
org.gradle.configuration-cache=true
org.gradle.vfs.watch=false
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
compileSdk = "35"
minSdk = "28"
targetSdk = "35"
versionName = "1.2.1"
versionCode = "102010"
versionName = "1.2.2"
versionCode = "102020"
kotlinCompilerExtensionVersion = "1.5.2"
jvmTarget = "1.8"

Expand Down

0 comments on commit b8209cd

Please sign in to comment.