input validation was added

AntonAsmirko · Mar 27, 2021 · c1fe0dd · c1fe0dd
1 parent 5d7441f
commit c1fe0dd
Show file tree

Hide file tree

Showing 65 changed files with 51 additions and 18 deletions.
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.bin b/.gradle/6.7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.lock b/.gradle/6.7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.bin b/.gradle/6.7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.lock b/.gradle/6.7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,7 +31,7 @@ compose.desktop {
         mainClass = "MainKt"
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "HelloWorld"
+            packageName = "Optimizer-Visualizer"
         }
     }
 }

diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$1$1$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$1$1$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$10.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$10.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$11$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$11$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$12$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$12$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$13.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$13.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$14$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$14$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$15$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$15$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$2$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$2$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$3$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$3$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$4$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$4$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$5$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$5$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$6.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$6.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$7$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$7$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$8.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$8.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$9$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$9$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$2$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$2$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$3$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$3$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$4$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$4$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$5.class b/build/classes/kotlin/main/MainKt$main$1$1$1$5.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1.class b/build/classes/kotlin/main/MainKt$main$1$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1.class b/build/classes/kotlin/main/MainKt$main$1.class
diff --git a/build/classes/kotlin/main/MainKt$sam$java_util_function_Function$0.class b/build/classes/kotlin/main/MainKt$sam$java_util_function_Function$0.class
diff --git a/build/classes/kotlin/main/MainKt.class b/build/classes/kotlin/main/MainKt.class
diff --git a/build/classes/kotlin/main/composables/ButtonInBoxComposableKt$buttonInBox$1$1$1.class b/build/classes/kotlin/main/composables/ButtonInBoxComposableKt$buttonInBox$1$1$1.class
diff --git a/build/classes/kotlin/main/composables/ButtonInBoxComposableKt$buttonInBox$1$2$1.class b/build/classes/kotlin/main/composables/ButtonInBoxComposableKt$buttonInBox$1$2$1.class
diff --git a/build/classes/kotlin/main/composables/ButtonInBoxComposableKt$buttonInBox$1$3$1.class b/build/classes/kotlin/main/composables/ButtonInBoxComposableKt$buttonInBox$1$3$1.class
diff --git a/build/classes/kotlin/main/composables/ButtonInBoxComposableKt$buttonInBox$1$4.class b/build/classes/kotlin/main/composables/ButtonInBoxComposableKt$buttonInBox$1$4.class
diff --git a/build/classes/kotlin/main/composables/ButtonInBoxComposableKt.class b/build/classes/kotlin/main/composables/ButtonInBoxComposableKt.class
diff --git a/build/kotlin/compileKotlin/build-history.bin b/build/kotlin/compileKotlin/build-history.bin
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-14
-2
+24
+12
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s
@@ -0,0 +1 @@
+�K�F�7�-�(��������
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/build/kotlin/compileKotlin/last-build.bin b/build/kotlin/compileKotlin/last-build.bin
diff --git a/src/main/kotlin/composables/ButtonInBoxComposable.kt b/src/main/kotlin/composables/ButtonInBoxComposable.kt
@@ -1,8 +1,7 @@
 package composables
 
 import LeftViewType
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -53,7 +52,11 @@ fun buttonInBox(
                 backgroundColor = if (!active.value) colors.secondary else colors.primaryVariant
             )
         ) {
-            Text(text)
+            Text(
+                text = text,
+                modifier = Modifier.horizontalScroll(rememberScrollState()),
+                maxLines = 1
+            )
         }
     }
 }
diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -1,6 +1,7 @@
 import Constants.BORDER_WIDTH
 import androidx.compose.desktop.Window
 import androidx.compose.foundation.*
+import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.Text
@@ -13,6 +14,7 @@ import androidx.compose.ui.input.pointer.pointerMoveFilter
 import androidx.compose.ui.layout.WithConstraints
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import composables.buttonInBox
 import composables.fieldSpacer
 import composables.plotView
@@ -85,7 +87,6 @@ fun main() = Window(
                                 MaterialTheme.colors
                             ) {
                                 leftViewType = it
-                                //TODO delete useless logger
                                 optimizer = getOptimizer[p.first]?.invoke()
                             }
                         }
@@ -126,41 +127,62 @@ fun main() = Window(
                         }
                         fieldSpacer()
                         Text(
-                            modifier = Modifier.padding(15.dp, 0.dp, 0.dp, 0.dp),
+                            modifier = Modifier
+                                .padding(15.dp, 0.dp, 0.dp, 0.dp)
+                                .horizontalScroll(rememberScrollState()),
                             text = func,
-                            style = TextStyle(color = MaterialTheme.colors.onSurface)
+                            style = TextStyle(color = MaterialTheme.colors.onSurface),
+                            maxLines = 1
                         )
                         fieldSpacer()
                         OutlinedTextField(
+                            modifier = Modifier.padding(10.dp),
                             value = lBound,
                             inactiveColor = MaterialTheme.colors.secondary,
                             activeColor = MaterialTheme.colors.surface,
                             onValueChange = {
                                 lBound = it
                             },
-                            label = { Text("enter left bound of the function") },
+                            label = {
+                                Text(
+                                    "left bound",
+                                    fontSize = 10.sp
+                                )
+                            },
                             textStyle = TextStyle(color = MaterialTheme.colors.onSurface)
                         )
                         fieldSpacer()
                         OutlinedTextField(
+                            modifier = Modifier.padding(10.dp),
                             value = rBound,
                             inactiveColor = MaterialTheme.colors.secondary,
                             activeColor = MaterialTheme.colors.surface,
                             onValueChange = {
                                 rBound = it
                             },
-                            label = { Text("enter right bound of function") },
+                            label = {
+                                Text(
+                                    "right bound",
+                                    fontSize = 10.sp
+                                )
+                            },
                             textStyle = TextStyle(color = MaterialTheme.colors.onSurface)
                         )
                         fieldSpacer()
                         OutlinedTextField(
+                            modifier = Modifier.padding(10.dp),
                             value = numBlobs,
                             inactiveColor = MaterialTheme.colors.secondary,
                             activeColor = MaterialTheme.colors.surface,
                             onValueChange = {
                                 numBlobs = it
                             },
-                            label = { Text("enter number of blobs to be taken") },
+                            label = {
+                                Text(
+                                    "number of blobs",
+                                    fontSize = 10.sp
+                                )
+                            },
                             textStyle = TextStyle(color = MaterialTheme.colors.onSurface)
                         )
                         fieldSpacer()
@@ -178,19 +200,27 @@ fun main() = Window(
                             Text(
                                 modifier = Modifier
                                     .padding(30.dp)
-                                    .align(Alignment.CenterHorizontally),
+                                    .align(Alignment.CenterHorizontally)
+                                    .horizontalScroll(rememberScrollState()),
                                 text = "Step (num iterations)",
-                                color = MaterialTheme.colors.onPrimary
+                                color = MaterialTheme.colors.onPrimary,
+                                maxLines = 1
                             )
                             fieldSpacer()
                             OutlinedTextField(
+                                modifier = Modifier.padding(10.dp),
                                 value = stepSize,
                                 inactiveColor = MaterialTheme.colors.secondary,
                                 activeColor = MaterialTheme.colors.surface,
                                 onValueChange = {
                                     stepSize = it
                                 },
-                                label = { Text("enter step size") },
+                                label = {
+                                    Text(
+                                        "enter step size",
+                                        fontSize = 10.sp
+                                    )
+                                },
                                 textStyle = TextStyle(color = MaterialTheme.colors.onSurface)
                             )
                             fieldSpacer()
@@ -314,6 +344,5 @@ fun main() = Window(
     }
 }
 
-private fun validateInput(num: String): Boolean {
-    return true
-}
+private fun validateInput(num: String): Boolean = Regex("[+-]?\\d+(\\.\\d+)?([Ee][+-]?\\d+)?")
+    .matches(num)