Merge branch 'feature/account-wizard' into feature/image-interactions

doc/CONFIGURATION.json

@@ -930,6 +930,19 @@
     "status" : "advanced",
     "type" : "dictionary"
   },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "description" : "Color in hex notation that should be used as tint color instead of the standard system tint color that is used throughout the app for buttons and other controls. This color is only used if no themes are defined otherwise.",
+    "flatIdentifier" : "branding.theme-tint-color",
+    "key" : "theme-tint-color",
+    "label" : "Theme Tint Color",
+    "status" : "advanced",
+    "type" : "string"
+  },
   {
     "autoExpansion" : "none",
     "category" : "Branding",
@@ -1105,6 +1118,19 @@
     "status" : "supported",
     "type" : "string"
   },
+  {
+    "autoExpansion" : "none",
+    "category" : "Build",
+    "categoryTag" : "build",
+    "classIdentifier" : "build",
+    "className" : "BuildOptions",
+    "description" : "Sets a custom version number for the app.",
+    "flatIdentifier" : "build.version-number",
+    "key" : "version-number",
+    "label" : "build.version-number",
+    "status" : "supported",
+    "type" : "string"
+  },
   {
     "autoExpansion" : "none",
     "category" : "Connection",
@@ -1839,6 +1865,14 @@
         "description" : "Extension with the identifier simple-apm.",
         "value" : "simple-apm"
       },
+      {
+        "description" : "Extension with the identifier system.dark.",
+        "value" : "system.dark"
+      },
+      {
+        "description" : "Extension with the identifier system.light.",
+        "value" : "system.light"
+      },
       {
         "description" : "Extension with the identifier web-finger.",
         "value" : "web-finger"

doc/configuration.adoc

@@ -552,6 +552,14 @@ branding.sidebar-links-title
 |Dictionary defining generic colors that can be used in the definitions.
 |advanced `candidate`
 
+|**Theme Tint Color** +
+ +
+branding.theme-tint-color
+|string
+|
+|Color in hex notation that should be used as tint color instead of the standard system tint color that is used throughout the app for buttons and other controls. This color is only used if no themes are defined otherwise.
+|advanced `candidate`
+
 |**Documentation URL** +
  +
 branding.url-documentation
@@ -668,6 +676,12 @@ tag::build[]
 |Set a custom app group identifier via Branding.plist parameter. This value will be set by fastlane. Changes OCAppGroupIdentifier, OCKeychainAccessGroupIdentifier only. Fastlane does not need the provisioning profile and certificate with the given app group identifer. Needs resigning with the correct provisioning profile and certificate. This is needed, if a customer is using an own resigning script which does not handle setting the app group identifier.
 |supported `candidate`
 
+|build.version-number
+|string
+|
+|Sets a custom version number for the app.
+|supported `candidate`
+
 |===
 end::build[]
 
@@ -1137,6 +1151,12 @@ tag::extensions[]
 ! `simple-apm`
 ! Extension with the identifier simple-apm.
 
+! `system.dark`
+! Extension with the identifier system.dark.
+
+! `system.light`
+! Extension with the identifier system.light.
+
 ! `web-finger`
 ! Extension with the identifier web-finger.
 

fastlane/Fastfile

@@ -548,7 +548,7 @@ end
     # Check, if Branding.plist file exists and handle custom set values
     if File.exist?("../" + themePath)
       # Check for custom app version number
-        tmpCustomAppVersionNumber = get_info_plist_value(path: themePath, key: "app.version-number")
+        tmpCustomAppVersionNumber = get_info_plist_value(path: themePath, key: "build.version-number")
         if tmpCustomAppVersionNumber && !tmpCustomAppVersionNumber.empty?
           customAppVersionNumber = tmpCustomAppVersionNumber
 

ownCloud/App Controllers/AppRootViewController.swift

@@ -162,6 +162,15 @@ open class AppRootViewController: EmbeddingViewController, BrowserNavigationView
 		ClientSessionManager.shared.remove(delegate: self)
 	}
 
+	// MARK: - Interface orientations
+	open override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+		if let contentViewController {
+			return contentViewController.supportedInterfaceOrientations
+		}
+
+		return super.supportedInterfaceOrientations
+	}
+
 	// MARK: - Status Bar style
 	open override var childForStatusBarStyle: UIViewController? {
 		return contentViewController
@@ -170,6 +179,9 @@ open class AppRootViewController: EmbeddingViewController, BrowserNavigationView
 	open override var contentViewController: UIViewController? {
 		didSet {
 			setNeedsStatusBarAppearanceUpdate()
+			if #available(iOS 16, *) {
+				setNeedsUpdateOfSupportedInterfaceOrientations()
+			}
 		}
 	}
 

ownCloud/Bookmarks/AccountSettingsProvider.swift

@@ -70,7 +70,7 @@ class AccountSettingsProvider: NSObject {
 	}
 
 	var logo: UIImage {
-		if Branding.shared.isBranded, let image = Branding.shared.brandedImageNamed(.loginLogo) {
+		if Branding.shared.isBranded, let image = Branding.shared.brandedImageNamed(.brandLogo) ?? Branding.shared.brandedImageNamed(.legacyBrandLogo) {
 			return image
 		}
 

ownCloud/Bookmarks/BookmarkViewController.swift

@@ -348,7 +348,7 @@ class BookmarkViewController: StaticTableViewController {
 		logoAndAppNameView.backgroundInsets = NSDirectionalEdgeInsets(top: 20, leading: 20, bottom: 0, trailing: 20)
 		logoAndAppNameView.elementInsets = NSDirectionalEdgeInsets(top: 30, leading: 20, bottom: 10, trailing: 20)
 
-		(logoAndAppNameView.backgroundView as? RoundCornerBackgroundView)?.fillImage = Branding.shared.brandedImageNamed(.loginBackground)
+		(logoAndAppNameView.backgroundView as? RoundCornerBackgroundView)?.fillImage = Branding.shared.brandedImageNamed(.brandBackground) ?? Branding.shared.brandedImageNamed(.legacyBrandBackground)
 
 		self.tableView.tableHeaderView = logoAndAppNameView
 		self.tableView.layoutTableHeaderView()
@@ -1154,6 +1154,7 @@ extension BookmarkViewController {
 			setupViewController.navigationItem.titleLabelText = "Add account".localized
 
 			let navigationViewController = ThemeNavigationController(rootViewController: setupViewController)
+			navigationViewController.modalPresentationStyle = .fullScreen
 			hostViewController.present(navigationViewController, animated: true, completion: nil)
 		}
 	}

ownCloud/Bookmarks/Setup/BookmarkSetupStepViewController.swift

@@ -79,8 +79,8 @@ class BookmarkSetupStepViewController: UIViewController, UITextFieldDelegate {
 
 	var titleLabel: UILabel?
 	var messageLabel: UILabel?
-	var continueButton: UIButton = UIButton()
-	var backButton: UIButton = UIButton()
+	var continueButton: UIButton = ThemeButton(withSelectors: [.filled])
+	var backButton: UIButton = ThemeCSSButton(withSelectors: [])
 
 	var contentContainerView: UIView?
 	var contentView: UIView? {

ownCloud/Bookmarks/Setup/BookmarkSetupViewController.swift

@@ -54,39 +54,25 @@ class BookmarkSetupViewController: EmbeddingViewController, BookmarkComposerDele
 
 		visibleContentContainerView.translatesAutoresizingMaskIntoConstraints = false
 
-		let backgroundView = ThemeCSSView(withSelectors: [.background])
-		backgroundView.translatesAutoresizingMaskIntoConstraints = false
+		let brandBackground = BrandView(showBackground: true, showLogo: false, roundedCorners: false, assetSuffix: .setup)
 
-		contentView.embed(toFillWith: backgroundView)
+		contentView.embed(toFillWith: brandBackground)
 		contentView.embed(toFillWith: visibleContentContainerView, enclosingAnchors: contentView.safeAreaWithKeyboardAnchorSet)
 
 		centerHelperView.translatesAutoresizingMaskIntoConstraints = false
 		contentView.addSubview(centerHelperView)
 
 		self.cssSelectors = [.modal, .accountSetup]
 
-		// Add login background image
-		if let image = Branding.shared.brandedImageNamed(.loginBackground) {
-			let backgroundImageView = UIImageView(image: image)
-			backgroundImageView.contentMode = .scaleAspectFill
-			backgroundView.embed(toFillWith: backgroundImageView)
-		}
-
 		// Add logo
-		let maxLogoSize = CGSize(width: 128, height: 128)
-		let logoImage = UIImage(named: "branding-login-logo")
-		var logoImageSize: CGSize?
-		if let logoImage {
-			logoImageSize = UIImage.sizeThatFits(logoImage.size, into: maxLogoSize)
-			logoView = UIImageView(image: logoImage)
+		if navigationController == nil {
+			let deviceScreenHeight = UIScreen.main.bounds.height
+			let logoMaxHeight = deviceScreenHeight < 800 ? (deviceScreenHeight < 600 ? 48 : 96) : 128
+			let maxLogoSize = CGSize(width: 256, height: logoMaxHeight)
+			logoView = BrandView(showBackground: false, showLogo: true, logoMaxSize: maxLogoSize, fitToLogo: true, roundedCorners: false, assetSuffix: .setup)
 		}
 
-		if let logoView = logoView as? UIImageView, let logoImageSize {
-			logoView.cssSelector = .icon
-			logoView.accessibilityLabel = VendorServices.shared.appName
-			logoView.contentMode = .scaleAspectFit
-			logoView.translatesAutoresizingMaskIntoConstraints = false
-
+		if let logoView {
 			contentView.addSubview(logoView)
 
 			NSLayoutConstraint.activate([
@@ -97,9 +83,7 @@ class BookmarkSetupViewController: EmbeddingViewController, BookmarkComposerDele
 				centerHelperView.heightAnchor.constraint(greaterThanOrEqualToConstant: 1),
 
 				logoView.topAnchor.constraint(equalTo: centerHelperView.topAnchor),
-				logoView.centerXAnchor.constraint(equalTo: centerHelperView.centerXAnchor),
-				logoView.widthAnchor.constraint(equalToConstant: logoImageSize.width),
-				logoView.heightAnchor.constraint(lessThanOrEqualToConstant: logoImageSize.height)
+				logoView.centerXAnchor.constraint(equalTo: centerHelperView.centerXAnchor)
 			])
 		}
 
@@ -167,6 +151,14 @@ class BookmarkSetupViewController: EmbeddingViewController, BookmarkComposerDele
 		composer?.updateState()
 	}
 
+	override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+		return [.portrait, .portraitUpsideDown]
+	}
+
+	override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
+		return .portrait
+	}
+
 	override var preferredStatusBarStyle : UIStatusBarStyle {
 		return Theme.shared.activeCollection.css.getStatusBarStyle(for: self) ?? .default
 	}
@@ -250,7 +242,12 @@ class BookmarkSetupViewController: EmbeddingViewController, BookmarkComposerDele
 
 		didSet {
 			if let hudMessageView {
-				visibleContentContainerView.embed(centered: hudMessageView, minimumInsets: NSDirectionalEdgeInsets(top: 20, leading: 20, bottom: 20, trailing: 20))
+				visibleContentContainerView.addSubview(hudMessageView)
+				NSLayoutConstraint.activate([
+					hudMessageView.centerYAnchor.constraint(equalTo: visibleContentContainerView.centerYAnchor),
+					hudMessageView.leadingAnchor.constraint(equalTo: visibleContentContainerView.safeAreaLayoutGuide.leadingAnchor, constant: 20),
+					hudMessageView.trailingAnchor.constraint(equalTo: visibleContentContainerView.safeAreaLayoutGuide.trailingAnchor, constant: -20)
+				])
 				contentViewController?.view.isHidden = true
 				logoView?.isHidden = true
 			}
@@ -309,10 +306,13 @@ class BookmarkSetupViewController: EmbeddingViewController, BookmarkComposerDele
 				let indeterminateProgress = Progress.indeterminate()
 				indeterminateProgress.isCancellable = false
 
-				self.hudMessageView = ComposedMessageView(elements: [
-					.progressCircle(with: indeterminateProgress),
-					.title(hudMessage)
+				let messageView = ComposedMessageView.infoBox(additionalElements: [
+					.progressCircle(with: indeterminateProgress, alignment: .centered),
+					.spacing(10),
+					.text(hudMessage, style: .system(textStyle: .headline, weight: .bold), alignment: .centered)
 				])
+				messageView.cssSelectors = [ .step ]
+				self.hudMessageView = messageView
 			} else {
 				self.hudMessageView = nil
 			}

ownCloud/Client/Viewer/DisplayHostViewController.swift

@@ -176,13 +176,13 @@ class DisplayHostViewController: UIPageViewController {
 	}
 
 	// MARK: - Active Viewer
-	private var _navigationTitleObservation : NSKeyValueObservation?
+	private var _navigationItemObservation : NSKeyValueObservation?
 	private var _navigationBarButtonItemsObservation : NSKeyValueObservation?
 
 	weak var activeDisplayViewController : DisplayViewController? {
 		willSet {
-			_navigationTitleObservation?.invalidate()
-			_navigationTitleObservation = nil
+			_navigationItemObservation?.invalidate()
+			_navigationItemObservation = nil
 
 			_navigationBarButtonItemsObservation?.invalidate()
 			_navigationBarButtonItemsObservation = nil
@@ -191,8 +191,12 @@ class DisplayHostViewController: UIPageViewController {
 		didSet {
 			Log.debug("New activeDisplayViewController: \(activeDisplayViewController?.item?.name ?? "-")")
 
-			_navigationTitleObservation = activeDisplayViewController?.observe(\DisplayViewController.displayTitle, options: .initial, changeHandler: { [weak self] (displayViewController, _) in
-				self?.navigationItem.title = displayViewController.displayTitle
+			_navigationItemObservation = activeDisplayViewController?.observe(\DisplayViewController.item, options: .initial, changeHandler: { [weak self] (displayViewController, _) in
+				if let itemLocation = displayViewController.item?.location, let clientContext = displayViewController.clientContext {
+					OnMainThread(inline: true) {
+						self?.navigationItem.titleView = ClientLocationPopupButton(clientContext: clientContext, location: itemLocation)
+					}
+				}
 			})
 
 			_navigationBarButtonItemsObservation = activeDisplayViewController?.observe(\DisplayViewController.displayBarButtonItems, options: .initial, changeHandler: { [weak self] (displayViewController, _) in

ownCloud/Client/Viewer/DisplayViewController.swift

@@ -120,7 +120,7 @@ class DisplayViewController: UIViewController, Themeable, OCQueryDelegate {
 		return nil
 	}
 
-	var item: OCItem? {
+	@objc dynamic var item: OCItem? {
 		didSet {
 			if itemClaimIdentifier == nil, // No claim registered by the DisplayViewController for the item yet
 			let item = item, let core = core,
@@ -477,8 +477,8 @@ class DisplayViewController: UIViewController, Themeable, OCQueryDelegate {
 	}
 
 	// MARK: - UI management
-	@objc var displayTitle : String?
-	@objc var displayBarButtonItems : [UIBarButtonItem]?
+	@objc dynamic var displayTitle : String?
+	@objc dynamic var displayBarButtonItems : [UIBarButtonItem]?
 
 	private func updateDisplayTitleAndButtons() {
 		if let itemName = item?.name {