Upgrade to cview v1.6.2

Author: tslocum

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"