From bdae0b5e66982f95c3c976a5a91abe20d2fe6077 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 08:34:40 +0900 Subject: [PATCH 01/13] =?UTF-8?q?[REFACTOR/#402]=20onClick=20=EB=A6=AC?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EC=A7=80=EC=85=98=20=EC=9E=A1=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/item/ProfileWithPlusButton.kt | 18 +++++++++++++++--- .../mypage/profileedit/ProfileEditRoute.kt | 10 ++++------ .../feature/onboarding/signup/SignUpRoute.kt | 5 +---- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/component/item/ProfileWithPlusButton.kt b/core/designsystem/src/main/java/com/terning/core/designsystem/component/item/ProfileWithPlusButton.kt index a63a03782..90b658677 100644 --- a/core/designsystem/src/main/java/com/terning/core/designsystem/component/item/ProfileWithPlusButton.kt +++ b/core/designsystem/src/main/java/com/terning/core/designsystem/component/item/ProfileWithPlusButton.kt @@ -14,17 +14,24 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.terning.core.designsystem.R +import com.terning.core.designsystem.extension.noRippleClickable +import com.terning.core.designsystem.theme.TerningPointTheme import com.terning.core.designsystem.type.ProfileImage @Composable fun ProfileWithPlusButton( profileImage: String, + onClick: (Boolean) -> Unit, modifier: Modifier = Modifier, ) { val userProfile = ProfileImage.fromString(profileImage) Box( - modifier = modifier.wrapContentWidth() + modifier = modifier + .wrapContentWidth() + .noRippleClickable { + onClick(true) + } ) { Image( painterResource(id = userProfile.drawableResId), @@ -44,6 +51,11 @@ fun ProfileWithPlusButton( @Preview(showBackground = true) @Composable -fun ProfileWithPlusButtonPreview() { - ProfileWithPlusButton(profileImage = "basic") +private fun ProfileWithPlusButtonPreview() { + TerningPointTheme { + ProfileWithPlusButton( + profileImage = "basic", + onClick = {} + ) + } } \ No newline at end of file diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt index 78f09f9a7..d5f4cab7c 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt @@ -30,7 +30,6 @@ import com.terning.core.designsystem.component.item.ProfileWithPlusButton import com.terning.core.designsystem.component.textfield.NameTextField import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar import com.terning.core.designsystem.extension.addFocusCleaner -import com.terning.core.designsystem.extension.noRippleClickable import com.terning.core.designsystem.extension.toast import com.terning.core.designsystem.theme.Grey500 import com.terning.core.designsystem.theme.TerningPointTheme @@ -140,11 +139,10 @@ fun ProfileEditScreen( ) Spacer(modifier = Modifier.height(20.dp)) ProfileWithPlusButton( - modifier = Modifier - .noRippleClickable { - onProfileEditClick(true) - } - .align(Alignment.CenterHorizontally), + onClick = { + onProfileEditClick(true) + }, + modifier = Modifier.align(Alignment.CenterHorizontally), profileImage = profileEditState.profile ) Spacer(modifier = Modifier.height(48.dp)) diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt index ec154a63b..cf4ddaa1d 100644 --- a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt +++ b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt @@ -29,7 +29,6 @@ import com.terning.core.designsystem.component.button.RectangleButton import com.terning.core.designsystem.component.item.ProfileWithPlusButton import com.terning.core.designsystem.component.textfield.NameTextField import com.terning.core.designsystem.extension.addFocusCleaner -import com.terning.core.designsystem.extension.noRippleClickable import com.terning.core.designsystem.extension.toast import com.terning.core.designsystem.theme.Grey500 import com.terning.core.designsystem.theme.TerningPointTheme @@ -133,9 +132,7 @@ fun SignUpScreen( modifier = Modifier.align(Alignment.CenterHorizontally) ) { ProfileWithPlusButton( - modifier = Modifier.noRippleClickable { - onProfileEditClick(true) - }, + onClick = { onProfileEditClick(true) }, profileImage = state.profileImage ) } From ac091b72a5d184aba553477aa1ce561d372cf387 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 09:20:02 +0900 Subject: [PATCH 02/13] =?UTF-8?q?[REFACTOR/#403]=20ImmutableList=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filteringthree/component/FilteringYearMonthPicker.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/component/FilteringYearMonthPicker.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/component/FilteringYearMonthPicker.kt index 5e77b1ba9..f5503454b 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/component/FilteringYearMonthPicker.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/component/FilteringYearMonthPicker.kt @@ -38,9 +38,10 @@ import com.terning.core.designsystem.util.CalendarDefaults.END_MONTH import com.terning.core.designsystem.util.CalendarDefaults.END_YEAR import com.terning.core.designsystem.util.CalendarDefaults.START_MONTH import com.terning.core.designsystem.util.CalendarDefaults.START_YEAR +import kotlinx.collections.immutable.ImmutableList +import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map -import okhttp3.internal.toImmutableList private val years = (START_YEAR..END_YEAR).map { "${it}년" }.toImmutableList() @@ -107,7 +108,7 @@ fun FilteringYearMonthPicker( @Composable fun DatePicker( - items: List, + items: ImmutableList, modifier: Modifier = Modifier, pickerState: PickerState = rememberPickerState(), startIndex: Int = 0, From 8cb56e485ed69777c0ea876dbbf11083bc48082e Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 10:16:04 +0900 Subject: [PATCH 03/13] =?UTF-8?q?[REFACTOR/#403]=20okhttp=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/network/build.gradle.kts | 1 - gradle/libs.versions.toml | 3 --- 2 files changed, 4 deletions(-) diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index edeab16a2..6ec8253ca 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -62,5 +62,4 @@ dependencies { implementation(libs.process.phoenix) implementation(libs.bundles.retrofit) implementation(libs.bundles.okhttp) - implementation(platform(libs.okhttp.bom)) } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4343b9d2..bb0630274 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -169,8 +169,6 @@ hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-com hilt-manager = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltManager" } javax-inject = { group = "javax.inject", name = "javax.inject", version.ref = "javax-inject" } -okhttp = { group = "com.squareup.okhttp3", name = "okhttp" } -okhttp-bom = { group = "com.squareup.okhttp3", name = "okhttp-bom", version.ref = "okhttp" } okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } retrofit-kotlin-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" } @@ -229,7 +227,6 @@ retrofit = [ "retrofit2-kotlinx-serialization-converter" ] okhttp = [ - "okhttp", "okhttp-logging" ] androidx-compose-ui-test = [ From 1bd5612f1c2f8084f69e8de16164a2fdb9626029 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 10:36:32 +0900 Subject: [PATCH 04/13] =?UTF-8?q?[REFACTOR/#403]=20TerningImage=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/image/TerningImage.kt | 38 ------------------ .../com/terning/feature/home/HomeRoute.kt | 14 +++---- .../home/component/HomeUpcomingEmptyFilter.kt | 10 +++-- .../feature/intern/component/InternTitle.kt | 8 ++-- .../feature/mypage/mypage/MyPageRoute.kt | 40 ++++++++++++++++--- .../mypage/mypage/component/MyPageItem.kt | 11 +++-- .../feature/search/search/SearchRoute.kt | 10 +++-- 7 files changed, 66 insertions(+), 65 deletions(-) delete mode 100644 core/designsystem/src/main/java/com/terning/core/designsystem/component/image/TerningImage.kt diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/component/image/TerningImage.kt b/core/designsystem/src/main/java/com/terning/core/designsystem/component/image/TerningImage.kt deleted file mode 100644 index 409146036..000000000 --- a/core/designsystem/src/main/java/com/terning/core/designsystem/component/image/TerningImage.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.terning.core.designsystem.component.image - -import androidx.compose.foundation.Image -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview -import com.terning.core.designsystem.R -import com.terning.core.designsystem.theme.TerningPointTheme - -/** - * contentDescription을 사용하지 않고 Image를 편리하게 사용할 수 있는 함수입니다. - * - * @param painter 이미지 리소스 ID입니다. - * @param modifier Image의 Modifier입니다. - */ -@Composable -fun TerningImage( - painter: Int, - modifier: Modifier = Modifier -) { - Image( - painter = painterResource(id = painter), - contentDescription = stringResource(id = R.string.image_content_descriptin), - modifier = modifier - ) -} - -@Preview(showBackground = true) -@Composable -fun TerningBasicImagePreview() { - TerningPointTheme { - TerningImage( - painter = R.drawable.ic_back - ) - } -} \ No newline at end of file diff --git a/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt b/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt index 2f3472383..7179d45a3 100644 --- a/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt +++ b/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt @@ -4,6 +4,7 @@ import android.Manifest import android.os.Build import androidx.annotation.RequiresApi import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -28,6 +29,7 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -45,7 +47,6 @@ import com.terning.core.analytics.EventType import com.terning.core.analytics.LocalTracker import com.terning.core.designsystem.R.raw.paging_loading_animation import com.terning.core.designsystem.component.bottomsheet.SortingBottomSheet -import com.terning.core.designsystem.component.image.TerningImage import com.terning.core.designsystem.component.item.InternItemWithShadow import com.terning.core.designsystem.component.item.TerningLottieAnimation import com.terning.core.designsystem.extension.noRippleClickable @@ -104,8 +105,7 @@ fun HomeRoute( viewModel.updateAlarmAvailability(isGranted) viewModel.updatePermissionRequested(true) } - } - else { + } else { val isAlarmAvailable = viewModel.getAlarmAvailability() viewModel.updateAlarmAvailability(isAlarmAvailable) } @@ -289,10 +289,10 @@ fun HomeScreen( .background(White) .padding(paddingValues) ) { - TerningImage( - painter = R.drawable.ic_terning_logo_typo, - modifier = Modifier - .padding(start = 24.dp, top = 16.dp, bottom = 16.dp) + Image( + painter = painterResource(R.drawable.ic_terning_logo_typo), + modifier = Modifier.padding(start = 24.dp, top = 16.dp, bottom = 16.dp), + contentDescription = "home logo" ) LazyColumn( diff --git a/feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt b/feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt index 5565da425..2d555b5ff 100644 --- a/feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt +++ b/feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt @@ -1,5 +1,6 @@ package com.terning.feature.home.component +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -11,10 +12,10 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.terning.core.designsystem.component.image.TerningImage import com.terning.core.designsystem.extension.customShadow import com.terning.core.designsystem.theme.Grey150 import com.terning.core.designsystem.theme.Grey500 @@ -42,11 +43,12 @@ fun HomeUpcomingEmptyFilter( verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) { - TerningImage( - painter = R.drawable.ic_home_scrap_empty, + Image( + painter = painterResource(R.drawable.ic_home_scrap_empty), modifier = Modifier .padding(top = 23.dp) - .size(44.dp) + .size(44.dp), + contentDescription = "scrap empty" ) Text( text = stringResource(id = R.string.home_upcoming_no_scrap), diff --git a/feature/intern/src/main/java/com/terning/feature/intern/component/InternTitle.kt b/feature/intern/src/main/java/com/terning/feature/intern/component/InternTitle.kt index 1e52a5431..d3bb5596b 100644 --- a/feature/intern/src/main/java/com/terning/feature/intern/component/InternTitle.kt +++ b/feature/intern/src/main/java/com/terning/feature/intern/component/InternTitle.kt @@ -1,5 +1,6 @@ package com.terning.feature.intern.component +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,9 +14,9 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.terning.core.designsystem.component.image.TerningImage import com.terning.core.designsystem.theme.Black import com.terning.core.designsystem.theme.Grey100 import com.terning.core.designsystem.theme.Grey300 @@ -78,8 +79,9 @@ fun InternTitle( modifier = Modifier .fillMaxWidth() ) { - TerningImage( - painter = R.drawable.ic_view_count_14 + Image( + painter = painterResource(R.drawable.ic_view_count_14), + contentDescription = "view count" ) Text( text = stringResource(id = R.string.intern_view_count_detail, viewCount), diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt index 14a811b6e..b1d0014c2 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt @@ -10,6 +10,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.RequiresApi import androidx.browser.customtabs.CustomTabsIntent +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -35,6 +36,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -51,7 +53,6 @@ import com.terning.core.analytics.EventType import com.terning.core.analytics.LocalTracker import com.terning.core.designsystem.component.bottomsheet.MyPageLogoutBottomSheet import com.terning.core.designsystem.component.bottomsheet.MyPageQuitBottomSheet -import com.terning.core.designsystem.component.image.TerningImage import com.terning.core.designsystem.extension.noRippleClickable import com.terning.core.designsystem.extension.toast import com.terning.core.designsystem.state.UiState @@ -276,13 +277,25 @@ private fun MyPageScreen( MyPageUiModel.MyPageItem( leadingIcon = R.drawable.ic_my_page_notice, text = R.string.my_page_notice, - onItemClick = onNoticeClick + onItemClick = onNoticeClick, + trailingContent = { + Image( + painter = painterResource(R.drawable.ic_my_page_go_detail), + contentDescription = "go detail" + ) + } ), MyPageUiModel.HorizontalDivider, MyPageUiModel.MyPageItem( leadingIcon = R.drawable.ic_my_page_opinion, text = R.string.my_page_opinion, - onItemClick = onOpinionClick + onItemClick = onOpinionClick, + trailingContent = { + Image( + painter = painterResource(R.drawable.ic_my_page_go_detail), + contentDescription = "go detail" + ) + } ) ) val serviceInfoItems = persistentListOf( @@ -290,13 +303,25 @@ private fun MyPageScreen( MyPageUiModel.MyPageItem( leadingIcon = R.drawable.ic_my_page_service, text = R.string.my_page_service, - onItemClick = onServiceClick + onItemClick = onServiceClick, + trailingContent = { + Image( + painter = painterResource(R.drawable.ic_my_page_go_detail), + contentDescription = "go detail" + ) + } ), MyPageUiModel.HorizontalDivider, MyPageUiModel.MyPageItem( leadingIcon = R.drawable.ic_my_page_personal, text = R.string.my_page_personal, - onItemClick = onPersonalClick + onItemClick = onPersonalClick, + trailingContent = { + Image( + painter = painterResource(R.drawable.ic_my_page_go_detail), + contentDescription = "" + ) + } ), MyPageUiModel.HorizontalDivider, MyPageUiModel.MyPageItem( @@ -416,7 +441,10 @@ private fun UserProfile( style = TerningTheme.typography.button3, color = Grey400 ) - TerningImage(painter = R.drawable.ic_my_page_go_edit) + Image( + painter = painterResource(R.drawable.ic_my_page_go_edit), + contentDescription = "go edit" + ) } } } diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt index de2b2caac..eeb0512ff 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt @@ -13,7 +13,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.terning.core.designsystem.component.image.TerningImage import com.terning.core.designsystem.extension.noRippleClickable import com.terning.core.designsystem.theme.TerningPointTheme import com.terning.core.designsystem.theme.TerningTheme @@ -25,7 +24,7 @@ internal fun MyPageItem( icon: Int, modifier: Modifier = Modifier, onButtonClick: () -> Unit = {}, - trailingContent: @Composable () -> Unit = { TerningImage(painter = R.drawable.ic_my_page_go_detail) } + trailingContent: @Composable () -> Unit, ) { Row( modifier = modifier @@ -60,7 +59,13 @@ private fun MyPageItemPreview() { TerningPointTheme { MyPageItem( text = "공지사항", - icon = R.drawable.ic_my_page_notice + icon = R.drawable.ic_my_page_notice, + trailingContent = { + Image( + painter = painterResource(R.drawable.ic_my_page_go_detail), + contentDescription = "" + ) + } ) } } diff --git a/feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt b/feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt index cfc2bb0f8..56cb9444b 100644 --- a/feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt +++ b/feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt @@ -1,6 +1,7 @@ package com.terning.feature.search.search import androidx.browser.customtabs.CustomTabsIntent +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -15,6 +16,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.net.toUri @@ -24,7 +26,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import com.terning.core.analytics.EventType import com.terning.core.analytics.LocalTracker -import com.terning.core.designsystem.component.image.TerningImage import com.terning.core.designsystem.component.textfield.SearchTextField import com.terning.core.designsystem.extension.noRippleClickable import com.terning.core.designsystem.state.UiState @@ -127,10 +128,11 @@ fun SearchScreen( .background(White) .padding(paddingValues) ) { - TerningImage( - painter = R.drawable.ic_terning_logo_typo, + Image( + painter = painterResource(R.drawable.ic_terning_logo_typo), modifier = Modifier - .padding(start = 24.dp, top = 16.dp) + .padding(start = 24.dp, top = 16.dp), + contentDescription = "logo typo" ) Box( From 35218297ea78fa005efe731bde61bd8cc130c6d8 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 19:23:09 +0900 Subject: [PATCH 05/13] =?UTF-8?q?[REFACTOR/#402]=20=EB=B0=94=ED=85=80?= =?UTF-8?q?=EC=8B=9C=ED=8A=B8=20=EC=9C=84=EC=B9=98=20=EC=98=AE=EA=B8=B0?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terning/feature/mypage/mypage/MyPageRoute.kt | 4 ++-- .../mypage/component}/MyPageLogoutBottomSheet.kt | 7 ++++--- .../mypage/component}/MyPageQuitBottomSheet.kt | 15 ++++++++------- 3 files changed, 14 insertions(+), 12 deletions(-) rename {core/designsystem/src/main/java/com/terning/core/designsystem/component/bottomsheet => feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component}/MyPageLogoutBottomSheet.kt (93%) rename {core/designsystem/src/main/java/com/terning/core/designsystem/component/bottomsheet => feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component}/MyPageQuitBottomSheet.kt (89%) diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt index b1d0014c2..d05340499 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt @@ -51,8 +51,8 @@ import com.google.accompanist.permissions.rememberPermissionState import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.terning.core.analytics.EventType import com.terning.core.analytics.LocalTracker -import com.terning.core.designsystem.component.bottomsheet.MyPageLogoutBottomSheet -import com.terning.core.designsystem.component.bottomsheet.MyPageQuitBottomSheet +import com.terning.feature.mypage.mypage.component.MyPageLogoutBottomSheet +import com.terning.feature.mypage.mypage.component.MyPageQuitBottomSheet import com.terning.core.designsystem.extension.noRippleClickable import com.terning.core.designsystem.extension.toast import com.terning.core.designsystem.state.UiState diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageLogoutBottomSheet.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageLogoutBottomSheet.kt similarity index 93% rename from core/designsystem/src/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageLogoutBottomSheet.kt rename to feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageLogoutBottomSheet.kt index bba763c15..8086d2344 100644 --- a/core/designsystem/src/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageLogoutBottomSheet.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageLogoutBottomSheet.kt @@ -1,4 +1,4 @@ -package com.terning.core.designsystem.component.bottomsheet +package com.terning.feature.mypage.mypage.component import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -14,6 +14,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.terning.core.designsystem.R +import com.terning.core.designsystem.component.bottomsheet.TerningBasicBottomSheet import com.terning.core.designsystem.component.button.DeleteRoundButton import com.terning.core.designsystem.component.button.RoundButton import com.terning.core.designsystem.theme.Grey400 @@ -32,7 +33,7 @@ import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @Composable fun MyPageLogoutBottomSheet( - modifier: Modifier = Modifier, + modifier: Modifier = Modifier.Companion, onDismiss: () -> Unit, onLogoutClick: () -> Unit ) { @@ -42,7 +43,7 @@ fun MyPageLogoutBottomSheet( TerningBasicBottomSheet( content = { Column( - horizontalAlignment = Alignment.CenterHorizontally, + horizontalAlignment = Alignment.Companion.CenterHorizontally, modifier = modifier ) { Spacer(modifier = modifier.height(10.dp)) diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageQuitBottomSheet.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt similarity index 89% rename from core/designsystem/src/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageQuitBottomSheet.kt rename to feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt index 9a29a79ac..64b9690ec 100644 --- a/core/designsystem/src/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageQuitBottomSheet.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt @@ -1,4 +1,4 @@ -package com.terning.core.designsystem.component.bottomsheet +package com.terning.feature.mypage.mypage.component import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -15,6 +15,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.terning.core.designsystem.R +import com.terning.core.designsystem.component.bottomsheet.TerningBasicBottomSheet import com.terning.core.designsystem.component.button.DeleteRoundButton import com.terning.core.designsystem.component.button.RoundButton import com.terning.core.designsystem.theme.Grey400 @@ -33,7 +34,7 @@ import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @Composable fun MyPageQuitBottomSheet( - modifier: Modifier = Modifier, + modifier: Modifier = Modifier.Companion, onDismiss: () -> Unit, onQuitClick: () -> Unit ) { @@ -43,7 +44,7 @@ fun MyPageQuitBottomSheet( TerningBasicBottomSheet( content = { Column( - horizontalAlignment = Alignment.CenterHorizontally, + horizontalAlignment = Alignment.Companion.CenterHorizontally, modifier = modifier ) { Spacer(modifier = modifier.height(10.dp)) @@ -55,7 +56,7 @@ fun MyPageQuitBottomSheet( Text( text = stringResource(id = R.string.my_page_quit_sub), style = TerningTheme.typography.body3, - textAlign = TextAlign.Center, + textAlign = TextAlign.Companion.Center, color = Grey400 ) Spacer(modifier = modifier.height(36.dp)) @@ -67,7 +68,7 @@ fun MyPageQuitBottomSheet( onButtonClick = { onQuitClick() }, - modifier = Modifier.padding( + modifier = Modifier.Companion.padding( start = 24.dp, end = 24.dp ) @@ -86,7 +87,7 @@ fun MyPageQuitBottomSheet( } } }, - modifier = Modifier.padding( + modifier = Modifier.Companion.padding( start = 24.dp, end = 24.dp, ) @@ -97,4 +98,4 @@ fun MyPageQuitBottomSheet( onDismissRequest = { onDismiss() }, sheetState = sheetState ) -} +} \ No newline at end of file From d26efc1553bede20b4d91477d4946715b44a2d9a Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 20:17:10 +0900 Subject: [PATCH 06/13] =?UTF-8?q?[REFACTOR/#402]=20=ED=94=84=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EC=A0=91=EA=B7=BC=EC=A0=9C=EC=96=B4=EC=9E=90=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/designsystem/component/button/DeleteRoundButton.kt | 2 +- .../core/designsystem/component/button/FilteringButton.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/component/button/DeleteRoundButton.kt b/core/designsystem/src/main/java/com/terning/core/designsystem/component/button/DeleteRoundButton.kt index 427ca6f02..d847e60fb 100644 --- a/core/designsystem/src/main/java/com/terning/core/designsystem/component/button/DeleteRoundButton.kt +++ b/core/designsystem/src/main/java/com/terning/core/designsystem/component/button/DeleteRoundButton.kt @@ -70,7 +70,7 @@ fun DeleteRoundButton( @Preview(showBackground = true) @Composable -fun DeleteRoundButtonPreview() { +private fun DeleteRoundButtonPreview() { TerningPointTheme { DeleteRoundButton( style = TextStyle(), diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/component/button/FilteringButton.kt b/core/designsystem/src/main/java/com/terning/core/designsystem/component/button/FilteringButton.kt index 1ed2399f4..5ba4f7a8e 100644 --- a/core/designsystem/src/main/java/com/terning/core/designsystem/component/button/FilteringButton.kt +++ b/core/designsystem/src/main/java/com/terning/core/designsystem/component/button/FilteringButton.kt @@ -101,7 +101,7 @@ fun FilteringButton( @Preview(showBackground = true) @Composable -fun FilteringButtonPreview() { +private fun FilteringButtonPreview() { TerningPointTheme { Column { FilteringButton( From d09e3fc01c7699f0c1c8584d6139056ea275ecba Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 20:22:01 +0900 Subject: [PATCH 07/13] =?UTF-8?q?[REFACTOR/#402]=20filtering=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=A0=91=EA=B7=BC=EC=A0=9C=EC=96=B4=EC=9E=90=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/filtering/filteringone/FilteringOneRoute.kt | 4 ++-- .../filtering/filteringone/component/StatusOneRadioGroup.kt | 2 +- .../feature/filtering/filteringthree/FilteringThreeRoute.kt | 4 ++-- .../feature/filtering/filteringtwo/FilteringTwoRoute.kt | 4 ++-- .../filtering/filteringtwo/component/StatusTwoRadioGroup.kt | 2 +- .../feature/filtering/startfiltering/StartFilteringRoute.kt | 2 +- .../com/terning/feature/filtering/starthome/StartHomeRoute.kt | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt index dee4f03d2..8666d608b 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt @@ -73,7 +73,7 @@ fun FilteringOneRoute( } @Composable -fun FilteringOneScreen( +private fun FilteringOneScreen( name: String, onNextClick: (String) -> Unit, navigateUp: () -> Unit, @@ -153,7 +153,7 @@ fun FilteringOneScreen( @Preview(showBackground = true) @Composable -fun FilteringOneScreenPreview() { +private fun FilteringOneScreenPreview() { TerningPointTheme { FilteringOneScreen( name = "터닝이", diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt index a6e0d12ba..50a6c7fef 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt @@ -16,7 +16,7 @@ import com.terning.core.designsystem.type.Grade import com.terning.feature.filtering.R @Composable -fun StatusOneRadioGroup( +internal fun StatusOneRadioGroup( onButtonClick: (String) -> Unit, modifier: Modifier = Modifier, ) { diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt index c31df2fc7..dce9ef110 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt @@ -101,7 +101,7 @@ fun FilteringThreeRoute( } @Composable -fun FilteringThreeScreen( +private fun FilteringThreeScreen( navigateUp: () -> Unit, chosenYear: Int, chosenMonth: Int, @@ -167,7 +167,7 @@ fun FilteringThreeScreen( @Preview(showBackground = true) @Composable -fun FilteringThreeScreenPreview() { +private fun FilteringThreeScreenPreview() { TerningPointTheme { FilteringThreeScreen( navigateUp = { }, diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt index 495d1b6c2..a11e51277 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt @@ -76,7 +76,7 @@ fun FilteringTwoRoute( } @Composable -fun FilteringTwoScreen( +private fun FilteringTwoScreen( grade: String, onNextClick: (String, String) -> Unit, navigateUp: () -> Unit, @@ -142,7 +142,7 @@ fun FilteringTwoScreen( @Preview(showBackground = true) @Composable -fun FilteringTwoScreenPreview() { +private fun FilteringTwoScreenPreview() { TerningPointTheme { FilteringTwoScreen( grade = "freshman", diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/component/StatusTwoRadioGroup.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/component/StatusTwoRadioGroup.kt index 08f42a882..a95388c67 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/component/StatusTwoRadioGroup.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/component/StatusTwoRadioGroup.kt @@ -16,7 +16,7 @@ import com.terning.core.designsystem.type.WorkingPeriod import com.terning.feature.filtering.R @Composable -fun StatusTwoRadioGroup( +internal fun StatusTwoRadioGroup( onButtonClick: (String) -> Unit, modifier: Modifier = Modifier, ) { diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt index 7646f2034..1baa360ea 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt @@ -78,7 +78,7 @@ fun StartFilteringRoute( } @Composable -fun StartFilteringScreen( +private fun StartFilteringScreen( onStartClick: () -> Unit, onLaterClick: () -> Unit, buttonState: Boolean, diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/starthome/StartHomeRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/starthome/StartHomeRoute.kt index 02113fb92..e42bf6f77 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/starthome/StartHomeRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/starthome/StartHomeRoute.kt @@ -57,7 +57,7 @@ fun StartHomeRoute( } @Composable -fun StartHomeScreen( +private fun StartHomeScreen( onClick: () -> Unit, buttonState: Boolean, screenHeight: Float, From 756a3d1b61ba8269931a59bfed9a93166297c9a5 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 20:26:12 +0900 Subject: [PATCH 08/13] =?UTF-8?q?[REFACTOR/#402]=20mypage=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=A0=91=EA=B7=BC=EC=A0=9C=EC=96=B4=EC=9E=90=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mypage/mypage/component/MyPageLogoutBottomSheet.kt | 8 ++++---- .../feature/mypage/mypage/component/MyPageProfile.kt | 2 +- .../mypage/mypage/component/MyPageQuitBottomSheet.kt | 8 ++++---- .../terning/feature/mypage/mypage/util/MyPageDefaults.kt | 2 +- .../feature/mypage/profileedit/ProfileEditRoute.kt | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageLogoutBottomSheet.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageLogoutBottomSheet.kt index 8086d2344..827ffe274 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageLogoutBottomSheet.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageLogoutBottomSheet.kt @@ -32,10 +32,10 @@ import kotlinx.coroutines.launch */ @OptIn(ExperimentalMaterial3Api::class) @Composable -fun MyPageLogoutBottomSheet( - modifier: Modifier = Modifier.Companion, +internal fun MyPageLogoutBottomSheet( onDismiss: () -> Unit, - onLogoutClick: () -> Unit + onLogoutClick: () -> Unit, + modifier: Modifier = Modifier, ) { val scope = rememberCoroutineScope() val sheetState = rememberModalBottomSheetState() @@ -43,7 +43,7 @@ fun MyPageLogoutBottomSheet( TerningBasicBottomSheet( content = { Column( - horizontalAlignment = Alignment.Companion.CenterHorizontally, + horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier ) { Spacer(modifier = modifier.height(10.dp)) diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageProfile.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageProfile.kt index c9d089ac4..80a9d313a 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageProfile.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageProfile.kt @@ -13,8 +13,8 @@ import com.terning.core.designsystem.type.ProfileImage @Composable internal fun MyPageProfile( + profileImage: String, modifier: Modifier = Modifier, - profileImage: String ) { val userProfile = ProfileImage.fromString(profileImage) diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt index 64b9690ec..e25a15a12 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt @@ -33,10 +33,10 @@ import kotlinx.coroutines.launch */ @OptIn(ExperimentalMaterial3Api::class) @Composable -fun MyPageQuitBottomSheet( - modifier: Modifier = Modifier.Companion, +internal fun MyPageQuitBottomSheet( onDismiss: () -> Unit, - onQuitClick: () -> Unit + onQuitClick: () -> Unit, + modifier: Modifier = Modifier, ) { val scope = rememberCoroutineScope() val sheetState = rememberModalBottomSheetState() @@ -44,7 +44,7 @@ fun MyPageQuitBottomSheet( TerningBasicBottomSheet( content = { Column( - horizontalAlignment = Alignment.Companion.CenterHorizontally, + horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier ) { Spacer(modifier = modifier.height(10.dp)) diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt index b90a4197a..83fbaa3fc 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt @@ -1,6 +1,6 @@ package com.terning.feature.mypage.mypage.util -object MyPageDefaults { +internal object MyPageDefaults { const val NOTICE_URL = "https://abundant-quiver-13f.notion.site/Android-49b3cc2390ee4dc389e25a5097736944" const val OPINION_URL = "https://forms.gle/AaLpVptfg6cATYWa7" diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt index d5f4cab7c..7b141b721 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt @@ -105,7 +105,7 @@ fun ProfileEditRoute( } @Composable -fun ProfileEditScreen( +private fun ProfileEditScreen( profileEditState: ProfileEditState, onProfileEditClick: (Boolean) -> Unit, onInputChange: (String) -> Unit, @@ -192,7 +192,7 @@ private const val KAKA0 = "KAKAO" @Preview(showBackground = true) @Composable -fun ProfileEditScreenPreview() { +private fun ProfileEditScreenPreview() { TerningPointTheme { ProfileEditScreen( profileEditState = ProfileEditState(), From c601a9ca91a001ed03dc66886bde282b7391c7c1 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 20:28:05 +0900 Subject: [PATCH 09/13] =?UTF-8?q?[REFACTOR/#402]=20Companion=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mypage/mypage/component/MyPageQuitBottomSheet.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt index e25a15a12..ea5a96c9a 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageQuitBottomSheet.kt @@ -56,7 +56,7 @@ internal fun MyPageQuitBottomSheet( Text( text = stringResource(id = R.string.my_page_quit_sub), style = TerningTheme.typography.body3, - textAlign = TextAlign.Companion.Center, + textAlign = TextAlign.Center, color = Grey400 ) Spacer(modifier = modifier.height(36.dp)) @@ -68,7 +68,7 @@ internal fun MyPageQuitBottomSheet( onButtonClick = { onQuitClick() }, - modifier = Modifier.Companion.padding( + modifier = Modifier.padding( start = 24.dp, end = 24.dp ) @@ -87,7 +87,7 @@ internal fun MyPageQuitBottomSheet( } } }, - modifier = Modifier.Companion.padding( + modifier = Modifier.padding( start = 24.dp, end = 24.dp, ) From 3de774fbd9610024369d1ee2b109b0f39b38095d Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 20:29:30 +0900 Subject: [PATCH 10/13] =?UTF-8?q?[REFACTOR/#402]=20onboarding=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=A0=91=EA=B7=BC=EC=A0=9C=EC=96=B4=EC=9E=90=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/terning/feature/onboarding/signin/SignInRoute.kt | 4 ++-- .../feature/onboarding/signin/component/KakaoButton.kt | 4 ++-- .../java/com/terning/feature/onboarding/signup/SignUpRoute.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt index 26a3fbe33..53107b089 100644 --- a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt +++ b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt @@ -98,7 +98,7 @@ fun SignInRoute( } @Composable -fun SignInScreen( +private fun SignInScreen( onSignInClick: () -> Unit, ) { Column( @@ -175,7 +175,7 @@ private const val KAKAO_NOT_LOGGED_IN = "statusCode=302" @Preview(showBackground = true) @Composable -fun SignInScreenPreview() { +private fun SignInScreenPreview() { TerningPointTheme { SignInScreen( onSignInClick = {} diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/component/KakaoButton.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/component/KakaoButton.kt index 8877dab28..296468527 100644 --- a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/component/KakaoButton.kt +++ b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/component/KakaoButton.kt @@ -21,7 +21,7 @@ import com.terning.core.designsystem.theme.TerningTheme import com.terning.feature.onboarding.R @Composable -fun KakaoButton( +internal fun KakaoButton( title: String, onSignInClick: () -> Unit, modifier: Modifier = Modifier, @@ -52,7 +52,7 @@ fun KakaoButton( @Preview(showBackground = true) @Composable -fun KakaoButtonPreview() { +private fun KakaoButtonPreview() { TerningPointTheme { KakaoButton( title = "카카오로 로그인하기", diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt index cf4ddaa1d..fdb495669 100644 --- a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt +++ b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt @@ -97,7 +97,7 @@ fun SignUpRoute( } @Composable -fun SignUpScreen( +private fun SignUpScreen( state: SignUpState, onSignUpClick: () -> Unit, onInputChange: (String) -> Unit, @@ -166,7 +166,7 @@ fun SignUpScreen( @Preview(showBackground = true) @Composable -fun SignUpScreenPreview() { +private fun SignUpScreenPreview() { TerningPointTheme { SignUpScreen( state = SignUpState(), From b629ed5207ee6b49bb1e505d21679820b3387383 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 20:32:33 +0900 Subject: [PATCH 11/13] =?UTF-8?q?[REFACTOR/#402]=20Route=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=EC=97=90=20internal=20=EC=A0=91=EA=B7=BC=EC=A0=9C?= =?UTF-8?q?=EC=96=B4=EC=9E=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terning/feature/filtering/filteringone/FilteringOneRoute.kt | 2 +- .../feature/filtering/filteringthree/FilteringThreeRoute.kt | 2 +- .../terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt | 2 +- .../feature/filtering/startfiltering/StartFilteringRoute.kt | 2 +- .../com/terning/feature/filtering/starthome/StartHomeRoute.kt | 2 +- .../main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt | 2 +- .../com/terning/feature/mypage/profileedit/ProfileEditRoute.kt | 2 +- .../java/com/terning/feature/onboarding/signin/SignInRoute.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt index 8666d608b..451c7c13a 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt @@ -31,7 +31,7 @@ import com.terning.feature.filtering.R import com.terning.feature.filtering.filteringone.component.StatusOneRadioGroup @Composable -fun FilteringOneRoute( +internal fun FilteringOneRoute( name: String, onNextClick: (String) -> Unit, navigateUp: () -> Unit, diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt index dce9ef110..5f01f9ed4 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt @@ -39,7 +39,7 @@ import com.terning.feature.filtering.filteringthree.component.FilteringYearMonth import java.util.Calendar @Composable -fun FilteringThreeRoute( +internal fun FilteringThreeRoute( grade: String, workingPeriod: String, navigateUp: () -> Unit, diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt index a11e51277..5c18c9896 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt @@ -31,7 +31,7 @@ import com.terning.feature.filtering.R import com.terning.feature.filtering.filteringtwo.component.StatusTwoRadioGroup @Composable -fun FilteringTwoRoute( +internal fun FilteringTwoRoute( grade: String, onNextClick: (String, String) -> Unit, navigateUp: () -> Unit, diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt index 1baa360ea..0eefcc6aa 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt @@ -40,7 +40,7 @@ import com.terning.feature.filtering.R import kotlinx.coroutines.delay @Composable -fun StartFilteringRoute( +internal fun StartFilteringRoute( onStartClick: () -> Unit, onLaterClick: () -> Unit, viewModel: StartFilteringViewModel = hiltViewModel() diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/starthome/StartHomeRoute.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/starthome/StartHomeRoute.kt index e42bf6f77..04e36541d 100644 --- a/feature/filtering/src/main/java/com/terning/feature/filtering/starthome/StartHomeRoute.kt +++ b/feature/filtering/src/main/java/com/terning/feature/filtering/starthome/StartHomeRoute.kt @@ -35,7 +35,7 @@ import com.terning.feature.filtering.R import kotlinx.coroutines.delay @Composable -fun StartHomeRoute( +internal fun StartHomeRoute( navigateToHome: () -> Unit, viewModel: StartHomeViewModel = hiltViewModel() ) { diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt index d05340499..1ea477bbb 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt @@ -78,7 +78,7 @@ import kotlinx.collections.immutable.persistentListOf @OptIn(ExperimentalPermissionsApi::class) @RequiresApi(Build.VERSION_CODES.TIRAMISU) @Composable -fun MyPageRoute( +internal fun MyPageRoute( paddingValues: PaddingValues, navigateToProfileEdit: (String, String, String) -> Unit, restartApp: () -> Unit, diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt index 7b141b721..2f3f04b2a 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/profileedit/ProfileEditRoute.kt @@ -38,7 +38,7 @@ import com.terning.core.designsystem.theme.White import com.terning.feature.mypage.R @Composable -fun ProfileEditRoute( +internal fun ProfileEditRoute( navigateUp: () -> Unit, initialName: String, initialProfile: String, diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt index 53107b089..9fafba4da 100644 --- a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt +++ b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt @@ -37,7 +37,7 @@ import com.terning.feature.onboarding.R import com.terning.feature.onboarding.signin.component.KakaoButton @Composable -fun SignInRoute( +internal fun SignInRoute( navigateToHome: () -> Unit, navigateToSignUp: (String) -> Unit, viewModel: SignInViewModel = hiltViewModel(), From 7a222c851b3a05c974742405d222c8dd59ab461f Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 22:29:09 +0900 Subject: [PATCH 12/13] =?UTF-8?q?[REFACTOR/#402]=20SplashUiState=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 --- .../com/terning/feature/splash/SplashRoute.kt | 22 +++++++++---------- .../terning/feature/splash/SplashUiState.kt | 19 ++++++++++++++++ 2 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 feature/splash/src/main/java/com/terning/feature/splash/SplashUiState.kt diff --git a/feature/splash/src/main/java/com/terning/feature/splash/SplashRoute.kt b/feature/splash/src/main/java/com/terning/feature/splash/SplashRoute.kt index ba4458e4f..5c3590b0c 100644 --- a/feature/splash/src/main/java/com/terning/feature/splash/SplashRoute.kt +++ b/feature/splash/src/main/java/com/terning/feature/splash/SplashRoute.kt @@ -29,7 +29,7 @@ import com.terning.core.designsystem.theme.TerningMain import com.terning.core.designsystem.theme.TerningPointTheme import com.terning.core.designsystem.theme.White import com.terning.core.designsystem.type.DeeplinkType -import com.terning.domain.update.entity.UpdateState +import com.terning.feature.splash.SplashUiState import com.terning.feature.splash.component.TerningMajorUpdateDialog import com.terning.feature.splash.component.TerningPatchUpdateDialog import kotlinx.coroutines.launch @@ -104,7 +104,7 @@ internal fun SplashRoute( } SplashScreen( - updateState = updateState, + splashUiState = updateState.toUi(), onUpdateButtonClick = context::launchPlayStore, onUpdateSkipButtonClick = viewModel::checkIfAccessTokenAvailable ) @@ -112,26 +112,26 @@ internal fun SplashRoute( @Composable private fun SplashScreen( - updateState: UpdateState, + splashUiState: SplashUiState, onUpdateButtonClick: () -> Unit, onUpdateSkipButtonClick: () -> Unit, ) { - when (updateState) { - is UpdateState.MajorUpdateAvailable -> { + when (splashUiState) { + is SplashUiState.MajorUpdateAvailable -> { AnimatedVisibility(visible = true) { TerningMajorUpdateDialog( - titleText = updateState.title, - bodyText = updateState.content, + titleText = splashUiState.title, + bodyText = splashUiState.content, onUpdateButtonClick = onUpdateButtonClick, ) } } - is UpdateState.PatchUpdateAvailable -> { + is SplashUiState.PatchUpdateAvailable -> { AnimatedVisibility(visible = true) { TerningPatchUpdateDialog( - titleText = updateState.title, - bodyText = updateState.content, + titleText = splashUiState.title, + bodyText = splashUiState.content, onDismissButtonClick = onUpdateSkipButtonClick, onUpdateButtonClick = onUpdateButtonClick, ) @@ -161,7 +161,7 @@ private fun SplashScreen( private fun SplashScreenPreview() { TerningPointTheme { SplashScreen( - updateState = UpdateState.NoUpdateAvailable, + splashUiState = SplashUiState.NoUpdateAvailable, onUpdateButtonClick = {}, onUpdateSkipButtonClick = {}, ) diff --git a/feature/splash/src/main/java/com/terning/feature/splash/SplashUiState.kt b/feature/splash/src/main/java/com/terning/feature/splash/SplashUiState.kt new file mode 100644 index 000000000..e9fd82630 --- /dev/null +++ b/feature/splash/src/main/java/com/terning/feature/splash/SplashUiState.kt @@ -0,0 +1,19 @@ +package com.terning.feature.splash + +import androidx.compose.runtime.Immutable +import com.terning.domain.update.entity.UpdateState + +@Immutable +sealed class SplashUiState { + data object InitialState : SplashUiState() + data object NoUpdateAvailable : SplashUiState() + data class MajorUpdateAvailable(val title: String, val content: String) : SplashUiState() + data class PatchUpdateAvailable(val title: String, val content: String) : SplashUiState() +} + +fun UpdateState.toUi(): SplashUiState = when (this) { + UpdateState.InitialState -> SplashUiState.InitialState + UpdateState.NoUpdateAvailable -> SplashUiState.NoUpdateAvailable + is UpdateState.MajorUpdateAvailable -> SplashUiState.MajorUpdateAvailable(title, content) + is UpdateState.PatchUpdateAvailable -> SplashUiState.PatchUpdateAvailable(title, content) +} From 68f88cbd7c30c67d2caf4cccf4235638d7207eaf Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Fri, 29 Aug 2025 22:15:46 +0900 Subject: [PATCH 13/13] =?UTF-8?q?[REFACTOR/#402]=20imageVector=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/terning/feature/home/HomeRoute.kt | 4 +++- .../home/component/HomeUpcomingEmptyFilter.kt | 4 +++- .../feature/mypage/mypage/MyPageRoute.kt | 17 +++++++++-------- .../mypage/mypage/component/MyPageItem.kt | 7 ++++--- .../feature/search/search/SearchRoute.kt | 4 +++- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt b/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt index 7179d45a3..dd1e0e852 100644 --- a/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt +++ b/feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt @@ -28,9 +28,11 @@ import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner @@ -290,7 +292,7 @@ fun HomeScreen( .padding(paddingValues) ) { Image( - painter = painterResource(R.drawable.ic_terning_logo_typo), + imageVector = ImageVector.vectorResource(R.drawable.ic_terning_logo_typo), modifier = Modifier.padding(start = 24.dp, top = 16.dp, bottom = 16.dp), contentDescription = "home logo" ) diff --git a/feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt b/feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt index 2d555b5ff..fd7b760de 100644 --- a/feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt +++ b/feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt @@ -12,8 +12,10 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.terning.core.designsystem.extension.customShadow @@ -44,7 +46,7 @@ fun HomeUpcomingEmptyFilter( horizontalAlignment = Alignment.CenterHorizontally, ) { Image( - painter = painterResource(R.drawable.ic_home_scrap_empty), + imageVector = ImageVector.vectorResource(R.drawable.ic_home_scrap_empty), modifier = Modifier .padding(top = 23.dp) .size(44.dp), diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt index 1ea477bbb..12091039b 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt @@ -35,9 +35,10 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.net.toUri @@ -51,8 +52,6 @@ import com.google.accompanist.permissions.rememberPermissionState import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.terning.core.analytics.EventType import com.terning.core.analytics.LocalTracker -import com.terning.feature.mypage.mypage.component.MyPageLogoutBottomSheet -import com.terning.feature.mypage.mypage.component.MyPageQuitBottomSheet import com.terning.core.designsystem.extension.noRippleClickable import com.terning.core.designsystem.extension.toast import com.terning.core.designsystem.state.UiState @@ -65,7 +64,9 @@ import com.terning.core.designsystem.theme.White import com.terning.feature.mypage.BuildConfig.VERSION_NAME import com.terning.feature.mypage.R import com.terning.feature.mypage.mypage.component.MyPageAlarmDialog +import com.terning.feature.mypage.mypage.component.MyPageLogoutBottomSheet import com.terning.feature.mypage.mypage.component.MyPageProfile +import com.terning.feature.mypage.mypage.component.MyPageQuitBottomSheet import com.terning.feature.mypage.mypage.component.MyPageSection import com.terning.feature.mypage.mypage.component.MyPageToggleButton import com.terning.feature.mypage.mypage.model.MyPageUiModel @@ -280,7 +281,7 @@ private fun MyPageScreen( onItemClick = onNoticeClick, trailingContent = { Image( - painter = painterResource(R.drawable.ic_my_page_go_detail), + imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail), contentDescription = "go detail" ) } @@ -292,7 +293,7 @@ private fun MyPageScreen( onItemClick = onOpinionClick, trailingContent = { Image( - painter = painterResource(R.drawable.ic_my_page_go_detail), + imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail), contentDescription = "go detail" ) } @@ -306,7 +307,7 @@ private fun MyPageScreen( onItemClick = onServiceClick, trailingContent = { Image( - painter = painterResource(R.drawable.ic_my_page_go_detail), + imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail), contentDescription = "go detail" ) } @@ -318,7 +319,7 @@ private fun MyPageScreen( onItemClick = onPersonalClick, trailingContent = { Image( - painter = painterResource(R.drawable.ic_my_page_go_detail), + imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail), contentDescription = "" ) } @@ -442,7 +443,7 @@ private fun UserProfile( color = Grey400 ) Image( - painter = painterResource(R.drawable.ic_my_page_go_edit), + imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_edit), contentDescription = "go edit" ) } diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt index eeb0512ff..2d9c76d9b 100644 --- a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt +++ b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt @@ -10,7 +10,8 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.terning.core.designsystem.extension.noRippleClickable @@ -39,7 +40,7 @@ internal fun MyPageItem( verticalAlignment = Alignment.CenterVertically ) { Image( - painter = painterResource(id = icon), + imageVector = ImageVector.vectorResource(id = icon), contentDescription = "my page image", modifier = modifier.size(28.dp) ) @@ -62,7 +63,7 @@ private fun MyPageItemPreview() { icon = R.drawable.ic_my_page_notice, trailingContent = { Image( - painter = painterResource(R.drawable.ic_my_page_go_detail), + imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail), contentDescription = "" ) } diff --git a/feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt b/feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt index 56cb9444b..6e719a097 100644 --- a/feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt +++ b/feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt @@ -15,9 +15,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel @@ -129,7 +131,7 @@ fun SearchScreen( .padding(paddingValues) ) { Image( - painter = painterResource(R.drawable.ic_terning_logo_typo), + imageVector = ImageVector.vectorResource(R.drawable.ic_terning_logo_typo), modifier = Modifier .padding(start = 24.dp, top = 16.dp), contentDescription = "logo typo"