zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 20 Releases Wiki Activity

feat: adapt large content content viewer for tab bar item

This commit is contained in:
CMK 2021-07-20 20:24:53 +08:00
parent 4ee065eda4
commit 16d6a835c0
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Mastodon/Scene/MainTab/MainTabBarController.swift
View File

@ -43,6 +43,15 @@ class MainTabBarController: UITabBarController {
} }
} }
var largeImage: UIImage {
switch self {
case .home: return UIImage(systemName: "house.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 80))!
case .search: return UIImage(systemName: "magnifyingglass", withConfiguration: UIImage.SymbolConfiguration(pointSize: 80))!
case .notification: return UIImage(systemName: "bell.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 80))!
case .me: return UIImage(systemName: "person.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 80))!
}
}
func viewController(context: AppContext, coordinator: SceneCoordinator) -> UIViewController { func viewController(context: AppContext, coordinator: SceneCoordinator) -> UIViewController {
let viewController: UIViewController let viewController: UIViewController
switch self { switch self {
@ -112,14 +121,20 @@ extension MainTabBarController {
let tabs = Tab.allCases let tabs = Tab.allCases
let viewControllers: [UIViewController] = tabs.map { tab in let viewControllers: [UIViewController] = tabs.map { tab in
let viewController = tab.viewController(context: context, coordinator: coordinator) let viewController = tab.viewController(context: context, coordinator: coordinator)
viewController.tabBarItem.title = "" // set text to empty string for image only style (SDK failed to layout when set to nil) viewController.tabBarItem.title = tab.title
viewController.tabBarItem.image = tab.image viewController.tabBarItem.image = tab.image
viewController.tabBarItem.accessibilityLabel = tab.title viewController.tabBarItem.accessibilityLabel = tab.title
viewController.tabBarItem.largeContentSizeImage = tab.largeImage
viewController.tabBarItem.imageInsets = UIEdgeInsets(top: 6, left: 0, bottom: -6, right: 0)
return viewController return viewController
} }
setViewControllers(viewControllers, animated: false) setViewControllers(viewControllers, animated: false)
selectedIndex = 0 selectedIndex = 0
UITabBarItem.appearance().setTitleTextAttributes([.foregroundColor : UIColor.clear], for: .normal)
UITabBarItem.appearance().setTitleTextAttributes([.foregroundColor : UIColor.clear], for: .highlighted)
UITabBarItem.appearance().setTitleTextAttributes([.foregroundColor : UIColor.clear], for: .selected)
context.apiService.error context.apiService.error
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] error in .sink { [weak self] error in

4
Mastodon/Service/ThemeService/ThemeService+Appearance.swift
View File

@ -30,6 +30,10 @@ extension ThemeService {
tabBarAppearance.configureWithDefaultBackground() tabBarAppearance.configureWithDefaultBackground()
let tabBarItemAppearance = UITabBarItemAppearance() let tabBarItemAppearance = UITabBarItemAppearance()
tabBarItemAppearance.selected.titleTextAttributes = [.foregroundColor: UIColor.clear]
tabBarItemAppearance.focused.titleTextAttributes = [.foregroundColor: UIColor.clear]
tabBarItemAppearance.normal.titleTextAttributes = [.foregroundColor: UIColor.clear]
tabBarItemAppearance.disabled.titleTextAttributes = [.foregroundColor: UIColor.clear]
tabBarItemAppearance.selected.iconColor = theme.tabBarItemSelectedIconColor tabBarItemAppearance.selected.iconColor = theme.tabBarItemSelectedIconColor
tabBarItemAppearance.focused.iconColor = theme.tabBarItemFocusedIconColor tabBarItemAppearance.focused.iconColor = theme.tabBarItemFocusedIconColor
tabBarItemAppearance.normal.iconColor = theme.tabBarItemNormalIconColor tabBarItemAppearance.normal.iconColor = theme.tabBarItemNormalIconColor