From cbebe43981c0c5d69108d5f9a2a44772e6077e39 Mon Sep 17 00:00:00 2001 From: Kevin Schoon Date: Sun, 28 Jan 2018 00:22:41 +0800 Subject: [PATCH] UI and copy updates --- ui.go | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/ui.go b/ui.go index c7d3c19..bc74a44 100644 --- a/ui.go +++ b/ui.go @@ -10,21 +10,37 @@ func status(runner *TaskRunner) termui.GridBufferer { switch runner.state { case RUNNING: text = fmt.Sprintf( - "%s %s remaining [ pomodoro %d/%d ]", - "X", + `%s remaining - [%d/%d] Pomodoros completed + + [q] - quit [p] - pause + `, runner.TimeRemaining(), runner.count, runner.nPomodoros, ) case BREAKING: - text = "Time to take a break.\nPress [enter] to begin the next Pomodoro!" + text = `It is time to take a break! + + Take a step back, reflect on your progress, or have a coffee. + Once you a ready press [enter] to begin the next Pomodoro. + + [q] - quit [p] - pause + ` case PAUSED: - text = "Press p to resume" + text = `Pomo is suspended, this time does not count against your progress. + + [q] - quit [p] - unpause + ` case COMPLETE: - text = "Press q to quit" + text = `This session has concluded, press [q] to exit. If you are + going to continue working, consider taking an extended break + before starting again. + + [q] - quit + ` } par := termui.NewPar(text) - par.Height = 10 + par.Height = 8 par.BorderLabel = fmt.Sprintf("Pomo - %s", runner.state) par.BorderLabelFg = termui.ColorWhite par.BorderFg = termui.ColorRed