1
0
mirror of https://github.com/taigrr/crocgui synced 2025-01-18 04:03:16 -08:00

add license info

This commit is contained in:
Chris Howey 2021-03-19 11:20:56 -05:00
parent e01cda480b
commit f9c5813713
7 changed files with 2100 additions and 13 deletions

View File

@ -3,7 +3,7 @@
all: crocgui.apk crocgui all: crocgui.apk crocgui
crocgui.apk: main.go send.go recv.go settings.go about.go AndroidManifest.xml crocgui.apk: main.go send.go recv.go settings.go about.go AndroidManifest.xml
ANDROID_HOME=~/android ./fyne-mobile-save/fyne package -os android -appID com.github.howeyc.crocgui -icon metadata/en-US/images/icon.png ANDROID_HOME=~/android ./fyne-uri-name/fyne package -os android -appID com.github.howeyc.crocgui -icon metadata/en-US/images/icon.png
crocgui: main.go send.go recv.go settings.go about.go crocgui: main.go send.go recv.go settings.go about.go
go build go build

View File

@ -19,11 +19,26 @@ func parseURL(s string) *url.URL {
//go:embed metadata/en-US/full_description.txt //go:embed metadata/en-US/full_description.txt
var longdesc string var longdesc string
//go:embed LICENSE
var crocguiLicense string
//go:embed third-party-licenses.txt
var thirdPartyLicenses string
func aboutTabItem() *container.TabItem { func aboutTabItem() *container.TabItem {
longdesc = strings.ReplaceAll(longdesc, "<b>", "") longdesc = strings.ReplaceAll(longdesc, "<b>", "")
longdesc = strings.ReplaceAll(longdesc, "</b>", "") longdesc = strings.ReplaceAll(longdesc, "</b>", "")
aboutInfo := widget.NewLabel(longdesc) aboutInfo := widget.NewLabel(longdesc)
aboutInfo.Wrapping = fyne.TextWrapWord aboutInfo.Wrapping = fyne.TextWrapWord
licenseInfo := widget.NewLabel(crocguiLicense + thirdPartyLicenses)
licenseInfo.Hide()
licenseToggle := widget.NewButton("Toggle License Info", func() {
if licenseInfo.Visible() {
licenseInfo.Hide()
} else {
licenseInfo.Show()
}
})
return container.NewTabItemWithIcon("About", theme.InfoIcon(), container.NewBorder(nil, return container.NewTabItemWithIcon("About", theme.InfoIcon(), container.NewBorder(nil,
widget.NewForm( widget.NewForm(
widget.NewFormItem("croc GUI", widget.NewHyperlink("v1.4.1", parseURL("https://github.com/howeyc/crocgui"))), widget.NewFormItem("croc GUI", widget.NewHyperlink("v1.4.1", parseURL("https://github.com/howeyc/crocgui"))),
@ -31,6 +46,6 @@ func aboutTabItem() *container.TabItem {
), ),
nil, nil,
nil, nil,
aboutInfo, container.NewVScroll(container.NewVBox(aboutInfo, licenseToggle, licenseInfo)),
)) ))
} }

View File

@ -11,11 +11,11 @@ export GO_COMPILED="$PWD/bin"
export PATH="$GO_LANG:$GO_COMPILED:$PATH" export PATH="$GO_LANG:$GO_COMPILED:$PATH"
export PATH=$(pwd)/go/bin:$PATH export PATH=$(pwd)/go/bin:$PATH
go version go version
curl -Lso fyne-mobile-save.zip https://github.com/howeyc/fyne/archive/mobile-save.zip curl -Lso fyne-uri-name.zip https://github.com/howeyc/fyne/archive/uri-name.zip
unzip fyne-mobile-save unzip fyne-uri-name
pushd fyne-mobile-save pushd fyne-uri-name
go build fyne.io/fyne/v2/cmd/fyne go build fyne.io/fyne/v2/cmd/fyne
popd popd
./fyne-mobile-save/fyne package -os android -release -appID com.github.howeyc.crocgui -icon metadata/en-US/images/icon.png ./fyne-uri-name/fyne package -os android -release -appID com.github.howeyc.crocgui -icon metadata/en-US/images/icon.png
zip -d crocgui.apk "META-INF/*" zip -d crocgui.apk "META-INF/*"

2
go.mod
View File

@ -7,4 +7,4 @@ require (
github.com/schollz/croc/v8 v8.6.7 github.com/schollz/croc/v8 v8.6.7
) )
replace fyne.io/fyne/v2 => ./fyne-mobile-save replace fyne.io/fyne/v2 => ./fyne-uri-name

View File

@ -0,0 +1,2 @@
- Add license info
- Update to show filename for content:// URI on android

View File

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"io" "io"
"log" "log"
"net/url"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@ -49,11 +48,7 @@ func sendTabItem(a fyne.App, w fyne.Window) *container.TabItem {
return return
} }
if f != nil { if f != nil {
upath, _ := url.PathUnescape(f.URI().Path()) nfile, oerr := os.Create(filepath.Join(sendDir, f.URI().Name()))
if colidx := strings.Index(upath, ":"); colidx != -1 {
upath = upath[colidx+1:]
}
nfile, oerr := os.Create(filepath.Join(sendDir, filepath.Base(upath)))
if oerr != nil { if oerr != nil {
status.SetText(fmt.Sprintf("Unable to copy file, error: %s - %s", sendDir, oerr.Error())) status.SetText(fmt.Sprintf("Unable to copy file, error: %s - %s", sendDir, oerr.Error()))
return return

2075
third-party-licenses.txt Normal file

File diff suppressed because it is too large Load Diff