Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fyne-io/fyne
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.4.0
Choose a base ref
...
head repository: fyne-io/fyne
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.4.1
Choose a head ref

Commits on Oct 29, 2020

  1. Fix the content size of table cells to fit inside padding

    This broke in a code refactor
    andydotxyz committed Oct 29, 2020
    Copy the full SHA
    ac78bac View commit details

Commits on Oct 31, 2020

  1. Copy the full SHA
    8056ce2 View commit details

Commits on Nov 1, 2020

  1. Fix FileICON

    andydotxyz committed Nov 1, 2020
    Copy the full SHA
    db12072 View commit details
  2. Fix FileIcon

    andydotxyz committed Nov 1, 2020
    Copy the full SHA
    56fdd27 View commit details
  3. Copy the full SHA
    0e0cc63 View commit details
  4. Copy the full SHA
    c65374b View commit details
  5. Merge pull request #1489 from andydotxyz/fix/tablecellsize

    Fix the content size of table cells to fit inside padding
    andydotxyz authored Nov 1, 2020
    Copy the full SHA
    4c483ab View commit details

Commits on Nov 3, 2020

  1. Copy the full SHA
    f291c11 View commit details
  2. Copy the full SHA
    e4d8268 View commit details
  3. Copy the full SHA
    ae802f4 View commit details
  4. Copy the full SHA
    916bf0e View commit details
  5. Copy the full SHA
    6a005fe View commit details

Commits on Nov 4, 2020

  1. Remove 32bit from iOS apps, Go 1.15 does not allow it

    Also this was stopped by Apple many years ago (iPhone 5s)
    Fixes #1497
    andydotxyz committed Nov 4, 2020
    Copy the full SHA
    a3728fa View commit details
  2. Copy the full SHA
    398892a View commit details
  3. Copy the full SHA
    120dece View commit details
  4. Update notes

    andydotxyz committed Nov 4, 2020
    Copy the full SHA
    76b34b6 View commit details
  5. Add missing LoadResourceFromURI

    Needed to be in storage rather than root, but I expect more such things to move here
    andydotxyz committed Nov 4, 2020
    Copy the full SHA
    8564457 View commit details
  6. Merge pull request #1506 from andydotxyz/resourcefromuri

    Add missing LoadResourceFromURI
    andydotxyz authored Nov 4, 2020
    Copy the full SHA
    a5cb179 View commit details

Commits on Nov 5, 2020

  1. Copy the full SHA
    80ca721 View commit details
  2. Update list.go (#1508)

    This min value is equal to -1 when minimized.  and line 192 panic: runtime error: index out of range [-1]
    ruanwenfeng authored and andydotxyz committed Nov 5, 2020
    Copy the full SHA
    dba39de View commit details
  3. Copy the full SHA
    e002fff View commit details
  4. Copy the full SHA
    7b26e09 View commit details
  5. Simplify code

    andydotxyz committed Nov 5, 2020
    Copy the full SHA
    b2a922f View commit details
  6. Update changes

    andydotxyz committed Nov 5, 2020
    Copy the full SHA
    56ad032 View commit details
  7. Fix typo

    andydotxyz committed Nov 5, 2020
    Copy the full SHA
    6d7a6d6 View commit details
  8. Fix type

    andydotxyz committed Nov 5, 2020
    Copy the full SHA
    b9d1180 View commit details
  9. Fix typo

    andydotxyz committed Nov 5, 2020
    Copy the full SHA
    808a4b1 View commit details

Commits on Nov 9, 2020

  1. Copy the full SHA
    400654c View commit details
  2. Copy the full SHA
    2efec93 View commit details

Commits on Nov 11, 2020

  1. Fix windows package error

    The default package numbering did not match our default format
    Fixes #1521
    andydotxyz committed Nov 11, 2020
    Copy the full SHA
    cea6b31 View commit details

Commits on Nov 12, 2020

  1. Turns out there was an off-by-1 error in Table

    Fix this and add the filled rect test for easier comparison
    andydotxyz committed Nov 12, 2020
    Copy the full SHA
    fc17176 View commit details
  2. Add support for Table.SetColumnWidth

    This takes the content width for a column (matching the template size).
    It also uncovered we were drawing more cells than required in some
    cases, hence a couple of test changes
    andydotxyz committed Nov 12, 2020
    Copy the full SHA
    10446f5 View commit details

Commits on Nov 14, 2020

  1. Merge pull request #1524 from andydotxyz/feature/tablecolwidth

    Add support for setting column width on table
    andydotxyz authored Nov 14, 2020
    Copy the full SHA
    5c2a2f1 View commit details
  2. Copy the full SHA
    f76a3c4 View commit details
  3. Support multiple mouse buttons combined

    Also remove old comment - that was supposed to reserve the iota, but
    it got broken some time ago
    Fixes #1533
    andydotxyz committed Nov 14, 2020
    Copy the full SHA
    e782df6 View commit details

Commits on Nov 15, 2020

  1. Tidy naming

    andydotxyz committed Nov 15, 2020
    Copy the full SHA
    5c7a20c View commit details
  2. Copy the full SHA
    24f323a View commit details
  3. Fix iOS app upload

    Missing xcassets and some icon keys
    andydotxyz committed Nov 15, 2020
    Copy the full SHA
    f50dfcd View commit details
  4. Fix format error

    andydotxyz committed Nov 15, 2020
    Copy the full SHA
    30fe369 View commit details
  5. Copy the full SHA
    9649763 View commit details
  6. Fix vet error

    andydotxyz committed Nov 15, 2020
    Copy the full SHA
    fea5798 View commit details

Commits on Nov 16, 2020

  1. Allow Raster to set scale mode

    Only used if the generator returns image of an unexpected size
    andydotxyz committed Nov 16, 2020
    Copy the full SHA
    cc57489 View commit details
  2. Copy the full SHA
    7b609b0 View commit details
  3. Copy the full SHA
    81b5862 View commit details
  4. Reword some popup deprecations for clarity (#1535)

    * Reword some popup deprecations for clarity
    
    * Correct deprecation wording
    
    * Update with correct deprecation notes
    Jacalz authored and andydotxyz committed Nov 16, 2020
    Copy the full SHA
    ac8ffd6 View commit details
  5. Static check fix

    andydotxyz committed Nov 16, 2020
    Copy the full SHA
    f21ba69 View commit details
  6. Fix lock in select test

    andydotxyz committed Nov 16, 2020
    Copy the full SHA
    2ad27f5 View commit details
  7. Copy the full SHA
    246f9d7 View commit details
  8. Fix nil reference in disabled buttons

    Also fixes issues with disabled handling in button and select_entry
    .
    Fixes #1553
    andydotxyz committed Nov 16, 2020
    Copy the full SHA
    fefe218 View commit details
  9. Copy the full SHA
    fc07a1c View commit details
Showing with 734 additions and 202 deletions.
  1. +26 −0 CHANGELOG.md
  2. +2 −2 README.md
  3. +3 −0 app.go
  4. +2 −1 canvas/raster.go
  5. +1 −1 cmd/fyne/commands/package-darwin.go
  6. +45 −10 cmd/fyne/commands/package-mobile.go
  7. +1 −1 cmd/fyne/commands/package.go
  8. +3 −3 cmd/fyne/internal/mobile/bind.go
  9. +6 −6 cmd/fyne/internal/mobile/build.go
  10. +26 −12 cmd/fyne/internal/mobile/build_iosapp.go
  11. +15 −11 cmd/fyne/internal/mobile/env.go
  12. +3 −3 cmd/fyne/internal/mobile/manifest.go
  13. +5 −0 cmd/fyne/internal/templates/bundled.go
  14. +103 −0 cmd/fyne/internal/templates/data/xcassets.JSON
  15. +5 −2 cmd/fyne/internal/templates/templates.go
  16. +12 −2 cmd/fyne_demo/tutorials/collection.go
  17. +4 −1 cmd/fyne_demo/tutorials/widget.go
  18. +1 −1 dialog/file_windows.go
  19. +2 −7 dialog/file_xdg.go
  20. +1 −4 driver/desktop/mouse.go
  21. +2 −0 go.mod
  22. +2 −2 go.sum
  23. +3 −3 internal/driver/glfw/window.go
  24. +132 −6 internal/driver/gomobile/android.c
  25. +4 −0 internal/driver/gomobile/clipboard_android.go
  26. +2 −2 internal/driver/gomobile/folder.go
  27. +6 −6 internal/driver/gomobile/folder_android.go
  28. +2 −2 internal/driver/gomobile/folder_desktop.go
  29. +2 −2 internal/driver/gomobile/folder_ios.go
  30. +1 −1 internal/painter/gl/gl_common.go
  31. +15 −6 internal/painter/software/draw.go
  32. +1 −2 internal/painter/software/painter.go
  33. +25 −0 storage/resource.go
  34. +20 −0 storage/resource_test.go
  35. +1 −0 storage/testdata/test.txt
  36. +7 −7 theme/theme.go
  37. +7 −3 vendor/github.com/go-gl/glfw/v3.3/glfw/glfw/src/cocoa_init.m
  38. +1 −1 vendor/modules.txt
  39. +15 −25 widget/button.go
  40. +9 −9 widget/form.go
  41. +1 −1 widget/form_test.go
  42. +3 −3 widget/list.go
  43. +2 −2 widget/popup_menu.go
  44. +2 −2 widget/select.go
  45. +4 −1 widget/select_entry.go
  46. +129 −37 widget/table.go
  47. +65 −4 widget/table_test.go
  48. BIN widget/testdata/entry/placeholder_initial.png
  49. BIN widget/testdata/entry/wrap_multi_line_off.png
  50. BIN widget/testdata/entry/wrap_single_line_off.png
  51. BIN widget/testdata/form/theme_changed.png
  52. BIN widget/testdata/form/theme_initial.png
  53. BIN widget/testdata/list/list_theme_changed.png
  54. BIN widget/testdata/table/col_size.png
  55. BIN widget/testdata/table/filled.png
  56. BIN widget/testdata/table/hovered.png
  57. BIN widget/testdata/table/hovered_out.png
  58. BIN widget/testdata/table/selected.png
  59. BIN widget/testdata/table/selected_scrolled.png
  60. BIN widget/testdata/table/theme_changed.png
  61. BIN widget/testdata/table/theme_initial.png
  62. BIN widget/testdata/tree/theme_changed.png
  63. +3 −6 widget/textgrid.go
  64. +2 −2 widget/tree.go
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -3,6 +3,32 @@
This file lists the main changes with each version of the Fyne toolkit.
More detailed release notes can be found on the [releases page](https://github.com/fyne-io/fyne/releases).

## 1.4.1 - Ongoing

### Changed

* Table columns can now be different sizes using SetColumnWidth
* Avoid unnecessary validation check on Refresh in widget.Form

### Fixed

* Tree could flicker on mouse hover (#1488)
* Content of table cells could overflow when sized correctly
* file:// based URI on Android would fail to list folder (#1495)
* Images in iOS release were not all correct size (#1498)
* iOS compile failed with Go 1.15 (#1497)
* Possible crash when minimising app containing List on Windows
* File chooser dialog ignores drive Z (#1513)
* Entry copy/paste is crashing on android 7.1 (#1511)
* Fyne package creating invalid windows packages (#1521)
* Menu bar initially doesn't respond to mouse input on macOS (#505)
* iOS: Missing CFBundleIconName and asset catalog (#1504)
* CenterOnScreen causes crash on MacOS when called from goroutine (#1539)
* desktop.MouseHover Button state is not reliable (#1533)
* Initial validation status in widget.Form is not respected
* Fix nil reference in disabled buttons (#1558)


## 1.4 - 1 November 2020

### Added (highlights)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://pkg.go.dev/fyne.io/fyne?tab=doc" title="Go API Reference" rel="nofollow"><img src="https://img.shields.io/badge/go-documentation-blue.svg?style=flat" alt="Go API Reference"></a>
<a href="https://github.com/fyne-io/fyne/releases/tag/v1.4.0" title="1.4.0 Release" rel="nofollow"><img src="https://img.shields.io/badge/version-1.4.0-blue.svg?style=flat" alt="1.4.0 release"></a>
<a href="https://github.com/fyne-io/fyne/releases/tag/v1.4.1" title="1.4.1 Release" rel="nofollow"><img src="https://img.shields.io/badge/version-1.4.1-blue.svg?style=flat" alt="1.4.1 release"></a>
<a href='http://gophers.slack.com/messages/fyne'><img src='https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=blue' alt='Join us on Slack' /></a>
<br />
<a href="https://goreportcard.com/report/fyne.io/fyne"><img src="https://goreportcard.com/badge/fyne.io/fyne" alt="Code Status" /></a>
@@ -16,7 +16,7 @@ It is designed to build applications that run on desktop and mobile devices with
single codebase.

Version 1.4 is the current release - it introduced high performance collection widgets,
Card, Separator and FileItem widgets as well as a folder open dialog.
Card, Separator and FileIcon widgets as well as a folder open dialog.
It also saw a theme refresh updating the colors and button styles for a more
material design look.
We are now working towards [2.0](https://github.com/fyne-io/fyne/milestone/6)
3 changes: 3 additions & 0 deletions app.go
Original file line number Diff line number Diff line change
@@ -75,5 +75,8 @@ func CurrentApp() App {
appLock.RLock()
defer appLock.RUnlock()

if app == nil {
LogError("Attempt to access current Fyne app when none is started", nil)
}
return app
}
3 changes: 2 additions & 1 deletion canvas/raster.go
Original file line number Diff line number Diff line change
@@ -17,7 +17,8 @@ type Raster struct {

Generator func(w, h int) image.Image // Render the raster image from code

Translucency float64 // Set a translucency value > 0.0 to fade the raster
Translucency float64 // Set a translucency value > 0.0 to fade the raster
ScaleMode ImageScale // Specify the type of scaling interpolation applied to the raster if it is not full-size
}

// Alpha is a convenience function that returns the alpha value for a raster
2 changes: 1 addition & 1 deletion cmd/fyne/commands/package-darwin.go
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ func (p *packager) packageDarwin() error {
infoFile, _ := os.Create(info)

tplData := darwinData{Name: p.name, ExeName: exeName, AppID: p.appID, Version: p.appVersion, Build: p.appBuild}
err := templates.PlistDarwin.Execute(infoFile, tplData)
err := templates.InfoPlistDarwin.Execute(infoFile, tplData)
if err != nil {
return errors.Wrap(err, "Failed to write plist template")
}
55 changes: 45 additions & 10 deletions cmd/fyne/commands/package-mobile.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
package commands

import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"path/filepath"

"fyne.io/fyne"
"fyne.io/fyne/cmd/fyne/internal/mobile"
"fyne.io/fyne/cmd/fyne/internal/templates"
"fyne.io/fyne/cmd/fyne/internal/util"
"github.com/pkg/errors"
)

func (p *packager) packageAndroid(arch string) error {
@@ -18,22 +24,51 @@ func (p *packager) packageIOS() error {
return err
}

appDir := filepath.Join(p.dir, mobile.AppOutputName(p.os, p.name))
iconPath := filepath.Join(appDir, "Icon.png")
if err = util.CopyFile(p.icon, iconPath); err != nil {
return err
assetDir := util.EnsureSubDir(p.dir, "Images.xcassets")
defer os.RemoveAll(assetDir)
err = ioutil.WriteFile(filepath.Join(assetDir, "Contents.json"), []byte(`{
"info" : {
"author" : "xcode",
"version" : 1
}
}`), 0644)
if err != nil {
fyne.LogError("Content err", err)
}

if err = copyResizeIcon("120", appDir); err != nil {
iconDir := util.EnsureSubDir(assetDir, "AppIcon.appiconset")
contentFile, _ := os.Create(filepath.Join(iconDir, "Contents.json"))

err = templates.XCAssetsDarwin.Execute(contentFile, nil)
if err != nil {
return errors.Wrap(err, "Failed to write xcassets content template")
}

if err = copyResizeIcon(1024, iconDir, p.icon); err != nil {
return err
}
if err = copyResizeIcon("76", appDir); err != nil {
if err = copyResizeIcon(180, iconDir, p.icon); err != nil {
return err
}
if err = copyResizeIcon(120, iconDir, p.icon); err != nil {
return err
}
if err = copyResizeIcon(76, iconDir, p.icon); err != nil {
return err
}
if err = copyResizeIcon(152, iconDir, p.icon); err != nil {
return err
}
return copyResizeIcon("152", appDir)
}

func copyResizeIcon(size, dir string) error {
cmd := exec.Command("sips", "-o", dir+"/Icon_"+size+".png", "-Z", "120", dir+"/Icon.png")
appDir := filepath.Join(p.dir, mobile.AppOutputName(p.os, p.name))
cmd := exec.Command("xcrun", "actool", "Images.xcassets", "--compile", appDir, "--platform",
"iphoneos", "--target-device", "iphone", "--minimum-deployment-target", "9.0", "--app-icon", "AppIcon",
"--output-partial-info-plist", "/dev/null")
return cmd.Run()
}

func copyResizeIcon(size int, dir, source string) error {
path := fmt.Sprintf("%s/Icon_%d.png", dir, size)
strSize := fmt.Sprintf("%d", size)
return exec.Command("sips", "-o", path, "-Z", strSize, source).Run()
}
2 changes: 1 addition & 1 deletion cmd/fyne/commands/package.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (

const (
defaultAppBuild = 1
defaultAppVersion = "1.0"
defaultAppVersion = "1.0.0"
)

// Declare conformity to Command interface
6 changes: 3 additions & 3 deletions cmd/fyne/internal/mobile/bind.go
Original file line number Diff line number Diff line change
@@ -65,14 +65,14 @@ func writeFile(filename string, generate func(io.Writer) error) error {
return generate(f)
}

func packagesConfig(targetOS string) *packages.Config {
func packagesConfig(targetOS, targetArch string) *packages.Config {
config := &packages.Config{}
// Add CGO_ENABLED=1 explicitly since Cgo is disabled when GOOS is different from host OS.
config.Env = append(os.Environ(), "GOARCH=arm", "GOOS="+targetOS, "CGO_ENABLED=1")
config.Env = append(os.Environ(), "GOARCH="+targetArch, "GOOS="+targetOS, "CGO_ENABLED=1")
if targetOS == "android" {
// with Cgo enabled we need to ensure the C compiler is set via CC to
// avoid the error: "gcc: error: unrecognized command line option '-marm'"
config.Env = append(os.Environ(), androidEnv["arm"]...)
config.Env = append(os.Environ(), androidEnv[targetArch]...)
}
tags := buildTags
if targetOS == "darwin" {
12 changes: 6 additions & 6 deletions cmd/fyne/internal/mobile/build.go
Original file line number Diff line number Diff line change
@@ -113,7 +113,7 @@ func runBuildImpl(cmd *command) (*packages.Package, error) {
cmd.usage()
os.Exit(1)
}
pkgs, err := packages.Load(packagesConfig(targetOS), buildPath)
pkgs, err := packages.Load(packagesConfig(targetOS, targetArchs[0]), buildPath)
if err != nil {
return nil, err
}
@@ -152,7 +152,7 @@ func runBuildImpl(cmd *command) (*packages.Package, error) {
return nil, fmt.Errorf("-os=ios requires XCode")
}
if buildRelease {
targetArchs = []string{"arm", "arm64"}
targetArchs = []string{"arm64"}
}

if pkg.Name != "main" {
@@ -381,8 +381,8 @@ func parseBuildTarget(buildTarget string) (os string, archs []string, _ error) {
}

// verify all archs are supported one while deduping.
isSupported := func(arch string) bool {
for _, a := range allArchs {
isSupported := func(os, arch string) bool {
for _, a := range allArchs[os] {
if a == arch {
return true
}
@@ -395,7 +395,7 @@ func parseBuildTarget(buildTarget string) (os string, archs []string, _ error) {
if _, ok := seen[arch]; ok {
continue
}
if !isSupported(arch) {
if !isSupported(os, arch) {
return "", nil, fmt.Errorf(`unsupported arch: %q`, arch)
}

@@ -408,7 +408,7 @@ func parseBuildTarget(buildTarget string) (os string, archs []string, _ error) {
targetOS = "darwin"
}
if all {
return targetOS, allArchs, nil
return targetOS, allArchs[os], nil
}
return targetOS, archs, nil
}
38 changes: 26 additions & 12 deletions cmd/fyne/internal/mobile/build_iosapp.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ func goIOSBuild(pkg *packages.Package, bundleID string, archs []string,
// Detect the team ID
teamID, err := DetectIOSTeamID(cert)
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to look up certificate %s: %s", cert, err.Error())
}

projPbxproj := new(bytes.Buffer)
@@ -288,25 +288,39 @@ var infoplistTmpl = template.Must(template.New("infoplist").Parse(`<?xml version
<key>CFBundleVersion</key>
<string>{{.Build}}</string>
<key>CFBundleIcons</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>AppIcon60x60</string>
</array>
<key>CFBundleIconName</key>
<string>AppIcon</string>
</dict>
</dict>
<key>CFBundleIcons~ipad</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>Icon.png</string>
<string>Icon_76.png</string>
<string>Icon_152.png</string>
<string>Icon_120.png</string>
</array>
</dict>
<key>CFBundleIconFiles</key>
<array>
<string>AppIcon60x60</string>
<string>AppIcon76x76</string>
</array>
<key>CFBundleIconName</key>
<string>AppIcon</string>
</dict>
</dict>
<key>CFBundleIconName</key>
<string>AppIcon</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
<string>arm64</string>
</array>
<key>UIRequiresFullScreen</key>
<true/>
26 changes: 15 additions & 11 deletions cmd/fyne/internal/mobile/env.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,9 @@ var (

darwinArmNM string

allArchs = []string{"arm", "arm64", "386", "amd64"}
allArchs = map[string][]string{
"android": {"arm", "arm64", "386", "amd64"},
"ios": {"arm64", "amd64"}}

bitcodeEnabled bool
)
@@ -83,15 +85,17 @@ func envInit() (err error) {
// An arbitrary standard package ('runtime' here) is given to go-list.
// This is because go-list tries to analyze the module at the current directory if no packages are given,
// and if the module doesn't have any Go file, go-list fails. See golang/go#36668.
cmd := exec.Command("go", "list", "-e", "-f", `{{range context.ReleaseTags}}{{if eq . "go1.14"}}{{.}}{{end}}{{end}}`, "runtime")
cmd.Stderr = os.Stderr
out, err := cmd.Output()
if err != nil {
return err
}
if len(strings.TrimSpace(string(out))) > 0 {
bitcodeEnabled = true
}

// TODO re-enable once we find out what broke after September event 2020
//cmd := exec.Command("go", "list", "-e", "-f", `{{range context.ReleaseTags}}{{if eq . "go1.14"}}{{.}}{{end}}{{end}}`, "runtime")
//cmd.Stderr = os.Stderr
//out, err := cmd.Output()
//if err != nil {
// return err
//}
//if len(strings.TrimSpace(string(out))) > 0 {
// bitcodeEnabled = true
//}

// Setup the cross-compiler environments.
if ndkRoot, err := ndkRoot(); err == nil {
@@ -136,7 +140,7 @@ func envInit() (err error) {

darwinArmNM = "nm"
darwinEnv = make(map[string][]string)
for _, arch := range allArchs {
for _, arch := range allArchs["ios"] {
var env []string
var err error
var clang, cflags string
6 changes: 3 additions & 3 deletions cmd/fyne/internal/mobile/manifest.go
Original file line number Diff line number Diff line change
@@ -64,9 +64,6 @@ var manifestTmpl = template.Must(template.New("manifest").Parse(`
android:versionCode="{{.Build}}"
android:versionName="{{.Version}}">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application android:label="{{.Name}}" android:debuggable="{{.Debug}}">
<activity android:name="org.golang.app.GoNativeActivity"
android:label="{{.Name}}"
@@ -78,4 +75,7 @@ var manifestTmpl = template.Must(template.New("manifest").Parse(`
</intent-filter>
</activity>
</application>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
</manifest>`))
Loading