Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix/#7] fix project setting #18

Merged
merged 8 commits into from
Jan 14, 2025
Merged

Conversation

hyoeunjoo
Copy link
Collaborator

โœ… ๐—–๐—ต๐—ฒ๐—ฐ๐—ธ-๐—Ÿ๐—ถ๐˜€๐˜

  • mergeํ•  ๋ธŒ๋žœ์น˜์˜ ์œ„์น˜๋ฅผ ํ™•์ธํ•ด ์ฃผ์„ธ์š”(mainโŒ/developโญ•)
  • ๋ฆฌ๋ทฐ๊ฐ€ ํ•„์š”ํ•œ ๊ฒฝ์šฐ ๋ฆฌ๋ทฐ์–ด๋ฅผ ์ง€์ •ํ•ด ์ฃผ์„ธ์š”
  • ๋ฆฌ๋ทฐ๋Š” (์•„์ง ๋ฏธ์ •)์— ์ง„ํ–‰๋ฉ๋‹ˆ๋‹ค.
  • P1 ๋‹จ๊ณ„์˜ ๋ฆฌ๋ทฐ๋Š” (์•„์ง ๋ฏธ์ •)๊นŒ์ง€ ๋ฐ˜์˜ํ•ฉ๋‹ˆ๋‹ค.
  • Approve๋œ PR์€ assigner๊ฐ€ ๋จธ์ง€ํ•˜๊ณ , ์ˆ˜์ • ์š”์ฒญ์ด ์˜จ ๊ฒฝ์šฐ ์ˆ˜์ • ํ›„ ๋‹ค์‹œ push๋ฅผ ํ•ฉ๋‹ˆ๋‹ค.

๐Ÿ“Œ ๐—œ๐˜€๐˜€๐˜‚๐—ฒ๐˜€

๐Ÿ“Ž๐—ช๐—ผ๐—ฟ๐—ธ ๐——๐—ฒ๐˜€๐—ฐ๐—ฟ๐—ถ๐—ฝ๐˜๐—ถ๐—ผ๐—ป

  • ๋ฐ”ํ…€๋„ค๋น„๊ฒŒ์ด์…˜ + ๋„ค๋น„๊ฒŒ์ด์…˜ ๋กœ์ง ์žฌ๊ตฌํ˜„ํ–ˆ์Šต๋‹ˆ๋‹ค.

๐Ÿ“ท ๐—ฆ๐—ฐ๐—ฟ๐—ฒ๐—ฒ๐—ป๐˜€๐—ต๐—ผ๐˜

bottom.mp4

๐Ÿ’ฌ ๐—ง๐—ผ ๐—ฅ๐—ฒ๐˜ƒ๐—ถ๐—ฒ๐˜„๐—ฒ๐—ฟ๐˜€

๋ฉ”๋‘ฅ์ด๋“ค์•„~~!!! ์กฐ๊ธˆ๋งŒ ํž˜๋‚ด์ž!! ๋‹ค๋“ค ๋„˜ ์ž˜ํ•˜๊ณ  ์žˆ์œผ๋‹ˆ๊นŒ!
์ด๊ฑฐ ๊ตฌ์กฐ๋Š” ์ด๋”ฐ๊ฐ€ ํ•œ ๋ฒˆ ์ซ™ ์„ค๋ช…ํ•ด์ฃผ๊ป˜!!!
๋‹ค๋“ค ๋ฉ”๋ž‘ํ•ด~๐Ÿ’—

@hyoeunjoo hyoeunjoo added the ๐Ÿ”ง [FIX] ๋ฒ„๊ทธ ๋ฐ ์˜ค๋ฅ˜ ํ•ด๊ฒฐ label Jan 14, 2025
@hyoeunjoo hyoeunjoo self-assigned this Jan 14, 2025
Copy link
Collaborator

@imtaejugkim imtaejugkim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋„ค๋น„๊ฒŒ์ด์…˜ ์ •๋ง ๊ณ ์ƒ ๋งŽ์•˜์Šต๋‹ˆ๋‹ค!! ์ธ์ž ๋„˜๊ฒจ์ฃผ๋Š” ์ฝ”๋“œ๋„ ํ•œ๋ฒˆ ์„ค๋ช…ํ•ด์ฃผ์‹œ๋ฉด ๊ฐ์‚ฌํ•˜๋“œ๋ฆฝ๋‹ˆ๋‹ค..ใ…Ž

Comment on lines +10 to +24
fun NavController.navigationOnboarding2(navOptions: NavOptions? = null) {
navigate("OnboardingScreen2", navOptions)
}

fun NavGraphBuilder.onboardingNavGraph(
navigateToOnboardingScreen2: () -> Unit,
navigateToMainScreen: () -> Unit,
) {
composable("OnboardingScreen1") {
OnboardingScreen1(navigateToOnboardingScreen2 = navigateToOnboardingScreen2)
}
composable("OnboardingScreen2") {
OnboardingScreen2(navigateToMainScreen = navigateToMainScreen)
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3 : ์„ค๋ช…ํ•˜์‹  ๊ฒƒ ์™„๋ฒฝํžˆ ์ดํ•ดํ–ˆ์Šต๋‹ˆ๋‹ค!!

Comment on lines +10 to +16
fun NavController.navigationTodo(navOptions: NavOptions) {
navigate(
route = MainNavigationBarRoute.Todo::class.simpleName.orEmpty(),
navOptions = navOptions,
)
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3 : simplename์ด ํด๋ž˜์Šค์˜ ๋™์  ์ด๋ฆ„์„ ๊ฐ€์ ธ์˜ค๋Š” ๋ฐฉ๋ฒ•์ด๊ตฐ์š”!

Copy link
Collaborator

@hwidung hwidung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋„ˆ๋ฌด ๋„ˆ๋ฌด ๊ณ ์ƒ ๋งŽ์•˜์–ด์š” ์–ธ๋‹ˆ ์ตœ๊ณ ์•ผ ์ง„์งœ!!! ๐Ÿ–ค๐Ÿ–ค

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3 : ๋“ค์–ด์ค€ ์˜จ๋ณด๋”ฉ ์˜ˆ์‹œ๋ฅผ ์ž˜ ํ™œ์šฉํ•ด ๋ณผ๊ฒŒ์š”!! ๐Ÿ‘

private val currentDestination: NavDestination?
@Composable get() = navHostController.currentBackStackEntryAsState().value?.destination

val startDestination = "OnboardingScreen1"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3 : ์ƒ์ˆ˜ํ™” ํ•„์š”ํ•œ์ง€ ๊ถ๊ธˆํ•ด์š” !

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋„ค! ์ œ๊ฐ€ ๊ทธ๋ƒฅ ์ง€๊ธˆ ๋ง‰ ์งœ๋Š๋ƒ๊ณ  ์ด๋ ‡๊ฒŒ ๋๋Š”๋ฐ ์‚ฌ์‹ค์€ ํ•˜๋ฉด ์ข‹์ฃ ..
์ œ ์ƒ๊ฐ์— ๋ฃจํŠธ๋Š” ๋ชจ๋‘ ์ƒ์ˆ˜ํ™”์‹œํ‚ค๋Š”๊ฒŒ ์ข‹์€ ๊ฒƒ ๊ฐ™์Šต๋‹ˆ๋‹ค!

@hyoeunjoo hyoeunjoo merged commit 50cdae8 into develop Jan 14, 2025
1 check passed
@hyoeunjoo hyoeunjoo deleted the fix/#7-fix-project-setting branch January 14, 2025 17:07
Copy link

@jihyunniiii jihyunniiii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๊ณ ์ƒํ•˜์…จ์Šต๋‹ˆ๋‹ค!
๋ฆฌ๋ทฐ ์ฝ์–ด๋ณด์‹œ๊ณ  ์งˆ๋ฌธ ์žˆ์œผ๋ฉด ์–ธ์ œ๋“  ํ•ด์ฃผ์…”์š”!

navigationBarItems = BottomNavigationType.entries,
currentNavigationBarItem = navigator.currentMainNavigationBarItem,
onNavigationBarItemSelected = { navigator.navigateMainNavigation(it) },
onAddButtonClick = { navigator.navigateToBottomSheet() },

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋ฐ”ํ…€ ์‹œํŠธ๋„ navigator๋กœ ๊ด€๋ฆฌํ•œ ์ด์œ ๊ฐ€ ๊ถ๊ธˆํ•ด์š”!
์ €๋Š” navigator๊ฐ€ ์•ฑ ๋‚ด์˜ ์„œ๋กœ ๋‹ค๋ฅธ ํ™”๋ฉด ๊ฐ„์˜ ์ด๋™์— ๋Œ€ํ•œ ๋กœ์ง์„ ์ฑ…์ž„์ง„๋‹ค๊ณ  ์ƒ๊ฐํ•ด์š”.
๋ฐ”ํ…€ ์‹œํŠธ๊ฐ€ ๋‚˜ํƒ€๋‚˜๋Š” ๊ฒƒ์€ ์„œ๋กœ ๋‹ค๋ฅธ ํ™”๋ฉด ๊ฐ„์˜ ์ด๋™์ด ์•„๋‹Œ ํ•œ ํ™”๋ฉด ๋‚ด์—์„œ ์ถ”๊ฐ€์ ์ธ ์ •๋ณด๋ฅผ ์–ป๊ธฐ ์œ„ํ•ด UI ์š”์†Œ๋ฅผ ๋‚˜ํƒ€๋‚˜๊ฒŒ ํ•˜๋Š” ๊ฒƒ์ด๊ธฐ ๋•Œ๋ฌธ์— navigator๋กœ ๊ด€๋ฆฌํ•˜๋Š” ๊ฒƒ๋ณด๋‹ค๋Š” ๊ฐ ํ™”๋ฉด์˜ ์ƒํƒœ๋ฅผ ๋ณ€๊ฒฝ ์‹œํ‚ค๋Š” ๋ฐฉ์‹์œผ๋กœ ๊ตฌํ˜„ํ•˜๋Š” ๊ฒƒ์ด ์–ด๋–จ๊นŒ ์‹ถ๋„ค์š”!

fun navigateToOnboarding2() {
navHostController.navigationOnboarding2()
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack ๊ด€๋ฆฌ๋ฅผ ์œ„ํ•ด popBackStack ํ•จ์ˆ˜๋“ค์„ ๋ฏธ๋ฆฌ ์ถ”๊ฐ€ํ•ด๋‘์–ด๋„ ์ข‹์„ ๊ฒƒ ๊ฐ™์•„์š” !


@Composable
fun CustomNavigationBarItem(
context: Context,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์‚ฌ์šฉ๋˜์ง€ ์•Š๋Š” ์ธ์ž๊ฐ™์•„์š”!
ํ™•์ธ ํ›„ ์ง€์›Œ์ฃผ์‹œ๋ฉด ์ข‹์„ ๊ฒƒ ๊ฐ™๋„ค์š” ~

Comment on lines +59 to +60
bottomNavigationType.label?.let {
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์š”๊ฑฐ ์—†์–ด๋„ ๋  ๊ฒƒ ๊ฐ™์€๋ฐ!
๋งˆ์ฐฌ๊ฐ€์ง€๋กœ ํ™•์ธ ํ›„ ์ˆ˜์ •ํ•˜๋ฉด ์ข‹์„ ๊ฒƒ ๊ฐ™์•„์š” ~

Comment on lines +89 to +113
CustomNavigationBarItem(
context = context,
bottomNavigationType = navigationBarItems[0],
isSelected = currentNavigationBarItem == navigationBarItems[0],
onClick = { onNavigationBarItemSelected(navigationBarItems[0]) },
modifier = Modifier.weight(1f),
)

Box(
modifier =
Modifier
.size(48.dp)
.background(Color.LightGray, shape = RoundedCornerShape(24.dp))
.clickable { onAddButtonClick() },
contentAlignment = Alignment.Center,
) {
Icon(
painter = painterResource(id = R.drawable.add_white_24),
contentDescription = "Add Button",
tint = Color.White,
)
}

CustomNavigationBarItem(
context = context,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ด ๋ถ€๋ถ„ ์กฐ๊ธˆ ๋” ํ™•์žฅ์„ฑ์žˆ๊ฒŒ ๊ด€๋ฆฌํ•˜๋Š” ๋ฐฉ๋ฒ•์„ ๊ณ ๋ฏผํ•ด๋ด๋„ ์ข‹์„ ๊ฒƒ ๊ฐ™์•„์š”!
์ง€๊ธˆ ์ƒ๊ฐ๋‚˜๋Š” ๋ฐฉ๋ฒ•์€,,,

  1. ์ค‘๊ฐ„ + ๋ฒ„ํŠผ๊นŒ์ง€ navigationBarItems์— ๋„ฃ๊ธฐ
  2. navigationBarItems enum ๋‚ด๋ถ€์— ๋ถ„๊ธฐ์ฒ˜๋ฆฌ๋ฅผ ํ•  ์ˆ˜ ์žˆ๋Š” ๊ฐ’ ๋„ฃ๊ธฐ
  3. ์ถ”๊ฐ€ ํ•œ ๊ฐ’์œผ๋กœ ๋ถ„๊ธฐ์ฒ˜๋ฆฌ ํ•˜์—ฌ ๋‹ค๋ฅธ UI ๋ฐ ๋กœ์ง ์‹คํ–‰ํ•˜๊ธฐ

๊ณ ๋ฏผํ•ด๋ณด์‹œ๊ณ  ์ถ”ํ›„์—๋ผ๋„ ๋ฆฌํŒฉํ† ๋ง ํ•ด๋ณด๋ฉด ํšจ์œจ์ ์ธ ์ฝ”๋“œ๊ฐ€ ๋  ๊ฒƒ ๊ฐ™์Šต๋‹ˆ๋‹ค! (์ถ”ํ›„ ๋ฐ”ํ…€ ๋„ค๋น„์˜ ์š”์†Œ๊ฐ€ ๋Š˜์–ด๋‚˜๋Š” ๊ฒฝ์šฐ๋„ ์ •๋ง ๋งŽ๊ธฐ์— ๋ณ€ํ™”์— ์œ ์—ฐํ•˜๊ฒŒ ๋Œ€์ฒ˜ํ•  ์ˆ˜ ์žˆ๋„๋ก !!)

Comment on lines +20 to +22
modifier: Modifier = Modifier,
navigator: MainNavigator,
padding: PaddingValues,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ด๊ฑฐ ์ˆœ์„œ ๋งž์ถฐ์ค์‹œ๋‹ค!!
ํ•„์ˆ˜ ์ธ์ž > Modifier > ์„ ํƒ ์ธ์ž ์ˆœ์„œ !!

)

todayNavGraph(
navigateToReqres = { navigator.navigateToReqres() },

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:: (๋”๋ธ”์ฝœ๋ก )์„ ํ†ตํ•ด์„œ ์ž‘์„ฑํ•  ์ˆ˜๋„ ์žˆ์–ด์š”!

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋‚˜์ค‘์— ์„ธ๋ฏธ๋‚˜ ๋•Œ ๋‹ค๋ค˜๋˜ ๊ฒƒ์ฒ˜๋Ÿผ TypeSafetyํ•œ ๋ฐฉ๋ฒ•์„ ์‚ฌ์šฉํ•ด ๋ณด์•„๋„ ์ข‹์„ ๊ฒƒ ๊ฐ™์•„์š”.

import androidx.compose.ui.graphics.Color

@Composable
fun OnboardingScreen1(navigateToOnboardingScreen2: () -> Unit) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OnboardingScreen์„ 2๊ฐœ๋ฅผ ๋งŒ๋“œ์‹  ์ด์œ ๊ฐ€ ์žˆ๋‚˜์š”?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UI๋ฅผ ๋ณด์ง€ ์•Š์•„์„œ ์ž˜ ๋ชจ๋ฅด๊ฒ ์ง€๋งŒ pager ๋“ฑ์œผ๋กœ ์ด๋™ํ•˜๋Š” ๊ฒƒ์ด ํ•„์š”ํ•œ ํ™”๋ฉด์ด๋ผ๋ฉด ํ•˜๋‚˜์˜ Screen์„ ํ†ตํ•ด์„œ ๊ตฌํ˜„ํ•˜์…”๋„ ์ถฉ๋ถ„ํ•  ๊ฒƒ ๊ฐ™์•„์š”!

Comment on lines +20 to +27
composable(TodoRoute.TODO) {
TodoScreen()
}
}

object TodoRoute {
const val TODO = "Todo"
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ด ํ™”๋ฉด ์ž˜ ์ด๋™ ํ•˜๋‚˜์š”??
navigate()์˜ route ๊ฐ’๊ณผ composable()์˜ route ๊ฐ’์ด ๋™์ผํ•ด์•ผ ์˜ค๋ฅ˜ ์—†์ด ์ •์ƒ์ ์œผ๋กœ navigation ๋ฉ๋‹ˆ๋‹ค!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
๐Ÿ”ง [FIX] ๋ฒ„๊ทธ ๋ฐ ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Fix] ํ”„๋กœ์ ํŠธ ๊ธฐ์ดˆ์„ธํŒ… ์ˆ˜์ •
4 participants