Merge branch 'refactor' into main

benpollarduk · Nov 16, 2023 · 7277e49 · 7277e49
2 parents 1a15272 + 068a560
commit 7277e49
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 34 deletions.
diff --git a/...c/main/kotlin/com.github.benpollarduk.ktvn.console/configuration/AnsiConsoleController.kt b/...c/main/kotlin/com.github.benpollarduk.ktvn.console/configuration/AnsiConsoleController.kt
@@ -1,11 +1,11 @@
 package com.github.benpollarduk.ktvn.console.configuration
 
-import com.github.benpollarduk.ktvn.rendering.sequencing.SequencedTextController
-import com.github.benpollarduk.ktvn.rendering.sequencing.SequencedTextControllerListener
-import com.github.benpollarduk.ktvn.rendering.frames.CharacterConstrainedTextFrame
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrame
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrameParameters
-import com.github.benpollarduk.ktvn.rendering.sequencing.TimeBasedTextSequencer
+import com.github.benpollarduk.ktvn.text.sequencing.SequencedTextController
+import com.github.benpollarduk.ktvn.text.sequencing.SequencedTextControllerListener
+import com.github.benpollarduk.ktvn.text.frames.CharacterConstrainedTextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrameParameters
+import com.github.benpollarduk.ktvn.text.sequencing.TimeBasedTextSequencer
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.locks.ReentrantLock
 
@@ -180,11 +180,13 @@ internal class AnsiConsoleController(
 
     /**
      * Display a [string] directly on the console temporarily. The default 1000ms duration can be specified with
-     * [durationInMs], in milliseconds.
+     * [durationInMs], in milliseconds. Optionally an ANSI color code can be specified, otherwise 90 (bright black)
+     * will be used.
      */
-    internal fun printlnDirectTemp(string: String, durationInMs: Long = 1000) {
+    internal fun printlnDirectTemp(string: String, durationInMs: Long = 1000, colorCode: Int = 90) {
         clear()
-        println(string)
+        // print string wrapped in ANSI color setting to specified colour and then resetting to 0 (reset)
+        println("\u001B[${colorCode}m$string\u001B[0m")
 
         if (durationInMs > 0) {
             Thread.sleep(durationInMs)

diff --git a/...g/frames/CharacterConstrainedTextFrame.kt → ...t/frames/CharacterConstrainedTextFrame.kt b/...g/frames/CharacterConstrainedTextFrame.kt → ...t/frames/CharacterConstrainedTextFrame.kt
@@ -1,4 +1,4 @@
-package com.github.benpollarduk.ktvn.rendering.frames
+package com.github.benpollarduk.ktvn.text.frames
 
 import java.awt.Point
 

diff --git a/...tvn/rendering/frames/CharacterPosition.kt → ...duk/ktvn/text/frames/CharacterPosition.kt b/...tvn/rendering/frames/CharacterPosition.kt → ...duk/ktvn/text/frames/CharacterPosition.kt
@@ -1,4 +1,4 @@
-package com.github.benpollarduk.ktvn.rendering.frames
+package com.github.benpollarduk.ktvn.text.frames
 
 /**
  * Defines the position of a [Char] in 2D space, with a specified [column] and [row].

diff --git a/...k/ktvn/rendering/frames/MeasuredString.kt → ...larduk/ktvn/text/frames/MeasuredString.kt b/...k/ktvn/rendering/frames/MeasuredString.kt → ...larduk/ktvn/text/frames/MeasuredString.kt
@@ -1,4 +1,4 @@
-package com.github.benpollarduk.ktvn.rendering.frames
+package com.github.benpollarduk.ktvn.text.frames
 
 /**
  * Provides a structure for holding a [string] with a measured [width].

diff --git a/...dering/frames/SizeConstrainedTextFrame.kt → ...n/text/frames/SizeConstrainedTextFrame.kt b/...dering/frames/SizeConstrainedTextFrame.kt → ...n/text/frames/SizeConstrainedTextFrame.kt
@@ -1,4 +1,4 @@
-package com.github.benpollarduk.ktvn.rendering.frames
+package com.github.benpollarduk.ktvn.text.frames
 
 import java.awt.Font
 import java.awt.FontMetrics

diff --git a/...larduk/ktvn/rendering/frames/TextFrame.kt → ...enpollarduk/ktvn/text/frames/TextFrame.kt b/...larduk/ktvn/rendering/frames/TextFrame.kt → ...enpollarduk/ktvn/text/frames/TextFrame.kt
@@ -1,4 +1,4 @@
-package com.github.benpollarduk.ktvn.rendering.frames
+package com.github.benpollarduk.ktvn.text.frames
 
 /**
  * Defines an interface for frames of text.

diff --git a/...n/rendering/frames/TextFrameParameters.kt → ...k/ktvn/text/frames/TextFrameParameters.kt b/...n/rendering/frames/TextFrameParameters.kt → ...k/ktvn/text/frames/TextFrameParameters.kt
@@ -1,4 +1,4 @@
-package com.github.benpollarduk.ktvn.rendering.frames
+package com.github.benpollarduk.ktvn.text.frames
 
 import java.awt.Font
 

diff --git a/...ing/sequencing/SequencedTextController.kt → ...ext/sequencing/SequencedTextController.kt b/...ing/sequencing/SequencedTextController.kt → ...ext/sequencing/SequencedTextController.kt
@@ -1,6 +1,6 @@
-package com.github.benpollarduk.ktvn.rendering.sequencing
+package com.github.benpollarduk.ktvn.text.sequencing
 
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrame
 
 /**
  * Provides a class for sequenced text control using a [sequencer].

diff --git a/...encing/SequencedTextControllerListener.kt → ...encing/SequencedTextControllerListener.kt b/...encing/SequencedTextControllerListener.kt → ...encing/SequencedTextControllerListener.kt
@@ -1,7 +1,7 @@
-package com.github.benpollarduk.ktvn.rendering.sequencing
+package com.github.benpollarduk.ktvn.text.sequencing
 
 import com.github.benpollarduk.ktvn.logic.structure.AcknowledgeListener
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrame
 
 /**
  * Provides an interface for listeners to [SequencedTextController] events.

diff --git a/...tvn/rendering/sequencing/TextSequencer.kt → ...duk/ktvn/text/sequencing/TextSequencer.kt b/...tvn/rendering/sequencing/TextSequencer.kt → ...duk/ktvn/text/sequencing/TextSequencer.kt
@@ -1,6 +1,6 @@
-package com.github.benpollarduk.ktvn.rendering.sequencing
+package com.github.benpollarduk.ktvn.text.sequencing
 
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrame
 
 /**
  * Provides an interface for sequencers for displaying [TextFrame].

diff --git a/...ring/sequencing/TimeBasedTextSequencer.kt → ...text/sequencing/TimeBasedTextSequencer.kt b/...ring/sequencing/TimeBasedTextSequencer.kt → ...text/sequencing/TimeBasedTextSequencer.kt
@@ -1,7 +1,7 @@
-package com.github.benpollarduk.ktvn.rendering.sequencing
+package com.github.benpollarduk.ktvn.text.sequencing
 
-import com.github.benpollarduk.ktvn.rendering.frames.CharacterPosition
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrame
+import com.github.benpollarduk.ktvn.text.frames.CharacterPosition
+import com.github.benpollarduk.ktvn.text.frames.TextFrame
 
 /**
  * Provides a [TextSequencer] that is time based. The delay between characters can be specified, in milliseconds, with

diff --git a/...ames/CharacterConstrainedTextFrameTest.kt → ...ames/CharacterConstrainedTextFrameTest.kt b/...ames/CharacterConstrainedTextFrameTest.kt → ...ames/CharacterConstrainedTextFrameTest.kt
@@ -1,4 +1,4 @@
-package com.github.benpollarduk.ktvn.rendering.frames
+package com.github.benpollarduk.ktvn.text.frames
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test

diff --git a/...ng/frames/SizeConstrainedTextFrameTest.kt → ...xt/frames/SizeConstrainedTextFrameTest.kt b/...ng/frames/SizeConstrainedTextFrameTest.kt → ...xt/frames/SizeConstrainedTextFrameTest.kt
@@ -1,4 +1,4 @@
-package com.github.benpollarduk.ktvn.rendering.frames
+package com.github.benpollarduk.ktvn.text.frames
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test

diff --git a/...sequencing/SequencedTextControllerTest.kt → ...sequencing/SequencedTextControllerTest.kt b/...sequencing/SequencedTextControllerTest.kt → ...sequencing/SequencedTextControllerTest.kt
@@ -1,8 +1,8 @@
-package com.github.benpollarduk.ktvn.rendering.sequencing
+package com.github.benpollarduk.ktvn.text.sequencing
 
-import com.github.benpollarduk.ktvn.rendering.frames.SizeConstrainedTextFrame
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrame
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrameParameters
+import com.github.benpollarduk.ktvn.text.frames.SizeConstrainedTextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrameParameters
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import java.awt.Font

diff --git a/.../sequencing/TimeBasedTextSequencerTest.kt → .../sequencing/TimeBasedTextSequencerTest.kt b/.../sequencing/TimeBasedTextSequencerTest.kt → .../sequencing/TimeBasedTextSequencerTest.kt
@@ -1,8 +1,8 @@
-package com.github.benpollarduk.ktvn.rendering.sequencing
+package com.github.benpollarduk.ktvn.text.sequencing
 
-import com.github.benpollarduk.ktvn.rendering.frames.SizeConstrainedTextFrame
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrame
-import com.github.benpollarduk.ktvn.rendering.frames.TextFrameParameters
+import com.github.benpollarduk.ktvn.text.frames.SizeConstrainedTextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrame
+import com.github.benpollarduk.ktvn.text.frames.TextFrameParameters
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import java.awt.Font