Merge pull request #33 from zMoooooritz/fullscreenReader

Add keybind (f) to open the reader in fullscreen view

pkg/tui/keybinds.go

@@ -6,10 +6,11 @@ type KeyMap struct {
 	quit      key.Binding
 	right     key.Binding
 	left      key.Binding
-	next      key.Binding
 	up        key.Binding
 	down      key.Binding
 	prev      key.Binding
+	next      key.Binding
+	full      key.Binding
 	start     key.Binding
 	end       key.Binding
 	open      key.Binding
@@ -40,14 +41,6 @@ func GetKeyMap() KeyMap {
 			key.WithKeys("k", "up"),
 			key.WithHelp("↑/k", "up"),
 		),
-		start: key.NewBinding(
-			key.WithKeys("g", "home"),
-			key.WithHelp("g/home", "start"),
-		),
-		end: key.NewBinding(
-			key.WithKeys("G", "end"),
-			key.WithHelp("G/end", "end"),
-		),
 		next: key.NewBinding(
 			key.WithKeys("tab"),
 			key.WithHelp("tab", "next"),
@@ -56,6 +49,18 @@ func GetKeyMap() KeyMap {
 			key.WithKeys("shift+tab"),
 			key.WithHelp("shift+tab", "prev"),
 		),
+		full: key.NewBinding(
+			key.WithKeys("f"),
+			key.WithHelp("f", "full"),
+		),
+		start: key.NewBinding(
+			key.WithKeys("g", "home"),
+			key.WithHelp("g/home", "start"),
+		),
+		end: key.NewBinding(
+			key.WithKeys("G", "end"),
+			key.WithHelp("G/end", "end"),
+		),
 		open: key.NewBinding(
 			key.WithKeys("o"),
 			key.WithHelp("o", "open"),
@@ -85,10 +90,11 @@ func (k KeyMap) FullHelp() [][]key.Binding {
 		{k.right},
 		{k.up},
 		{k.down},
-		{k.start},
-		{k.end},
 		{k.next},
 		{k.prev},
+		{k.full},
+		{k.start},
+		{k.end},
 		{k.open},
 		{k.video},
 		{k.shortNews},

pkg/tui/reader.go

@@ -17,11 +17,12 @@ const (
 )
 
 type Reader struct {
-	style       config.Style
-	isFocused   bool
-	toplineText string
-	dateText    string
-	viewport    viewport.Model
+	style        config.Style
+	isFocused    bool
+	isFullScreen bool
+	toplineText  string
+	dateText     string
+	viewport     viewport.Model
 }
 
 func NewReader(s config.Style) Reader {
@@ -47,6 +48,14 @@ func (r *Reader) IsFocused() bool {
 	return r.isFocused
 }
 
+func (r *Reader) SetFullScreen(isFullScreen bool) {
+	r.isFullScreen = isFullScreen
+}
+
+func (r *Reader) IsFullScreen() bool {
+	return r.isFullScreen
+}
+
 func (r *Reader) SetDims(w, h int) {
 	r.viewport.Width = w
 	r.viewport.Height = h - lipgloss.Height(r.headerView()) - lipgloss.Height(r.footerView())
@@ -81,7 +90,7 @@ func (r Reader) headerView() string {
 	titleStyle := r.style.ReaderTitleInactiveStyle
 	lineStyle := r.style.InactiveStyle
 	dateStyle := r.style.ReaderInfoInactiveStyle
-	if r.isFocused {
+	if r.isFocused || r.isFullScreen {
 		titleStyle = r.style.ReaderTitleActiveStyle
 		lineStyle = r.style.ActiveStyle
 		dateStyle = r.style.ReaderInfoActiveStyle
@@ -97,7 +106,7 @@ func (r Reader) headerView() string {
 func (r Reader) footerView() string {
 	infoStyle := r.style.ReaderInfoInactiveStyle
 	lineStyle := r.style.InactiveStyle
-	if r.isFocused {
+	if r.isFocused || r.isFullScreen {
 		infoStyle = r.style.ReaderInfoActiveStyle
 		lineStyle = r.style.ActiveStyle
 	}

pkg/tui/selector.go

@@ -21,6 +21,7 @@ type Selector struct {
 	listsActiveIndeces []int
 	activeListIndex    int
 	isFocused          bool
+	isVisible          bool
 	fullWidth          int
 	headerWidth        int
 	height             int
@@ -33,6 +34,7 @@ func NewSelector(s config.Style) Selector {
 		listsActiveIndeces: []int{},
 		activeListIndex:    0,
 		isFocused:          true,
+		isVisible:          true,
 	}
 }
 
@@ -82,6 +84,10 @@ func (s *Selector) SetFocused(isFocused bool) {
 	s.isFocused = isFocused
 }
 
+func (s *Selector) SetVisible(isVisible bool) {
+	s.isVisible = isVisible
+}
+
 func (s *Selector) SetDims(w, h int) {
 	s.fullWidth = w
 	s.headerWidth = w - 4
@@ -117,6 +123,10 @@ func (s Selector) Update(msg tea.Msg) (Selector, tea.Cmd) {
 }
 
 func (s Selector) View() string {
+	if !s.isVisible {
+		return ""
+	}
+
 	listHeader := s.listView([]string{nationalHeaderText, regionalHeaderText}, s.activeListIndex)
 	listStyle := s.style.ListActiveStyle
 	if !s.isFocused {

pkg/tui/tui.go

@@ -113,6 +113,10 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, m.keymap.prev):
 			m.selector.PrevList()
 			m.setFocus(false)
+		case key.Matches(msg, m.keymap.full):
+			m.reader.SetFullScreen(!m.reader.IsFullScreen())
+			m.updateSizes(m.width, m.height)
+			m.updateDisplayedArticle()
 		case key.Matches(msg, m.keymap.start):
 			if m.reader.IsFocused() {
 				m.reader.GotoTop()
@@ -142,7 +146,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return m, tea.Batch(cmds...)
 	}
 
-	if m.reader.IsFocused() {
+	if m.reader.IsFocused() || m.reader.IsFullScreen() {
 		m.reader, cmd = m.reader.Update(msg)
 		cmds = append(cmds, cmd)
 	} else {
@@ -181,7 +185,14 @@ func (m *Model) updateSizes(width, height int) {
 	m.selector.SetDims(m.width/3, m.height-m.helperHeight()-5)
 	m.selector.ResizeLists()
 
-	m.reader.SetDims(m.width-m.width/3-6, m.height-m.helperHeight())
+	if m.reader.IsFullScreen() {
+		m.selector.SetVisible(false)
+		m.reader.SetDims(m.width, m.height-m.helperHeight())
+	} else {
+		m.selector.SetVisible(true)
+		m.reader.SetDims(m.width-m.width/3-6, m.height-m.helperHeight())
+	}
+
 	m.help.Width = m.width
 }