refactor: move eventity to app widget package

Author: ErikKalkoken

internal/app/testutil/testutil.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"fyne.io/fyne/v2"
 	"github.com/ErikKalkoken/go-set"
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
@@ -280,3 +281,82 @@ func (c CacheFake2) SetString(k string, v string, d time.Duration) {
 func Ptr[T any](v T) *T {
 	return &v
 }
+
+type EveImageServiceFake struct {
+	Alliance    fyne.Resource
+	Character   fyne.Resource
+	Corporation fyne.Resource
+	Err         error
+	Faction     fyne.Resource
+	Type        fyne.Resource
+}
+
+func (s *EveImageServiceFake) AllianceLogo(id int64, size int) (fyne.Resource, error) {
+	return s.Alliance, s.Err
+}
+
+func (s *EveImageServiceFake) AllianceLogoAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Alliance)
+}
+
+func (s *EveImageServiceFake) CharacterPortrait(id int64, size int) (fyne.Resource, error) {
+	return s.Character, s.Err
+}
+
+func (s *EveImageServiceFake) CharacterPortraitAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Character)
+}
+
+func (s *EveImageServiceFake) CorporationLogo(id int64, size int) (fyne.Resource, error) {
+	return s.Corporation, s.Err
+}
+
+func (s *EveImageServiceFake) CorporationLogoAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Corporation)
+}
+func (s *EveImageServiceFake) FactionLogo(id int64, size int) (fyne.Resource, error) {
+	return s.Faction, s.Err
+}
+
+func (s *EveImageServiceFake) FactionLogoAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Faction)
+}
+
+func (s *EveImageServiceFake) InventoryTypeRender(id int64, size int) (fyne.Resource, error) {
+	return s.Type, s.Err
+}
+
+func (s *EveImageServiceFake) InventoryTypeRenderAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Type)
+}
+
+func (s *EveImageServiceFake) InventoryTypeIcon(id int64, size int) (fyne.Resource, error) {
+	return s.Type, s.Err
+}
+
+func (s *EveImageServiceFake) InventoryTypeIconAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Type)
+}
+
+func (s *EveImageServiceFake) InventoryTypeBPO(id int64, size int) (fyne.Resource, error) {
+	return s.Type, s.Err
+}
+
+func (s *EveImageServiceFake) InventoryTypeBPOAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Type)
+}
+
+func (s *EveImageServiceFake) InventoryTypeBPC(id int64, size int) (fyne.Resource, error) {
+	return s.Type, s.Err
+}
+
+func (s *EveImageServiceFake) InventoryTypeBPCAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Type)
+}
+func (s *EveImageServiceFake) InventoryTypeSKIN(id int64, size int) (fyne.Resource, error) {
+	return s.Type, s.Err
+}
+
+func (s *EveImageServiceFake) InventoryTypeSKINAsync(id int64, size int, setter func(r fyne.Resource)) {
+	setter(s.Type)
+}

internal/app/ui/charactercommunications.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/icons"
+	awidget "github.com/ErikKalkoken/evebuddy/internal/app/widget"
 	ihumanize "github.com/ErikKalkoken/evebuddy/internal/humanize"
 	"github.com/ErikKalkoken/evebuddy/internal/optional"
 )
@@ -402,7 +403,7 @@ type communicationDetail struct {
 	subject *widget.Label
 }
 
-func newCommunicationDetail(eis eveEntityEIS, show func(*app.EveEntity)) *communicationDetail {
+func newCommunicationDetail(eis awidget.EveEntityEIS, show func(*app.EveEntity)) *communicationDetail {
 	subject := widget.NewLabel("")
 	subject.SizeName = theme.SizeNameSubHeadingText
 	subject.Wrapping = fyne.TextWrapWord

internal/app/ui/charactercontacts.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/icons"
+	awidget "github.com/ErikKalkoken/evebuddy/internal/app/widget"
 	ihumanize "github.com/ErikKalkoken/evebuddy/internal/humanize"
 	"github.com/ErikKalkoken/evebuddy/internal/optional"
 	iwidget "github.com/ErikKalkoken/evebuddy/internal/widget"
@@ -462,7 +463,7 @@ type characterContactItem struct {
 	widget.BaseWidget
 
 	blocked  *ttwidget.Icon
-	eis      eveEntityEIS
+	eis      awidget.EveEntityEIS
 	icon     *canvas.Image
 	category *widget.Label
 	npc      *widget.Label
@@ -472,7 +473,7 @@ type characterContactItem struct {
 	watched  *ttwidget.Icon
 }
 
-func newCharacterContactItem(eis eveEntityEIS) *characterContactItem {
+func newCharacterContactItem(eis awidget.EveEntityEIS) *characterContactItem {
 	icon := iwidget.NewImageFromResource(icons.BlankSvg, fyne.NewSquareSize(32))
 	name := widget.NewLabel("")
 	name.Truncation = fyne.TextTruncateClip
@@ -529,7 +530,7 @@ func (w *characterContactItem) set(r characterContactRow) {
 	w.labels.SetText(r.labelsDisplay)
 	w.category.SetText(r.category)
 	w.symbol.set(r.standing, r.standingCategory)
-	loadEveEntityIconAsync(w.eis, r.contact, func(r fyne.Resource) {
+	awidget.LoadEveEntityIconAsync(w.eis, r.contact, func(r fyne.Resource) {
 		w.icon.Resource = r
 		w.icon.Refresh()
 	})

internal/app/ui/charactersendmail.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/icons"
+	awidget "github.com/ErikKalkoken/evebuddy/internal/app/widget"
 	iwidget "github.com/ErikKalkoken/evebuddy/internal/widget"
 )
 
@@ -26,9 +27,9 @@ type characterSendMail struct {
 
 	body      *widget.Entry
 	character atomic.Pointer[app.Character]
-	from      *eveEntityEntry
+	from      *awidget.EveEntityEntry
 	subject   *widget.Entry
-	to        *eveEntityEntry
+	to        *awidget.EveEntityEntry
 	u         *baseUI
 	w         fyne.Window
 }
@@ -41,7 +42,7 @@ func newCharacterSendMail(u *baseUI, c *app.Character, mode app.SendMailMode, m
 	a.character.Store(c)
 	a.ExtendBaseWidget(a)
 
-	a.from = newEveEntityEntry(widget.NewLabel("From"), labelWith, u.eis)
+	a.from = awidget.NewEveEntityEntry(widget.NewLabel("From"), labelWith, u.eis)
 	a.from.ShowInfoWindow = u.ShowEveEntityInfoWindow
 	a.from.Set([]*app.EveEntity{{ID: c.ID, Name: c.EveCharacter.Name, Category: app.EveEntityCharacter}})
 	a.from.Disable()
@@ -51,7 +52,7 @@ func newCharacterSendMail(u *baseUI, c *app.Character, mode app.SendMailMode, m
 			a.to.Add(ee)
 		}, a.w)
 	})
-	a.to = newEveEntityEntry(toButton, labelWith, u.eis)
+	a.to = awidget.NewEveEntityEntry(toButton, labelWith, u.eis)
 	a.to.ShowInfoWindow = u.ShowEveEntityInfoWindow
 	a.to.Placeholder = "Tap To-Button to add recipients..."
 
@@ -172,7 +173,7 @@ func showAddDialog(u *baseUI, characterID int64, onSelected func(ee *app.EveEnti
 			row := co.(*fyne.Container).Objects
 			row[0].(*widget.Label).SetText(ee.Name)
 			image := row[1].(*canvas.Image)
-			loadEveEntityIconAsync(u.eis, ee, func(r fyne.Resource) {
+			awidget.LoadEveEntityIconAsync(u.eis, ee, func(r fyne.Resource) {
 				image.Resource = r
 				image.Refresh()
 			})

internal/app/ui/clones.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/icons"
+	awidget "github.com/ErikKalkoken/evebuddy/internal/app/widget"
 	iwidget "github.com/ErikKalkoken/evebuddy/internal/widget"
 	"github.com/ErikKalkoken/evebuddy/internal/xslices"
 )
@@ -126,18 +127,18 @@ func newClones(u *baseUI) *clones {
 				Alignment: fyne.TextAlignTrailing,
 			})
 		},
-	}, makeEveEntityColumn(makeEveEntityColumnParams[cloneRow]{
-		columnID: clonesColCharacter,
-		eis:      u.eis,
-		getEntity: func(r cloneRow) *app.EveEntity {
+	}, awidget.MakeEveEntityColumn(awidget.MakeEveEntityColumnParams[cloneRow]{
+		ColumnID: clonesColCharacter,
+		EIS:      u.eis,
+		GetEntity: func(r cloneRow) *app.EveEntity {
 			return &app.EveEntity{
 				ID:       r.jc.Character.ID,
 				Name:     r.jc.Character.Name,
 				Category: app.EveEntityCharacter,
 			}
 		},
-		isAvatar: true,
-		label:    "Character",
+		IsAvatar: true,
+		Label:    "Character",
 	}), {
 		ID:    clonesColJumps,
 		Label: "Jumps",

internal/app/ui/corporationmember.go

@@ -8,9 +8,7 @@ import (
 	"sync/atomic"
 
 	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
-	"fyne.io/fyne/v2/layout"
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
 	kxwidget "github.com/ErikKalkoken/fyne-kx/widget"
@@ -19,9 +17,9 @@ import (
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/icons"
+	awidget "github.com/ErikKalkoken/evebuddy/internal/app/widget"
 	ihumanize "github.com/ErikKalkoken/evebuddy/internal/humanize"
 	"github.com/ErikKalkoken/evebuddy/internal/optional"
-	iwidget "github.com/ErikKalkoken/evebuddy/internal/widget"
 )
 
 type corporationMemberRow struct {
@@ -209,50 +207,38 @@ func (a *corporationMember) fetchRows(ctx context.Context, corporationID, ceoID
 type corporationMemberItem struct {
 	widget.BaseWidget
 
-	ceo            *ttwidget.Icon
-	name           *widget.Label
-	owned          *ttwidget.Icon
-	portrait       *canvas.Image
-	portraitLoader loadFuncAsync
+	ceo    *ttwidget.Icon
+	owned  *ttwidget.Icon
+	member *awidget.EntityListItem
 }
 
-func newCorporationMemberItem(portraitLoader loadFuncAsync) *corporationMemberItem {
+func newCorporationMemberItem(loadCharacterIcon loadFuncAsync) *corporationMemberItem {
 	ceo := ttwidget.NewIcon(theme.NewWarningThemedResource(icons.CrownSvg))
 	ceo.SetToolTip("CEO of this corporation")
 	owned := ttwidget.NewIcon(theme.NewSuccessThemedResource(icons.CheckDecagramSvg))
 	owned.SetToolTip("You own this character")
-	portrait := iwidget.NewImageFromResource(
-		icons.Characterplaceholder64Jpeg,
-		fyne.NewSquareSize(app.IconUnitSize),
-	)
 	w := &corporationMemberItem{
-		ceo:            ceo,
-		name:           widget.NewLabel(""),
-		owned:          owned,
-		portrait:       portrait,
-		portraitLoader: portraitLoader,
+		ceo:    ceo,
+		owned:  owned,
+		member: awidget.NewEntityListItem(false, loadCharacterIcon),
 	}
 	w.ExtendBaseWidget(w)
 	return w
 }
 
 func (w *corporationMemberItem) CreateRenderer() fyne.WidgetRenderer {
-	p := theme.Padding()
-	c := container.NewPadded(container.NewHBox(
-		container.New(layout.NewCustomPaddedLayout(p, p, p, 0), w.portrait),
-		w.name,
-		w.owned,
-		w.ceo,
+	c := container.NewPadded(container.NewBorder(
+		nil,
+		nil,
+		nil,
+		container.NewHBox(w.owned, w.ceo),
+		w.member,
 	))
 	return widget.NewSimpleRenderer(c)
 }
 
 func (w *corporationMemberItem) set(r corporationMemberRow) {
-	w.portraitLoader(r.id, app.IconPixelSize, func(r fyne.Resource) {
-		w.portrait.Resource = r
-		w.portrait.Refresh()
-	})
-	w.name.SetText(r.name)
+	w.member.Set(r.id, r.name)
 	if r.isOwned {
 		w.owned.Show()
 	} else {

internal/app/ui/corporationstructures.go

@@ -17,6 +17,7 @@ import (
 	"github.com/ErikKalkoken/go-set"
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
+	awidget "github.com/ErikKalkoken/evebuddy/internal/app/widget"
 	ihumanize "github.com/ErikKalkoken/evebuddy/internal/humanize"
 	"github.com/ErikKalkoken/evebuddy/internal/optional"
 	iwidget "github.com/ErikKalkoken/evebuddy/internal/widget"
@@ -108,11 +109,11 @@ func newCorporationStructures(u *baseUI) *corporationStructures {
 		Update: func(r corporationStructureRow, co fyne.CanvasObject) {
 			co.(*iwidget.RichText).SetWithText(r.structureName)
 		},
-	}, makeEveEntityColumn(makeEveEntityColumnParams[corporationStructureRow]{
-		columnID: structuresColType,
-		eis:      u.eis,
-		label:    "Type",
-		getEntity: func(r corporationStructureRow) *app.EveEntity {
+	}, awidget.MakeEveEntityColumn(awidget.MakeEveEntityColumnParams[corporationStructureRow]{
+		ColumnID: structuresColType,
+		EIS:      u.eis,
+		Label:    "Type",
+		GetEntity: func(r corporationStructureRow) *app.EveEntity {
 			return &app.EveEntity{
 				Category: app.EveEntityInventoryType,
 				ID:       r.typeID,

internal/app/ui/gamesearch.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/icons"
+	awidget "github.com/ErikKalkoken/evebuddy/internal/app/widget"
 	iwidget "github.com/ErikKalkoken/evebuddy/internal/widget"
 	"github.com/ErikKalkoken/evebuddy/internal/xslices"
 	"github.com/ErikKalkoken/evebuddy/internal/xsync"
@@ -485,7 +486,7 @@ func (w *searchResult) set(o *app.EveEntity) {
 					return w.eis.InventoryTypeIcon(et.ID, app.IconPixelSize)
 				}
 			default:
-				return entityIcon(w.eis, o, app.IconPixelSize, icons.BlankSvg)
+				return awidget.EntityIcon(w.eis, o, app.IconPixelSize, icons.BlankSvg)
 			}
 		},
 		func(r fyne.Resource) {

internal/app/ui/helper.go

@@ -15,9 +15,8 @@ import (
 	"github.com/dustin/go-humanize"
 
 	"github.com/ErikKalkoken/evebuddy/internal/app"
-	"github.com/ErikKalkoken/evebuddy/internal/optional"
-
 	ihumanize "github.com/ErikKalkoken/evebuddy/internal/humanize"
+	"github.com/ErikKalkoken/evebuddy/internal/optional"
 	iwidget "github.com/ErikKalkoken/evebuddy/internal/widget"
 )