Skip to content

Commit 0842691

Browse files
committed
Remove unused parameters
1 parent f5f9353 commit 0842691

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

cmd/fyne/internal/mobile/android_resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func writeAdaptiveIconResources(resDir, foregroundPath, backgroundPath, monochro
9292

9393
// compileAndroidResources compiles Android resources using aapt2
9494
// Returns: resources.arsc path, res/ directory path, compiled AndroidManifest.xml path, error
95-
func compileAndroidResources(tempDir string, manifestData []byte, foregroundPath, backgroundPath, monochromePath string, targetSDK, versionCode int, versionName, packageName string) (arscPath string, resDir string, manifestPath string, err error) {
95+
func compileAndroidResources(tempDir string, manifestData []byte, foregroundPath, backgroundPath, monochromePath string, targetSDK, versionCode int, versionName string) (arscPath string, resDir string, manifestPath string, err error) {
9696
aapt2, err := util.Aapt2Path()
9797
if err != nil {
9898
return "", "", "", err

cmd/fyne/internal/mobile/build_androidapp.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func goAndroidBuild(pkg *packages.Package, bundleID string, androidArchs []strin
6161
return nil, err
6262
}
6363

64-
foreground, _, _ := detectAdaptiveIcons(dir, iconPath, iconFG, iconBG, iconMono)
64+
foreground, _, _ := detectAdaptiveIcons(dir, iconFG, iconBG, iconMono)
6565
adaptive := foreground != "" && util.Exists(foreground)
6666

6767
buf := new(bytes.Buffer)
@@ -148,7 +148,7 @@ func goAndroidBuild(pkg *packages.Package, bundleID string, androidArchs []strin
148148
if err != nil {
149149
return nil, err
150150
}
151-
err = addAssets(apkw, manifestData, dir, iconPath, target, build, version, bundleID, iconFG, iconBG, iconMono)
151+
err = addAssets(apkw, manifestData, dir, iconPath, target, build, version, iconFG, iconBG, iconMono)
152152
if err != nil {
153153
return nil, err
154154
}
@@ -179,7 +179,7 @@ func goAndroidBuild(pkg *packages.Package, bundleID string, androidArchs []strin
179179

180180
// detectAdaptiveIcons checks for adaptive icon layers based on metadata or convention
181181
// Returns: foreground path, background path, monochrome path (empty strings if not found)
182-
func detectAdaptiveIcons(dir, iconPath, foreground, background, monochrome string) (string, string, string) {
182+
func detectAdaptiveIcons(dir, foreground, background, monochrome string) (string, string, string) {
183183
if !util.Exists(foreground) {
184184
foreground = filepath.Join(dir, "Icon-foreground.png")
185185
}
@@ -207,7 +207,7 @@ func detectAdaptiveIcons(dir, iconPath, foreground, background, monochrome strin
207207
}
208208

209209
func addAssets(apkw *Writer, manifestData []byte, dir, iconPath string, target int, versionCode int,
210-
versionName, packageName, iconFG, iconBG, iconMono string,
210+
versionName, iconFG, iconBG, iconMono string,
211211
) error {
212212
// Add any assets.
213213
var arsc struct {
@@ -260,7 +260,7 @@ func addAssets(apkw *Writer, manifestData []byte, dir, iconPath string, target i
260260
}
261261
}
262262

263-
iconForeground, iconBackground, iconMonochrome := detectAdaptiveIcons(dir, iconPath, iconFG, iconBG, iconMono)
263+
iconForeground, iconBackground, iconMonochrome := detectAdaptiveIcons(dir, iconFG, iconBG, iconMono)
264264

265265
// No adaptive icons, use legacy build
266266
if iconForeground == "" {
@@ -282,7 +282,6 @@ func addAssets(apkw *Writer, manifestData []byte, dir, iconPath string, target i
282282
target,
283283
versionCode,
284284
versionName,
285-
packageName,
286285
)
287286
if err != nil {
288287
return fmt.Errorf("failed to compile adaptive icon resources: %w", err)

0 commit comments

Comments
 (0)