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.

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/ui-tests] Fixing UI Tests for iOS 13 / Xcode 11 #608

Merged
merged 49 commits into from
Feb 25, 2020
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
14aad90
- Fix Swift and SwiftLint warnings
felix-schwarz Oct 21, 2019
a26fe30
Merge branch 'master' into milestone/1.2
hosy Oct 28, 2019
d5a4caa
- address libzip Xcode project upgrade warning
felix-schwarz Oct 29, 2019
0112b8d
Merge branch 'milestone/1.2' of https://www.github.com/owncloud/ios-a…
felix-schwarz Oct 29, 2019
4e47f9b
[feature/multiple-windows] Multiple window support for iPadOS (#498)
hosy Oct 29, 2019
074ae70
[feature/docs] Docs support (#494)
felix-schwarz Oct 30, 2019
10729ce
[fix/2ndLevelSort] Sort alphabetically if sort attribute is equal (#546)
felix-schwarz Nov 4, 2019
729cb88
[feature/keyboard-commands] Keyboard Commands for all actions on iPad…
hosy Nov 5, 2019
bbadba5
- Remove document scanning feature (pending licensing feature)
felix-schwarz Nov 11, 2019
9d5ffc5
- Allow offline browsing of folders in the File Provider (#554)
hosy Nov 20, 2019
ba9023f
[feature/ios13_ql_preview] QuickLookPreview and QuickLookThumbnailing…
mneuwert Nov 26, 2019
02dfc02
[fix/uti-conversion] work around broken MIMEType->UTI conversions in …
felix-schwarz Nov 26, 2019
9143136
[feature/shortcuts] iOS 13 Add Shortcut parameter support (#491)
hosy Nov 26, 2019
e18fd9e
added error responses to Shortcut intents, if Shortcuts is disabled o…
hosy Dec 12, 2019
972a44c
Merge branch 'master' into milestone/1.3
hosy Jan 10, 2020
6904fcf
fixed merge issues with master branch
hosy Jan 13, 2020
ef06a4d
[feature/filelist-layout] Cleaner File List Layout (#594)
hosy Jan 21, 2020
5ece57d
#590 show sort bar in directory picker, but without the edit/select b…
hosy Jan 21, 2020
93cdae4
Updated README.MD (#599)
hosy Jan 21, 2020
39ee826
show select button was shown on view disappear
hosy Jan 21, 2020
ff38f3c
[feature/whats new screen] In-App changelog "What´s new screen" (#572)
hosy Jan 22, 2020
5e36ab5
fixing sharing view on iPad for logfiles and public links (#605)
hosy Jan 23, 2020
13628a3
#601 fixes app stucks in blank view, if app tries to restore the UI f…
hosy Jan 23, 2020
18977d8
[feature/quick-access-collections ] Expand Quick Access Collections (…
hosy Jan 24, 2020
c72308f
[feature/awake] Keep device awake (#579)
felix-schwarz Jan 27, 2020
f919a23
- updated to newest EarlGrey 1.16 for iOS 13
hosy Jan 29, 2020
e095327
- fixed failing UI tests
hosy Jan 29, 2020
53b965e
[feature/licensing] Licensing support (#571)
felix-schwarz Feb 7, 2020
44c45ce
Update ios-sdk to master with latest develop branch changes included
felix-schwarz Feb 10, 2020
5865f93
[feature/quicklook-editing] Markup or Edit Files (on iOS 13) (#607)
hosy Feb 10, 2020
9a950fd
New release notes for version 1.3
hosy Feb 10, 2020
582d02a
removed duplicated entry from release notes
hosy Feb 10, 2020
8ebbcfb
disable beta warning to release 1.3
jesmrec Feb 11, 2020
5210087
- fixed theme colors
hosy Feb 11, 2020
9b1e52a
changed icon for release notes arabic language
hosy Feb 12, 2020
8bd2602
replace deprecated matcher 'select' for the new 'selectElement' using…
jesmrec Feb 12, 2020
2860441
using newest SDK with optimization levels off in release build
hosy Feb 12, 2020
a27d1af
added changelog for version 1.3.0
hosy Feb 12, 2020
e57702c
Translation sync (#576)
hosy Feb 12, 2020
9603d80
changed APP_SHORT_VERSION to 1.3.0
hosy Feb 12, 2020
e84ad1b
Merge branch 'milestone/1.3' into fix/ui-tests
hosy Feb 12, 2020
e0a97ef
Bring SDK version back to latest master
felix-schwarz Feb 12, 2020
b6a9d39
updated to newest SnapshotHelperVersion
hosy Feb 12, 2020
c5b2929
- Reinstate actions
felix-schwarz Feb 12, 2020
5ba9d47
Merge branch 'milestone/1.3' into fix/ui-tests
hosy Feb 12, 2020
1b5a692
Fix encoding info for translated files (UTF-8 (set) -> UTF-16 (actual))
felix-schwarz Feb 12, 2020
2f217e4
Merge branch 'milestone/1.3' into fix/ui-tests
hosy Feb 12, 2020
ec7e152
- new SnapshotHelper Version
hosy Feb 12, 2020
fe92249
Merge branch 'release/1.3.1' into fix/ui-tests
hosy Feb 25, 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
3 changes: 2 additions & 1 deletion .github/release_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Release a new version
- [ ] [DEV] Update `APP_SHORT_VERSION` `[major].[minor].[patch]` in [ownCloud.xcodeproj/project.pbxproj](https://github.com/owncloud/ios-app/blob/master/ownCloud.xcodeproj/project.pbxproj)
- [ ] [TRFX] Update translations from transifex branch.
- [ ] [DIS] Update [changelog](https://github.com/owncloud/ios-app/blob/master/CHANGELOG.md)
- [ ] [DEV] Update In-App Release Notes (changelog) in ownCloud/Release Notes/ReleaseNotes.plist
- [ ] [QA] Design Test plan
- [ ] [QA] Regression Test plan
- [ ] [DOC] Update user manual with the new functionalities
Expand All @@ -21,7 +22,7 @@ Release a new version

If it is required to update the iOS-SDK version:

- [ ] [GIT] Create branch library `release/[major].[minor].[patch]`(freeze the code)
- [ ] [GIT] Create branch library `release/[major].[minor].[patch]`(freeze the code)
- [ ] [mail] inform #marketing about the new release.
- [ ] [DIS] Update README.md (version number, third party, supported versions of iOS, Xcode)
- [ ] [DIS] Update [changelog](https://github.com/owncloud/ios-sdk/blob/master/CHANGELOG.md)
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/test_output
fastlane/Match/
fastlane/screenshots/screenshots.html
fastlane/screenshots/**/*.png
.env.default

# Code Injection
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ target 'ownCloudTests' do

use_frameworks! # Required for Swift Test Targets only
inherit! :search_paths # Required for not double-linking libraries in the app and test targets.
pod 'EarlGrey'
pod 'EarlGrey', '~> 1.16'
end

target 'ownCloudScreenshotsTests' do
project 'ownCloud'

use_frameworks! # Required for Swift Test Targets only
inherit! :search_paths # Required for not double-linking libraries in the app and test targets.
pod 'EarlGrey'
pod 'EarlGrey', '~> 1.16'
end
12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- EarlGrey (1.11.0)
- EarlGrey (1.16.0)

DEPENDENCIES:
- EarlGrey
- EarlGrey (~> 1.16)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
trunk:
- EarlGrey

SPEC CHECKSUMS:
EarlGrey: 7515b05c7f448374ad7ca2c454f3ea566fcb1a2f
EarlGrey: 455e5597ae5ccaca92cd46b81d8b25cacec060a1

PODFILE CHECKSUM: 630a62887837e654b316e1e9125f19c3a673f5e0
PODFILE CHECKSUM: 9075b8f92281024401a0039c3477c9a16650b092

COCOAPODS: 1.5.3
COCOAPODS: 1.8.4
66 changes: 51 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,69 @@
# [ownCloud](https://owncloud.org) iOS app
# [ownCloud](https://owncloud.org) iOS App

Available in the Apple App Store:
## 📱 The new iOS App for your ownCloud!

#### 🌎 https://ownCloud.com

| Account List | File List | File Actions | Preview Files | Quick Access | Settings |
| ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
| <img src="fastlane/screenshots/en-US/iPhone Xs Max-11_ios_accounts_list_demo.png" alt="Simulator Screen Shot - iPhone 11 Pro"> | <img src="fastlane/screenshots/en-US/iPhone Xs Max-20_ios_files_list_demo.png" alt="Simulator Screen Shot - iPhone 11 Pro"> | <img src="fastlane/screenshots/en-US/iPhone Xs Max-21_ios_files_actions_demo.png" alt="Simulator Screen Shot - iPhone 11 Pro"> | <img src="fastlane/screenshots/en-US/iPhone Xs Max-22_ios_files_preview_pdf_demo.png" alt="Simulator Screen Shot - iPhone 11 Pro"> | <img src="fastlane/screenshots/en-US/iPhone Xs Max-40_ios_quick_access_demo.png" alt="Simulator Screen Shot - iPhone 11 Pro"> | <img src="fastlane/screenshots/en-US/iPhone Xs Max-60_ios_settings_demo.png" alt="Simulator Screen Shot - iPhone 11 Pro"> |

## 😍 Features

* 🦋 Using the current iOS frameworks
* ⭐️ Exclusively built for iOS
* 🛠 Written in Swift
* 📂 Seamless integration with iOS files for improved collaboration
* 🕹 Multi-select with drag and drop features for efficient file management
* 👑 Using iPadOS features for pro users
* ✅ Certificate management and password manager integration for boosting security
* 🏳️‍🌈 Multiple UI themes with dark and light colors
* 🚢 Free on the AppStore
* 🇪🇺 Localised in many languages
* 📱iOS 11+
* 🧩 License: [GPLv3](https://github.com/owncloud/ios-app/LICENSE)

## 📲 Download

Our iOS app is free for downloading available on the AppStore

[![](https://owncloud.org/wp-content/themes/owncloudorgnew/assets/img/clients/buttons/appstore.png)](https://apps.apple.com/app/id1359583808)

## 🛠 Build our App

## Join development!
To build our App, please read our [SETUP.md](https://github.com/owncloud/ios-app/blob/master/SETUP.md)

**Build status:**
```
$ read SETUP.md
```

master ![](https://app.bitrise.io/app/c48bddff715d0664/status.svg?token=7Tmh463L-GLGS9MN5yZ0jA&branch=master)
## 🇪🇺 Translate

master ![codecov](https://codecov.io/gh/owncloud/ios-app/branch/master/graph/badge.svg)
The App is translated in many languages. If your language is missing or if you want to improve a string, you are welcome!
This can be done in [Transifex](https://www.transifex.com/signup/?join_project=owncloud).

stable ![](https://app.bitrise.io/app/c48bddff715d0664/status.svg?token=7Tmh463L-GLGS9MN5yZ0jA&branch=stable)

stable ![codecov](https://codecov.io/gh/owncloud/ios-app/branch/stable/graph/badge.svg)
## 💡 Found a bug or have some ideas for improvement?

- 💬 Open a new issue on [Github](https://github.com/owncloud/ios-app/issues/new) or [chat](https://talk.owncloud.com/) with us
- 🐥 Don't forget to follow us on [Twitter](https://twitter.com/owncloud)

## 📋 Start contributing

**Start contributing:** Make sure you read [SETUP.md](https://github.com/owncloud/ios-app/blob/master/SETUP.md) when you start working on this project. Basically: Fork this repository and contribute back using pull requests to the master branch.
Make sure you read [SETUP.md](https://github.com/owncloud/ios-app/blob/master/SETUP.md) when you start working on this project. Basically: Fork this repository and contribute back using pull requests to the master branch.
Easy starting points are also reviewing [pull requests](https://github.com/owncloud/ios-app/pulls) and working on [good first issue](https://github.com/owncloud/ios-app/labels/good%20first%20issue).

### Real-time Chat
## ☁️ ownCloud Server

[Learn](https://owncloud.org/news/how-to-set-up-an-owncloud-in-3-minutes/), how you can easily setup your own ownCloud server in 3 minutes or test our ownCloud iOS app with our demo server:

- [Download](https://apps.apple.com/app/id1359583808) our iOS App
- Add account

* [Rocketchat](https://talk.owncloud.com):

* The `#mobile` channel is the right place to ask for support for the ownCloud iOS App.
* Also you can check other [channels](https://talk.owncloud.com/directory) for support.
### Demo credentials

**License:** [GPLv3](https://github.com/owncloud/ios-app/LICENSE)
| Server URL | demo.owncloud.com |
| ---------- | ----------------- |
| User | demo |
| Password | demo |

32 changes: 30 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ platform :ios do
provisioningProfiles: {
"com.owncloud.ios-app" => "match AdHoc com.owncloud.ios-app",
"com.owncloud.ios-app.ownCloud-File-Provider" => "match AdHoc com.owncloud.ios-app.ownCloud-File-Provider",
"com.owncloud.ios-app.ownCloud-File-ProviderUI" => "match AdHoc com.owncloud.ios-app.ownCloud-File-ProviderUI"
"com.owncloud.ios-app.ownCloud-File-ProviderUI" => "match AdHoc com.owncloud.ios-app.ownCloud-File-ProviderUI",
"com.owncloud.ios-app.ownCloud-File-Intents" => "match AdHoc com.owncloud.ios-app.ownCloud-Intents"
#Add more Provisioning Profiles when extensions are added
}
}
Expand Down Expand Up @@ -71,6 +72,8 @@ platform :ios do
ENTERPRISE_FP_PROFILE = "Enterprise Distribution iOS Neo File Provider"
ENTERPRISE_FP_UI_ID = "com.owncloud.enterprise.ios-app.ownCloud-File-ProviderUI"
ENTERPRISE_FP_UI_PROFILE = "Enterprise Distribution iOS Neo File ProviderUI"
ENTERPRISE_INTENT_ID = "com.owncloud.enterprise.ios-app.ownCloud-Intents"
ENTERPRISE_INTENT_PROFILE = "Enterprise Distribution iOS Neo Intent"
ENTERPRISE_APP_FW_ID = "com.owncloud.enterprise.ownCloudApp"
ENTERPRISE_TEAM = "5QNK8L2PSC"
ENTERPRISE_IDENTITY = "iPhone Distribution: ownCloud GmbH"
Expand Down Expand Up @@ -99,6 +102,12 @@ platform :ios do
app_identifier: ENTERPRISE_APP_FW_ID
)

update_app_identifier(
xcodeproj: "ownCloud.xcodeproj",
plist_path: "ownCloud Intents/Info.plist",
app_identifier: ENTERPRISE_INTENT_ID
)

update_app_group_identifiers(
entitlements_file: "ownCloud/ownCloud.entitlements",
app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
Expand All @@ -109,10 +118,18 @@ platform :ios do
app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
)

update_app_group_identifiers(
entitlements_file: "ownCloud Intents/ownCloud Intents.entitlements",
app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
)

set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCAppGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "NSExtension", subkey: "NSExtensionFileProviderDocumentGroup", value: "group.com.owncloud.enterprise.ios-app")

set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCAppGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")

automatic_code_signing(
path: "ownCloud.xcodeproj",
use_automatic_signing: false,
Expand Down Expand Up @@ -143,6 +160,16 @@ platform :ios do
targets: ["ownCloud File ProviderUI"]
)

automatic_code_signing(
path: "ownCloud.xcodeproj",
use_automatic_signing: false,
team_id: ENTERPRISE_TEAM,
code_sign_identity: ENTERPRISE_IDENTITY,
profile_name: ENTERPRISE_INTENT_PROFILE,
bundle_identifier: ENTERPRISE_INTENT_ID,
targets: ["ownCloud Intents"]
)

automatic_code_signing(
path: "ownCloud.xcodeproj",
use_automatic_signing: false,
Expand Down Expand Up @@ -175,7 +202,8 @@ platform :ios do
provisioningProfiles: {
ENTERPRISE_APP_ID => ENTERPRISE_APP_PROFILE,
ENTERPRISE_FP_ID => ENTERPRISE_FP_PROFILE,
ENTERPRISE_FP_UI_ID => ENTERPRISE_FP_UI_PROFILE
ENTERPRISE_FP_UI_ID => ENTERPRISE_FP_UI_PROFILE,
ENTERPRISE_INTENT_ID => ENTERPRISE_INTENT_PROFILE
}
}
)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading