-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #45 from zurdus/top-app-bar
Introduce TopAppBar component
- Loading branch information
Showing
8 changed files
with
152 additions
and
208 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
187 changes: 0 additions & 187 deletions
187
catalog/src/main/java/kiwi/orbit/compose/catalog/components/AppBar.kt
This file was deleted.
Oops, something went wrong.
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
119 changes: 119 additions & 0 deletions
119
ui/src/main/java/kiwi/orbit/compose/ui/controls/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,119 @@ | ||
| package kiwi.orbit.compose.ui.controls | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.RowScope | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.CompositionLocalProvider | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.painter.Painter | ||
| import androidx.compose.ui.platform.LocalLayoutDirection | ||
| import androidx.compose.ui.platform.testTag | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.semantics.semantics | ||
| import androidx.compose.ui.semantics.testTag | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.Dp | ||
| import androidx.compose.ui.unit.LayoutDirection | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import com.google.accompanist.insets.LocalWindowInsets | ||
| import com.google.accompanist.insets.rememberInsetsPaddingValues | ||
| import kiwi.orbit.compose.ui.OrbitTheme | ||
| import kiwi.orbit.compose.ui.R | ||
| import kiwi.orbit.compose.ui.foundation.ContentEmphasis | ||
| import kiwi.orbit.compose.ui.foundation.LocalContentEmphasis | ||
| import kiwi.orbit.compose.ui.foundation.ProvideMergedTextStyle | ||
| import kiwi.orbit.compose.ui.foundation.contentColorFor | ||
| import com.google.accompanist.insets.ui.TopAppBar as AccompanistTopAppBar | ||
|
|
||
| @Composable | ||
| public fun TopAppBar( | ||
| title: @Composable () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| navigationIcon: @Composable (() -> Unit)? = null, | ||
| actions: @Composable RowScope.() -> Unit = {}, | ||
| backgroundColor: Color = OrbitTheme.colors.surface.main, | ||
| contentColor: Color = contentColorFor(backgroundColor), | ||
| elevation: Dp = 2.dp, | ||
| ) { | ||
| AccompanistTopAppBar( | ||
| title = { | ||
| ProvideMergedTextStyle( | ||
| value = OrbitTheme.typography.title2.copy( | ||
| fontSize = 20.sp, | ||
| letterSpacing = 0.15.sp, | ||
| fontWeight = FontWeight.Medium, | ||
| ) | ||
| ) { | ||
| CompositionLocalProvider( | ||
| LocalContentEmphasis provides ContentEmphasis.Normal | ||
| ) { | ||
| Box( | ||
| Modifier.semantics(mergeDescendants = true) { | ||
| testTag = TopAppBarSemantics.TitleTag | ||
| } | ||
| ) { | ||
| title() | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| modifier = modifier.testTag(TopAppBarSemantics.Tag), | ||
| navigationIcon = if (navigationIcon != null) { | ||
| { | ||
| CompositionLocalProvider( | ||
| LocalContentEmphasis provides ContentEmphasis.Normal | ||
| ) { | ||
| navigationIcon.invoke() | ||
| } | ||
| } | ||
| } else null, | ||
| contentPadding = rememberInsetsPaddingValues( | ||
| insets = LocalWindowInsets.current.systemBars, | ||
| applyBottom = false | ||
| ), | ||
| actions = actions, | ||
| backgroundColor = backgroundColor, | ||
| contentColor = contentColor, | ||
| elevation = elevation, | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| public fun TopAppBar( | ||
| title: @Composable () -> Unit, | ||
| onBack: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| actions: @Composable RowScope.() -> Unit = {}, | ||
| ) { | ||
| TopAppBar( | ||
| title = title, | ||
| modifier = modifier, | ||
| navigationIcon = { | ||
| IconButton( | ||
| onClick = { onBack() }, | ||
| ) { | ||
| Icon( | ||
| getBackArrowIcon(), | ||
| contentDescription = stringResource(R.string.orbit_cd_navigate_up), | ||
| ) | ||
| } | ||
| }, | ||
| actions = actions, | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| private fun getBackArrowIcon(): Painter { | ||
| val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl | ||
| return painterResource( | ||
| if (isRtl) R.drawable.ic_appbar_arrow_right else R.drawable.ic_appbar_arrow_left | ||
| ) | ||
| } | ||
|
|
||
| public object TopAppBarSemantics { | ||
| public const val Tag: String = "top_app_bar" | ||
| public const val TitleTag: String = "title" | ||
| } |
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,9 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="#000000" | ||
| android:pathData="M22,12C22,11.448 21.552,11 21,11L5.83,11L10.71,6.12C11.102,5.728 11.101,5.093 10.708,4.703C10.316,4.314 9.685,4.315 9.295,4.705L2.707,11.293C2.317,11.683 2.317,12.317 2.707,12.707L9.295,19.295C9.684,19.684 10.316,19.684 10.705,19.295C11.095,18.905 11.095,18.274 10.706,17.885L5.83,13L21,13C21.552,13 22,12.552 22,12Z" /> | ||
| </vector> |
Oops, something went wrong.