Skip to content

Commit 68f88cb

Browse files
leeeyubinleeeyubin
committed
[REFACTOR/#402] imageVector로 수정
1 parent 7a222c8 commit 68f88cb

5 files changed

Lines changed: 22 additions & 14 deletions

File tree

‎feature/home/src/main/java/com/terning/feature/home/HomeRoute.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ import androidx.compose.runtime.setValue
2828
import androidx.compose.runtime.snapshotFlow
2929
import androidx.compose.ui.Alignment
3030
import androidx.compose.ui.Modifier
31+
import androidx.compose.ui.graphics.vector.ImageVector
3132
import androidx.compose.ui.platform.LocalContext
3233
import androidx.compose.ui.res.painterResource
3334
import androidx.compose.ui.res.stringResource
35+
import androidx.compose.ui.res.vectorResource
3436
import androidx.compose.ui.unit.dp
3537
import androidx.hilt.navigation.compose.hiltViewModel
3638
import androidx.lifecycle.compose.LocalLifecycleOwner
@@ -290,7 +292,7 @@ fun HomeScreen(
290292
.padding(paddingValues)
291293
) {
292294
Image(
293-
painter = painterResource(R.drawable.ic_terning_logo_typo),
295+
imageVector = ImageVector.vectorResource(R.drawable.ic_terning_logo_typo),
294296
modifier = Modifier.padding(start = 24.dp, top = 16.dp, bottom = 16.dp),
295297
contentDescription = "home logo"
296298
)

‎feature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import androidx.compose.material3.Text
1212
import androidx.compose.runtime.Composable
1313
import androidx.compose.ui.Alignment
1414
import androidx.compose.ui.Modifier
15+
import androidx.compose.ui.graphics.vector.ImageVector
1516
import androidx.compose.ui.res.painterResource
1617
import androidx.compose.ui.res.stringResource
18+
import androidx.compose.ui.res.vectorResource
1719
import androidx.compose.ui.text.style.TextAlign
1820
import androidx.compose.ui.unit.dp
1921
import com.terning.core.designsystem.extension.customShadow
@@ -44,7 +46,7 @@ fun HomeUpcomingEmptyFilter(
4446
horizontalAlignment = Alignment.CenterHorizontally,
4547
) {
4648
Image(
47-
painter = painterResource(R.drawable.ic_home_scrap_empty),
49+
imageVector = ImageVector.vectorResource(R.drawable.ic_home_scrap_empty),
4850
modifier = Modifier
4951
.padding(top = 23.dp)
5052
.size(44.dp),

‎feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ import androidx.compose.runtime.remember
3535
import androidx.compose.runtime.setValue
3636
import androidx.compose.ui.Alignment
3737
import androidx.compose.ui.Modifier
38+
import androidx.compose.ui.graphics.vector.ImageVector
3839
import androidx.compose.ui.platform.LocalContext
39-
import androidx.compose.ui.res.painterResource
4040
import androidx.compose.ui.res.stringResource
41+
import androidx.compose.ui.res.vectorResource
4142
import androidx.compose.ui.tooling.preview.Preview
4243
import androidx.compose.ui.unit.dp
4344
import androidx.core.net.toUri
@@ -51,8 +52,6 @@ import com.google.accompanist.permissions.rememberPermissionState
5152
import com.google.accompanist.systemuicontroller.rememberSystemUiController
5253
import com.terning.core.analytics.EventType
5354
import com.terning.core.analytics.LocalTracker
54-
import com.terning.feature.mypage.mypage.component.MyPageLogoutBottomSheet
55-
import com.terning.feature.mypage.mypage.component.MyPageQuitBottomSheet
5655
import com.terning.core.designsystem.extension.noRippleClickable
5756
import com.terning.core.designsystem.extension.toast
5857
import com.terning.core.designsystem.state.UiState
@@ -65,7 +64,9 @@ import com.terning.core.designsystem.theme.White
6564
import com.terning.feature.mypage.BuildConfig.VERSION_NAME
6665
import com.terning.feature.mypage.R
6766
import com.terning.feature.mypage.mypage.component.MyPageAlarmDialog
67+
import com.terning.feature.mypage.mypage.component.MyPageLogoutBottomSheet
6868
import com.terning.feature.mypage.mypage.component.MyPageProfile
69+
import com.terning.feature.mypage.mypage.component.MyPageQuitBottomSheet
6970
import com.terning.feature.mypage.mypage.component.MyPageSection
7071
import com.terning.feature.mypage.mypage.component.MyPageToggleButton
7172
import com.terning.feature.mypage.mypage.model.MyPageUiModel
@@ -280,7 +281,7 @@ private fun MyPageScreen(
280281
onItemClick = onNoticeClick,
281282
trailingContent = {
282283
Image(
283-
painter = painterResource(R.drawable.ic_my_page_go_detail),
284+
imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail),
284285
contentDescription = "go detail"
285286
)
286287
}
@@ -292,7 +293,7 @@ private fun MyPageScreen(
292293
onItemClick = onOpinionClick,
293294
trailingContent = {
294295
Image(
295-
painter = painterResource(R.drawable.ic_my_page_go_detail),
296+
imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail),
296297
contentDescription = "go detail"
297298
)
298299
}
@@ -306,7 +307,7 @@ private fun MyPageScreen(
306307
onItemClick = onServiceClick,
307308
trailingContent = {
308309
Image(
309-
painter = painterResource(R.drawable.ic_my_page_go_detail),
310+
imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail),
310311
contentDescription = "go detail"
311312
)
312313
}
@@ -318,7 +319,7 @@ private fun MyPageScreen(
318319
onItemClick = onPersonalClick,
319320
trailingContent = {
320321
Image(
321-
painter = painterResource(R.drawable.ic_my_page_go_detail),
322+
imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail),
322323
contentDescription = ""
323324
)
324325
}
@@ -442,7 +443,7 @@ private fun UserProfile(
442443
color = Grey400
443444
)
444445
Image(
445-
painter = painterResource(R.drawable.ic_my_page_go_edit),
446+
imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_edit),
446447
contentDescription = "go edit"
447448
)
448449
}

‎feature/mypage/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import androidx.compose.material3.Text
1010
import androidx.compose.runtime.Composable
1111
import androidx.compose.ui.Alignment
1212
import androidx.compose.ui.Modifier
13-
import androidx.compose.ui.res.painterResource
13+
import androidx.compose.ui.graphics.vector.ImageVector
14+
import androidx.compose.ui.res.vectorResource
1415
import androidx.compose.ui.tooling.preview.Preview
1516
import androidx.compose.ui.unit.dp
1617
import com.terning.core.designsystem.extension.noRippleClickable
@@ -39,7 +40,7 @@ internal fun MyPageItem(
3940
verticalAlignment = Alignment.CenterVertically
4041
) {
4142
Image(
42-
painter = painterResource(id = icon),
43+
imageVector = ImageVector.vectorResource(id = icon),
4344
contentDescription = "my page image",
4445
modifier = modifier.size(28.dp)
4546
)
@@ -62,7 +63,7 @@ private fun MyPageItemPreview() {
6263
icon = R.drawable.ic_my_page_notice,
6364
trailingContent = {
6465
Image(
65-
painter = painterResource(R.drawable.ic_my_page_go_detail),
66+
imageVector = ImageVector.vectorResource(R.drawable.ic_my_page_go_detail),
6667
contentDescription = ""
6768
)
6869
}

‎feature/search/src/main/java/com/terning/feature/search/search/SearchRoute.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ import androidx.compose.runtime.Composable
1515
import androidx.compose.runtime.LaunchedEffect
1616
import androidx.compose.runtime.getValue
1717
import androidx.compose.ui.Modifier
18+
import androidx.compose.ui.graphics.vector.ImageVector
1819
import androidx.compose.ui.platform.LocalContext
1920
import androidx.compose.ui.res.painterResource
2021
import androidx.compose.ui.res.stringResource
22+
import androidx.compose.ui.res.vectorResource
2123
import androidx.compose.ui.unit.dp
2224
import androidx.core.net.toUri
2325
import androidx.hilt.navigation.compose.hiltViewModel
@@ -129,7 +131,7 @@ fun SearchScreen(
129131
.padding(paddingValues)
130132
) {
131133
Image(
132-
painter = painterResource(R.drawable.ic_terning_logo_typo),
134+
imageVector = ImageVector.vectorResource(R.drawable.ic_terning_logo_typo),
133135
modifier = Modifier
134136
.padding(start = 24.dp, top = 16.dp),
135137
contentDescription = "logo typo"

0 commit comments

Comments
 (0)