-
Notifications
You must be signed in to change notification settings - Fork 2
π :: (#810) ν νλ©΄ ꡬν #811
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
Merged
The head ref may contain hidden characters: "feature/810-\uD648-\uD654\uBA74-\uAD6C\uD604"
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
5d538e8
design :: λ°ν
λ€λΉκ²μ΄μ
λ° μμ΄μ½ 리μμ€ μΆκ°
uson1004 7a050a5
feat :: DmsItemButton μ»΄ν¬λνΈ κ΅¬ν
uson1004 dfd3d38
refactor :: BaseStateViewModel κ°μ
uson1004 bc045dd
refactor :: MyPage λͺ¨λΈ λ° λ§€νΌ μμ
uson1004 85b797d
feat :: ν νλ©΄ ꡬν
uson1004 6e082c0
feat :: μ μ² νλ©΄ ꡬν
uson1004 3a1521c
feat :: λ§μ΄νμ΄μ§ νλ©΄ ꡬν
uson1004 cb524b9
feat :: λ°ν
λ€λΉκ²μ΄μ
λ° κ΅¬ν
uson1004 d3129dd
feat :: DmsApp λ€λΉκ²μ΄μ
ν΅ν© λ° λ°ν
λ° μ°λ
uson1004 c9ed5dc
feat :: μ΄λ―Έμ§ μΆκ°
uson1004 714abe9
feat :: Meal Screen ꡬν
uson1004 6a880db
feat :: μ»΄ν¬λνΈ λ° λ·°λͺ¨λΈ ꡬν
uson1004 fb5f68b
feat :: NavHost MealScreen λ±λ‘
uson1004 3873625
feat :: ν app bar, μΊλ¦°λ λμμΈ μμ€ν
ꡬν
uson1004 680ed64
refactor :: paddingDefault νμΌ λͺ¨λ κ²½λ‘ λμμΈ μμ€ν
μΌλ‘ λ³κ²½
uson1004 1cecdaa
refactor :: paddingDefault λ³κ²½μΌλ‘ μΈν λ³κ²½μ¬ν μ μ©
uson1004 1b0e25b
refactor :: LocalDate java.timeμΌλ‘ λ³κ²½
uson1004 28a511a
refactor :: λ°ν
λ° μΈλμΌμ΄ν° ν¬λͺ
μμΌλ‘ λ³κ²½
uson1004 7890207
refactor :: home screen icon μμ
uson1004 011b107
feat :: brush μ μ©
uson1004 5cad217
feat :: immutable λΌμ΄λΈλ¬λ¦¬ μΆκ°
uson1004 8987417
refactor :: UI μΌλΆ λ‘μ§ λ·°λͺ¨λΈλ‘ μ΄μ νμ¬ κ°μ
uson1004 674c121
refactor :: μ»΄ν¬λνΈ λ μ§ νμ λ³κ²½
uson1004 93853bb
refactor :: μ»΄ν¬λνΈ λ° λμμΈ μμ€ν
μμ°μ΄λ μμ λ³κ²½
uson1004 5471c61
feat :: manifest νμΌ νμ΄μ΄λ² μ΄μ€ μ μ©
uson1004 5591f6c
refactor :: meal repository ꡬν체 result κ°μ²΄ λ°ν
uson1004 89eea07
refactor :: java.time λΌμ΄λΈλ¬λ¦¬ sdk 21+ μ§μ
uson1004 3605f56
refactor :: minsdk 24+ μ§μ
uson1004 8665f98
refactor :: μ€ν¬λ‘€ λλλ‘ μ μ© / λ°ν
λ° νμ νμ΄μ§ λ³κ²½
uson1004 93976dd
refactor :: meal screen ν¨λ© κ° μμ
uson1004 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
app/src/dev/kotlin/team/aliens/dms/android/app/BottomMenu.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package team.aliens.dms.android.app | ||
|
|
||
| import androidx.annotation.DrawableRes | ||
| import androidx.navigation3.runtime.NavKey | ||
| import team.aliens.dms.android.core.designsystem.foundation.DmsIcon | ||
| import team.aliens.dms.android.feature.main.application.navigation.ApplicationRoute | ||
| import team.aliens.dms.android.feature.main.home.navigation.HomeRoute | ||
| import team.aliens.dms.android.feature.main.mypage.navigation.MyPageRoute | ||
|
|
||
| sealed class BottomMenu( | ||
| val route: NavKey, | ||
| @DrawableRes val icon: Int, | ||
| @DrawableRes val selectedIcon: Int, | ||
| val title: String, | ||
| ) { | ||
| data object Home : BottomMenu( | ||
| route = HomeScreenNav, | ||
| icon = DmsIcon.Home, | ||
| selectedIcon = DmsIcon.HomeFill, | ||
| title = "ν", | ||
| ) | ||
|
|
||
| data object Application : BottomMenu( | ||
| route = ApplicationScreenNav, | ||
| icon = DmsIcon.CheckCircle, | ||
| selectedIcon = DmsIcon.CheckCircleFill, | ||
| title = "μ μ²", | ||
| ) | ||
|
|
||
| data object MyPage : BottomMenu( | ||
| route = MyPageScreenNav, | ||
| icon = DmsIcon.MyPage, | ||
| selectedIcon = DmsIcon.MyPageFill, | ||
| title = "λ§μ΄νμ΄μ§", | ||
| ) | ||
| } |
84 changes: 84 additions & 0 deletions
84
app/src/dev/kotlin/team/aliens/dms/android/app/BottomNavigationBar.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package team.aliens.dms.android.app | ||
|
|
||
| import androidx.compose.animation.animateColorAsState | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.BottomAppBar | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.NavigationBarItem | ||
| import androidx.compose.material3.NavigationBarItemColors | ||
| import androidx.compose.material3.NavigationBarItemDefaults | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.navigation3.runtime.NavKey | ||
| import team.aliens.dms.android.core.designsystem.DmsTheme | ||
| import team.aliens.dms.android.core.designsystem.labelB | ||
|
|
||
| private val bottomMenus = listOf( | ||
| BottomMenu.Home, | ||
| BottomMenu.Application, | ||
| BottomMenu.MyPage, | ||
| ) | ||
|
|
||
| @Composable | ||
| fun BottomNavigationBar( | ||
| currentScreen: NavKey?, | ||
| onNavigate: (NavKey) -> Unit, | ||
| ) { | ||
|
|
||
| BottomAppBar( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .clip(RoundedCornerShape(topStart = 32.dp, topEnd = 32.dp)), | ||
| containerColor = DmsTheme.colorScheme.surfaceTint, | ||
| ) { | ||
| bottomMenus.forEach { destination -> | ||
| val selected = currentScreen == destination.route | ||
| val color by animateColorAsState( | ||
| targetValue = if (selected) { | ||
| DmsTheme.colorScheme.inverseOnSurface | ||
| } else { | ||
| DmsTheme.colorScheme.scrim | ||
| }, | ||
| ) | ||
|
|
||
| NavigationBarItem( | ||
| selected = selected, | ||
| enabled = !selected, | ||
| onClick = { | ||
| onNavigate(destination.route) | ||
| }, | ||
| colors = NavigationBarItemDefaults.colors( | ||
| indicatorColor = Color.Transparent, | ||
| ), | ||
| icon = { | ||
| Column( | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| Icon( | ||
| modifier = Modifier.size(32.dp), | ||
| painter = painterResource(id = if (selected) destination.selectedIcon else destination.icon), | ||
| contentDescription = destination.title, | ||
| tint = color, | ||
| ) | ||
| Text( | ||
| text = destination.title, | ||
| style = DmsTheme.typography.labelB, | ||
| color = color, | ||
| ) | ||
| } | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Enable desugaring for prod flavor as well.
Desugaring is only enabled for the dev flavor, but the
coreLibraryDesugaringdependency is added globally (Line 147). Since the PR migrates tojava.timeAPIs andminSdk = 23(API 23 < 26), the prod build will crash at runtime when usingjava.timeclasses without desugaring.π Proposed fix to enable desugaring for prod flavor
create("prod") { dimension = "environment" buildConfigField("String", "ENVIRONMENT", "\"prod\"") + + compileOptions { + isCoreLibraryDesugaringEnabled = true + } }π€ Prompt for AI Agents