some fixes for UI

AntonAsmirko · Mar 27, 2021 · 68e18bf · 68e18bf
1 parent 96730f0
commit 68e18bf
Show file tree

Hide file tree

Showing 73 changed files with 38 additions and 43 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/6.7.1/fileHashes/resourceHashesCache.bin b/.gradle/6.7.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/6.7.1/javaCompile/classAnalysis.bin b/.gradle/6.7.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/6.7.1/javaCompile/jarAnalysis.bin b/.gradle/6.7.1/javaCompile/jarAnalysis.bin
diff --git a/.gradle/6.7.1/javaCompile/javaCompile.lock b/.gradle/6.7.1/javaCompile/javaCompile.lock
diff --git a/.gradle/6.7.1/javaCompile/taskHistory.bin b/.gradle/6.7.1/javaCompile/taskHistory.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build/classes/kotlin/main/META-INF/HelloWorld.kotlin_module b/build/classes/kotlin/main/META-INF/HelloWorld.kotlin_module
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/TextCentredComposableKt$textCentred$2.class b/build/classes/kotlin/main/composables/TextCentredComposableKt$textCentred$2.class
diff --git a/build/classes/kotlin/main/composables/TextCentredComposableKt.class b/build/classes/kotlin/main/composables/TextCentredComposableKt.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 b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values
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/inputs/source-to-output.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.s
@@ -1 +1 @@
-��������������������������
+������������������������������������
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 b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values
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/internal-name-to-source.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.s
@@ -1 +1 @@
-т	ккксхчђђђђЬ	ячъУ	ќсњи	и	и	Ш	Ф	ї
+β	ΪΪΪαεηςςςςΜ	οηκΓ	όαϊΨ	Ψ	Ψ	Θ	Δ	χοφϋςςςςςςς
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 b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values
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/proto.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s
@@ -1 +1 @@
-챘쑖쑖쁖셕핔���화
+챘쑖쑖쁖셕핔���화ｓ쉔�텒텒
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 @@
-72
-59
+83
+71
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
@@ -1 +1,4 @@
-έςΙ.α6Γ)Ϋ'Ρ$ΰ'Ο(ά Ϊ$εΣ"γβΛθΗΟοοΩΩάΩχΗΥΚωψθαβφΦχΘΙΕ'π�Α*ψ%ψ$π"χύ"ςΐΔΪοΦαπθΓΡ%ω#ΦχέύυΜΧ%ρϊ$Ο,Ω,Η,ΛΚό!άΑ(ά*ΐΪΘ(δχΤΒθν
+ЭтЙ.б6Г)Ы'С$а'П(Ь Ъ$еУ"гвЛиЗПппЩЩЬЩчЗХКщшибвцЦчИЙЕ'ряБ*ш%ш$р"чэ"тАДЪпЦбриГС%щ#ЦчЭэхМЧ%съ$П,Щ,З,ЛКь!ЬБ(Ь*АЪИ(дчФВинФ"ГчЦиб$ЕШЭБсютЮбЛбдЬМЫнЧЖИЩ
+жкэИэя	ЮЯфЭюФ
+мЯВЙХТ
+зЩщДрУГьтьЦъ

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/TextCentredComposable.kt b/src/main/kotlin/composables/TextCentredComposable.kt
diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.unit.dp
 import composables.buttonInBox
 import composables.fieldSpacer
 import composables.plotView
-import composables.textCentred
 import firstLab.*
 import model.PlotData
 import model.interpolators.FunctionInterpolator
@@ -45,12 +44,12 @@ fun main() = Window(
     ) {
         var leftViewType by remember { mutableStateOf(LeftViewType.METHOD) }
         var func by remember { mutableStateOf(Constants.NONE_FUNC) }
-        var numBlobs by remember { mutableStateOf("") }
+        var numBlobs by remember { mutableStateOf("1000") }
         var lBound by remember { mutableStateOf("") }
         var rBound by remember { mutableStateOf("") }
         val functionInterpolator by remember { mutableStateOf(FunctionInterpolator()) }
         var functionDrawingPermitted by remember { mutableStateOf(false) }
-        var stepSize by remember { mutableStateOf("") }
+        var stepSize by remember { mutableStateOf("1") }
         var currentOptimizerStep by remember { mutableStateOf(0) }
         var message: String? = null
         var points: List<Offset>?
@@ -106,6 +105,7 @@ fun main() = Window(
                                 func = pair.key
                                 funcChanged = true
                                 leftViewType = LeftViewType.FUNCTION_INPUT
+                                optimizer?.array?.clear()
                             }
                         }
                     }
@@ -117,9 +117,11 @@ fun main() = Window(
                             leftViewType = LeftViewType.FUNCTION
                             func = Constants.NONE_FUNC
                             functionDrawingPermitted = false
-                            numBlobs = ""
+                            numBlobs = "1000"
                             lBound = ""
                             rBound = ""
+                            currentOptimizerStep = 0
+
                         }
                         fieldSpacer()
                         Text(
@@ -172,7 +174,13 @@ fun main() = Window(
                         }
                         if (functionDrawingPermitted) {
                             fieldSpacer()
-                            Text(text = "Step (num iterations)")
+                            Text(
+                                modifier = Modifier
+                                    .padding(30.dp)
+                                    .align(Alignment.CenterHorizontally),
+                                text = "Step (num iterations)",
+                                color = MaterialTheme.colors.onPrimary
+                            )
                             fieldSpacer()
                             OutlinedTextField(
                                 value = stepSize,
@@ -266,33 +274,39 @@ fun main() = Window(
                                             val xFlt = p.first.toFloat()
                                             Optimizer.Pair<Float>(
                                                 p.first.toFloat(),
-                                                functionsButtonsText[func]!!.invoke(xFlt)
+                                                p.second.toFloat()
                                             )
                                         }
                                     },
                                 currentOptimizerStep
                             )
-                        } ?: textCentred(
+                        } ?: Text(
                             modifier = Modifier
                                 .align(alignment = Alignment.CenterVertically)
-                                .weight(0.8f),
-                            Constants.MESSAGE_TROUBLES_WITH_OPTIMIZER
+                                .weight(0.8f)
+                                .padding(30.dp),
+                            text = Constants.MESSAGE_TROUBLES_WITH_OPTIMIZER,
+                            color = MaterialTheme.colors.onPrimary
                         )
                     } else {
-                        textCentred(
+                        Text(
                             modifier = Modifier
                                 .align(alignment = Alignment.CenterVertically)
-                                .weight(0.8f),
-                            message!!
+                                .weight(0.8f)
+                                .padding(30.dp),
+                            text = message!!,
+                            color = MaterialTheme.colors.onPrimary
                         )
                     }
                 }
             } else {
-                textCentred(
-                    Modifier
+                Text(
+                    modifier = Modifier
+                        .padding(30.dp)
                         .align(alignment = Alignment.CenterVertically)
                         .weight(0.8f),
-                    Constants.HINT_CHOOSE_FUNCTION
+                    text = Constants.HINT_CHOOSE_FUNCTION,
+                    color = MaterialTheme.colors.onPrimary
                 )
             }
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		т ккксхчђђђђЬ ячъУ ќсњи и и Ш Ф ї
		β ΪΪΪαεηςςςςΜ οηκΓ όαϊΨ Ψ Ψ Θ Δ χοφϋςςςςςςς
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		챘쑖쑖쁖셕핔���화
		챘쑖쑖쁖셕핔���화ｓ쉔�텒텒