Фикс бага с консолью

Author: Apochromat

app/src/main/java/com/apochromat/codeblockmobile/ProjectActivity.kt

@@ -560,9 +560,7 @@ class ProjectActivity : AppCompatActivity() {
                 listBlocks[i].status = ok()
                 blocksAdapter.notifyItemChanged(i)
             }
-            if (listBlocks[i].type == "ConsoleInput"){
-                listBlocks[i].activity = this
-            }
+            listBlocks[i].activity = this
 
         }
         if (!connectionBlocks()) {
@@ -584,7 +582,7 @@ class ProjectActivity : AppCompatActivity() {
 
         }
     }
-    private fun disconnectAllBlocks(){
+    fun disconnectAllBlocks(){
         for (i in 0 until listBlocks.size){
             listBlocks[i].prevBlock = null
             listBlocks[i].nextBlock = null

app/src/main/java/com/apochromat/codeblockmobile/logic/Block.kt

@@ -37,7 +37,7 @@ open class Block {
     lateinit var adapterConsole : ConsoleAdapter
     lateinit var adapterBlocks : BlocksAdapter
     lateinit var holder : BlocksAdapter.ViewHolder
-    lateinit var activity: ProjectActivity
+    var activity: ProjectActivity? = null
 
     var crutch = true
 
@@ -68,6 +68,7 @@ open class Block {
             when {
                 nextBlock == null -> {
                     isProgramRunning = false
+                    activity?.disconnectAllBlocks()
                     adapterConsole.addMessage(programFinish(status))
                     adapterBlocks.notifyItemChanged(indexListBlocks)
                 }
@@ -76,6 +77,7 @@ open class Block {
                 }
                 else -> {
                     isProgramRunning = false
+                    activity?.disconnectAllBlocks()
                     adapterConsole.addMessage(programFinish(status))
                     adapterBlocks.notifyItemChanged(indexListBlocks)
                 }

app/src/main/java/com/apochromat/codeblockmobile/logic/ConsoleInput.kt

@@ -104,6 +104,7 @@ class ConsoleInput : Block() {
         when {
             nextB == null -> {
                 isProgramRunning = false
+                activity?.disconnectAllBlocks()
                 adapterConsole.addMessage(programFinish(status))
                 adapterBlocks.notifyItemChanged(indexListBlocks)
             }
@@ -112,6 +113,7 @@ class ConsoleInput : Block() {
             }
             else -> {
                 isProgramRunning = false
+                activity?.disconnectAllBlocks()
                 adapterConsole.addMessage(programFinish(status))
                 adapterBlocks.notifyItemChanged(indexListBlocks)
             }

app/src/main/java/com/apochromat/codeblockmobile/logic/EntryPoint.kt

@@ -9,6 +9,7 @@ class EntryPoint : Block() {
     }
 
     override fun executeBlock() {
+        adapterConsole.addMessage(programStart())
         accessHeap().clearVariables()
         accessHeap().clearArrays()
     }

app/src/main/java/com/apochromat/codeblockmobile/logic/Strings.kt

@@ -29,6 +29,7 @@ var tagVariable = fun(): String { return "Variable" }
 var tagArray = fun(): String { return "Array" }
 
 var programFinish = fun(status: String): String { return "Program finished with status: $status" }
+var programStart = fun(): String { return "Program started" }
 
 var allComparators = listOf(">", ">=", "<", "<=", "==", "!=")