diff --git a/android/app/src/main/java/pt/naps/maestro/ui/theme/Type.kt b/android/app/src/main/java/pt/naps/maestro/ui/theme/Type.kt index cfd7e1d..8628a87 100644 --- a/android/app/src/main/java/pt/naps/maestro/ui/theme/Type.kt +++ b/android/app/src/main/java/pt/naps/maestro/ui/theme/Type.kt @@ -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, +) diff --git a/android/app/src/main/res/font/jetbrains_mono_bold.ttf b/android/app/src/main/res/font/jetbrains_mono_bold.ttf new file mode 100644 index 0000000..8c93043 Binary files /dev/null and b/android/app/src/main/res/font/jetbrains_mono_bold.ttf differ diff --git a/android/app/src/main/res/font/jetbrains_mono_medium.ttf b/android/app/src/main/res/font/jetbrains_mono_medium.ttf new file mode 100644 index 0000000..9767115 Binary files /dev/null and b/android/app/src/main/res/font/jetbrains_mono_medium.ttf differ diff --git a/android/app/src/main/res/font/jetbrains_mono_regular.ttf b/android/app/src/main/res/font/jetbrains_mono_regular.ttf new file mode 100644 index 0000000..dff66cc Binary files /dev/null and b/android/app/src/main/res/font/jetbrains_mono_regular.ttf differ diff --git a/android/licenses/JetBrainsMono-OFL.txt b/android/licenses/JetBrainsMono-OFL.txt new file mode 100644 index 0000000..8bee414 --- /dev/null +++ b/android/licenses/JetBrainsMono-OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE.