Skip to content

Bottom tab improvements: Enable feature flag #22344

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

Merged
mokagio merged 2 commits into from
Jan 9, 2024
Merged

Bottom tab improvements: Enable feature flag #22344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7187323
enable new tab icons
Jan 8, 2024
7efa1d7
find the imageview to animate
Jan 8, 2024
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
2 changes: 1 addition & 1 deletion WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ enum FeatureFlag: Int, CaseIterable {
case .googleDomainsCard:
return false
case .newTabIcons:
return BuildConfiguration.current == .localDeveloper
return true
}
}

Expand Down
9 changes: 7 additions & 2 deletions WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,13 @@ extension WPTabBarController {

@objc func animateSelectedItem(_ item: UITabBarItem, for tabBar: UITabBar) {

guard let index = tabBar.items?.firstIndex(of: item), tabBar.subviews.count > index + 1,
let imageView = tabBar.subviews[index + 1].subviews.last as? UIImageView else {
guard let index = tabBar.items?.firstIndex(of: item), tabBar.subviews.count > index + 1 else {
return
}

let button = tabBar.subviews[(index + 1)]

guard let imageView = button.subviews.lazy.compactMap({ $0 as? UIImageView }).first else {
return
}

Expand Down