feat: make this a text editor

composeApp/src/jvmMain/kotlin/com/wannaverse/wannacode/Main.kt

@@ -110,10 +110,6 @@ fun main() = application {
                 Scaffold(
                     containerColor = MaterialTheme.colorScheme.background
                 ) {
-                    Thread {
-                        launchJdtServer(viewModel.getDir())
-                    }.start()
-
                     IDEScreen(viewModel.getDir())
                 }
             }

composeApp/src/jvmMain/kotlin/com/wannaverse/wannacode/common/NoStyleDropdown.kt

@@ -0,0 +1,80 @@
+package com.wannaverse.wannacode.common
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.jetbrains.compose.resources.painterResource
+import wannacode.composeapp.generated.resources.Res
+import wannacode.composeapp.generated.resources.down_cheveron
+
+@Composable
+fun NoStyleDropDown(
+    selectedOption: String,
+    options: List<String>,
+    onOptionSelected: (String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    var expanded by remember { mutableStateOf(false) }
+
+    Box(
+        modifier = modifier
+            .clickable { expanded = !expanded },
+        contentAlignment = Alignment.CenterStart
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = selectedOption,
+                color = Color(0xFF9F9F9F),
+                fontSize = 14.sp,
+                modifier = Modifier.weight(1f)
+            )
+        }
+
+        DropdownMenu(
+            expanded = expanded,
+            onDismissRequest = { expanded = false },
+            modifier = Modifier
+                .background(Color(0xFF17171D))
+                .border(1.dp, Color(0xFF373737), RoundedCornerShape(2.dp))
+        ) {
+            options.forEach { option ->
+                DropdownMenuItem(
+                    onClick = {
+                        onOptionSelected(option)
+                        expanded = false
+                    },
+                    text = {
+                        Text(
+                            text = option,
+                            color = Color(0xFFB6B6B6),
+                            fontSize = 14.sp
+                        )
+                    }
+                )
+            }
+        }
+    }
+}

composeApp/src/jvmMain/kotlin/com/wannaverse/wannacode/ide/Hamburger.kt

@@ -3,7 +3,12 @@ package com.wannaverse.wannacode.ide
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.Icon
@@ -14,67 +19,113 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.pointerMoveFilter
+import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.painterResource
 import wannacode.composeapp.generated.resources.Res
 import wannacode.composeapp.generated.resources.hamburg
+import wannacode.composeapp.generated.resources.right_cheveron
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun Hamburger() {
     var expanded by remember { mutableStateOf(false) }
+    var subMenuExpanded by remember { mutableStateOf(false) }
 
-    Icon(
-        painter = painterResource(Res.drawable.hamburg),
-        contentDescription = null,
-        tint = Color.White,
-        modifier = Modifier.size(15.dp).clickable { expanded = !expanded }
-    )
+    Box {
+        Icon(
+            painter = painterResource(Res.drawable.hamburg),
+            contentDescription = null,
+            tint = Color.White,
+            modifier = Modifier
+                .size(15.dp)
+                .clickable { expanded = !expanded }
+        )
+        DropdownMenu(
+            expanded = expanded,
+            onDismissRequest = {
+                expanded = false
+                subMenuExpanded = false
+            },
+            modifier = Modifier
+                .background(Color(0xFF17171D))
+                .border(1.dp, Color(0xFF373737), RoundedCornerShape(5.dp))
+        ) {
+            DropdownMenuItem(
+                text = {
+                    Row {
+                        Text("View", color = Color(0xFFB6B6B6), fontSize = 14.sp)
+                        Spacer(Modifier.width(50.dp))
+                        Icon(
+                            painter = painterResource(Res.drawable.right_cheveron),
+                            contentDescription = null,
+                            tint = Color.Gray,
+                            modifier = Modifier.padding(top = 5.dp).size(10.dp)
+                        )
+                    }
+                },
+                onClick = {},
+                modifier = Modifier.pointerMoveFilter(
+                    onEnter = {
+                        subMenuExpanded = true
+                        false
+                    },
+                    onExit = {
+                        false
+                    }
+                )
+            )
 
-    DropdownMenu(
-        expanded = expanded,
-        onDismissRequest = { expanded = false },
-        modifier = Modifier
-            .background(Color(0xFF17171D))
-            .border(1.dp, Color(0xFF373737), RoundedCornerShape(5.dp))
-    ) {
-        DropdownMenuItem(
-            text = {
-                Text(
-                    text = "New Project",
-                    color = Color(0xFFB6B6B6),
-                    fontSize = 14.sp
+            DropdownMenuItem(
+                text = { Text("New Project", color = Color(0xFFB6B6B6), fontSize = 14.sp) },
+                onClick = { expanded = false }
+            )
+            DropdownMenuItem(
+                text = { Text("Open", color = Color(0xFFB6B6B6), fontSize = 14.sp) },
+                onClick = { expanded = false }
+            )
+            DropdownMenuItem(
+                text = { Text("Close", color = Color(0xFFB6B6B6), fontSize = 14.sp) },
+                onClick = { expanded = false }
+            )
+        }
+
+        if (subMenuExpanded) {
+            DropdownMenu(
+                expanded = true,
+                onDismissRequest = { subMenuExpanded = false },
+                offset = DpOffset(x = 110.dp, y = 0.dp),
+                modifier = Modifier
+                    .background(Color(0xFF17171D))
+                    .border(1.dp, Color(0xFF373737), RoundedCornerShape(5.dp))
+            ) {
+                DropdownMenuItem(
+                    text = { Text("Line Encodings", color = Color(0xFFB6B6B6), fontSize = 14.sp) },
+                    onClick = {
+                        subMenuExpanded = false
+                        expanded = false
+                    }
                 )
-            },
-            onClick = {
-                expanded = false
-            }
-        )
-        DropdownMenuItem(
-            text = {
-                Text(
-                    text = "Open",
-                    color = Color(0xFFB6B6B6),
-                    fontSize = 14.sp
+                DropdownMenuItem(
+                    text = { Text("Whitespace", color = Color(0xFFB6B6B6), fontSize = 14.sp) },
+                    onClick = {
+                        subMenuExpanded = false
+                        expanded = false
+                    }
                 )
-            },
-            onClick = {
-                expanded = false
-            }
-        )
-        DropdownMenuItem(
-            text = {
-                Text(
-                    text = "Close",
-                    color = Color(0xFFB6B6B6),
-                    fontSize = 14.sp
+                DropdownMenuItem(
+                    text = { Text("Special Characters", color = Color(0xFFB6B6B6), fontSize = 14.sp) },
+                    onClick = {
+                        subMenuExpanded = false
+                        expanded = false
+                    }
                 )
-            },
-            onClick = {
-                expanded = false
             }
-        )
+        }
     }
 }

composeApp/src/jvmMain/kotlin/com/wannaverse/wannacode/ide/IDEScreen.kt

@@ -10,7 +10,6 @@ import com.wannaverse.wannacode.ide.editor.CodeEditor
 import com.wannaverse.wannacode.ide.editor.CodeEditorTabs
 import com.wannaverse.wannacode.ide.editor.viewmodel.CodeEditorViewModel
 import com.wannaverse.wannacode.ide.explorer.FileExplorer
-import com.wannaverse.wannacode.ide.terminal.Terminal
 import java.io.File
 
 @Composable
@@ -31,9 +30,5 @@ fun IDEScreen(directory: File, viewModel: CodeEditorViewModel = viewModel { Code
                 CodeEditor(viewModel)
             }
         }
-
-        Column {
-            Terminal()
-        }
     }
 }

composeApp/src/jvmMain/kotlin/com/wannaverse/wannacode/ide/Toolbar.kt

@@ -11,9 +11,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Icon
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.wannaverse.wannacode.STROKE_COLOR
@@ -38,49 +40,11 @@ fun Toolbar(viewModel: CodeEditorViewModel) {
                 top = 20.dp
             )
     ) {
-        Row {
+        Row(modifier = Modifier.padding(bottom = 20.dp)) {
             Hamburger()
 
-            Spacer(Modifier.width(30.dp))
-
-            Dropdown(
-                selectedOption = viewModel.projectName.value,
-                options = listOf(),
-                onOptionSelected = { },
-                modifier = Modifier.width(200.dp).height(43.dp).padding(bottom = 10.dp).offset(y = (-5).dp),
-                backgroundColor = Color(0xFF16161A),
-                alignTextAlign = TextAlign.Center
-            )
-
-            Spacer(Modifier.width(20.dp))
-
-            PlainDropdown(
-                selectedOption = "Version Control",
-                options = listOf("Pull", "Commit", "Push", "New Branch", "Change Branch"),
-                onOptionSelected = {},
-                modifier = Modifier.width(130.dp).offset(y = (-3).dp)
-            )
-
             Spacer(Modifier.weight(1f))
 
-            Dropdown(
-                selectedOption = "./gradlew run",
-                options = listOf(""),
-                onOptionSelected = { },
-                modifier = Modifier.width(200.dp).offset(y = (-10).dp).height(40.dp)
-            )
-
-            Spacer(Modifier.width(10.dp))
-
-            Icon(
-                painter = painterResource(Res.drawable.play),
-                contentDescription = null,
-                tint = Color(0xFF27FF27),
-                modifier = Modifier.size(20.dp)
-            )
-
-            Spacer(Modifier.width(100.dp))
-
             Icon(
                 painter = painterResource(Res.drawable.minimize),
                 contentDescription = null,

composeApp/src/jvmMain/kotlin/com/wannaverse/wannacode/ide/editor/CodeEditor.kt

@@ -44,6 +44,12 @@ fun CodeEditor(viewModel: CodeEditorViewModel) {
 
     var fontSize by remember { mutableStateOf(14.sp) }
 
+    EditorMenu(
+        tab = tab,
+        viewModel = viewModel,
+        fontSize = fontSize
+    )
+
     Column(modifier = Modifier.fillMaxSize()) {
         BoxWithConstraints(
             modifier = Modifier
@@ -58,20 +64,22 @@ fun CodeEditor(viewModel: CodeEditorViewModel) {
                     .heightIn(max = maxHeight)
                     .verticalScroll(scrollState)
             ) {
-                CodeEditorGutter(tab, viewModel = viewModel, fontSize = fontSize)
-                CodeEditorInput(tab, viewModel = viewModel, onFontSizeChange = {
-                    fontSize = it
-                })
+                CodeEditorGutter(
+                    tab = tab,
+                    viewModel = viewModel,
+                    fontSize = fontSize
+                )
+
+                CodeEditorInput(
+                    tab = tab,
+                    viewModel = viewModel,
+                    onFontSizeChange = {
+                        fontSize = it
+                    }
+                )
             }
 
             Scrollbar(scrollState, Modifier.align(Alignment.CenterEnd))
         }
-
-        InfoPanel(
-            viewModel = viewModel,
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(150.dp)
-        )
     }
 }