Upgrade to cview v1.6.2

NOTES.md

@@ -6,10 +6,10 @@
 ## Upstream Bugs
 - Bookmark keys aren't deleted, just set to `""`
   - Waiting on [this viper PR](https://github.com/spf13/viper/pull/519) to be merged
-- [ANSI conversion is messed up](https://code.rocketnine.space/tslocum/cview/issues/48)
-- [WordWrap is broken in some cases](https://code.rocketnine.space/tslocum/cview/issues/27) - close #156 if this is fixed
-- [Prevent panic when reformatting](https://code.rocketnine.space/tslocum/cview/issues/50) - can't reliably reproduce or debug
-- [Unicode bullet symbol mask causes issues with PasswordInput](https://code.rocketnine.space/tslocum/cview/issues/55)
+- [ANSI conversion is messed up](https://codeberg.org/tslocum/cview/issues/48)
+- [WordWrap is broken in some cases](https://codeberg.org/tslocum/cview/issues/27) - close #156 if this is fixed
+- [Prevent panic when reformatting](https://codeberg.org/tslocum/cview/issues/50) - can't reliably reproduce or debug
+- [Unicode bullet symbol mask causes issues with PasswordInput](https://codeberg.org/tslocum/cview/issues/55)
 
 
 ## Upstream PRs

README.md

@@ -152,7 +152,7 @@ Please see [the wiki](https://github.com/makeworld-the-better-one/amfora/wiki) f
 ## Libraries
 Amfora ❤️ open source!
 
-- [cview](https://code.rocketnine.space/tslocum/cview) for the TUI
+- [cview](https://codeberg.org/tslocum/cview) for the TUI
   - It's a fork of [tview](https://github.com/rivo/tview) with PRs merged and active support
   - It uses [tcell](https://github.com/gdamore/tcell) for low level terminal operations
 - [Viper](https://github.com/spf13/viper) for configuration and TOFU storing

THANKS.md

@@ -10,7 +10,7 @@ Thank you to the following contributors, who have helped make Amfora great. FOSS
 * Timur Ismagilov (@bouncepaw)
 * Matt Caroll (@ohiolab)
 * Patryk Niedźwiedziński (@pniedzwiedzinski)
-* Trevor Slocum (@tsclocum)
+* Trevor Slocum (@tslocum)
 * Mattias Jadelius (@jedthehumanoid)
 * Lokesh Krishna (@lokesh-krishna)
 * Jeff (@phaedrus-jaf)

config/config.go

@@ -1,6 +1,7 @@
 // Package config initializes all files required for Amfora, even those used by
 // other packages. It also reads in the config file and initializes a Viper and
 // the theme
+//
 //nolint:golint,goerr113
 package config
 
@@ -11,7 +12,7 @@ import (
 	"runtime"
 	"strings"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	"github.com/gdamore/tcell/v2"
 	"github.com/makeworld-the-better-one/amfora/cache"
 	homedir "github.com/mitchellh/go-homedir"

config/keybindings.go

@@ -3,7 +3,7 @@ package config
 import (
 	"strings"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	"github.com/gdamore/tcell/v2"
 	"github.com/spf13/viper"
 )

display/bookmarks.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	"github.com/gdamore/tcell/v2"
 	"github.com/makeworld-the-better-one/amfora/bookmarks"
 	"github.com/makeworld-the-better-one/amfora/config"

display/display.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	"github.com/gdamore/tcell/v2"
 	"github.com/makeworld-the-better-one/amfora/cache"
 	"github.com/makeworld-the-better-one/amfora/client"
@@ -110,9 +110,11 @@ func Init(version, commit, builtBy string) {
 
 	if viper.GetBool("a-general.color") {
 		bottomBar.SetBackgroundColor(config.GetColor("bottombar_bg"))
+		bottomBar.SetFieldBackgroundColorFocused(config.GetColor("bottombar_bg"))
 		bottomBar.SetLabelColor(config.GetColor("bottombar_label"))
 		bottomBar.SetFieldBackgroundColor(config.GetColor("bottombar_bg"))
 		bottomBar.SetFieldTextColor(config.GetColor("bottombar_text"))
+		bottomBar.SetFieldTextColorFocused(config.GetColor("bottombar_text"))
 
 		browser.SetTabBackgroundColor(config.GetColor("bg"))
 		browser.SetTabBackgroundColorFocused(config.GetColor("tab_num"))

display/download.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	"github.com/gdamore/tcell/v2"
 	"github.com/makeworld-the-better-one/amfora/config"
 	"github.com/makeworld-the-better-one/amfora/structs"

display/help.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	"github.com/gdamore/tcell/v2"
 	"github.com/makeworld-the-better-one/amfora/config"
 )

display/modals.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	humanize "github.com/dustin/go-humanize"
 	"github.com/gdamore/tcell/v2"
 	"github.com/makeworld-the-better-one/amfora/config"

display/tab.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	"github.com/atotto/clipboard"
 	"github.com/gdamore/tcell/v2"
 	"github.com/makeworld-the-better-one/amfora/config"

display/util.go

@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"code.rocketnine.space/tslocum/cview"
+	"codeberg.org/tslocum/cview"
 	"github.com/spf13/viper"
 )
 

go.mod

@@ -1,60 +1,60 @@
 module github.com/makeworld-the-better-one/amfora
 
-go 1.24
+go 1.24.0
+
+toolchain go1.24.9
 
 require (
-	code.rocketnine.space/tslocum/cview v1.5.6-0.20210530175404-7e8817f20bdc
+	codeberg.org/tslocum/cview v1.6.2
 	github.com/alecthomas/chroma v0.10.0
 	github.com/atotto/clipboard v0.1.4
 	github.com/dustin/go-humanize v1.0.1
-	github.com/gdamore/tcell/v2 v2.6.0
+	github.com/gdamore/tcell/v2 v2.12.1
 	github.com/makeworld-the-better-one/go-gemini v0.13.1
 	github.com/makeworld-the-better-one/go-gemini-socks5 v1.0.0
 	github.com/makeworld-the-better-one/rr v1.0.0
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/mmcdole/gofeed v1.2.1
-	github.com/muesli/termenv v0.15.2
+	github.com/mmcdole/gofeed v1.3.0
+	github.com/muesli/termenv v0.16.0
 	github.com/rkoesters/xdg v0.0.1
-	github.com/schollz/progressbar/v3 v3.13.1
-	github.com/spf13/viper v1.16.0
-	github.com/stretchr/testify v1.8.4
-	golang.org/x/text v0.23.0
+	github.com/schollz/progressbar/v3 v3.18.0
+	github.com/spf13/viper v1.21.0
+	github.com/stretchr/testify v1.11.1
+	golang.org/x/text v0.31.0
 )
 
 require (
-	code.rocketnine.space/tslocum/cbind v0.1.5 // indirect
-	github.com/PuerkitoBio/goquery v1.8.0 // indirect
-	github.com/andybalholm/cascadia v1.3.1 // indirect
+	codeberg.org/tslocum/cbind v0.1.7 // indirect
+	github.com/PuerkitoBio/goquery v1.11.0 // indirect
+	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/clipperhouse/stringish v0.1.1 // indirect
+	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dlclark/regexp2 v1.4.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gdamore/encoding v1.0.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/dlclark/regexp2 v1.11.5 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/gdamore/encoding v1.0.1 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/mmcdole/goxpp v1.1.0 // indirect
+	github.com/mmcdole/goxpp v1.1.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rivo/uniseg v0.4.3 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/term v0.30.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/sagikazarmark/locafero v0.12.0 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/term v0.37.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace code.rocketnine.space/tslocum/cview => codeberg.org/tslocum/cview v1.5.6-0.20210530175404-7e8817f20bdc