diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt index d59f267..0b1a77f 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Typography.kt @@ -22,6 +22,17 @@ val openSansFontFamily = FontFamily( Font("fonts/OpenSans/OpenSans-BoldItalic.ttf", FontWeight.Bold, FontStyle.Italic), ) +val notoSansMonoFontFamily = FontFamily( + Font("fonts/NotoSansMono/NotoSansMono-Regular.ttf", FontWeight.Normal, FontStyle.Normal), + Font("fonts/NotoSansMono/NotoSansMono-Italic.ttf", FontWeight.Normal, FontStyle.Italic), + Font("fonts/NotoSansMono/NotoSansMono-Medium.ttf", FontWeight.Medium, FontStyle.Normal), + Font("fonts/NotoSansMono/NotoSansMono-MediumItalic.ttf", FontWeight.Medium, FontStyle.Italic), + Font("fonts/NotoSansMono/NotoSansMono-SemiBold.ttf", FontWeight.SemiBold, FontStyle.Normal), + Font("fonts/NotoSansMono/NotoSansMono-SemiBoldItalic.ttf", FontWeight.SemiBold, FontStyle.Italic), + Font("fonts/NotoSansMono/NotoSansMono-Bold.ttf", FontWeight.Bold, FontStyle.Normal), + Font("fonts/NotoSansMono/NotoSansMono-BoldItalic.ttf", FontWeight.Bold, FontStyle.Italic), +) + const val LETTER_SPACING = 0.5 @Composable diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt index 3ae48eb..b21d559 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt @@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.extensions.* import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.matchesBinding +import com.jetpackduba.gitnuro.theme.notoSansMonoFontFamily import com.jetpackduba.gitnuro.theme.tertiarySurface import com.jetpackduba.gitnuro.theme.secondarySurface import com.jetpackduba.gitnuro.ui.components.PrimaryButton @@ -115,7 +116,7 @@ fun Blame( text = line + blameResult.resultContents.lineDelimiter, color = MaterialTheme.colors.onBackground, modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp), - fontFamily = FontFamily.Monospace, + fontFamily = notoSansMonoFontFamily, maxLines = 1, ) } @@ -137,7 +138,7 @@ private fun LineNumber(line: Int, highestLineLength: Int) { Text( text = line.toStringWithSpaces(highestLineLength), color = MaterialTheme.colors.onBackground, - fontFamily = FontFamily.Monospace, + fontFamily = notoSansMonoFontFamily, ) } } diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt index 5d4d1e4..bfb7633 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt @@ -940,7 +940,7 @@ fun DiffLineText(line: Line, diffEntryType: DiffEntryType, onActionTriggered: () modifier = Modifier .padding(start = 16.dp) .fillMaxSize(), - fontFamily = FontFamily.Monospace, + fontFamily = notoSansMonoFontFamily, style = MaterialTheme.typography.body2, color = MaterialTheme.colors.onBackground, overflow = TextOverflow.Visible, @@ -968,7 +968,7 @@ fun LineNumber(text: String, remarked: Boolean) { text = text, modifier = Modifier .padding(start = 8.dp, end = 4.dp), - fontFamily = FontFamily.Monospace, + fontFamily = notoSansMonoFontFamily, style = MaterialTheme.typography.body2, color = if (remarked) MaterialTheme.colors.onBackground else MaterialTheme.colors.onBackgroundSecondary, ) diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-Black.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Black.ttf new file mode 100644 index 0000000..ed87328 Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Black.ttf differ diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-Bold.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Bold.ttf new file mode 100644 index 0000000..8073d57 Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Bold.ttf differ diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-ExtraBold.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-ExtraBold.ttf new file mode 100644 index 0000000..a861796 Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-ExtraBold.ttf differ diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-ExtraLight.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-ExtraLight.ttf new file mode 100644 index 0000000..0bfe101 Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-ExtraLight.ttf differ diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-Light.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Light.ttf new file mode 100644 index 0000000..2463d6b Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Light.ttf differ diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-Medium.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Medium.ttf new file mode 100644 index 0000000..6ebf2d5 Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Medium.ttf differ diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-Regular.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Regular.ttf new file mode 100644 index 0000000..ff9389a Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Regular.ttf differ diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-SemiBold.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-SemiBold.ttf new file mode 100644 index 0000000..d0ec386 Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-SemiBold.ttf differ diff --git a/src/main/resources/fonts/NotoSansMono/NotoSansMono-Thin.ttf b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Thin.ttf new file mode 100644 index 0000000..2698815 Binary files /dev/null and b/src/main/resources/fonts/NotoSansMono/NotoSansMono-Thin.ttf differ