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

Jump to bottom

[feature/branding] Branding / Static Login support #637

Merged
merged 115 commits into from
Jul 15, 2020
Merged

[feature/branding] Branding / Static Login support #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
b381d0c
- New Static Login
felix-schwarz Nov 26, 2018
4785921
- Add closeHandler-support to ClientRootViewController to run a block…
felix-schwarz Nov 27, 2018
6b3daf5
- Merge remote-tracking branch 'origin/master' into feature/branded-l…
felix-schwarz Dec 4, 2018
eb94d2f
Merge remote-tracking branch 'origin/master' into feature/branded-login
felix-schwarz Dec 5, 2018
ac1f014
New Iconset for iOS: Filetype Icons
wuenschedesign May 14, 2019
f21dde2
Documentation for the app color scheme
hosy May 16, 2019
1e97e18
markdown definition for color theme values
hosy Jun 11, 2019
6d938ab
added links to type definitons
hosy Jun 11, 2019
5b4d5a8
added color definition
hosy Jun 12, 2019
95cf64d
added global colors
hosy Jun 12, 2019
9aaa560
added color values for dark scheme
hosy Jun 12, 2019
5a0214d
added light and classic color scheme
hosy Jun 12, 2019
ada2624
Preparing branding support with themes and colors from plist file
hosy Jul 31, 2019
a0b1813
- using theme styles from plist file
hosy Aug 5, 2019
9e1b388
set tint color for server list icon
hosy Aug 6, 2019
178261d
Add example images
ChrisEdS Aug 6, 2019
1f41385
Change the color of the bookmark-logo
ChrisEdS Aug 6, 2019
77b37d3
Change colors to match example-theme
ChrisEdS Aug 6, 2019
f188d74
use different icons
hosy Aug 6, 2019
2ecead0
Merge branch 'Design' of github.com:owncloud/ios-app into Design
hosy Aug 6, 2019
ee0c349
All colors are not customizable by setting the color in Theme.plist. …
hosy Aug 7, 2019
79f6178
fixed resolving theme color pair
hosy Aug 7, 2019
cfb0e07
Added appiconset and changes branding colors
ChrisEdS Aug 14, 2019
b39c39b
Color adjustments and edited bookmark-logo
ChrisEdS Aug 14, 2019
dc073af
Add Surf logos and colors
ChrisEdS Aug 15, 2019
22cdba3
setting new theme generic colors and reading them from keypath, if ex…
hosy Sep 5, 2019
2d8ad90
Add Surf logos and colors
ChrisEdS Aug 15, 2019
c53ca15
Merge branch 'Design-Surf' of https://github.com/owncloud/ios-app int…
ChrisEdS Sep 5, 2019
ddaa477
Add first SURF branding
ChrisEdS Sep 7, 2019
da1886a
removed iOS 13 code
hosy Sep 9, 2019
befb1a9
Merge branch 'master' into Design
hosy Sep 9, 2019
fbd6ee1
fixed broken project file
hosy Sep 9, 2019
1434e07
fixed broken plist file after merge
hosy Sep 9, 2019
a2d2754
Cleanup after cherry-pick from Design branch
ChrisEdS Sep 10, 2019
83cf30b
Add colors from SURF
ChrisEdS Sep 13, 2019
7f30ad1
Add changes to Fastfile from tag 1.1.0
ChrisEdS Sep 17, 2019
9876b2c
Comment out Themes tests
hosy Sep 18, 2019
54bd4e3
removed bookmark icon tint color
hosy Sep 18, 2019
fd45c3b
Add new bookmark-icon.png
ChrisEdS Sep 18, 2019
ca46bec
Change the name to SURFdrive
ChrisEdS Sep 18, 2019
6ba9df5
changed app name in build settings instead of target name
hosy Sep 18, 2019
c833a82
customize search bar
hosy Sep 18, 2019
b4a16d3
Add new bookmark icon and polish color settings
ChrisEdS Sep 18, 2019
6f85ebe
Add new bookmark icon and polish color settings
ChrisEdS Sep 19, 2019
5f9c603
Change the name to SURFdrive, again
ChrisEdS Sep 19, 2019
f5a5455
Merge branch 'Design-Surf' of github.com:owncloud/ios-app into Design…
hosy Sep 19, 2019
adfd557
- searchbar customization
hosy Sep 20, 2019
14aad90
- Fix Swift and SwiftLint warnings
felix-schwarz Oct 21, 2019
36b60aa
Merge with latest master release
hosy Oct 23, 2019
25370cb
- adopted Fastfile to set the app name
hosy Oct 23, 2019
3eeed53
set correct path in Fastfile
hosy Oct 23, 2019
250e6f8
removed output name, because Bitrise expects other ipa name
hosy Oct 23, 2019
1590df0
using branded image for quick access tab
hosy Nov 6, 2019
ddee699
setting the placeholder color for UISearchBar text field in iOS 13
hosy Nov 6, 2019
8d611bc
check if app is branded, disable help and feedback, if branded app
hosy Nov 6, 2019
2aef608
- support for branded urls (help, privacy)
hosy Nov 6, 2019
547eda9
hide Theme settings for branded apps
hosy Nov 6, 2019
8410b76
using correct branding file name
hosy Nov 7, 2019
ad6245a
added tint color for alert view labels
hosy Nov 7, 2019
815e4ff
Branded App Name fixes
hosy Nov 7, 2019
df674e4
Using correct app name, if branded
hosy Nov 7, 2019
9b820a3
Change spp name in extension targets for branded apps
hosy Nov 8, 2019
bf7cebe
- using newest SDK for custom User-Agent
hosy Nov 14, 2019
3739011
Merge branch 'feature/Branding-Support' into feature/branded-login
hosy Nov 25, 2019
5c62dc9
Added a vendor setting, if an account can be added, in UI (can b
hosy Nov 26, 2019
eb227ee
- changed AppName to use organizationNamer of Bundle in Branding.plist
hosy Nov 29, 2019
211a074
- only show Feedback only for unbranded clients
hosy Nov 29, 2019
ee63120
added feedback mail
hosy Dec 2, 2019
ca97188
adding a Done button to the settings view, if the Settings-View was p…
hosy Dec 9, 2019
6bd4733
Add image for the branded login
ChrisEdS Dec 17, 2019
8d49902
- PushTransition:
felix-schwarz Dec 20, 2019
08f4f77
Updated with branding changes for better branding support and using t…
hosy Mar 3, 2020
5a76724
Merge branch 'master' into feature/branding
hosy Mar 4, 2020
75a980b
fixed merge problems with new version
hosy Mar 5, 2020
919a02d
Merge with master branch version 1.3.1
hosy Mar 5, 2020
6e2a81e
- fixed title color in release notes
hosy Mar 5, 2020
4056dda
changed online creation of badge file for icon creation to local crea…
hosy Mar 5, 2020
d83b504
added own fastlane action to read APP_SHORT_VERSION and APP_VERSION f…
hosy Mar 6, 2020
0a107e1
changed variable names to match values
hosy Mar 6, 2020
cd47f41
removed build number, because of missing space
hosy Mar 6, 2020
229698f
- added missing localization strings
hosy Mar 6, 2020
f9c8dd4
- fixed login problem on iOS 12
hosy Mar 9, 2020
96aa4a2
change the folder color
ChrisEdS Mar 10, 2020
a77da72
Merge remote-tracking branch 'origin/milestone/1.4' into feature/bran…
felix-schwarz Mar 13, 2020
3e346e2
- remove duplicated files, accidentally moved new line
felix-schwarz Mar 13, 2020
2cd6d8a
- remove unused LibraryFilesTableViewController.swift
felix-schwarz Mar 13, 2020
0140f42
- Remove duplicate file ownCloudAppFramework/Info.plist
felix-schwarz Mar 13, 2020
f5a9d56
- Remove unused file
felix-schwarz Mar 13, 2020
02b3066
- remove redundant code, fix header comments
felix-schwarz Mar 13, 2020
5d40af2
- remove code that'll be never executed in StaticLoginViewController
felix-schwarz Mar 13, 2020
3b9a593
- Fix merge errors in project file
felix-schwarz Mar 13, 2020
7c89c7c
- Fix file headers
felix-schwarz Mar 16, 2020
83de448
- Use enums instead of plain numbers for sections and rows
felix-schwarz Mar 16, 2020
ce0db3d
- make sure Branding.plist/Profiles/[n]/allowedAuthenticationMethods …
felix-schwarz Mar 16, 2020
58fb0f5
- Solved code review findings
hosy Apr 16, 2020
99ed748
- ServerListTableViewController: make UIActivityIndicatorView indicat…
felix-schwarz Apr 17, 2020
bf209c7
fixed QA findings:
hosy May 14, 2020
9f18317
Fixed QA finding:
hosy May 14, 2020
98f01dc
moved branded images, changed names
hosy May 14, 2020
072cbbe
removed unneeded code and values
hosy May 14, 2020
8551be8
fixed QA finding 11 crash, when Help and Privacy values was not provided
hosy May 27, 2020
5ea079e
fixed QA finding 14:
hosy May 27, 2020
c1e7109
fixed QA finding 17:
hosy May 27, 2020
42a5f40
fixed QA finding 16, 3:
hosy May 27, 2020
bb5060a
fixed QA finding 9:
hosy May 27, 2020
735ee7e
fixed QA finding 10:
hosy May 27, 2020
bbea00f
fixed QA finding 13, skip profile selection, when only one profile is…
hosy May 27, 2020
54d30c9
fixed QA finding 21, removed duplicated "Settings" in single account …
hosy May 29, 2020
d91d352
added documentation for theme color values
hosy May 29, 2020
1f72930
fixed reading and setting statusBar values from Branding.plist
hosy Jun 22, 2020
1f76c5c
Merge branch 'milestone/1.4' into feature/extended-share-sheet
hosy Jul 14, 2020
81362d2
isBranded is only true, if Profiles was defined in Branding.plist. Th…
hosy Jul 14, 2020
adcebd7
Merge branch 'milestone/0.4' into feature/branding
hosy Jul 14, 2020
7b27ca5
- fixed findings, when app was not build as branded app to match the …
hosy Jul 15, 2020
bb3a561
Merge branch 'milestone/1.4' into feature/branding
hosy Jul 15, 2020
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
10 changes: 5 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
atomos (0.1.3)
babosa (1.0.3)
badge (0.10.0)
badge (0.11.0)
curb (~> 0.9)
fastimage (>= 1.6)
fastlane (>= 2.0)
mini_magick (>= 4.5)
mini_magick (~> 4.9.5)
claide (1.0.3)
colored (1.2)
colored2 (3.1.2)
Expand All @@ -33,7 +33,7 @@ GEM
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.7)
fastlane (2.135.1)
fastlane (2.135.2)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
Expand Down Expand Up @@ -70,8 +70,8 @@ GEM
xcodeproj (>= 1.8.1, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-badge (1.2.0)
badge (~> 0.10.0)
fastlane-plugin-badge (1.3.0)
badge (~> 0.11.0)
gh_inspector (1.1.3)
google-api-client (0.23.9)
addressable (~> 2.5, >= 2.5.1)
Expand Down
Binary file added design/18-512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
235 changes: 235 additions & 0 deletions design/doc/Classic-scheme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
# Classic Color Scheme Guide

[TOC]



## Bars

| Name | Type | Mapping Name | Value |
| ----------------------------------- | ------------------------------------------------------------ | ------------ | ----------------- |
| navigationBarColors | [ThemeColorCollection](./Colorscheme.md#ThemeColorCollection) | | |
| toolbarColors | [ThemeColorCollection](./Colorscheme.md#ThemeColorCollection) | | |
| statusBarStyle | UIStatusBar.Style | | **.lightContent** |
| barStyle | UIBar.Style | | **.black** |
| activityIndicatorViewStyle | UIActivityIndicatorView.Style | | **.gray** |
| searchBarActivityIndicatorViewStyle | UIActivityIndicatorView.Style | | **.white** |

### Bars.navigationBarColors

| Name | Type | Mapping Name | Value |
| ------------------------- | ------------------------------------------------------------ | ------------ | ---------- |
| backgroundColor | UIColor | | **1d293b** |
| labelColor | UIColor | | **ffffff** |
| secondaryLabelColor | UIColor | | **aaaaaa** |
| symbolColor | UIColor | | **ffffff** |
| tintColor | UIColor | | **6ba3d3** |
| filledColorPairCollection | [ThemeColorPairCollection](./Colorscheme.md#ThemeColorPairCollection) | - | |

#### Bars.navigationBarColors.filledColorPairCollection

| Name | Type |
| ----------- | ------------------------------------------------- |
| normal | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |
| highlighted | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |
| disabled | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |

##### Bars.navigationBarColors.filledColorPairCollection.normal

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **1d293b** |

##### Bars.navigationBarColors.filledColorPairCollection.highlighted

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **555e6c** |

##### Bars.navigationBarColors.filledColorPairCollection.disabled

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **555e6c** |

### Bars.toolbarColors

| Name | Type | Mapping Name | Value |
| ------------------------- | ------------------------------------------------------------ | ------------ | ---------- |
| backgroundColor | UIColor | | **1d293b** |
| labelColor | UIColor | | **ffffff** |
| secondaryLabelColor | UIColor | | **aaaaaa** |
| symbolColor | UIColor | | **ffffff** |
| tintColor | UIColor | | **6ba3d3** |
| filledColorPairCollection | [ThemeColorPairCollection](./Colorscheme.md#ThemeColorPairCollection) | - | |

#### Bars.toolbarColors.filledColorPairCollection

| Name | Type |
| ----------- | ------------------------------------------------- |
| normal | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |
| highlighted | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |
| disabled | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |

##### Bars.toolbarColors.filledColorPairCollection.normal

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **1d293b** |

##### Bars.toolbarColors.filledColorPairCollection.highlighted

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **555e6c** |

##### Bars.toolbarColors.filledColorPairCollection.disabled

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **555e6c** |

## Progress

| Name | Type |
| -------------- | ------------------------------------------------- |
| progressColors | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |

### Progress.progressColors

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **468cc8** |
| background | UIColor | | **aaaaaa** |



## Icon colors

| Name | Type | Mapping Name | Value |
| --------------- | ------- | ------------ | ---------- |
| folderFillColor | UIColor | | **1d293b** |
| fileFillColor | UIColor | | **1d293b** |
| logoFillColor | UIColor | | **aaaaaa** |
| iconFillColor | UIColor | | **1d293b** |
| symbolFillColor | UIColor | | **1d293b** |



## Table view

| Name | Type | Mapping Name | Value |
| ------------------------- | ------------------------------------------------------------ | ------------ | ---------- |
| tableBackgroundColor | UIColor | | **ffffff** |
| tableGroupBackgroundColor | UIColor | | **efeff4** |
| tableSeparatorColor | UIColor | | - |
| tableRowBorderColor | UIColor | | **000000** |
| tableRowColors | [ThemeColorCollection](./Colorscheme.md#ThemeColorCollection) | | |
| tableRowHighlightColors | [ThemeColorCollection](./Colorscheme.md#ThemeColorCollection) | | |



### TableView.tableRowColors

| Name | Type | Mapping Name | Value |
| ------------------------- | ------------------------------------------------------------ | ------------ | ---------- |
| backgroundColor | UIColor | | **ffffff** |
| labelColor | UIColor | | **000000** |
| secondaryLabelColor | UIColor | | **7f7f7f** |
| symbolColor | UIColor | | **1d293b** |
| tintColor | UIColor | | - |
| filledColorPairCollection | [ThemeColorPairCollection](./Colorscheme.md#ThemeColorPairCollection) | | |



#### TableView.tableRowColor.filledColorPairCollection

| Name | Type |
| ----------- | ------------------------------------------------- |
| normal | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |
| highlighted | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |
| disabled | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |



##### TableView.tableRowColor.filledColorPairCollection.normal

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **468cc8** |



##### TableView.tableRowColor.filledColorPairCollection.highlighted

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **74a8d5** |



##### TableView.tableRowColor.filledColorPairCollection.disabled

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **74a8d5** |



### TableView.tableRowHighlightColors

| Name | Type | Mapping Name | Value |
| ------------------------- | ------------------------------------------------------------ | ------------ | ---------- |
| backgroundColor | UIColor | | - |
| labelColor | UIColor | | **000000** |
| secondaryLabelColor | UIColor | | **7f7f7f** |
| symbolColor | UIColor | | **1d293b** |
| tintColor | UIColor | | - |
| filledColorPairCollection | [ThemeColorPairCollection](./Colorscheme.md#ThemeColorPairCollection) | | |



#### TableView.tableRowHighlightColors.filledColorPairCollection

| Name | Type |
| ----------- | ------------------------------------------------- |
| normal | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |
| highlighted | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |
| disabled | [ThemeColorPair](./Colorscheme.md#ThemeColorPair) |



##### TableView.tableRowHighlightColors.filledColorPairCollection.normal

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **468cc8** |



##### TableView.tableRowHighlightColors.filledColorPairCollection.highlighted

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **74a8d5** |



##### TableView.tableRowHighlightColors.filledColorPairCollection.disabled

| Name | Type | Mapping Name | Value |
| ---------- | ------- | ------------ | ---------- |
| foreground | UIColor | | **ffffff** |
| background | UIColor | | **74a8d5** |

Loading