fix: 固定首页常用应用图标尺寸

This commit is contained in:
2026-07-16 19:02:00 +08:00
parent 5f1c22c6a8
commit 3d5ad8a614
4 changed files with 104 additions and 26 deletions

View File

@ -8,14 +8,49 @@ import UIKit
/// / SF Symbol
enum HomeMenuIconFactory {
/// 使
static let canvasSize = CGSize(width: 24, height: 24)
/// 2426pt
static let symbolConfiguration = UIImage.SymbolConfiguration(pointSize: 18, weight: .medium)
/// Assets SF Symbol
private static let imageCache = NSCache<NSString, UIImage>()
/// Assets SF Symbol
static func image(named iconName: String) -> UIImage? {
if let asset = UIImage(named: iconName) {
return asset
let cacheKey = iconName as NSString
if let cachedImage = imageCache.object(forKey: cacheKey) {
return cachedImage
}
return UIImage(systemName: iconName, withConfiguration: symbolConfiguration)
guard let sourceImage = UIImage(named: iconName)
?? UIImage(systemName: iconName, withConfiguration: symbolConfiguration) else {
return nil
}
let normalizedImage = renderOnFixedCanvas(sourceImage)
imageCache.setObject(normalizedImage, forKey: cacheKey)
return normalizedImage
}
private static func renderOnFixedCanvas(_ image: UIImage) -> UIImage {
let sourceSize = image.size
guard sourceSize.width > 0, sourceSize.height > 0 else {
return image
}
let scale = min(canvasSize.width / sourceSize.width, canvasSize.height / sourceSize.height)
let drawSize = CGSize(width: sourceSize.width * scale, height: sourceSize.height * scale)
let drawRect = CGRect(
x: (canvasSize.width - drawSize.width) / 2,
y: (canvasSize.height - drawSize.height) / 2,
width: drawSize.width,
height: drawSize.height
)
let renderer = UIGraphicsImageRenderer(size: canvasSize)
let renderedImage = renderer.image { _ in
image.withRenderingMode(.alwaysOriginal).draw(in: drawRect)
}
return renderedImage.withRenderingMode(.alwaysTemplate)
}
}

View File

@ -75,9 +75,8 @@ final class AllFunctionMenuCell: UICollectionViewCell {
cardView.clipsToBounds = true
iconView.tintColor = AppColor.primary
iconView.contentMode = .scaleAspectFit
iconView.preferredSymbolConfiguration = HomeMenuIconFactory.symbolConfiguration
iconView.contentMode = .center
iconView.adjustsImageSizeForAccessibilityContentSizeCategory = false
contentStackView.axis = .vertical
contentStackView.alignment = .center

View File

@ -127,6 +127,13 @@ final class HomeMenuCell: UICollectionViewCell {
fatalError("init(coder:) has not been implemented")
}
override func prepareForReuse() {
super.prepareForReuse()
iconView.image = nil
iconView.accessibilityIdentifier = nil
titleLabel.text = nil
}
func apply(menu: HomeMenuItem) {
iconView.image = HomeMenuIconFactory.image(named: menu.iconName)
iconView.accessibilityIdentifier = menu.iconName
@ -146,9 +153,8 @@ final class HomeMenuCell: UICollectionViewCell {
iconContainerView.layer.cornerRadius = 20
iconView.tintColor = AppColor.primary
iconView.contentMode = .scaleAspectFit
iconView.preferredSymbolConfiguration = HomeMenuIconFactory.symbolConfiguration
iconView.contentMode = .center
iconView.adjustsImageSizeForAccessibilityContentSizeCategory = false
contentStackView.axis = .vertical
contentStackView.alignment = .center
@ -176,6 +182,8 @@ final class HomeMenuCell: UICollectionViewCell {
iconContainerView.snp.makeConstraints { make in
make.width.height.equalTo(40)
}
iconContainerView.setContentHuggingPriority(.required, for: .vertical)
iconContainerView.setContentCompressionResistancePriority(.required, for: .vertical)
iconView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.width.height.equalTo(24)