Skip to content

feat: fallback to UIImage(named:) for custom symbol/image sets in tab… #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HaywhyD wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: fallback to UIImage(named:) for custom symbol/image sets in tab… #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ios/Classes/Views/CupertinoTabBarPlatformView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class CupertinoTabBarPlatformView: NSObject, FlutterPlatformView, UITabBarDelega
var items: [UITabBarItem] = []
for i in range {
var image: UIImage? = nil
if i < symbols.count { image = UIImage(systemName: symbols[i]) }
if i < symbols.count { image = UIImage(systemName: symbols[i]) ?? UIImage(named: symbols[i]) }
let title = (i < labels.count) ? labels[i] : nil
items.append(UITabBarItem(title: title, image: image, selectedImage: image))
}
Expand Down Expand Up @@ -171,7 +171,7 @@ channel.setMethodCallHandler { [weak self] call, result in
var items: [UITabBarItem] = []
for i in range {
var image: UIImage? = nil
if i < symbols.count { image = UIImage(systemName: symbols[i]) }
if i < symbols.count { image = UIImage(systemName: symbols[i]) ?? UIImage(named: symbols[i]) }
let title = (i < labels.count) ? labels[i] : nil
items.append(UITabBarItem(title: title, image: image, selectedImage: image))
}
Expand Down Expand Up @@ -219,7 +219,7 @@ channel.setMethodCallHandler { [weak self] call, result in
var items: [UITabBarItem] = []
for i in range {
var image: UIImage? = nil
if i < symbols.count { image = UIImage(systemName: symbols[i]) }
if i < symbols.count { image = UIImage(systemName: symbols[i]) ?? UIImage(named: symbols[i]) }
let title = (i < labels.count) ? labels[i] : nil
items.append(UITabBarItem(title: title, image: image, selectedImage: image))
}
Expand Down