-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* TopBar, SingleTitleTopBar, SearchTitleTopBar, DoubleTitleTopBar의 머티리얼 의존성 제거 - AppBar 파일 생성 -> TopAppBar, BottomAppBar 구현 - BottomBar 구현 중 * 리뷰 반영: BottomAppBar 삭제, BottomNavigation -> BottomBar * AppBar.kt -> TopAppBar.kt, TopAppBar internal (TopBar와 오인하지 않게) * Update TopAppBar.kt * topappbar는 topbar 패키지로 * conflict 제거 * Revert "conflict 제거" This reverts commit 51c006d. * 버전업 * 바텀바 제거 (BottomBar 브랜치에 있어야함) * Update BottomBar.kt
- Loading branch information
1 parent
ac10e2f
commit c676bcb
Showing
8 changed files
with
72 additions
and
23 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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
65 changes: 65 additions & 0 deletions
65
compose/src/main/java/com/yourssu/design/system/compose/component/topbar/TopAppBar.kt
This file contains 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,65 @@ | ||
| package com.yourssu.design.system.compose.component.topbar | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.RowScope | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.RectangleShape | ||
| import androidx.compose.ui.graphics.Shape | ||
| import androidx.compose.ui.unit.dp | ||
| import com.yourssu.design.system.compose.YdsTheme | ||
| import com.yourssu.design.system.compose.base.Surface | ||
|
|
||
| @Composable | ||
| internal fun TopAppBar( | ||
| modifier: Modifier = Modifier, | ||
| backgroundColor: Color = YdsTheme.colors.bgElevated, | ||
| contentColor: Color = YdsTheme.colors.textPrimary, | ||
| contentPadding: PaddingValues, | ||
| content: @Composable RowScope.() -> Unit, | ||
| ) { | ||
| AppBar( | ||
| backgroundColor, | ||
| contentColor, | ||
| contentPadding, | ||
| RectangleShape, | ||
| modifier = modifier, | ||
| content = content, | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| private fun AppBar( | ||
| backgroundColor: Color, | ||
| contentColor: Color, | ||
| contentPadding: PaddingValues, | ||
| shape: Shape, | ||
| modifier: Modifier = Modifier, | ||
| content: @Composable RowScope.() -> Unit, | ||
| ) { | ||
| Surface( | ||
| color = backgroundColor, | ||
| contentColor = contentColor, | ||
| shape = shape, | ||
| modifier = modifier, | ||
| ) { | ||
| Row( | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .padding(contentPadding) | ||
| .height(AppBarHeight), | ||
| horizontalArrangement = Arrangement.Start, | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| content = content, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private val AppBarHeight = 56.dp |
This file contains 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 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 |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| versionName=2.5.0 | ||
| versionName=2.5.1 | ||
| #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다 |