Skip to content

Commit 67f4593

Browse files
committed
Changing font to Monospace
1 parent 78d0668 commit 67f4593

File tree

9 files changed

+34
-17
lines changed

9 files changed

+34
-17
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.google.protobuf.gradle.*
55

66
plugins {
77
kotlin("jvm") version "1.4.32"
8-
id("org.jetbrains.compose") version "0.4.0-build180"
8+
id("org.jetbrains.compose") version "0.4.0-build183"
99
id("com.google.protobuf") version "0.8.15"
1010
}
1111

src/main/kotlin/com/kotlang/ui/UiUtils.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.runtime.remember
1313
import androidx.compose.ui.Modifier
1414
import androidx.compose.ui.graphics.Color
1515
import androidx.compose.ui.text.TextStyle
16+
import androidx.compose.ui.text.font.FontFamily
1617
import androidx.compose.ui.text.font.FontWeight
1718
import androidx.compose.ui.unit.dp
1819
import androidx.compose.ui.unit.sp
@@ -37,6 +38,7 @@ fun Chip(text: String, dropDownItems: List<String> = listOf(), onSelect: (idx: I
3738
Row {
3839
Text(text,
3940
color = Color.Black,
41+
fontFamily = FontFamily.Monospace
4042
)
4143

4244
Icon(Icons.Default.ArrowDropDown, contentDescription = "", tint = Color.Black)
@@ -49,7 +51,7 @@ fun Chip(text: String, dropDownItems: List<String> = listOf(), onSelect: (idx: I
4951
onSelect(idx)
5052
showDropDown.value = false
5153
}) {
52-
Text(item, color = Color.Black)
54+
Text(item, color = Color.Black, fontFamily = FontFamily.Monospace)
5355
}
5456
}
5557
}
@@ -61,7 +63,9 @@ fun PromptIcon(osShell: String) {
6163
Text(
6264
"$osShell > ",
6365
color = MaterialTheme.colors.primary,
64-
style = TextStyle(fontSize = 15.sp, fontWeight = FontWeight.Bold)
66+
fontWeight = FontWeight.Bold,
67+
fontFamily = FontFamily.Monospace,
68+
fontSize = 15.sp
6569
)
6670
}
6771

@@ -84,7 +88,7 @@ fun SearchSuggestions(items: List<String>,
8488
DropdownMenuItem(onClick = { onClick(item) },
8589
modifier = Modifier.background(bckgndColor)
8690
) {
87-
Text(item, color = textColor)
91+
Text(item, color = textColor, fontFamily = FontFamily.Monospace)
8892
}
8993
}
9094
}

src/main/kotlin/com/kotlang/ui/dialogs/EnvironmentDialog.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.compose.material.MaterialTheme
1010
import androidx.compose.material.Text
1111
import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.text.TextStyle
13+
import androidx.compose.ui.text.font.FontFamily
1314
import androidx.compose.ui.text.font.FontWeight
1415
import androidx.compose.ui.unit.dp
1516
import com.kotlang.omnishell.EnvironmentRequest
@@ -26,12 +27,11 @@ fun EnvironmentDialog(shell: Shell) = Window(title = "Environment") {
2627
Text(
2728
entry.split("=")[0],
2829
modifier = Modifier.padding(horizontal = 5.dp),
29-
style = TextStyle(
30-
color = MaterialTheme.colors.primaryVariant,
31-
fontWeight = FontWeight.SemiBold,
32-
)
30+
color = MaterialTheme.colors.primaryVariant,
31+
fontWeight = FontWeight.SemiBold,
32+
fontFamily = FontFamily.Monospace
3333
)
34-
Text(entry.split("=")[1])
34+
Text(entry.split("=")[1], fontFamily = FontFamily.Monospace)
3535
}
3636
Divider()
3737
}

src/main/kotlin/com/kotlang/ui/shell/CommandExecutionCard.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.graphics.Color
1111
import androidx.compose.ui.input.key.*
1212
import androidx.compose.ui.text.TextStyle
13+
import androidx.compose.ui.text.font.FontFamily
1314
import androidx.compose.ui.text.font.FontWeight
1415
import androidx.compose.ui.text.input.PasswordVisualTransformation
1516
import androidx.compose.ui.text.input.VisualTransformation
@@ -118,8 +119,8 @@ class CommandExecutionCard(
118119
) {
119120
for (child in document) {
120121
when(child.format) {
121-
CommandOutput.TextFormat.ERROR -> Text(child.text.sanitize(), color = Color.Red)
122-
else -> Text(child.text.sanitize(), color = Color.DarkGray)
122+
CommandOutput.TextFormat.ERROR -> Text(child.text.sanitize(), color = Color.Red, fontFamily = FontFamily.Monospace)
123+
else -> Text(child.text.sanitize(), color = Color.DarkGray, fontFamily = FontFamily.Monospace)
123124
}
124125
}
125126

@@ -181,7 +182,9 @@ class CommandExecutionCard(
181182
Row(modifier = Modifier.fillMaxWidth(0.93f)) {
182183
PromptIcon(osShell)
183184
Text(cmd.command, color = Color.DarkGray,
184-
style = TextStyle(fontSize = 15.sp, fontWeight = FontWeight.Bold)
185+
fontWeight = FontWeight.Bold,
186+
fontFamily = FontFamily.Monospace,
187+
fontSize = 15.sp
185188
)
186189
}
187190
CommandStateIcon(state.value)

src/main/kotlin/com/kotlang/ui/shell/FileTree.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier
1515
import androidx.compose.ui.graphics.Color
1616
import androidx.compose.ui.text.AnnotatedString
1717
import androidx.compose.ui.text.TextStyle
18+
import androidx.compose.ui.text.font.FontFamily
1819
import androidx.compose.ui.text.font.FontWeight
1920
import androidx.compose.ui.unit.dp
2021
import androidx.compose.ui.unit.sp
@@ -69,7 +70,7 @@ class FileTree(private val shell: Shell) {
6970
}
7071
},
7172
modifier = Modifier.padding(horizontal = 5.dp, vertical = 0.dp),
72-
style = TextStyle(color = Color.White)
73+
style = TextStyle(color = Color.White, fontFamily = FontFamily.Monospace)
7374
)
7475
}
7576
}
@@ -85,7 +86,8 @@ class FileTree(private val shell: Shell) {
8586
text = "FOLDERS",
8687
style = TextStyle(
8788
fontSize = 20.sp,
88-
fontWeight = FontWeight.SemiBold
89+
fontWeight = FontWeight.SemiBold,
90+
fontFamily = FontFamily.Monospace
8991
),
9092
color = Color.White
9193
)

src/main/kotlin/com/kotlang/ui/shell/Prompt.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.ui.graphics.Color
1212
import androidx.compose.ui.input.key.*
1313
import androidx.compose.ui.text.TextRange
1414
import androidx.compose.ui.text.TextStyle
15+
import androidx.compose.ui.text.font.FontFamily
1516
import androidx.compose.ui.text.font.FontWeight
1617
import androidx.compose.ui.text.input.TextFieldValue
1718
import androidx.compose.ui.unit.dp
@@ -105,7 +106,7 @@ class Prompt(private val shell: Shell) {
105106
) {
106107
TextField(
107108
value = command.value,
108-
textStyle = TextStyle(color = Color.DarkGray),
109+
textStyle = TextStyle(color = Color.DarkGray, fontFamily = FontFamily.Monospace),
109110
onValueChange = { newVal: TextFieldValue ->
110111
command.value = newVal
111112
scope.launch {
@@ -128,7 +129,7 @@ class Prompt(private val shell: Shell) {
128129
commandSuggestions.value = suggestions.distinct()
129130
}
130131
},
131-
placeholder = { Text("Run Command here. Press Tab for Auto-Complete") },
132+
placeholder = { Text("Run Command here. Press Tab for Auto-Complete", fontFamily = FontFamily.Monospace) },
132133
leadingIcon = { PromptOsShellChoice() },
133134
modifier = Modifier
134135
.fillMaxWidth()

src/main/kotlin/com/kotlang/ui/shell/Shell.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable
1111
import androidx.compose.runtime.mutableStateOf
1212
import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.graphics.Color
14+
import androidx.compose.ui.text.font.FontFamily
1415
import androidx.compose.ui.unit.dp
1516
import com.kotlang.HostAgent
1617
import com.kotlang.isOldVersion
@@ -68,6 +69,7 @@ class Shell(var commandExecutionCards: LinkedList<CommandExecutionCard> = Linked
6869
Text(
6970
"Update available. Visit https://github.com/SaiNageswarS/Omnishell/releases",
7071
color = warningColor,
72+
fontFamily = FontFamily.Monospace
7173
)
7274
}
7375
}

src/main/kotlin/com/kotlang/ui/shell/ShellHeader.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.compose.material.TopAppBar
99
import androidx.compose.runtime.Composable
1010
import androidx.compose.ui.Modifier
1111
import androidx.compose.ui.graphics.Color
12+
import androidx.compose.ui.text.font.FontFamily
1213
import androidx.compose.ui.text.font.FontWeight
1314
import androidx.compose.ui.unit.dp
1415
import com.kotlang.remoting.LocalTargetManager
@@ -36,6 +37,7 @@ class ShellHeader(private val shell: Shell) {
3637
Text(
3738
getHost(),
3839
color = Color.DarkGray,
40+
fontFamily = FontFamily.Monospace,
3941
fontWeight = FontWeight.Bold,
4042
modifier = Modifier.padding(10.dp)
4143
)
@@ -49,6 +51,7 @@ class ShellHeader(private val shell: Shell) {
4951
Text(
5052
currentWorkingDir,
5153
color = Color.DarkGray,
54+
fontFamily = FontFamily.Monospace,
5255
modifier = Modifier.padding(10.dp)
5356
)
5457
}
@@ -62,6 +65,7 @@ class ShellHeader(private val shell: Shell) {
6265
"Env",
6366
color = Color.DarkGray,
6467
fontWeight = FontWeight.Bold,
68+
fontFamily = FontFamily.Monospace,
6569
modifier = Modifier.padding(10.dp)
6670
)
6771
}

src/main/kotlin/com/kotlang/ui/tabs/TabHeader.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.material.icons.filled.Add
88
import androidx.compose.material.icons.filled.Close
99
import androidx.compose.runtime.Composable
1010
import androidx.compose.ui.Modifier
11+
import androidx.compose.ui.text.font.FontFamily
1112
import androidx.compose.ui.unit.dp
1213
import com.kotlang.ui.window.OmnishellWindow
1314

@@ -19,7 +20,7 @@ class TabHeader(private val windowActions: OmnishellWindow) {
1920
onClick = { windowActions.changeTab(index) }
2021
) {
2122
Row {
22-
Text(title, modifier = Modifier.padding(vertical = 10.dp))
23+
Text(title, modifier = Modifier.padding(vertical = 10.dp), fontFamily = FontFamily.Monospace)
2324
//close tab button
2425
IconButton(onClick = { windowActions.closeTab(index) }) {
2526
Icon(

0 commit comments

Comments
 (0)