Add spinner for signin

Author: dyng

internal/view/method_call.go

@@ -300,14 +300,13 @@ func (d *MethodCallDialog) callMethod() {
 		}
 
 		d.app.QueueUpdateDraw(func() {
-			// stop spinner
-			d.spinner.StopAndHide()
-
 			if err != nil {
+				d.spinner.StopAndHide() // must stop spinner before show error message
 				log.Error("Method call is failed", "name", methodName, "args", args, "error", err)
 				d.app.root.NotifyError(format.FineErrorMessage("Cannot call contract method '%s'.", methodName, err))
 			} else {
 				d.result.SetText(fmt.Sprint(res...))
+				d.spinner.StopAndHide()
 			}
 		})
 	}()

internal/view/query.go

@@ -50,28 +50,28 @@ func (d *QueryDialog) handleKey(key tcell.Key) {
 	switch key {
 	case tcell.KeyEnter:
 		// start spinner
-		d.setSpinnerRect()
-		d.spinner.StartAndShow()
+		d.Loading()
 
 		address := d.GetText()
+		if address == "" {
+			return
+		}
+
 		go func() {
-			if address != "" {
-				account, err := d.app.service.GetAccount(address)
-				d.app.QueueUpdateDraw(func() {
-					// stop spinner
-					d.spinner.StopAndHide()
-					d.Hide()
-
-					if err != nil {
-						log.Error("Failed to fetch account of given address",
-							"address", address, "error", err)
-						d.app.root.NotifyError(format.FineErrorMessage(
-							"Failed to fetch account of address %s", address, err))
-					} else {
-						d.app.root.ShowAccountPage(account)
-					}
-				})
-			}
+			account, err := d.app.service.GetAccount(address)
+			d.app.QueueUpdateDraw(func() {
+				if err != nil {
+					d.Finished() // must stop loading animation before show error message
+					log.Error("Failed to fetch account of given address",
+						"address", address, "error", err)
+					d.app.root.NotifyError(format.FineErrorMessage(
+						"Failed to fetch account of address %s", address, err))
+				} else {
+					d.app.root.ShowAccountPage(account)
+					d.Finished()
+				}
+
+			})
 		}()
 	case tcell.KeyEsc:
 		d.Hide()
@@ -91,6 +91,18 @@ func (d *QueryDialog) Hide() {
 	d.app.SetFocus(d.lastFocus)
 }
 
+// Loading will set the location of spinner and show it
+func (d *QueryDialog) Loading() {
+	d.setSpinnerRect()
+	d.spinner.StartAndShow()
+}
+
+// Finished will stop and hide spinner, as well as close current dialog
+func (d *QueryDialog) Finished() {
+	d.spinner.StopAndHide()
+	d.Hide()
+}
+
 func (d *QueryDialog) Clear() {
 	d.InputField.SetText("")
 }

internal/view/signin.go

@@ -3,6 +3,7 @@ package view
 import (
 	"github.com/dyng/ramen/internal/view/format"
 	"github.com/dyng/ramen/internal/view/style"
+	"github.com/dyng/ramen/internal/view/util"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
@@ -13,12 +14,14 @@ type SignInDialog struct {
 	app       *App
 	display   bool
 	lastFocus tview.Primitive
+	spinner   *util.Spinner
 }
 
 func NewSignInDialog(app *App) *SignInDialog {
 	d := &SignInDialog{
 		app:     app,
 		display: false,
+		spinner: util.NewSpinner(app.Application),
 	}
 
 	// setup layout
@@ -46,19 +49,27 @@ func (d *SignInDialog) initLayout() {
 func (d *SignInDialog) handleKey(key tcell.Key) {
 	switch key {
 	case tcell.KeyEnter:
-		// close dialog at first
-		d.Hide()
+		// start spinner
+		d.Loading()
 
 		privateKey := d.GetText()
-		if privateKey != "" {
-			signer, err := d.app.service.GetSigner(privateKey)
-			if err != nil {
-				log.Error("Failed to create signer", "error", err)
-				d.app.root.NotifyError(format.FineErrorMessage("Failed to create signer", err))
-			} else {
-				d.app.root.SignIn(signer)
-			}
+		if privateKey == "" {
+			return
 		}
+
+		go func() {
+			signer, err := d.app.service.GetSigner(privateKey)
+			d.app.QueueUpdateDraw(func() {
+				if err != nil {
+					d.Finished()
+					log.Error("Failed to create signer", "error", err)
+					d.app.root.NotifyError(format.FineErrorMessage("Failed to create signer", err))
+				} else {
+					d.app.root.SignIn(signer)
+					d.Finished()
+				}
+			})
+		}()
 	case tcell.KeyEsc:
 		d.Hide()
 	}
@@ -77,6 +88,18 @@ func (d *SignInDialog) Hide() {
 	d.app.SetFocus(d.lastFocus)
 }
 
+// Loading will set the location of spinner and show it
+func (d *SignInDialog) Loading() {
+	d.setSpinnerRect()
+	d.spinner.StartAndShow()
+}
+
+// Finished will stop and hide spinner, as well as close current dialog
+func (d *SignInDialog) Finished() {
+	d.spinner.StopAndHide()
+	d.Hide()
+}
+
 func (d *SignInDialog) Clear() {
 	d.InputField.SetText("")
 }
@@ -94,6 +117,7 @@ func (d *SignInDialog) Draw(screen tcell.Screen) {
 	if d.display {
 		d.InputField.Draw(screen)
 	}
+	d.spinner.Draw(screen)
 }
 
 func (d *SignInDialog) SetCentral(x int, y int, width int, height int) {
@@ -114,3 +138,9 @@ func (d *SignInDialog) inputSize() (int, int) {
 	height := d.GetFieldHeight() + 2
 	return width, height
 }
+
+func (d *SignInDialog) setSpinnerRect() {
+	x, y, _, _ := d.GetInnerRect()
+	sx := x + len(d.GetText()) + 1
+	d.spinner.SetRect(sx, y, 0, 0)
+}

internal/view/util/spinner.go

@@ -103,5 +103,6 @@ func (s *Spinner) Draw(screen tcell.Screen) {
 	s.Box.DrawForSubclass(screen, s)
 	x, y, _, _ := s.Box.GetInnerRect()
 	frame := string(frames[s.counter])
+	screen.HideCursor()
 	tview.Print(screen, frame, x, y, 1, tview.AlignLeft, tcell.ColorDefault)
 }