feat(maestro): bundle JetBrains Mono and match web's type scale
Bundles JetBrainsMono Regular/Medium/Bold (SIL OFL, see android/licenses/) so terminal and code content render the same face as the web SPA's --font-mono instead of falling back to the device's system mono. Typography now steps through the same sizes as the web --fs-* tokens, using the platform sans for UI chrome.
This commit is contained in:
@@ -1,17 +1,99 @@
|
||||
package pt.naps.maestro.ui.theme
|
||||
|
||||
import androidx.compose.material3.Typography
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.font.Font
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.unit.sp
|
||||
import pt.naps.maestro.R
|
||||
|
||||
/** Bundled (SIL OFL, android/licenses/JetBrainsMono-OFL.txt) rather than the
|
||||
* system mono fallback, so the terminal pane and code blocks render the same
|
||||
* face as the web SPA (--font-mono) on every device. */
|
||||
val JetBrainsMono = FontFamily(
|
||||
Font(R.font.jetbrains_mono_regular, FontWeight.Normal),
|
||||
Font(R.font.jetbrains_mono_medium, FontWeight.Medium),
|
||||
Font(R.font.jetbrains_mono_bold, FontWeight.Bold),
|
||||
)
|
||||
|
||||
/** UI chrome uses the platform sans (--font-sans is a system-ui stack on
|
||||
* web); only terminal/code content switches to [JetBrainsMono]. */
|
||||
private val Sans = FontFamily.Default
|
||||
|
||||
/** Scale roughly mirrors the web token steps (web/src/styles.css --fs-11
|
||||
* through --fs-20); role names are Material3's, not the CSS ones. */
|
||||
val Typography = Typography(
|
||||
bodyLarge = TextStyle(
|
||||
fontFamily = FontFamily.Default,
|
||||
fontWeight = FontWeight.Normal,
|
||||
fontSize = 16.sp,
|
||||
titleLarge = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
fontSize = 20.sp,
|
||||
lineHeight = 26.sp,
|
||||
letterSpacing = 0.sp,
|
||||
),
|
||||
titleMedium = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.Medium,
|
||||
fontSize = 17.sp,
|
||||
lineHeight = 24.sp,
|
||||
letterSpacing = 0.5.sp,
|
||||
letterSpacing = 0.sp,
|
||||
),
|
||||
titleSmall = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.Medium,
|
||||
fontSize = 15.sp,
|
||||
lineHeight = 20.sp,
|
||||
letterSpacing = 0.1.sp,
|
||||
),
|
||||
bodyLarge = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.Normal,
|
||||
fontSize = 15.sp,
|
||||
lineHeight = 22.sp,
|
||||
letterSpacing = 0.1.sp,
|
||||
),
|
||||
bodyMedium = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.Normal,
|
||||
fontSize = 14.sp,
|
||||
lineHeight = 20.sp,
|
||||
letterSpacing = 0.1.sp,
|
||||
),
|
||||
bodySmall = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.Normal,
|
||||
fontSize = 13.sp,
|
||||
lineHeight = 18.sp,
|
||||
letterSpacing = 0.1.sp,
|
||||
),
|
||||
labelLarge = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.Medium,
|
||||
fontSize = 13.sp,
|
||||
lineHeight = 18.sp,
|
||||
letterSpacing = 0.1.sp,
|
||||
),
|
||||
labelMedium = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.Medium,
|
||||
fontSize = 12.sp,
|
||||
lineHeight = 16.sp,
|
||||
letterSpacing = 0.2.sp,
|
||||
),
|
||||
labelSmall = TextStyle(
|
||||
fontFamily = Sans,
|
||||
fontWeight = FontWeight.Medium,
|
||||
fontSize = 11.sp,
|
||||
lineHeight = 14.sp,
|
||||
letterSpacing = 0.2.sp,
|
||||
),
|
||||
)
|
||||
|
||||
/** For terminal output and code blocks — callers set this explicitly instead
|
||||
* of a [Typography] role, since mono content isn't part of the M3 type scale. */
|
||||
val MonoTextStyle = TextStyle(
|
||||
fontFamily = JetBrainsMono,
|
||||
fontWeight = FontWeight.Normal,
|
||||
fontSize = 14.sp,
|
||||
lineHeight = 20.sp,
|
||||
)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user