Skip to content

Commit 8d776df

Browse files
ikseong00ikseong00
authored
Merge pull request #44 from YAPP-Github/chore/#43-naming-icon
[chore] #43 코드베이스 네이밍 컨벤션 통일
2 parents 0c77393 + c6920c3 commit 8d776df

File tree

76 files changed

+415
-492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+415
-492
lines changed

‎app/src/main/java/com/neki/android/app/MainActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class MainActivity : ComponentActivity() {
5454
when (rootNavigationState.currentRootKey) {
5555
RootNavKey.Login -> {
5656
LoginRoute(
57-
navigateMain = { navigator.navigateRoot(RootNavKey.Main) },
57+
navigateToMain = { navigator.navigateRoot(RootNavKey.Main) },
5858
)
5959
}
6060

@@ -70,7 +70,7 @@ class MainActivity : ComponentActivity() {
7070
),
7171
onTabSelected = { navigator.navigate(it) },
7272
onBack = { navigator.goBack() },
73-
navigateLogin = { navigator.navigateRoot(RootNavKey.Login) },
73+
navigateToLogin = { navigator.navigateRoot(RootNavKey.Login) },
7474
)
7575
}
7676
}

‎app/src/main/java/com/neki/android/app/MainScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fun MainScreen(
2525
entries: SnapshotStateList<NavEntry<NavKey>>,
2626
onTabSelected: (NavKey) -> Unit,
2727
onBack: () -> Unit,
28-
navigateLogin: () -> Unit,
28+
navigateToLogin: () -> Unit,
2929
) {
3030
val shouldShowBottomBar by remember(currentKey) {
3131
mutableStateOf(currentKey in topLevelKeys)

‎app/src/main/java/com/neki/android/app/navigation/TopLevelNavItem.kt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,33 @@ import com.neki.android.feature.mypage.api.MyPageNavKey
1010
import com.neki.android.feature.pose.api.PoseNavKey
1111

1212
enum class TopLevelNavItem(
13-
@DrawableRes val selectedIcon: Int,
14-
@DrawableRes val unselectedIcon: Int,
15-
@StringRes val iconTextId: Int,
13+
@DrawableRes val selectedIconRes: Int,
14+
@DrawableRes val unselectedIconRes: Int,
15+
@StringRes val iconStringRes: Int,
1616
val navKey: NavKey,
1717
) {
1818
ARCHIVE(
19-
selectedIcon = R.drawable.ic_nav_archive_selected,
20-
unselectedIcon = R.drawable.ic_nav_archive_unselected,
21-
iconTextId = R.string.top_level_nav_archive,
19+
selectedIconRes = R.drawable.ic_nav_archive_selected,
20+
unselectedIconRes = R.drawable.ic_nav_archive_unselected,
21+
iconStringRes = R.string.top_level_nav_archive,
2222
navKey = ArchiveNavKey.Archive,
2323
),
2424
POSE_RECOMMEND(
25-
selectedIcon = R.drawable.ic_nav_pose_selected,
26-
unselectedIcon = R.drawable.ic_nav_pose_unselected,
27-
iconTextId = R.string.top_level_nav_pose,
25+
selectedIconRes = R.drawable.ic_nav_pose_selected,
26+
unselectedIconRes = R.drawable.ic_nav_pose_unselected,
27+
iconStringRes = R.string.top_level_nav_pose,
2828
navKey = PoseNavKey.Pose,
2929
),
3030
MAP(
31-
selectedIcon = R.drawable.ic_nav_map_selected,
32-
unselectedIcon = R.drawable.ic_nav_map_unselected,
33-
iconTextId = R.string.top_level_nav_map,
31+
selectedIconRes = R.drawable.ic_nav_map_selected,
32+
unselectedIconRes = R.drawable.ic_nav_map_unselected,
33+
iconStringRes = R.string.top_level_nav_map,
3434
navKey = MapNavKey.Map,
3535
),
3636
MYPAGE(
37-
selectedIcon = R.drawable.ic_nav_mypage_selected,
38-
unselectedIcon = R.drawable.ic_nav_mypage_unselected,
39-
iconTextId = R.string.top_level_nav_mypage,
37+
selectedIconRes = R.drawable.ic_nav_mypage_selected,
38+
unselectedIconRes = R.drawable.ic_nav_mypage_unselected,
39+
iconStringRes = R.string.top_level_nav_mypage,
4040
navKey = MyPageNavKey.MyPage,
4141
),
4242
;

‎app/src/main/java/com/neki/android/app/ui/BottomNavigationBar.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fun BottomNavigationBarItem(
7676
modifier: Modifier = Modifier,
7777
onClick: () -> Unit = {},
7878
) {
79-
val icon = if (selected) tab.selectedIcon else tab.unselectedIcon
79+
val icon = if (selected) tab.selectedIconRes else tab.unselectedIconRes
8080
val iconColor = if (selected) NekiTheme.colorScheme.gray800 else NekiTheme.colorScheme.gray200
8181
val textColor = if (selected) NekiTheme.colorScheme.gray800 else NekiTheme.colorScheme.gray500
8282

@@ -93,11 +93,11 @@ fun BottomNavigationBarItem(
9393
Icon(
9494
modifier = Modifier.size(24.dp),
9595
imageVector = ImageVector.vectorResource(icon),
96-
contentDescription = stringResource(tab.iconTextId),
96+
contentDescription = stringResource(tab.iconStringRes),
9797
tint = iconColor,
9898
)
9999
Text(
100-
text = stringResource(tab.iconTextId),
100+
text = stringResource(tab.iconStringRes),
101101
color = textColor,
102102
style = NekiTheme.typography.caption11SemiBold,
103103
)

‎core/designsystem/src/main/java/com/neki/android/core/designsystem/bottomsheet/NekiTextFieldBottomSheet.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ fun NekiTextFieldBottomSheet(
4747
subtitle: String,
4848
textFieldState: TextFieldState,
4949
onDismissRequest: () -> Unit,
50-
onCancelClick: () -> Unit,
51-
onConfirmClick: () -> Unit,
50+
onClickCancel: () -> Unit,
51+
onClickConfirm: () -> Unit,
5252
modifier: Modifier = Modifier,
5353
sheetState: SheetState = rememberModalBottomSheetState(),
5454
placeholder: String = "",
@@ -70,8 +70,8 @@ fun NekiTextFieldBottomSheet(
7070
title = title,
7171
subtitle = subtitle,
7272
textFieldState = textFieldState,
73-
onCancelClick = onCancelClick,
74-
onConfirmClick = onConfirmClick,
73+
onClickCancel = onClickCancel,
74+
onClickConfirm = onClickConfirm,
7575
placeholder = placeholder,
7676
maxLength = maxLength,
7777
confirmButtonText = confirmButtonText,
@@ -87,8 +87,8 @@ private fun NekiTextFieldBottomSheetContent(
8787
title: String,
8888
subtitle: String,
8989
textFieldState: TextFieldState,
90-
onCancelClick: () -> Unit,
91-
onConfirmClick: () -> Unit,
90+
onClickCancel: () -> Unit,
91+
onClickConfirm: () -> Unit,
9292
modifier: Modifier = Modifier,
9393
placeholder: String = "",
9494
maxLength: Int? = null,
@@ -151,12 +151,12 @@ private fun NekiTextFieldBottomSheetContent(
151151
CTAButtonGray(
152152
modifier = Modifier.weight(93f),
153153
text = "취소",
154-
onClick = onCancelClick,
154+
onClick = onClickCancel,
155155
)
156156
CTAButtonPrimary(
157157
modifier = Modifier.weight(230f),
158158
text = confirmButtonText,
159-
onClick = onConfirmClick,
159+
onClick = onClickConfirm,
160160
enabled = textFieldState.text.isNotEmpty() && !isError,
161161
)
162162
}
@@ -240,8 +240,8 @@ private fun NekiTextFieldBottomSheetContentDefaultPreview() {
240240
title = "텍스트",
241241
subtitle = "보조 텍스트가 들어가는 자리입니다",
242242
textFieldState = rememberTextFieldState(),
243-
onCancelClick = {},
244-
onConfirmClick = {},
243+
onClickCancel = {},
244+
onClickConfirm = {},
245245
placeholder = "플레이스 홀더에 들어갈 문구",
246246
)
247247
}
@@ -255,8 +255,8 @@ private fun NekiTextFieldBottomSheetContentCompletedPreview() {
255255
title = "텍스트",
256256
subtitle = "보조 텍스트가 들어가는 자리입니다",
257257
textFieldState = rememberTextFieldState(initialText = "입력 완료 입력 완료 입력 완료 입력 완료 입력 완료 입력 완료 "),
258-
onCancelClick = {},
259-
onConfirmClick = {},
258+
onClickCancel = {},
259+
onClickConfirm = {},
260260
)
261261
}
262262
}
@@ -269,8 +269,8 @@ private fun NekiTextFieldBottomSheetContentErrorPreview() {
269269
title = "텍스트",
270270
subtitle = "보조 텍스트가 들어가는 자리입니다",
271271
textFieldState = rememberTextFieldState(initialText = "오류인 상태 텍스트입니다"),
272-
onCancelClick = {},
273-
onConfirmClick = {},
272+
onClickCancel = {},
273+
onClickConfirm = {},
274274
maxLength = 16,
275275
isError = true,
276276
errorMessage = "에러 메세지 텍스트",

‎core/designsystem/src/main/java/com/neki/android/core/designsystem/dialog/DoubleButtonAlertDialog.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ fun DoubleButtonAlertDialog(
3434
grayButtonText: String,
3535
primaryButtonText: String,
3636
onDismissRequest: () -> Unit,
37-
onPrimaryButtonClick: () -> Unit,
38-
onGrayButtonClick: () -> Unit,
37+
onClickPrimaryButton: () -> Unit,
38+
onClickGrayButton: () -> Unit,
3939
modifier: Modifier = Modifier,
4040
properties: DialogProperties = DialogProperties(),
4141
) {
@@ -85,12 +85,12 @@ fun DoubleButtonAlertDialog(
8585
) {
8686
CTAButtonGray(
8787
text = grayButtonText,
88-
onClick = onGrayButtonClick,
88+
onClick = onClickGrayButton,
8989
modifier = Modifier.weight(1f),
9090
)
9191
CTAButtonPrimary(
9292
text = primaryButtonText,
93-
onClick = onPrimaryButtonClick,
93+
onClick = onClickPrimaryButton,
9494
modifier = Modifier.weight(1f),
9595
)
9696
}
@@ -108,8 +108,8 @@ private fun DoubleButtonAlertDialogPreview() {
108108
grayButtonText = "텍스트",
109109
primaryButtonText = "텍스트",
110110
onDismissRequest = {},
111-
onPrimaryButtonClick = {},
112-
onGrayButtonClick = {},
111+
onClickPrimaryButton = {},
112+
onClickGrayButton = {},
113113
)
114114
}
115115
}

‎core/designsystem/src/main/java/com/neki/android/core/designsystem/dialog/WarningDialog.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box
66
import androidx.compose.foundation.layout.Column
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.padding
9+
import androidx.compose.foundation.layout.size
910
import androidx.compose.foundation.shape.RoundedCornerShape
1011
import androidx.compose.material3.Icon
1112
import androidx.compose.material3.Text
@@ -46,8 +47,9 @@ fun WarningDialog(
4647
modifier = Modifier
4748
.align(Alignment.TopEnd)
4849
.padding(12.dp)
50+
.size(24.dp)
4951
.clickableSingle(onClick = onDismissRequest),
50-
imageVector = ImageVector.vectorResource(R.drawable.icon_close_24),
52+
imageVector = ImageVector.vectorResource(R.drawable.icon_close),
5153
tint = NekiTheme.colorScheme.gray900,
5254
contentDescription = null,
5355
)

‎core/designsystem/src/main/java/com/neki/android/core/designsystem/toast/NekiToast.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fun NekiActionToast(
8484
private fun NekiToastPreview() {
8585
NekiTheme {
8686
NekiToast(
87-
iconRes = R.drawable.icon_checkbox_on_24,
87+
iconRes = R.drawable.icon_checkbox_on,
8888
text = "텍스트",
8989
)
9090
}
@@ -95,7 +95,7 @@ private fun NekiToastPreview() {
9595
private fun NekiActionToastPreview() {
9696
NekiTheme {
9797
NekiActionToast(
98-
iconRes = R.drawable.icon_checkbox_on_24,
98+
iconRes = R.drawable.icon_checkbox_on,
9999
text = "텍스트",
100100
buttonText = "텍스트",
101101
onClickActionButton = {},

‎core/designsystem/src/main/java/com/neki/android/core/designsystem/topbar/TitleTopBar.kt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fun CloseTitleTopBar(
3737
) {
3838
Icon(
3939
modifier = Modifier.size(28.dp),
40-
imageVector = ImageVector.vectorResource(R.drawable.icon_close_24),
40+
imageVector = ImageVector.vectorResource(R.drawable.icon_close),
4141
tint = NekiTheme.colorScheme.gray800,
4242
contentDescription = null,
4343
)
@@ -56,7 +56,7 @@ fun CloseTitleTextButtonTopBar(
5656
enabledTextColor: Color = NekiTheme.colorScheme.primary500,
5757
disabledTextColor: Color = NekiTheme.colorScheme.gray200,
5858
onClose: () -> Unit = {},
59-
onTextButtonClick: () -> Unit = {},
59+
onClickTextButton: () -> Unit = {},
6060
) {
6161
NekiTitleTopBar(
6262
modifier = modifier,
@@ -69,7 +69,7 @@ fun CloseTitleTextButtonTopBar(
6969
) {
7070
Icon(
7171
modifier = Modifier.size(28.dp),
72-
imageVector = ImageVector.vectorResource(R.drawable.icon_close_24),
72+
imageVector = ImageVector.vectorResource(R.drawable.icon_close),
7373
tint = NekiTheme.colorScheme.gray800,
7474
contentDescription = null,
7575
)
@@ -80,7 +80,7 @@ fun CloseTitleTextButtonTopBar(
8080
NekiTextButton(
8181
modifier = modifier.fillMaxHeight(),
8282
contentPadding = PaddingValues(horizontal = 20.dp),
83-
onClick = onTextButtonClick,
83+
onClick = onClickTextButton,
8484
enabled = enabled,
8585
) {
8686
Text(
@@ -102,7 +102,7 @@ fun BackTitleTextButtonTopBar(
102102
enabledTextColor: Color = NekiTheme.colorScheme.primary500,
103103
disabledTextColor: Color = NekiTheme.colorScheme.gray200,
104104
onBack: () -> Unit = {},
105-
onTextButtonClick: () -> Unit = {},
105+
onClickTextButton: () -> Unit = {},
106106
) {
107107
NekiTitleTopBar(
108108
modifier = modifier,
@@ -126,7 +126,7 @@ fun BackTitleTextButtonTopBar(
126126
NekiTextButton(
127127
modifier = modifier.fillMaxHeight(),
128128
contentPadding = PaddingValues(horizontal = 20.dp),
129-
onClick = onTextButtonClick,
129+
onClick = onClickTextButton,
130130
enabled = enabled,
131131
) {
132132
Text(
@@ -171,7 +171,7 @@ fun BackTitleOptionTopBar(
171171
title: String,
172172
modifier: Modifier = Modifier,
173173
onBack: () -> Unit = {},
174-
onIconClick: () -> Unit = {},
174+
onClickIcon: () -> Unit = {},
175175
) {
176176
NekiTitleTopBar(
177177
modifier = modifier,
@@ -196,11 +196,11 @@ fun BackTitleOptionTopBar(
196196
modifier = modifier
197197
.padding(end = 8.dp)
198198
.size(52.dp),
199-
onClick = onIconClick,
199+
onClick = onClickIcon,
200200
) {
201201
Icon(
202202
modifier = Modifier.size(28.dp),
203-
imageVector = ImageVector.vectorResource(R.drawable.icon_option),
203+
imageVector = ImageVector.vectorResource(R.drawable.icon_kebab),
204204
tint = NekiTheme.colorScheme.gray800,
205205
contentDescription = null,
206206
)
@@ -219,8 +219,8 @@ fun BackTitleTextButtonOptionTopBar(
219219
disabledTextColor: Color = NekiTheme.colorScheme.gray200,
220220
optionIconRes: Int = R.drawable.icon_option,
221221
onBack: () -> Unit = {},
222-
onTextButtonClick: () -> Unit = {},
223-
onIconClick: () -> Unit = {},
222+
onClickTextButton: () -> Unit = {},
223+
onClickIcon: () -> Unit = {},
224224
) {
225225
NekiTitleTopBar(
226226
modifier = modifier,
@@ -250,7 +250,7 @@ fun BackTitleTextButtonOptionTopBar(
250250
.fillMaxHeight()
251251
.padding(vertical = 3.dp),
252252
contentPadding = PaddingValues(horizontal = 8.dp),
253-
onClick = onTextButtonClick,
253+
onClick = onClickTextButton,
254254
enabled = enabled,
255255
) {
256256
Text(
@@ -263,7 +263,7 @@ fun BackTitleTextButtonOptionTopBar(
263263
modifier = modifier
264264
.padding(end = 8.dp)
265265
.size(52.dp),
266-
onClick = onIconClick,
266+
onClick = onClickIcon,
267267
) {
268268
Icon(
269269
modifier = Modifier.size(28.dp),

core/designsystem/src/main/res/drawable/icon_check_white.xml renamed to core/designsystem/src/main/res/drawable/icon_check.xml

File renamed without changes.

0 commit comments

Comments
 (0)