Skip to content
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

[fix/sidebar-logo] Sidebar Logo #1247

Merged
merged 2 commits into from
Aug 4, 2023
Merged

[fix/sidebar-logo] Sidebar Logo #1247

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5313248
removed the logo label from the sidebar navigation bar to have more s…
hosy Jul 11, 2023
e14352c
- show vendor label in the sidebar if app is unbranded
hosy Jul 24, 2023
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
49 changes: 30 additions & 19 deletions ownCloudAppShared/Client/View Controllers/ClientSidebarViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,46 +211,57 @@ extension ClientSidebarViewController {
let logoImage = UIImage(named: "branding-login-logo")
let logoImageView = UIImageView(image: logoImage)
logoImageView.cssSelector = .icon
logoImageView.accessibilityLabel = VendorServices.shared.appName
logoImageView.contentMode = .scaleAspectFit
logoImageView.translatesAutoresizingMaskIntoConstraints = false
if let logoImage = logoImage {
// Keep aspect ratio + scale logo to 90% of available height
logoImageView.widthAnchor.constraint(equalTo: logoImageView.heightAnchor, multiplier: (logoImage.size.width / logoImage.size.height) * 0.9).isActive = true
}

let logoLabel = ThemeCSSLabel()
logoLabel.translatesAutoresizingMaskIntoConstraints = false
logoLabel.text = VendorServices.shared.appName
logoLabel.font = UIFont.systemFont(ofSize: 20, weight: .bold)
logoLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
logoLabel.setContentCompressionResistancePriority(.required, for: .vertical)

let logoContainer = ThemeCSSView(withSelectors: [.logo])
logoContainer.translatesAutoresizingMaskIntoConstraints = false
logoContainer.addSubview(logoImageView)
logoContainer.addSubview(logoLabel)
logoContainer.setContentHuggingPriority(.required, for: .horizontal)
logoContainer.setContentHuggingPriority(.required, for: .vertical)

let logoWrapperView = ThemeCSSView()
logoWrapperView.addSubview(logoContainer)

NSLayoutConstraint.activate([
logoImageView.topAnchor.constraint(greaterThanOrEqualTo: logoContainer.topAnchor),
logoImageView.bottomAnchor.constraint(lessThanOrEqualTo: logoContainer.bottomAnchor),
logoImageView.centerYAnchor.constraint(equalTo: logoContainer.centerYAnchor),
logoLabel.topAnchor.constraint(greaterThanOrEqualTo: logoContainer.topAnchor),
logoLabel.bottomAnchor.constraint(lessThanOrEqualTo: logoContainer.bottomAnchor),
logoLabel.centerYAnchor.constraint(equalTo: logoContainer.centerYAnchor),

logoImageView.leadingAnchor.constraint(equalTo: logoContainer.leadingAnchor),
logoLabel.leadingAnchor.constraint(equalToSystemSpacingAfter: logoImageView.trailingAnchor, multiplier: 1),
logoLabel.trailingAnchor.constraint(equalTo: logoContainer.trailingAnchor),

logoContainer.topAnchor.constraint(equalTo: logoWrapperView.topAnchor),
logoContainer.bottomAnchor.constraint(equalTo: logoWrapperView.bottomAnchor),
logoContainer.centerXAnchor.constraint(equalTo: logoWrapperView.centerXAnchor)
])
if VendorServices.shared.isBranded {
NSLayoutConstraint.activate([
logoImageView.topAnchor.constraint(greaterThanOrEqualTo: logoContainer.topAnchor),
logoImageView.bottomAnchor.constraint(lessThanOrEqualTo: logoContainer.bottomAnchor),
logoImageView.centerYAnchor.constraint(equalTo: logoContainer.centerYAnchor),
logoImageView.centerXAnchor.constraint(equalTo: logoContainer.centerXAnchor),
logoContainer.topAnchor.constraint(equalTo: logoWrapperView.topAnchor),
logoContainer.bottomAnchor.constraint(equalTo: logoWrapperView.bottomAnchor),
logoContainer.centerXAnchor.constraint(equalTo: logoWrapperView.centerXAnchor)
])
} else {
logoContainer.addSubview(logoLabel)
NSLayoutConstraint.activate([
logoImageView.topAnchor.constraint(greaterThanOrEqualTo: logoContainer.topAnchor),
logoImageView.bottomAnchor.constraint(lessThanOrEqualTo: logoContainer.bottomAnchor),
logoImageView.centerYAnchor.constraint(equalTo: logoContainer.centerYAnchor),
logoLabel.topAnchor.constraint(greaterThanOrEqualTo: logoContainer.topAnchor),
logoLabel.bottomAnchor.constraint(lessThanOrEqualTo: logoContainer.bottomAnchor),
logoLabel.centerYAnchor.constraint(equalTo: logoContainer.centerYAnchor),
logoImageView.leadingAnchor.constraint(equalTo: logoContainer.leadingAnchor),
logoLabel.leadingAnchor.constraint(equalToSystemSpacingAfter: logoImageView.trailingAnchor, multiplier: 1),
logoLabel.trailingAnchor.constraint(equalTo: logoContainer.trailingAnchor),
logoContainer.topAnchor.constraint(equalTo: logoWrapperView.topAnchor),
logoContainer.bottomAnchor.constraint(equalTo: logoWrapperView.bottomAnchor),
logoContainer.centerXAnchor.constraint(equalTo: logoWrapperView.centerXAnchor)
])
}

logoWrapperView.addThemeApplier({ (_, collection, _) in
if !VendorServices.shared.isBranded, let logoColor = collection.css.getColor(.stroke, for: logoImageView) {
Expand Down