Added noto sans to be the default mono font

This commit is contained in:
Abdelilah El Aissaoui 2022-11-05 13:07:21 +01:00
parent 69089c9910
commit 1597733d43
12 changed files with 16 additions and 4 deletions

View File

@ -22,6 +22,17 @@ val openSansFontFamily = FontFamily(
Font("fonts/OpenSans/OpenSans-BoldItalic.ttf", FontWeight.Bold, FontStyle.Italic), 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 const val LETTER_SPACING = 0.5
@Composable @Composable

View File

@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp
import com.jetpackduba.gitnuro.extensions.* import com.jetpackduba.gitnuro.extensions.*
import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.KeybindingOption
import com.jetpackduba.gitnuro.keybindings.matchesBinding import com.jetpackduba.gitnuro.keybindings.matchesBinding
import com.jetpackduba.gitnuro.theme.notoSansMonoFontFamily
import com.jetpackduba.gitnuro.theme.tertiarySurface import com.jetpackduba.gitnuro.theme.tertiarySurface
import com.jetpackduba.gitnuro.theme.secondarySurface import com.jetpackduba.gitnuro.theme.secondarySurface
import com.jetpackduba.gitnuro.ui.components.PrimaryButton import com.jetpackduba.gitnuro.ui.components.PrimaryButton
@ -115,7 +116,7 @@ fun Blame(
text = line + blameResult.resultContents.lineDelimiter, text = line + blameResult.resultContents.lineDelimiter,
color = MaterialTheme.colors.onBackground, color = MaterialTheme.colors.onBackground,
modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp), modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp),
fontFamily = FontFamily.Monospace, fontFamily = notoSansMonoFontFamily,
maxLines = 1, maxLines = 1,
) )
} }
@ -137,7 +138,7 @@ private fun LineNumber(line: Int, highestLineLength: Int) {
Text( Text(
text = line.toStringWithSpaces(highestLineLength), text = line.toStringWithSpaces(highestLineLength),
color = MaterialTheme.colors.onBackground, color = MaterialTheme.colors.onBackground,
fontFamily = FontFamily.Monospace, fontFamily = notoSansMonoFontFamily,
) )
} }
} }

View File

@ -940,7 +940,7 @@ fun DiffLineText(line: Line, diffEntryType: DiffEntryType, onActionTriggered: ()
modifier = Modifier modifier = Modifier
.padding(start = 16.dp) .padding(start = 16.dp)
.fillMaxSize(), .fillMaxSize(),
fontFamily = FontFamily.Monospace, fontFamily = notoSansMonoFontFamily,
style = MaterialTheme.typography.body2, style = MaterialTheme.typography.body2,
color = MaterialTheme.colors.onBackground, color = MaterialTheme.colors.onBackground,
overflow = TextOverflow.Visible, overflow = TextOverflow.Visible,
@ -968,7 +968,7 @@ fun LineNumber(text: String, remarked: Boolean) {
text = text, text = text,
modifier = Modifier modifier = Modifier
.padding(start = 8.dp, end = 4.dp), .padding(start = 8.dp, end = 4.dp),
fontFamily = FontFamily.Monospace, fontFamily = notoSansMonoFontFamily,
style = MaterialTheme.typography.body2, style = MaterialTheme.typography.body2,
color = if (remarked) MaterialTheme.colors.onBackground else MaterialTheme.colors.onBackgroundSecondary, color = if (remarked) MaterialTheme.colors.onBackground else MaterialTheme.colors.onBackgroundSecondary,
) )