Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.flipcash.core.R
Expand Down Expand Up @@ -59,7 +60,7 @@ data class TokenBalanceRowStyling(

@Composable
fun rememberTokenBalanceRowStyling(
nameTextStyle: TextStyle = CodeTheme.typography.screenTitle,
nameTextStyle: TextStyle = CodeTheme.typography.screenTitle.copy(fontWeight = FontWeight.Bold),
balanceDisplayStyle: TokenBalanceStyle = TokenBalanceStyle.Large(),
iconSize: Dp = CodeTheme.dimens.staticGrid.x6,
flagSize: Dp = CodeTheme.dimens.staticGrid.x3,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import com.getcode.theme.CodeTheme
import com.getcode.ui.components.charts.LineTrend
import com.getcode.ui.core.addIf
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.padding


@Composable
Expand Down Expand Up @@ -97,7 +98,7 @@ internal fun TokenMetricsRow(
)
}
Row(
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.fillMaxWidth().padding(top = CodeTheme.dimens.grid.x1),
horizontalArrangement = Arrangement.SpaceBetween,
) {
Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewWrapper
import com.flipcash.app.theme.FlipcashThemeWrapper
Expand Down Expand Up @@ -110,17 +112,24 @@ internal fun ReceiptLabel(
val readAtFormatted =
readPointer?.timestamp?.let { formatReadTimestamp(it) } ?: ""

Row(horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x1)) {
Row(
horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x1)) {
Text(
modifier = Modifier.alignByBaseline(),
text = text,
style = CodeTheme.typography.caption,
style = CodeTheme.typography.caption.copy(
fontWeight = FontWeight.SemiBold,
),
color = CodeTheme.colors.textSecondary,
)

if (animatedStatus == ReceiptStatus.READ && readAtFormatted.isNotEmpty()) {
Text(
modifier = Modifier.alignByBaseline(),
text = readAtFormatted,
style = CodeTheme.typography.caption,
style = CodeTheme.typography.caption.copy(
fontWeight = FontWeight.Medium,
),
color = CodeTheme.colors.textSecondary,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewWrapper
import androidx.compose.ui.unit.Dp
Expand Down Expand Up @@ -105,7 +106,9 @@ private fun TextBubble(
SelectionContainer {
Text(
text = text,
style = CodeTheme.typography.textSmall,
style = CodeTheme.typography.textMedium.copy(
fontWeight = FontWeight.Medium
),
color = CodeTheme.colors.textMain,
)
}
Expand Down Expand Up @@ -180,7 +183,9 @@ private fun CashBubble(
} else {
stringResource(R.string.subtitle_youReceived)
},
style = CodeTheme.typography.caption,
style = CodeTheme.typography.caption.copy(
fontWeight = FontWeight.Medium,
),
color = CodeTheme.colors.textSecondary,
)
PriceWithFlag(
Expand Down
2 changes: 1 addition & 1 deletion ui/theme/src/main/kotlin/com/getcode/theme/Type.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ private val Avenir = FontFamily(
Font(R.font.avenir_next_regular, FontWeight.ExtraLight),
Font(R.font.avenir_next_regular, FontWeight.Light),
Font(R.font.avenir_next_regular, FontWeight.Normal),
Font(R.font.avenir_next_demi, FontWeight.Medium),
Font(R.font.avenir_next_medium, FontWeight.Medium),
Font(R.font.avenir_next_demi, FontWeight.SemiBold),
Font(R.font.avenir_next_demi, FontWeight.Bold),
Font(R.font.avenir_next_demi, FontWeight.ExtraBold),
Expand Down
Loading