owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

onboard to new custom padded box layouts

Browse Source
This commit is contained in:
Drew Weymouth
2024-05-24 16:57:49 -07:00
parent 883c1f738d
commit 819f42dac0
15 changed files with 22 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/dialogs/aboutdialog.go
+3 -3
View File
@@ -69,7 +69,7 @@ func (a *AboutDialog) buildMainTabContainer(version string) *fyne.Container {
ghUrl, _ := url.Parse(res.GithubURL)
kofiUrl, _ := url.Parse(res.KofiURL)
githubKofi := container.NewCenter(
container.New(&layouts.HboxCustomPadding{DisableThemePad: true, ExtraPad: -10},
container.New(layout.NewCustomPaddedHBoxLayout(-10),
widget.NewHyperlink("Github page", ghUrl),
widget.NewLabel("·"),
widget.NewHyperlink("Support the project", kofiUrl)),
@@ -77,7 +77,7 @@ func (a *AboutDialog) buildMainTabContainer(version string) *fyne.Container {
return container.New(&layouts.CenterPadLayout{PadTopBottom: 10},
container.NewVBox(iconImage,
container.New(&layouts.VboxCustomPadding{ExtraPad: -10}, title, versionLbl, copyright, license, githubKofi)))
container.New(layout.NewCustomPaddedVBoxLayout(theme.Padding()-10), title, versionLbl, copyright, license, githubKofi)))
}
func (a *AboutDialog) licenseLabel(res *fyne.StaticResource) *widget.Label {
@@ -94,7 +94,7 @@ func (a *AboutDialog) buildCreditsContainer() fyne.CanvasObject {
freepikURL, _ := url.Parse("https://www.flaticon.com/authors/freepik")
appIconCredit := widget.NewLabel("The Supersonic app icon is a derivative of a work created by Piotr Siedlecki and placed in the public domain.")
appIconCredit.Wrapping = fyne.TextWrapWord
return container.New(&layouts.VboxCustomPadding{ExtraPad: -10},
return container.New(layout.NewCustomPaddedVBoxLayout(theme.Padding()-10),
widget.NewLabel("Major frameworks and modules used in this application include:"),
container.NewHBox(widget.NewHyperlink("Fyne toolkit", fyneURL), widget.NewLabel("BSD 3-Clause License")),
container.NewHBox(widget.NewHyperlink("go-subsonic", goSubsonicURL), widget.NewLabel("GPL v3 License")),
ui/dialogs/albuminfodialog.go
+1 -2
View File
@@ -7,7 +7,6 @@ import (
"strings"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/ui/layouts"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas"
@@ -111,7 +110,7 @@ func (a *AlbumInfoDialog) buildUrlContainer(lastFm, musicBrainzID string) *fyne.
}
}
urlContainer := container.New(&layouts.HboxCustomPadding{DisableThemePad: true, ExtraPad: -10})
urlContainer := container.New(layout.NewCustomPaddedHBoxLayout(-10))
for index, url := range urls {
if index > 0 {
urlContainer.Add(widget.NewLabel("·"))
ui/dialogs/searchdialog.go
+1 -2
View File
@@ -14,7 +14,6 @@ import (
"fyne.io/fyne/v2/widget"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/ui/layouts"
myTheme "github.com/dweymouth/supersonic/ui/theme"
"github.com/dweymouth/supersonic/ui/util"
"github.com/dweymouth/supersonic/ui/widgets"
@@ -317,7 +316,7 @@ func (q *searchResult) Tapped(_ *fyne.PointEvent) {
func (q *searchResult) CreateRenderer() fyne.WidgetRenderer {
if q.content == nil {
q.content = container.NewBorder(nil, nil, container.NewCenter(q.image), nil,
container.New(&layouts.VboxCustomPadding{ExtraPad: -15},
container.New(layout.NewCustomPaddedVBoxLayout(theme.Padding()-15),
q.title,
q.secondary,
))