[fix/branding refinement] Branding: Color and UI Improvements #1057

hosy · 2021-10-20T08:37:58Z

Description

Setup a complete customer branding with only two color values darkBrandColor and lightBrandColor
set all other branding color and style values to optional values
ownBrander gomplate script was moved into this repository
show always detailed single account view, instead of server list (if only one account is configured) (also for unbranded app)
show Add Account in detailed single account view, if can-add-account is true
added some default colors for branded builds and regrading which darkBrandColor or lightBrandColor were used
added a new color style loginStatusBarStyle to set a custom status bar style for the login view
if the key app.version-number exists, fastlane will use this value as app and extension short version number, which gives the possibility to set custom version numbers

Related Issue

https://github.com/owncloud/enterprise/issues/4804
https://github.com/owncloud/enterprise/issues/4759
#1014
https://github.com/owncloud/enterprise/issues/4828

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.
Added changelog files for the fixed issues in folder changelog/unreleased

…randed builds - show single account server list, if only one account is configured for branded and unbranded builds

- added table view section border to branded account table view

- removed table row separator in branding login view - fixed colors in contrast mode, if tint color is white - fixed UIAlertView tint color

…d for a complete branding, all other values are optional)

…ckground color is white

adopted template for new Parameter and removed default values i template

…r style for the login view

… app and extension short version number, which gives the possibility to set custom version numbers

felix-schwarz · 2021-11-08T08:39:56Z

ownCloudAppShared/User Interface/Theme/UI/ThemeNavigationController.swift

+		if let object = self.viewControllers.last {
+			let loginController = ["StaticLoginViewController", "StaticLoginSingleAccountServerListViewController"]
+
+			if self.presentedViewController == nil, loginController.contains(String(describing: type(of: object))) {


Suggestion: you could add a protocol that can be adopted by StaticLoginViewController and StaticLoginSingleAccountServerListViewController, which could then be used to control the use loginStatusBarStyle rather than statusBarStyle. That would avoid the use of class names as strings and separate responsibilities more clearly, while also avoiding an (impossible to resolve) dependency of ownCloudAppShared on the app or other components.

Thanks for that hint! I added a protocol to solve the dependency problem and class name problems.

felix-schwarz · 2021-11-08T08:42:40Z

ownCloudAppShared/User Interface/Theme/ThemeCollection.swift

@@ -243,10 +244,15 @@ public class ThemeCollection : NSObject {
 		let rowColor : UIColor? = UIColor.black.withAlphaComponent(0.1)
 		self.tableRowBorderColor = colors.resolveColor("Table.tableRowBorderColor", rowColor)

+		var defaultTableRowLabelColor = darkColor
+		if VendorServices.shared.isBranded {
+			defaultTableRowLabelColor = UIColor(hex: 0x000000)


This seems very specific. Should this really be the default for all branding, both light and dark?

Yes, this should be default for all brandings, but can be overridden by Branding.plist

ownCloudAppShared/UIKit Extension/UITableViewController+Extension.swift

ownCloudAppShared/AppLock/PasscodeViewController.swift

- added a protocol for setting the custom status bar style, instead of using static class names - using the correct SDK method for round rect

hosy · 2021-11-09T15:39:11Z

@felix-schwarz all CR findings are fixed or I added a comment and you can give it a new try. Thanks!

hosy · 2021-11-11T08:58:34Z

@jesmrec not sure, if this one need deeper testing by your side? Most things were tested by @NannaBarz and by you in the 11.7.2 preview version for the customers.

jesmrec · 2021-11-11T11:26:43Z

This was already tested. Testing of such colours and branding options has to be done with a global perspective, taking all of them as a whole. This is a task to be scheduled and done somewhen. This specific PR is OK to be moved forward.

hosy · 2021-11-11T14:45:21Z

@jesmrec ok, would be cool if you can approve the PR.

* added additional build information to the Branding.plist file: - ios-app and ios-sdk commit hash - copy the Branding.plist with additional app and build information as file name * [feature/biometrical-mdm-setting ]Suggest Biometrical Unlock (#1046) * Suggest biometrical unlock, after setting up passcode * - do not show Cancel button, if password is enforced - update biometrical UI switch value in settings view - fixed bug, dismissing the view, if biometrical is not available * moved extension into ownCloudAppShared folder * Branding: (#1045) - add new `branding.user-defaults-default-values` class settings key to allow registration of alternative defaults for user defaults * - fix bug where a quick access entry showed no items when selected a second time. (#1044) * used better wording for "Cellular transfers" * - in branded clients: removed UISwitch to enable/disable deletion of available offline files in manage screen - fixed text center layout in table view cell * fixed UI issue in sharing view * #4801 "Log out" text changes * #4801 text changes for "Prevent gestures" * - ThemeTableViewCell, StaticTableViewRow: new .plain message style (#1053) - add new view controller to present license texts for each component individually * [feature/modular-localization] Modular localization (#1054) * - Branding class: - move logic for VendorServices.appName to Branding.appDisplayName - change app.name variable value to that of Branding.appDisplayName - switch String.localized from NSLocalizedString() to OCLocale.localize() - SwiftLint: adapt to latest SwiftLint version * - add .localized(replacements) function to provide easy access to custom variables support in OCLocale * - update SDK * [feature/mdm-auto-connect] Skip Account Screen via MDM (#1056) * #4801 Skip "Manage" screen / automatically open "Files" screen after login via MDM parameter account.auto-connect * - SceneDelegate: use .first (which returns nil in case there are no bookmarks) instead of bookmark(at: 0) (which crashes in case there are no bookmarks because the array is empty and the method tries to access an item at index 0) * added auto-connect after every setup, not only the first setup Co-authored-by: Felix Schwarz <fs-git@iospirit.com> * [feature/mdm-biometrical-unlock] MDM setting for Biometrical Unlock (#1058) * #4818 control via MDM to auto enable biometrical unlock * overwrites user defaults with MDM settings and use existing getter/setter; renamed MDM key to use-biometrical-unlock * - use user defaults for use-biometrical-unlock - show Face ID authorization immediately after enabling Face ID * [feature/hide-background-location-settings] Do not show Background Location section by default (#1051) * #1050 The Background Uploads section should be only shown, if Auto Upload Photos/Videos was enabled. Otherwise the setting section Background Uploads confuses the user, why the disabled options in this section could not be enabled. * fixed removing table view section * [fix/branding refinement] Branding: Color and UI Improvements (#1057) * Fixed branding issues * - fixed default searchBar background and placeholder text color for branded builds - show single account server list, if only one account is configured for branded and unbranded builds * - fixed default (unselected) tab bar color - added table view section border to branded account table view * - fixed rounded border for text fields in branded login UI - removed table row separator in branding login view - fixed colors in contrast mode, if tint color is white - fixed UIAlertView tint color * fixed tint color in UIAlertController in dark mode for branding colors * fixed color value again * fixed tint color in single account server list cell view * fixed missing profile UI * removed optional branding values (only two color values are now needed for a complete branding, all other values are optional) * fixed border color in single account server view, if navigationbar background color is white * added gomplate template for Branding.plist creation to the iOS repo adopted template for new Parameter and removed default values i template * fixed some color issues, if tint color is white * fixed setting custom UISearchBar backgroundColor on iOS 12 * set profile url as prefilled default value into setup url field * added a new color style loginStatusBarStyle to set a custom status bar style for the login view * if the key app.version-number exists, fastlane will use this value as app and extension short version number, which gives the possibility to set custom version numbers * Fixed CR findings: - added a protocol for setting the custom status bar style, instead of using static class names - using the correct SDK method for round rect * fixed merge error * [fix/branding-login-retry] Retry Section for Branded Login Error (#1047) * add a error section with a retry button in branded login view * #4786 added a retry interval of 10 seconds. In this time interval the app retries to establish the connection before a error message will be shown * only retry for network issues * only show retry section on network issues * - changed retry time interval to 30 seconds - retries minimum of 3 times * Update ownCloud/Static Login/Interface/StaticLoginSetupViewController.swift Co-authored-by: Felix Schwarz <fs-git@iospirit.com> * fixed connection retry and show retry section UI * HTTP pipeline is ready to schedule HTTP requests before the Static Login View Controller is brought up. Moved it before setting up the UIWindow * removed connection retries output and put it into the log Co-authored-by: Felix Schwarz <fs-git@iospirit.com> * [fix/single-accouont-display-name] Show Display Name in Branded Single Account View (#1049) * username could be like a uuid, which is not user readable. Instead now showing the displayName and if not available, the userName * fixed syntax error * fixed compile error * first draft for retrieving the user display name for the header view * retrieving the users display name by init a connection and reloading the table view * - new version and build number - new release notes entry * [feature/appstore-buildflag] Remove App Store / IAP code via build flag (#1052) * - add support and documentation for DISABLE_APPSTORE_LICENSING build flag * - ReleaseNotesHostViewController: remove unused reference to StoreKit - OCLicenseDuration: make sure SKProductSubscriptionPeriod conversion code is excluded when using the DISABLE_APPSTORE_LICENSING build flag * [fix/clear-lock] Clear lock when determining unlock expiry (#1061) * - AppLockmanager: clear unlock and lastApplicationBackgroundedDate in case an unlock has expired, to protect against subsequent attempts setting the device time to an earlier date * - AppLockManager: clear unlocked state if device time is earlier than lastBackgrounded time * - fix logic bug and improve structure * - AppLockManager: now returns correct unlock status when detecting that time was turned back * [feature/custom-app-scheme] Custom app/auth schemes (#1060) * - add support and documentation for DISABLE_APPSTORE_LICENSING build flag * - ReleaseNotesHostViewController: remove unused reference to StoreKit - OCLicenseDuration: make sure SKProductSubscriptionPeriod conversion code is excluded when using the DISABLE_APPSTORE_LICENSING build flag * - add support for app.custom-app-scheme and app.custom-auth-scheme to Fastfile - add documentation for new custom scheme Branding.plist parameters * - remove test values from Branding.plist * - move build options from `app.` space to `build.` space and rename options accordingly - add legacy support for previously used Branding.plist build customization option names - add `BuildOptions` class to `ownCloudApp` framework to make build customization options visible in documentation * - ensure BuildOptions class is actually loaded/initialized * - update Xcode to 12.5.1 for GitHub workflow configuration-documentation.yml * - adapt code in `ImportPasteboardAction.swift` to also compile in Xcode 12.4 * Configuration documentation updated Co-authored-by: felix-schwarz <felix-schwarz@users.noreply.github.com> Co-authored-by: Matthias Hühne <mhuehne@owncloud.com> * - switch to ios-sdk milestone/11.7.2 * add an accesibility id for the access files row, so that it can be matched by the autom tests * quote shell command, because it can contain spaces in path name * added public release notes for version 11.8.0 * fixed regression test findings * fixed toolbar visibility on iPad, if should not be shown * updated in-app changelog and added calens changelog entries * Calens changelog updated * - change SDK to 11.8 release * - updated fastlane release notes - changed changelog folder name * Calens changelog updated Co-authored-by: Felix Schwarz <fs-git@iospirit.com> Co-authored-by: felix-schwarz <felix-schwarz@users.noreply.github.com> Co-authored-by: Jesus Recio <jrecio@izertis.com> Co-authored-by: hosy <hosy@users.noreply.github.com>

hosy added 14 commits September 29, 2021 12:15

Fixed branding issues

ace5c7c

- fixed default searchBar background and placeholder text color for b…

39d3e9b

…randed builds - show single account server list, if only one account is configured for branded and unbranded builds

- fixed default (unselected) tab bar color

d179794

- added table view section border to branded account table view

- fixed rounded border for text fields in branded login UI

7170037

- removed table row separator in branding login view - fixed colors in contrast mode, if tint color is white - fixed UIAlertView tint color

fixed tint color in UIAlertController in dark mode for branding colors

68f1b4f

fixed color value again

0cf8d5e

fixed tint color in single account server list cell view

5a49467

fixed missing profile UI

a5f797b

removed optional branding values (only two color values are now neede…

c1035a3

…d for a complete branding, all other values are optional)

fixed border color in single account server view, if navigationbar ba…

52eb11c

…ckground color is white

added gomplate template for Branding.plist creation to the iOS repo

44a21d0

adopted template for new Parameter and removed default values i template

fixed some color issues, if tint color is white

2bb23f5

fixed setting custom UISearchBar backgroundColor on iOS 12

32c6201

set profile url as prefilled default value into setup url field

39972de

hosy self-assigned this Oct 20, 2021

hosy added this to the 11.7.2-Fix milestone Oct 20, 2021

hosy linked an issue Oct 20, 2021 that may be closed by this pull request

[FEATURE REQUEST] Compact Account List (one Account) #1014

Closed

1 task

hosy added 2 commits October 25, 2021 21:42

added a new color style loginStatusBarStyle to set a custom status ba…

6fab7e9

…r style for the login view

if the key app.version-number exists, fastlane will use this value as…

e2e349f

… app and extension short version number, which gives the possibility to set custom version numbers

felix-schwarz requested changes Nov 8, 2021

View reviewed changes

Fixed CR findings:

e9a2ec9

- added a protocol for setting the custom status bar style, instead of using static class names - using the correct SDK method for round rect

hosy added 2 commits November 9, 2021 16:59

Merge branch 'milestone/11.7.2' into fix/branding-refinement

ff2bf53

fixed merge error

e804951

felix-schwarz approved these changes Nov 10, 2021

View reviewed changes

hosy requested a review from jesmrec November 11, 2021 08:55

jesmrec approved these changes Nov 12, 2021

View reviewed changes

hosy merged commit fa81414 into milestone/11.7.2 Nov 12, 2021

delete-merged-branch bot deleted the fix/branding-refinement branch November 12, 2021 12:28

michaelstingl mentioned this pull request Jun 6, 2023

[DOC] Branding / build parameter app.version-number not documented #1217

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[fix/branding refinement] Branding: Color and UI Improvements #1057

[fix/branding refinement] Branding: Color and UI Improvements #1057

hosy commented Oct 20, 2021 •

edited

Loading

felix-schwarz Nov 8, 2021

hosy Nov 9, 2021

felix-schwarz Nov 8, 2021

hosy Nov 9, 2021

hosy commented Nov 9, 2021

hosy commented Nov 11, 2021

jesmrec commented Nov 11, 2021

hosy commented Nov 11, 2021

[fix/branding refinement] Branding: Color and UI Improvements #1057

[fix/branding refinement] Branding: Color and UI Improvements #1057

Conversation

hosy commented Oct 20, 2021 • edited Loading

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

felix-schwarz Nov 8, 2021

Choose a reason for hiding this comment

hosy Nov 9, 2021

Choose a reason for hiding this comment

felix-schwarz Nov 8, 2021

Choose a reason for hiding this comment

hosy Nov 9, 2021

Choose a reason for hiding this comment

hosy commented Nov 9, 2021

hosy commented Nov 11, 2021

jesmrec commented Nov 11, 2021

hosy commented Nov 11, 2021

hosy commented Oct 20, 2021 •

edited

Loading