ColoredLines: Showed on-deck balls in UI.

Author: Daniel Barclay

src/main/scala/com/us/dsb/explore/algs/coloredlines/manual/game/board/BallKind.scala

@@ -4,11 +4,11 @@ import enumeratum.{Enum, EnumEntry}
 
 import scala.io.AnsiColor
 
-private[game] sealed class BallKind(private[board] val initial: String,
+private[game] sealed class BallKind(private[manual] val initial: String,
                                     private[this] val setFgColorSeq: String,
                                     private[this] val setBgColorSeq: String
                                     ) extends EnumEntry {
-  private[board] def getColoredCharSeq(background: Boolean): String =
+  private[manual] def getColoredCharSeq(background: Boolean): String =
     (if (background) this.setBgColorSeq else this.setFgColorSeq) +
         initial +
         AnsiColor.RESET

src/main/scala/com/us/dsb/explore/algs/coloredlines/manual/game/board/BoardPlus.scala

@@ -9,7 +9,7 @@ private[game] object BoardPlus {
 /**
  * CURRENTLY:  Core board state (now wrapped), not score yet, tap-UI selection state
  */
-private[game] class BoardPlus(private[game] val boardState: BoardState,
+private[game] class BoardPlus(private[manual] val boardState: BoardState,
                               private[this] val score: Int,
                               //???? move to (low-level) tap-UI state:
                               private[this] val selectionAddress: Option[CellAddress]

src/main/scala/com/us/dsb/explore/algs/coloredlines/manual/game/board/BoardState.scala

@@ -36,7 +36,7 @@ private[game] class BoardState(private[this] val cellStates: Vector[CellBallStat
 
   // on-deck balls:
 
-  private[game] def getOnDeckBalls: Iterable[BallKind] = onDeck
+  private[manual] def getOnDeckBalls: Iterable[BallKind] = onDeck
 
   private[game] def withOnDeckBalls(newBalls: Iterable[BallKind]): BoardState =
     copy(onDeck = newBalls)

src/main/scala/com/us/dsb/explore/algs/coloredlines/manual/ui/GameUIState.scala

@@ -64,9 +64,13 @@ private[this] case class GameUIState(gameState: UpperGameState,
   }
 
   private[ui] def toDisplayString: String = {
+    val onDeckList =
+      gameState.boardPlus.boardState.getOnDeckBalls.map(_.getColoredCharSeq(false)).mkString(", ")
+
     renderTableMultilineWithSelection + "\n" +
-    s"Score: ${gameState.boardPlus.getScore}  " +
-        s"Marking cursor: <row ${cursorAddress.row} / column ${cursorAddress.column}>"
+        s"Next: $onDeckList" +
+        s"  Score: ${gameState.boardPlus.getScore}" +
+        s"  Marking cursor: <row ${cursorAddress.row} / column ${cursorAddress.column}>"
   }
 
 }