app image was added

AntonAsmirko · Mar 12, 2021 · 4981e1c · 4981e1c
1 parent 9821537
commit 4981e1c
Show file tree

Hide file tree

Showing 86 changed files with 17 additions and 13 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/classes/kotlin/main/Constants.class b/build/classes/kotlin/main/Constants.class
diff --git a/build/classes/kotlin/main/LeftViewType.class b/build/classes/kotlin/main/LeftViewType.class
diff --git a/build/classes/kotlin/main/MainKt$buttonInBox$1$1$1.class b/build/classes/kotlin/main/MainKt$buttonInBox$1$1$1.class
diff --git a/build/classes/kotlin/main/MainKt$buttonInBox$1$2$1.class b/build/classes/kotlin/main/MainKt$buttonInBox$1$2$1.class
diff --git a/build/classes/kotlin/main/MainKt$buttonInBox$1$3$1.class b/build/classes/kotlin/main/MainKt$buttonInBox$1$3$1.class
diff --git a/build/classes/kotlin/main/MainKt$buttonInBox$1$4.class b/build/classes/kotlin/main/MainKt$buttonInBox$1$4.class
diff --git a/build/classes/kotlin/main/MainKt$drawPoints$sorted$1.class b/build/classes/kotlin/main/MainKt$drawPoints$sorted$1.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$1.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$1.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$2.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$2.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$3.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$3.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$4.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$4.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$5.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$5.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$6.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$6.class
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$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.class b/build/classes/kotlin/main/MainKt$main$1$1$1$2.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$plotView$1.class b/build/classes/kotlin/main/MainKt$plotView$1.class
diff --git a/build/classes/kotlin/main/MainKt.class b/build/classes/kotlin/main/MainKt.class
diff --git a/build/classes/kotlin/main/MethodType.class b/build/classes/kotlin/main/MethodType.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
@@ -9,4 +9,4 @@
 é
 á
 ØííííñÀÀÀÀÀÀÄý
-ÀÀ
+ÀÀÀÀÃ
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.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.keystream b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
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/internal-name-to-source.tab_i b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
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 b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values
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/jvm/kotlin/source-to-classes.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.s
@@ -1 +1 @@
-�������������
+�윌촌︌︌︌︌︌︌︌，︌︌︌︌，
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.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 @@
-117
-114
+120
+117
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 @@
-ΰΪκΡχάχκΞήΠυΥΟοιαόρύΕγΰΦΧέαωΘβΜΥτοξχζήθάΰΗέ�ΓλΣίΓνμιλεΰ�ΕβϊεαΗπήηζςθ�ΤϋΙααΕνΟκςρχωΦςωΩδΣΒήΛέΟΣΑ�τθξφϊΕΕϊψΑΪΰβυηϊ�ηηΑςάΠφψΨΠΞτΤΛψβΤλΞΡόοΖΔπΛ
+ηΫόμΟΞΙΦχέΙΥΓοΟξΙννεΦρ

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/img/appIcon.png b/img/appIcon.png
diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -10,15 +10,16 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Canvas
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Paint
+import androidx.compose.ui.graphics.*
 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 model.PlotData
 import model.interpolators.FunctionInterpolator
+import java.awt.image.BufferedImage
+import java.io.File
+import javax.imageio.ImageIO
+import javax.swing.Icon
 import kotlin.math.log2
 import kotlin.math.pow
 import kotlin.math.sin
@@ -58,10 +59,13 @@ val functionsButtonsText = mapOf(
     Pair("y = x^2", fun(x: Float): Float { return x.pow(2f) }),
     Pair("y = x^3", fun(x: Float): Float { return x.pow(3f) }),
     Pair("y = sin(x)", fun(x: Float): Float { return sin(x) }),
-    Pair("y = log2(x)", fun(x: Float): Float { return log2(x) })
+    Pair("y = log2(x)", fun(x: Float): Float { return log2(x) }),
+    Pair("y = x^2 * cos(x)", fun(x: Float): Float {return x.pow(2f) * sin(x)})
 )
 
-fun main() = Window(title = Constants.TITLE) {
+val appImg: BufferedImage = ImageIO.read(File("./img/appIcon.png"))
+
+fun main() = Window(title = Constants.TITLE, icon = appImg) {
     MaterialTheme {
         var leftViewType by remember { mutableStateOf(LeftViewType.METHOD) }
         var func by remember { mutableStateOf(Constants.NONE_FUNC) }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ @@
     é
     á
     ØííííñÀÀÀÀÀÀÄý
-    ÀÀ
+    ÀÀÀÀÃ
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		джжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжьыыыыыыыыыыышшшшшшшдддьоооооИИИИИИИИИИ
		джжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжьыыыыыыыыыыышшшшшшшдддьоооооИИИИИИИИИИИИз
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Юххххххххххххххххххххххххххххххххххххххххххххххххххт!м"У)У)У)У)У)Щ)У(У(У(У(У(У(о(Г)Г)Г)Г)Г)й(п(у)у.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.
		Юххххххххххххххххххххххххххххххххххххххххххххххххххт!м"У)У)У)У)У)Щ)У(У(У(У(У(У(о(Г)Г)Г)Г)Г)й(п(у)у.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.д.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		��
		�윌촌︌︌︌︌︌︌︌，︌︌︌︌，
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ΰΪκΡχάχκΞήΠυΥΟοιαόρύΕγΰΦΧέαωΘβΜΥτοξχζήθάΰΗέ�ΓλΣίΓνμιλεΰ�ΕβϊεαΗπήηζςθ�ΤϋΙααΕνΟκςρχωΦςωΩδΣΒήΛέΟΣΑ�τθξφϊΕΕϊψΑΪΰβυηϊ�ηηΑςάΠφψΨΠΞτΤΛψβΤλΞΡόοΖΔπΛ
		ηΫόμΟΞΙΦχέΙΥΓοΟξΙννεΦρ
Expand Down