diff --git a/.gradle/6.7.1/executionHistory/executionHistory.bin b/.gradle/6.7.1/executionHistory/executionHistory.bin index 3f57341..0e78b20 100644 Binary files a/.gradle/6.7.1/executionHistory/executionHistory.bin and b/.gradle/6.7.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/6.7.1/executionHistory/executionHistory.lock b/.gradle/6.7.1/executionHistory/executionHistory.lock index 6a9abdc..ff1b0e4 100644 Binary files a/.gradle/6.7.1/executionHistory/executionHistory.lock and b/.gradle/6.7.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/6.7.1/fileHashes/fileHashes.bin b/.gradle/6.7.1/fileHashes/fileHashes.bin index ab3373f..89cf004 100644 Binary files a/.gradle/6.7.1/fileHashes/fileHashes.bin and b/.gradle/6.7.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/6.7.1/fileHashes/fileHashes.lock b/.gradle/6.7.1/fileHashes/fileHashes.lock index 77af90c..6dd541d 100644 Binary files a/.gradle/6.7.1/fileHashes/fileHashes.lock and b/.gradle/6.7.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/6.7.1/fileHashes/resourceHashesCache.bin b/.gradle/6.7.1/fileHashes/resourceHashesCache.bin index e33d9d0..592503a 100644 Binary files a/.gradle/6.7.1/fileHashes/resourceHashesCache.bin and b/.gradle/6.7.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/6.7.1/javaCompile/classAnalysis.bin b/.gradle/6.7.1/javaCompile/classAnalysis.bin index 5e276bc..0735bf6 100644 Binary files a/.gradle/6.7.1/javaCompile/classAnalysis.bin and b/.gradle/6.7.1/javaCompile/classAnalysis.bin differ diff --git a/.gradle/6.7.1/javaCompile/jarAnalysis.bin b/.gradle/6.7.1/javaCompile/jarAnalysis.bin index f750c15..09c63de 100644 Binary files a/.gradle/6.7.1/javaCompile/jarAnalysis.bin and b/.gradle/6.7.1/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/6.7.1/javaCompile/javaCompile.lock b/.gradle/6.7.1/javaCompile/javaCompile.lock index 95e1af8..7c939c8 100644 Binary files a/.gradle/6.7.1/javaCompile/javaCompile.lock and b/.gradle/6.7.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/6.7.1/javaCompile/taskHistory.bin b/.gradle/6.7.1/javaCompile/taskHistory.bin index a503103..814a102 100644 Binary files a/.gradle/6.7.1/javaCompile/taskHistory.bin and b/.gradle/6.7.1/javaCompile/taskHistory.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9488e7d..5721dc6 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/kotlin/main/META-INF/HelloWorld.kotlin_module b/build/classes/kotlin/main/META-INF/HelloWorld.kotlin_module index 2bf35d1..8faec41 100644 Binary files a/build/classes/kotlin/main/META-INF/HelloWorld.kotlin_module and b/build/classes/kotlin/main/META-INF/HelloWorld.kotlin_module differ 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 index 1bed605..aefd7d2 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$1$1$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$1$1$1.class differ 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 index f9b2b54..e1368ce 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$10.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$10.class differ 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 index 0e4b74a..f03b0e5 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$11$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$11$1.class differ 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 index c4c49cf..f282090 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$12$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$12$1.class differ 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 index 360559d..2a96f7c 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$13.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$13.class differ 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 index 70b7cda..8735bf2 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$14$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$14$1.class differ 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 index bc2c9a2..39adab9 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$15$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$15$1.class differ 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 index d467abb..8b83467 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$2$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$2$1.class differ 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 index b333d33..80ca08b 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$3$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$3$1.class differ 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 index 1eb9527..1f0bcef 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$4$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$4$1.class differ 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 index 82a2977..af03c7f 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$5$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$5$1.class differ 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 index 80e5bd5..2a172e9 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$6.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$6.class differ 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 index 25a6614..1719592 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$7$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$7$1.class differ 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 index 00ae197..cf4a431 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$8.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$8.class differ 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 index 806fe9a..b0e9996 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$1$9$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$1$9$1.class differ 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 index fa6984c..d8d81b6 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$2$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$2$1.class differ 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 index 1f70e75..915f82e 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$3$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$3$1.class differ 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 index 8d6160e..cb6e20d 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$4$1.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$4$1.class differ 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 index e582654..be8a407 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1$1$5.class and b/build/classes/kotlin/main/MainKt$main$1$1$1$5.class differ diff --git a/build/classes/kotlin/main/MainKt$main$1$1.class b/build/classes/kotlin/main/MainKt$main$1$1.class index a071999..8652c29 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1$1.class and b/build/classes/kotlin/main/MainKt$main$1$1.class differ diff --git a/build/classes/kotlin/main/MainKt$main$1.class b/build/classes/kotlin/main/MainKt$main$1.class index 091e50c..3e0b1eb 100644 Binary files a/build/classes/kotlin/main/MainKt$main$1.class and b/build/classes/kotlin/main/MainKt$main$1.class differ 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 index a2960d2..3df4e59 100644 Binary files a/build/classes/kotlin/main/MainKt$sam$java_util_function_Function$0.class and b/build/classes/kotlin/main/MainKt$sam$java_util_function_Function$0.class differ diff --git a/build/classes/kotlin/main/MainKt.class b/build/classes/kotlin/main/MainKt.class index a4dcca8..9073d91 100644 Binary files a/build/classes/kotlin/main/MainKt.class and b/build/classes/kotlin/main/MainKt.class differ diff --git a/build/classes/kotlin/main/composables/TextCentredComposableKt$textCentred$2.class b/build/classes/kotlin/main/composables/TextCentredComposableKt$textCentred$2.class deleted file mode 100644 index 8b07088..0000000 Binary files a/build/classes/kotlin/main/composables/TextCentredComposableKt$textCentred$2.class and /dev/null differ diff --git a/build/classes/kotlin/main/composables/TextCentredComposableKt.class b/build/classes/kotlin/main/composables/TextCentredComposableKt.class deleted file mode 100644 index 8fd4bbd..0000000 Binary files a/build/classes/kotlin/main/composables/TextCentredComposableKt.class and /dev/null differ diff --git a/build/kotlin/compileKotlin/build-history.bin b/build/kotlin/compileKotlin/build-history.bin index 8054bf0..cf46abe 100644 Binary files a/build/kotlin/compileKotlin/build-history.bin and b/build/kotlin/compileKotlin/build-history.bin differ diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab index 4795ebb..7bc260c 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab and b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab differ 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 index a10f913..b0eebb4 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values and b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values differ 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 index 803d9e8..94fd6ca 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at differ 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 index da317d4..ed465db 100644 --- 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 @@ -ÂÉääääääääÌÌÒÇÊõõÅÕööööööù \ No newline at end of file +ÂÉääääääääÌÌÒÇÊõõÅÕööööööùÉÉÛÛÛÛÛÛÛÛ \ No newline at end of file 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 index e8fab47..d4bb9f3 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ 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 index 7ab891e..5a7e2d3 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values differ 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 index 5d04a6e..2abc488 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ 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 index e6d73af..591b766 100644 --- 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 @@ -â ÚÚÚáåçòòòòÌ ïçêà üáúØ Ø Ø È Ä ÷ \ No newline at end of file +â ÚÚÚáåçòòòòÌ ïçêà üáúØ Ø Ø È Ä ÷ïöûòòòòòòò \ No newline at end of file diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab index 09c9e0d..e426aa2 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab differ 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 index b8130ad..8480953 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab index c608d66..3b623c1 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values index 4578f59..0ee1561 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values differ 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 index 1abf16c..0080ddd 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at differ 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 index ad958e4..c6ce4be 100644 --- 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 @@ -óZÌXÄVÄVÀVÁUÕTØTÛTîSéRóQçUâTâTâTÙTÖTáU \ No newline at end of file +óZÌXÄVÄVÀVÁUÕTØTÛTîSéRóQçUâTâTâTÙTÖTáUÿSÂTÛRÑRÑRîRîRîRîRîR \ No newline at end of file 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 index 6c90006..921ab8a 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab differ 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 index 9319661..14efeee 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab index 6a54daa..2035e38 100644 --- a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab +++ b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab @@ -1,2 +1,2 @@ -72 -59 \ No newline at end of file +83 +71 \ No newline at end of file diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab index 6ed359d..ffeee74 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab and b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab differ 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 index 723160d..57e5d54 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab index 7edd326..acbdf9c 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab differ 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 index 15f8e27..db6da1a 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream differ 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 index 9ce7b83..1a83a7a 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len differ 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 index 2553f37..bb3f6cb 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len differ 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 index 2e9bd29..a876831 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at differ 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 index 1e02c1a..b1a5573 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab index 517870d..ac44154 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream index 7b20abf..31c7eb8 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len index 82b2345..2f7f0e3 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len index cfb2468..2ba9fec 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values index 2a711a3..eea1c56 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at index a09c1d6..fa7909d 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s index 68d1dbd..3d6c08b 100644 --- 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Ã)Û'Ñ$à'Ï(Ü Ú$åÓ"ãâËèÇÏïïÙÙÜÙ÷ÇÕÊ ùøèáâöÖ÷ÈÉÅ'ðÿÁ*ø%ø$ð"÷ý"òÀÄÚïÖáðèÃÑ%ù#Ö÷ÝýõÌ×%ñú$Ï,Ù,Ç,ËÊü!ÜÁ(Ü*ÀÚÈ(ä÷ÔÂèí \ No newline at end of file +ÝòÉ.á6Ã)Û'Ñ$à'Ï(Ü Ú$åÓ"ãâËèÇÏïïÙÙÜÙ÷ÇÕÊ ùøèáâöÖ÷ÈÉÅ'ðÿÁ*ø%ø$ð"÷ý"òÀÄÚïÖáðèÃÑ%ù#Ö÷ÝýõÌ×%ñú$Ï,Ù,Ç,ËÊü!ÜÁ(Ü*ÀÚÈ(ä÷ÔÂèí Ô"Ã÷Öè á$ÅØÝÁñþòÞá ËáäÜÌÛ í×ÆÈÙ +æêý Èýÿ Þßô ÝþÔ +ìß ÉÕÒ +çÙù ÄðÓ Ãüò üÖú \ No newline at end of file diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i index 52c3e14..0e9f224 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i differ diff --git a/build/kotlin/compileKotlin/last-build.bin b/build/kotlin/compileKotlin/last-build.bin index 3eee848..ea75a56 100644 Binary files a/build/kotlin/compileKotlin/last-build.bin and b/build/kotlin/compileKotlin/last-build.bin differ diff --git a/src/main/kotlin/composables/TextCentredComposable.kt b/src/main/kotlin/composables/TextCentredComposable.kt deleted file mode 100644 index 439cbd5..0000000 --- a/src/main/kotlin/composables/TextCentredComposable.kt +++ /dev/null @@ -1,22 +0,0 @@ -package composables - -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.padding -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp - -@Composable -fun textCentred( - modifier: Modifier, - message: String -) { - Column(modifier) { - Text( - modifier = Modifier - .padding(30.dp), - text = message - ) - } -} \ No newline at end of file diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt index f11f0eb..4dcccde 100644 --- 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? @@ -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( 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 ) } }