feat: add search bar on training screen (#300)

Author: ErikKalkoken

internal/app/ui/assets.go

@@ -113,10 +113,10 @@ type assets struct {
 
 	body           fyne.CanvasObject
 	columnSorter   *iwidget.ColumnSorter
-	entry          *widget.Entry
 	found          *widget.Label
 	rows           []assetRow
 	rowsFiltered   []assetRow
+	search         *widget.Entry
 	selectCategory *kxwidget.FilterChipSelect
 	selectGroup    *kxwidget.FilterChipSelect
 	selectLocation *kxwidget.FilterChipSelect
@@ -166,20 +166,21 @@ func newAssets(u *baseUI) *assets {
 	}})
 	a := &assets{
 		columnSorter: headers.NewColumnSorter(assetsColItem, iwidget.SortAsc),
-		entry:        widget.NewEntry(),
+		search:       widget.NewEntry(),
 		found:        widget.NewLabel(""),
 		rowsFiltered: make([]assetRow, 0),
 		total:        makeTopLabel(),
 		u:            u,
 	}
 	a.ExtendBaseWidget(a)
-	a.entry.ActionItem = kxwidget.NewIconButton(theme.CancelIcon(), func() {
-		a.resetSearch()
+	a.search.ActionItem = kxwidget.NewIconButton(theme.CancelIcon(), func() {
+		a.search.SetText("")
+		a.filterRows(-1)
 	})
-	a.entry.OnChanged = func(s string) {
+	a.search.OnChanged = func(s string) {
 		a.filterRows(-1)
 	}
-	a.entry.PlaceHolder = "Search items"
+	a.search.PlaceHolder = "Search items"
 	a.found.Hide()
 
 	if !a.u.isDesktop {
@@ -272,7 +273,7 @@ func (a *assets) CreateRenderer() fyne.WidgetRenderer {
 	}
 	topBox := container.NewVBox(
 		container.NewBorder(nil, nil, nil, a.found, a.total),
-		a.entry,
+		a.search,
 		container.NewHScroll(filters),
 	)
 	c := container.NewBorder(topBox, nil, nil, nil, a.body)
@@ -327,7 +328,7 @@ func (a *assets) makeDataList() *iwidget.StripedList {
 }
 
 func (a *assets) focus() {
-	a.u.MainWindow().Canvas().Focus(a.entry)
+	a.u.MainWindow().Canvas().Focus(a.search)
 }
 
 func (a *assets) filterRows(sortCol int) {
@@ -375,7 +376,7 @@ func (a *assets) filterRows(sortCol int) {
 		})
 	}
 	// search filter
-	if search := strings.ToLower(a.entry.Text); search != "" {
+	if search := strings.ToLower(a.search.Text); search != "" {
 		rows2 := make([]assetRow, 0)
 		for _, r := range rows {
 			var matches bool
@@ -443,11 +444,6 @@ func (a *assets) filterRows(sortCol int) {
 	}
 }
 
-func (a *assets) resetSearch() {
-	a.entry.SetText("")
-	a.filterRows(-1)
-}
-
 func (a *assets) update() {
 	var t string
 	var i widget.Importance

internal/app/ui/testdata/training/active.png

@@ -37,6 +37,7 @@ type trainingRow struct {
 	characterID                int32
 	characterName              string
 	isActive                   bool
+	searchTarget               string
 	skill                      *app.CharacterSkillqueueItem
 	skillDisplay               []widget.RichTextSegment
 	skillFinishDate            optional.Optional[time.Time]
@@ -94,14 +95,15 @@ func (r trainingRow) remainingTimeString(d optional.Optional[time.Duration]) str
 type training struct {
 	widget.BaseWidget
 
-	main         fyne.CanvasObject
+	bottom       *widget.Label
 	columnSorter *iwidget.ColumnSorter
+	main         fyne.CanvasObject
 	rows         []trainingRow
 	rowsFiltered []trainingRow
+	search       *widget.Entry
 	selectStatus *kxwidget.FilterChipSelect
 	selectTag    *kxwidget.FilterChipSelect
 	sortButton   *iwidget.SortButton
-	bottom       *widget.Label
 	u            *baseUI
 }
 
@@ -149,13 +151,22 @@ func newTraining(u *baseUI) *training {
 		Width: 100,
 	}})
 	a := &training{
+		bottom:       widget.NewLabel(""),
 		columnSorter: headers.NewColumnSorter(trainingColName, iwidget.SortAsc),
 		rows:         make([]trainingRow, 0),
 		rowsFiltered: make([]trainingRow, 0),
-		bottom:       widget.NewLabel(""),
+		search:       widget.NewEntry(),
 		u:            u,
 	}
 	a.ExtendBaseWidget(a)
+	a.search.ActionItem = kxwidget.NewIconButton(theme.CancelIcon(), func() {
+		a.search.SetText("")
+		a.filterRows(-1)
+	})
+	a.search.OnChanged = func(s string) {
+		a.filterRows(-1)
+	}
+	a.search.PlaceHolder = "Search characters"
 	makeCell := func(col int, r trainingRow) []widget.RichTextSegment {
 		switch col {
 		case trainingColName:
@@ -238,7 +249,10 @@ func (a *training) CreateRenderer() fyne.WidgetRenderer {
 		filter.Add(a.sortButton)
 	}
 	c := container.NewBorder(
-		container.NewHScroll(filter),
+		container.NewVBox(
+			a.search,
+			container.NewHScroll(filter),
+		),
 		nil,
 		nil,
 		nil,
@@ -353,6 +367,22 @@ func (a *training) filterRows(sortCol int) {
 			return r.tags.Contains(x)
 		})
 	}
+	// search filter
+	if search := strings.ToLower(a.search.Text); search != "" {
+		rows2 := make([]trainingRow, 0)
+		for _, r := range rows {
+			var matches bool
+			if search == "" {
+				matches = true
+			} else {
+				matches = strings.Contains(r.searchTarget, search)
+			}
+			if matches {
+				rows2 = append(rows2, r)
+			}
+		}
+		rows = rows2
+	}
 	// sort
 	a.columnSorter.Sort(sortCol, func(sortCol int, dir iwidget.SortDir) {
 		slices.SortFunc(rows, func(a, b trainingRow) int {
@@ -436,6 +466,7 @@ func (*training) fetchRows(s services) ([]trainingRow, error) {
 		r := trainingRow{
 			characterID:   c.ID,
 			characterName: c.EveCharacter.Name,
+			searchTarget:  strings.ToLower(c.EveCharacter.Name),
 			totalSP:       c.TotalSP,
 			totalSPDisplay: c.TotalSP.StringFunc("?", func(v int) string {
 				return humanize.Comma(int64(v))