diff --git a/ownCloud/Client/Viewer/DisplayHostViewController.swift b/ownCloud/Client/Viewer/DisplayHostViewController.swift index 50054db21..1edcfa122 100644 --- a/ownCloud/Client/Viewer/DisplayHostViewController.swift +++ b/ownCloud/Client/Viewer/DisplayHostViewController.swift @@ -322,7 +322,7 @@ extension DisplayHostViewController: UIPageViewControllerDelegate { extension DisplayHostViewController: Themeable { func applyThemeCollection(theme: Theme, collection: ThemeCollection, event: ThemeEvent) { - self.view.backgroundColor = .black + self.view.backgroundColor = collection.tableBackgroundColor } } diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png index 4a363927d..e11ed3b8e 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png index 880bcbb69..00f48a8db 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png index fa8e9a985..415be8917 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png index 04c0132e8..e06a34160 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png index 83c4ab81f..10d288c08 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png index 4f34cfd5a..c7009e370 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png index 2edd2ce18..d1d090968 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png index fa8e9a985..415be8917 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png index 0fe5ebfcb..46621e254 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png index 951c30d00..90f20f466 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png index 951c30d00..90f20f466 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png index 8250aea9a..060f21f82 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png index e83d14de8..e50667f14 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png index 548db82e2..104d696f2 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png index 0a409b484..fed0a2898 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-1024.png index 87d58ef19..66294a740 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-1024.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20.png index 8a8e1ec73..7b8c551c4 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png index e43f89300..5265cd644 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png index 07013ae31..397221439 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29.png index 81eb85115..1449e2ce7 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png index fd02a4ac6..1675c21cf 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png index 3e50c9ca4..a14729826 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png index e43f89300..5265cd644 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png index 107181d32..c68484026 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png index 0b2623465..7c0aef50c 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png index 7d21ffe07..7c0aef50c 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png index b005715d9..61d545717 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-76.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-76.png index 3e5e8e479..006d2505c 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-76.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-76.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png index c68133e4c..bfbe42d61 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png index 5d4aa1175..08dc61093 100644 Binary files a/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and b/ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/ownCloud/Resources/Theming/branding-splashscreen-background.png b/ownCloud/Resources/Theming/branding-splashscreen-background.png index 17ec30196..ca2b68fcf 100644 Binary files a/ownCloud/Resources/Theming/branding-splashscreen-background.png and b/ownCloud/Resources/Theming/branding-splashscreen-background.png differ diff --git a/ownCloudAppShared/Client/File Lists/ClientQueryViewController.swift b/ownCloudAppShared/Client/File Lists/ClientQueryViewController.swift index e381a8a2a..cfec672fd 100644 --- a/ownCloudAppShared/Client/File Lists/ClientQueryViewController.swift +++ b/ownCloudAppShared/Client/File Lists/ClientQueryViewController.swift @@ -112,7 +112,14 @@ open class ClientQueryViewController: QueryFileListTableViewController, UIDropIn self.tableView.dropDelegate = self self.tableView.dragInteractionEnabled = true - folderActionBarButton = UIBarButtonItem(image: UIImage(named: "more-dots"), style: .plain, target: self, action: #selector(moreBarButtonPressed)) + var rightInset : CGFloat = 4 + var leftInset : CGFloat = 0 + if self.view.effectiveUserInterfaceLayoutDirection == .rightToLeft { + rightInset = 0 + leftInset = 3 + } + + folderActionBarButton = UIBarButtonItem(image: UIImage(named: "more-dots")?.withInset(UIEdgeInsets(top: 0, left: leftInset, bottom: 0, right: rightInset)), style: .plain, target: self, action: #selector(moreBarButtonPressed)) folderActionBarButton?.accessibilityIdentifier = "client.folder-action" folderActionBarButton?.accessibilityLabel = "Actions".localized plusBarButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(plusBarButtonPressed)) diff --git a/ownCloudAppShared/Client/User Interface/SortBar.swift b/ownCloudAppShared/Client/User Interface/SortBar.swift index 6dd3b7224..2de0f9817 100644 --- a/ownCloudAppShared/Client/User Interface/SortBar.swift +++ b/ownCloudAppShared/Client/User Interface/SortBar.swift @@ -59,6 +59,7 @@ public class SortBar: UIView, Themeable, UIPopoverPresentationControllerDelegate let sideButtonsSize: CGSize = CGSize(width: 44.0, height: 44.0) let leftPadding: CGFloat = 20.0 let rightPadding: CGFloat = 20.0 + let rightSelectButtonPadding: CGFloat = 8.0 let topPadding: CGFloat = 10.0 let bottomPadding: CGFloat = 10.0 @@ -191,7 +192,7 @@ public class SortBar: UIView, Themeable, UIPopoverPresentationControllerDelegate NSLayoutConstraint.activate([ selectButton.centerYAnchor.constraint(equalTo: self.centerYAnchor), - selectButton.trailingAnchor.constraint(lessThanOrEqualTo: self.safeAreaLayoutGuide.trailingAnchor, constant: -rightPadding), + selectButton.trailingAnchor.constraint(lessThanOrEqualTo: self.safeAreaLayoutGuide.trailingAnchor, constant: -rightSelectButtonPadding), selectButton.heightAnchor.constraint(equalToConstant: sideButtonsSize.height), selectButton.widthAnchor.constraint(equalToConstant: sideButtonsSize.width) ]) @@ -287,7 +288,12 @@ public class SortBar: UIView, Themeable, UIPopoverPresentationControllerDelegate let popoverPresentationController = tableViewController.popoverPresentationController popoverPresentationController?.sourceView = sender popoverPresentationController?.delegate = self - popoverPresentationController?.sourceRect = CGRect(x: 0, y: 0, width: sender.frame.size.width, height: sender.frame.size.height) + + if self.effectiveUserInterfaceLayoutDirection == .rightToLeft { + popoverPresentationController?.sourceRect = CGRect(x: 5, y: 0, width: 10, height: sender.frame.size.height) + } else { + popoverPresentationController?.sourceRect = CGRect(x: sender.frame.size.width - 12, y: 0, width: 10, height: sender.frame.size.height) + } popoverPresentationController?.permittedArrowDirections = .up delegate?.sortBar(self, presentViewController: tableViewController, animated: true, completionHandler: nil) diff --git a/ownCloudAppShared/Client/User Interface/SortMethodTableViewController.swift b/ownCloudAppShared/Client/User Interface/SortMethodTableViewController.swift index 21c5863d4..8ffab04e8 100644 --- a/ownCloudAppShared/Client/User Interface/SortMethodTableViewController.swift +++ b/ownCloudAppShared/Client/User Interface/SortMethodTableViewController.swift @@ -36,27 +36,28 @@ class SortMethodTableViewController: StaticTableViewController { var rows : [StaticTableViewRow] = [] let contentHeight : CGFloat = rowHeight * CGFloat(SortMethod.all.count) - 1 - let contentWidth : CGFloat = (view.frame.size.width < maxContentWidth) ? view.frame.size.width : maxContentWidth + let contentWidth : CGFloat = maxContentWidth self.preferredContentSize = CGSize(width: contentWidth, height: contentHeight) for method in SortMethod.all { - var title = method.localizedName() + let title = method.localizedName() + var sortDirectionTitle = "" if sortBarDelegate?.sortMethod == method { if sortBarDelegate?.sortDirection == .ascendant { // Show arrows opposite to the current sort direction to show what choosing them will lead to - title = String(format: "%@ ↓", method.localizedName()) + sortDirectionTitle = "↓" } else { - title = String(format: "%@ ↑", method.localizedName()) + sortDirectionTitle = "↑" } } - let aRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in + let aRow = StaticTableViewRow(subtitleRowWithAction: { [weak self] (_, _) in guard let self = self else { return } self.sortBar?.sortMethod = method self.dismiss(animated: false, completion: nil) - }, title: title) + }, title: title, subtitle: sortDirectionTitle, style: .value1, accessoryType: .none, identifier: nil, withButtonStyle: true) rows.append(aRow) } diff --git a/ownCloudAppShared/UIKit Extension/UIImage+Extension.swift b/ownCloudAppShared/UIKit Extension/UIImage+Extension.swift index af2542834..c6968da52 100644 --- a/ownCloudAppShared/UIKit Extension/UIImage+Extension.swift +++ b/ownCloudAppShared/UIKit Extension/UIImage+Extension.swift @@ -58,4 +58,17 @@ public extension UIImage { return image } + + func withInset(_ insets: UIEdgeInsets) -> UIImage? { + let cgSize = CGSize(width: self.size.width + insets.left * self.scale + insets.right * self.scale, + height: self.size.height + insets.top * self.scale + insets.bottom * self.scale) + + UIGraphicsBeginImageContextWithOptions(cgSize, false, self.scale) + defer { UIGraphicsEndImageContext() } + + let origin = CGPoint(x: insets.left * self.scale, y: insets.top * self.scale) + self.draw(at: origin) + + return UIGraphicsGetImageFromCurrentImageContext()?.withRenderingMode(self.renderingMode) + } } diff --git a/ownCloudAppShared/User Interface/StaticTableView/StaticTableViewRow.swift b/ownCloudAppShared/User Interface/StaticTableView/StaticTableViewRow.swift index 7c4d72a2d..0dc115e03 100644 --- a/ownCloudAppShared/User Interface/StaticTableView/StaticTableViewRow.swift +++ b/ownCloudAppShared/User Interface/StaticTableView/StaticTableViewRow.swift @@ -265,13 +265,12 @@ open class StaticTableViewRow : NSObject, UITextFieldDelegate { }) } - convenience public init(subtitleRowWithAction: StaticTableViewRowAction?, title: String, subtitle: String? = nil, style : UITableViewCell.CellStyle = .subtitle, accessoryType: UITableViewCell.AccessoryType = UITableViewCell.AccessoryType.none, identifier : String? = nil) { + convenience public init(subtitleRowWithAction: StaticTableViewRowAction?, title: String, subtitle: String? = nil, style : UITableViewCell.CellStyle = .subtitle, accessoryType: UITableViewCell.AccessoryType = UITableViewCell.AccessoryType.none, identifier : String? = nil, withButtonStyle : Bool = false) { self.init() type = .subtitleRow self.identifier = identifier - - self.cell = ThemeTableViewCell(style: style, reuseIdentifier: nil) + self.cell = ThemeTableViewCell(withLabelColorUpdates: !withButtonStyle, style: style, reuseIdentifier: nil) self.cell?.textLabel?.text = title self.cell?.detailTextLabel?.text = subtitle self.cell?.accessoryType = accessoryType @@ -289,6 +288,18 @@ open class StaticTableViewRow : NSObject, UITextFieldDelegate { row.cell?.detailTextLabel?.text = value } } + + if withButtonStyle { + themeApplierToken = Theme.shared.add(applier: { [weak self] (_, themeCollection, _) in + let textColor = themeCollection.tintColor + + self?.cell?.textLabel?.textColor = textColor + self?.cell?.detailTextLabel?.textColor = textColor + + self?.cell?.textLabel?.highlightedTextColor = themeCollection.tableRowHighlightColors.labelColor + self?.cell?.detailTextLabel?.highlightedTextColor = themeCollection.tableRowHighlightColors.labelColor + }, applyImmediately: true) + } } convenience public init(valueRowWithAction: StaticTableViewRowAction?, title: String, value: String, accessoryType: UITableViewCell.AccessoryType = UITableViewCell.AccessoryType.none, identifier : String? = nil) { @@ -751,12 +762,10 @@ open class StaticTableViewRow : NSObject, UITextFieldDelegate { self?.cell?.tintColor = themeCollection.tintColor if selectedTextColor != nil { - self?.cell?.textLabel?.highlightedTextColor = selectedTextColor } if backgroundColor != nil { - self?.cell?.backgroundColor = backgroundColor } diff --git a/ownCloudAppShared/User Interface/Theme/NSObject+ThemeApplication.swift b/ownCloudAppShared/User Interface/Theme/NSObject+ThemeApplication.swift index f29d446d3..3b8f96af2 100644 --- a/ownCloudAppShared/User Interface/Theme/NSObject+ThemeApplication.swift +++ b/ownCloudAppShared/User Interface/Theme/NSObject+ThemeApplication.swift @@ -121,7 +121,7 @@ public extension NSObject { if let tabBar = self as? UITabBar { tabBar.barTintColor = collection.toolbarColors.backgroundColor tabBar.tintColor = collection.toolbarColors.tintColor - tabBar.unselectedItemTintColor = collection.toolbarColors.filledColorPairCollection.normal.foreground.darker(0.25) + tabBar.unselectedItemTintColor = collection.toolbarColors.secondaryLabelColor } if let tableView = self as? UITableView { diff --git a/ownCloudAppShared/User Interface/Theme/ThemeCollection.swift b/ownCloudAppShared/User Interface/Theme/ThemeCollection.swift index a9d9ac8e9..e04cc26ea 100644 --- a/ownCloudAppShared/User Interface/Theme/ThemeCollection.swift +++ b/ownCloudAppShared/User Interface/Theme/ThemeCollection.swift @@ -187,7 +187,7 @@ public class ThemeCollection : NSObject { self.darkBrandColors = colors.resolveThemeColorCollection("darkBrandColors", ThemeColorCollection( backgroundColor: darkColor, - tintColor: lightColor.lighter(0.2), + tintColor: lightColor, labelColor: UIColor.white, secondaryLabelColor: UIColor.lightGray, symbolColor: UIColor.white, @@ -238,18 +238,18 @@ public class ThemeCollection : NSObject { self.tableRowColors = colors.resolveThemeColorCollection("Table.tableRowColors", ThemeColorCollection( backgroundColor: tableBackgroundColor, tintColor: nil, - labelColor: UIColor.black, - secondaryLabelColor: UIColor.gray, - symbolColor: darkColor, + labelColor: darkColor, + secondaryLabelColor: UIColor(hex: 0x475770), + symbolColor: UIColor(hex: 0x475770), filledColorPairCollection: ThemeColorPairCollection(fromPair: ThemeColorPair(foreground: UIColor.white, background: lightBrandColor)) )) self.tableRowHighlightColors = colors.resolveThemeColorCollection("Table.tableRowHighlightColors", ThemeColorCollection( backgroundColor: UIColor.white.darker(0.1), tintColor: nil, - labelColor: UIColor.black, - secondaryLabelColor: UIColor.gray, - symbolColor: darkColor, + labelColor: darkColor, + secondaryLabelColor: UIColor(hex: 0x475770), + symbolColor: UIColor(hex: 0x475770), filledColorPairCollection: ThemeColorPairCollection(fromPair: ThemeColorPair(foreground: UIColor.white, background: lightBrandColor)) )) @@ -320,7 +320,7 @@ public class ThemeCollection : NSObject { self.navigationBarColors = colors.resolveThemeColorCollection("NavigationBar", ThemeColorCollection( backgroundColor: UIColor.white.darker(0.05), tintColor: nil, - labelColor: UIColor.black, + labelColor: darkColor, secondaryLabelColor: UIColor.gray, symbolColor: darkColor, filledColorPairCollection: ThemeColorPairCollection(fromPair: ThemeColorPair(foreground: UIColor.white, background: lightBrandColor)) @@ -358,6 +358,7 @@ public class ThemeCollection : NSObject { // Bars self.navigationBarColors = colors.resolveThemeColorCollection("NavigationBar", self.darkBrandColors) self.toolbarColors = colors.resolveThemeColorCollection("Toolbar", self.darkBrandColors) + self.toolbarColors.secondaryLabelColor = .lightGray self.searchBarColors = colors.resolveThemeColorCollection("Searchbar", self.darkBrandColors) self.loginColors = colors.resolveThemeColorCollection("Login", self.darkBrandColors) diff --git a/ownCloudAppShared/User Interface/Theme/ThemeStyle+DefaultStyles.swift b/ownCloudAppShared/User Interface/Theme/ThemeStyle+DefaultStyles.swift index 5e963c304..5fa9ea5ce 100644 --- a/ownCloudAppShared/User Interface/Theme/ThemeStyle+DefaultStyles.swift +++ b/ownCloudAppShared/User Interface/Theme/ThemeStyle+DefaultStyles.swift @@ -21,8 +21,8 @@ import ownCloudSDK // MARK: - ownCloud brand colors extension UIColor { - static var ownCloudLightColor : UIColor { return UIColor(hex: 0x468CC8) } - static var ownCloudDarkColor : UIColor { return UIColor(hex: 0x1D293B) } + static var ownCloudLightColor : UIColor { return UIColor(hex: 0x4E85C8) } + static var ownCloudDarkColor : UIColor { return UIColor(hex: 0x041E42) } } extension ThemeStyle {