Fixed dialog menu after choosing option.

grrlopes · Jul 14, 2023 · 9a70ae2 · 9a70ae2
1 parent 231ca5c
commit 9a70ae2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/ui/styles.go b/ui/styles.go
@@ -3,9 +3,9 @@ package ui
 import "github.com/charmbracelet/lipgloss"
 
 var (
-	view      = lipgloss.NewStyle()
-	BaseStyle = lipgloss.NewStyle()
-	SubtleStyle    = lipgloss.AdaptiveColor{Light: "#D9DCCF", Dark: "#383838"}
+	view        = lipgloss.NewStyle()
+	BaseStyle   = lipgloss.NewStyle()
+	SubtleStyle = lipgloss.AdaptiveColor{Light: "#D9DCCF", Dark: "#383838"}
 
 	titleStyle = func() lipgloss.Style {
 		b := lipgloss.RoundedBorder()
@@ -40,6 +40,13 @@ var (
 			MarginTop(1).
 			MarginRight(2)
 
+	ButtonDisableStyle = lipgloss.NewStyle().
+			Foreground(lipgloss.Color("#FFFFFF")).
+			Background(lipgloss.Color("#7a0609")).
+			Padding(0, 3).
+			MarginTop(1).
+			MarginRight(2)
+
 	ActiveButtonStyle = ButtonStyle.Copy().
 				Foreground(lipgloss.Color("#FFFFFF")).
 				Background(lipgloss.AdaptiveColor{Light: "#b7cbbf", Dark: "#b7cbbf"}).

diff --git a/ui/sync.go b/ui/sync.go
@@ -14,6 +14,8 @@ const (
 	maxWidth = 80
 )
 
+var choiceEntered bool = false
+
 type tickMsg time.Time
 
 func syncUpdate(msg tea.Msg, m ModelHome) (*ModelHome, tea.Cmd) {
@@ -31,18 +33,15 @@ func syncUpdate(msg tea.Msg, m ModelHome) (*ModelHome, tea.Cmd) {
 			m.home.Viewport.SetContent(syncView(&m))
 			return &m, nil
 		case "enter":
-			if !m.home.StatusSyncScreen && m.home.ActiveSyncScreen {
-				m.home.ActiveSyncScreen = false
-				m.home.ProgressSync = progress.NewModel(progress.WithDefaultGradient())
-				m.home.Viewport.SetContent(m.GetDataView())
-				return &m, nil
-			}
+			choiceEntered = true
+			m.home.StatusSyncScreen = false
 			return &m, syncTickCmd()
 		case "q":
 			if m.home.ActiveSyncScreen {
 				m.home.ActiveSyncScreen = false
 				m.home.ProgressSync = progress.NewModel(progress.WithDefaultGradient())
 				m.home.Viewport.SetContent(m.GetDataView())
+				choiceEntered = false
 				return &m, nil
 			}
 		}
@@ -77,9 +76,12 @@ func syncUpdate(msg tea.Msg, m ModelHome) (*ModelHome, tea.Cmd) {
 func syncView(m *ModelHome) string {
 	var okButton, cancelButton string
 
-	if m.home.StatusSyncScreen {
+	if m.home.StatusSyncScreen && !choiceEntered {
 		okButton = ActiveButtonStyle.Render("Yes")
 		cancelButton = ButtonStyle.Render("No, take me back")
+	} else if choiceEntered {
+		okButton = ButtonDisableStyle.Render("Yes")
+		cancelButton = ButtonDisableStyle.Render("No, take me back")
 	} else {
 		okButton = ButtonStyle.Render("Yes")
 		cancelButton = ActiveButtonStyle.Render("No, take me back")