feat(layout): add notification bar at the bottom

xetra11 · Dec 17, 2020 · 3e3d08e · 3e3d08e
1 parent 34d7afc
commit 3e3d08e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ buildscript {
 
 plugins {
     kotlin("jvm") version "1.4.21"
-    id("org.jetbrains.compose") version "0.2.0-build128"
+    id("org.jetbrains.compose") version "0.3.0-build135"
     id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
     id("io.gitlab.arturbosch.detekt") version "1.15.0-RC2"
 }

diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -2,13 +2,16 @@ import androidx.compose.desktop.AppManager
 import androidx.compose.desktop.AppWindow
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
+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.CutCornerShape
 import androidx.compose.material.Button
 import androidx.compose.material.Colors
@@ -84,14 +87,28 @@ fun main() = invokeLater {
             if (hasAlert.value) {
                 CharacterValidationErrorAlert(hasAlert, validationErrors)
             }
-            Row(modifier = Modifier.fillMaxWidth().fillMaxHeight(0.9F).border(3.dp, Color.Green)) {
-                val widthBlack = percWindowWidth(windowSize.value.width, 20)
-                Box(Modifier.border(5.dp, Color.Black).fillMaxWidth(0.2F).fillMaxHeight(),
-                contentAlignment = Alignment.Center) {
-                    WorkbenchFunctions()
+
+            Column(Modifier.fillMaxSize()) {
+                Row(modifier = Modifier.fillMaxWidth().fillMaxHeight(0.95F).border(3.dp, Color.Green)) {
+                    val widthBlack = percWindowWidth(windowSize.value.width, 20)
+                    Box(
+                        Modifier.border(5.dp, Color.Black).fillMaxWidth(0.2F).fillMaxHeight(),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        WorkbenchFunctions()
+                    }
+                    Box(Modifier.border(5.dp, Color.Red).fillMaxWidth()) {
+                        CharacterModuleView(characterState)
+                    }
                 }
-                Box(Modifier.border(5.dp, Color.Red).fillMaxWidth()) {
-                    CharacterModuleView(characterState)
+                Row(
+                    Modifier.border(3.dp, Color.Yellow)
+                        .fillMaxSize()
+                        .padding(end = 10.dp),
+                    horizontalArrangement = Arrangement.End,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text("Placeholder for error messages and app wide notifications")
                 }
             }
         }