Skip to content

Commit

Permalink
Rename missing parts to concrete
Browse files Browse the repository at this point in the history
  • Loading branch information
yasanglass committed Dec 19, 2023
1 parent 0139e11 commit d62100d
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme

@Composable
public fun BottomBar(
Expand All @@ -14,7 +14,7 @@ public fun BottomBar(
) {
Column(
modifier = modifier
.background(color = StillbirthTheme.colors.layer.foreground)
.background(color = ConcreteTheme.colors.layer.foreground)
.fillMaxWidth(),
) {
Divider()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.Shape
import glass.yasan.spine.compose.util.adaptiveContentColor
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme

@Composable
public fun Button(
content: @Composable (Color) -> Unit,
onClick: () -> Unit,
modifier: Modifier = Modifier,
shape: Shape = RectangleShape,
backgroundColor: Color = StillbirthTheme.colors.layer.foreground,
backgroundColor: Color = ConcreteTheme.colors.layer.foreground,
contentColor: Color = adaptiveContentColor(backgroundColor = backgroundColor),
border: BorderStroke? = BorderStroke(
width = StillbirthTheme.sizes.borderStrokeWidth,
color = StillbirthTheme.colors.layer.background,
width = ConcreteTheme.sizes.borderStrokeWidth,
color = ConcreteTheme.colors.layer.background,
),
enabled: Boolean = true,
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme
import androidx.compose.material3.Divider as Material3Divider

@Composable
public fun Divider(
modifier: Modifier = Modifier,
color: Color = StillbirthTheme.colors.layer.background,
thickness: Dp = StillbirthTheme.sizes.borderStrokeWidth,
color: Color = ConcreteTheme.colors.layer.background,
thickness: Dp = ConcreteTheme.sizes.borderStrokeWidth,
) {

Material3Divider(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme

@Composable
public fun Icon(
imageVector: ImageVector,
contentDescription: String?,
modifier: Modifier = Modifier,
tint: Color = StillbirthTheme.colors.content.major,
tint: Color = ConcreteTheme.colors.content.major,
) {

Material3Icon(
Expand All @@ -30,7 +30,7 @@ public fun Icon(
painter: Painter,
contentDescription: String?,
modifier: Modifier = Modifier,
tint: Color = StillbirthTheme.colors.content.major,
tint: Color = ConcreteTheme.colors.content.major,
) {

Material3Icon(
Expand All @@ -46,7 +46,7 @@ public fun Icon(
bitmap: ImageBitmap,
contentDescription: String?,
modifier: Modifier = Modifier,
tint: Color = StillbirthTheme.colors.content.major,
tint: Color = ConcreteTheme.colors.content.major,
) {

Material3Icon(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp
import glass.yasan.spine.compose.util.adaptiveContentColor
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme

@Composable
public fun IconButton(
imageVector: ImageVector,
onClick: () -> Unit,
modifier: Modifier = Modifier,
shape: Shape = CircleShape,
backgroundColor: Color = StillbirthTheme.colors.layer.foreground,
backgroundColor: Color = ConcreteTheme.colors.layer.foreground,
contentColor: Color = adaptiveContentColor(backgroundColor = backgroundColor),
border: BorderStroke? = BorderStroke(
width = StillbirthTheme.sizes.borderStrokeWidth,
color = StillbirthTheme.colors.layer.background,
width = ConcreteTheme.sizes.borderStrokeWidth,
color = ConcreteTheme.colors.layer.background,
),
enabled: Boolean = true,
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import androidx.compose.material3.CircularProgressIndicator as Material3Circular
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme

@Composable
public fun ProgressBarCircular(
modifier: Modifier = Modifier,
color: Color = StillbirthTheme.colors.content.major,
color: Color = ConcreteTheme.colors.content.major,
) {
Material3CircularProgressIndicator(
modifier = modifier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import androidx.compose.material3.LinearProgressIndicator as Material3LinearProg
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme

@Composable
public fun ProgressBarLinear(
modifier: Modifier = Modifier,
color: Color = StillbirthTheme.colors.content.major,
color: Color = ConcreteTheme.colors.content.major,
) {
Material3LinearProgressIndicator(
modifier = modifier.fillMaxWidth(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.TextUnit
import glass.yasan.spine.compose.type.rubikFamily
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme
import androidx.compose.material3.Text as Material3Text

@Composable
Expand Down Expand Up @@ -57,9 +57,9 @@ public fun Text(
@Preview
@Composable
private fun TextPreview() {
StillbirthTheme {
ConcreteTheme {
Surface(
color = StillbirthTheme.colors.layer.foreground,
color = ConcreteTheme.colors.layer.foreground,
) {
Text(
text = "Hello World",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import glass.yasan.spine.compose.util.adaptiveContentColor
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme


@Composable
Expand All @@ -30,11 +30,11 @@ public fun TextButton(
iconStart: ImageVector? = null,
iconEnd: ImageVector? = null,
shape: Shape = RectangleShape,
backgroundColor: Color = StillbirthTheme.colors.layer.foreground,
backgroundColor: Color = ConcreteTheme.colors.layer.foreground,
contentColor: Color = adaptiveContentColor(backgroundColor = backgroundColor),
border: BorderStroke? = BorderStroke(
width = StillbirthTheme.sizes.borderStrokeWidth,
color = StillbirthTheme.colors.layer.background,
width = ConcreteTheme.sizes.borderStrokeWidth,
color = ConcreteTheme.colors.layer.background,
),
enabled: Boolean = true,
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import glass.yasan.concrete.theme.StillbirthTheme
import glass.yasan.concrete.theme.ConcreteTheme

@Composable
public fun TopBar(
Expand All @@ -14,7 +14,7 @@ public fun TopBar(
) {
Column(
modifier = modifier
.background(color = StillbirthTheme.colors.layer.foreground)
.background(color = ConcreteTheme.colors.layer.foreground)
.fillMaxWidth(),
) {
content()
Expand Down
8 changes: 4 additions & 4 deletions concrete/src/main/kotlin/glass/yasan/concrete/theme/Theme.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import glass.yasan.concrete.theme.size.LocalSizes
import glass.yasan.concrete.theme.size.Sizes

@Composable
public fun StillbirthTheme(
colors: Colors = StillbirthTheme.colors,
sizes: Sizes = StillbirthTheme.sizes,
public fun ConcreteTheme(
colors: Colors = ConcreteTheme.colors,
sizes: Sizes = ConcreteTheme.sizes,
content: @Composable () -> Unit,
) {
val rememberedColors = remember { colors.copy() }.apply { updateColorsFrom(colors) }
Expand All @@ -25,7 +25,7 @@ public fun StillbirthTheme(
)
}

public object StillbirthTheme {
public object ConcreteTheme {

public val colors: Colors
@Composable
Expand Down

0 comments on commit d62100d

Please sign in to comment.