OpenLP

Merge lp://qastaging/~dude-from-by/openlp/my-ios-remote into lp://qastaging/~danielborges93/openlp/ios-remote

my-ios-remote
Merge into ios-remote

Proposed by andrei on 2017-01-30

Status:	Merged
Approved by:	Daniel Borges on 2017-02-01
Approved revision:	no longer in the source branch.
Merged at revision:	55
Proposed branch:	lp://qastaging/~dude-from-by/openlp/my-ios-remote
Merge into:	lp://qastaging/~danielborges93/openlp/ios-remote
Diff against target:	2700 lines (+749/-489) 42 files modified OLP RemoteTests/APITest.swift (+1/-1) OLP RemoteTests/PollAPITests.swift (+12/-12) OLP RemoteTests/TestUtils.swift (+3/-3) Podfile (+6/-2) Podfile.lock (+44/-35) Remote.xcodeproj/project.pbxproj (+24/-21) Remote/AppDelegate.swift (+44/-11) Remote/Classes/Controller/Alerts/AlertsViewController.swift (+36/-36) Remote/Classes/Controller/Search/SearchResultViewController.swift (+26/-26) Remote/Classes/Controller/Search/SearchViewController.swift (+33/-33) Remote/Classes/Controller/Service/ServiceViewController.swift (+40/-35) Remote/Classes/Controller/Service/ServiceViewController.xib (+13/-9) Remote/Classes/Controller/Service/ServiceViewControllerDelegate.swift (+29/-0) Remote/Classes/Controller/Settings/SettingsControllerPresenter.swift (+3/-3) Remote/Classes/Controller/Settings/SettingsViewController.swift (+14/-24) Remote/Classes/Controller/Slides/SlidesViewController.swift (+54/-44) Remote/Classes/Controller/Slides/SlidesViewController.xib (+12/-8) Remote/Classes/Model/ItemModel.swift (+1/-1) Remote/Classes/Model/LiveModel.swift (+1/-1) Remote/Classes/Model/PollModel.swift (+36/-49) Remote/Classes/Model/ServiceListModel.swift (+2/-2) Remote/Classes/Model/SlideModel.swift (+1/-1) Remote/Classes/Model/SuccessModel.swift (+1/-1) Remote/Classes/Model/UserSettings.swift (+19/-14) Remote/Classes/Network/API.swift (+2/-2) Remote/Classes/Network/AddAPI.swift (+12/-9) Remote/Classes/Network/AlertAPI.swift (+6/-6) Remote/Classes/Network/ControllerAPI.swift (+16/-16) Remote/Classes/Network/DisplayAPI.swift (+4/-4) Remote/Classes/Network/LiveAPI.swift (+12/-9) Remote/Classes/Network/PollAPI.swift (+17/-30) Remote/Classes/Network/SearchAPI.swift (+8/-8) Remote/Classes/Network/Service.swift (+2/-0) Remote/Classes/Network/ServiceAPI.swift (+20/-19) Remote/Classes/Util/ColorUtil.swift (+1/-1) Remote/Classes/Util/DictionaryUtil.swift (+3/-3) Remote/Classes/Util/ErrorUtil.swift (+5/-4) Remote/Classes/Util/TabSwitchingToRightAnimationController.swift (+66/-0) Remote/Classes/Util/ViewControllerUtil.swift (+42/-6) Remote/Classes/View/SlideCell.swift (+44/-0) Remote/Resources/Settings.bundle/Root.inApp.plist (+16/-0) Remote/Resources/Settings.bundle/Root.plist (+18/-0)
To merge this branch:	bzr merge lp://qastaging/~dude-from-by/openlp/my-ios-remote
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel Borges		2017-01-30	Approve on 2017-02-01
Review via email: mp+315893@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2017-01-25.

Description of the change

migrated to swift 3

Revision history for this message

Daniel Borges (danielborges93) wrote on 2017-01-22: Posted in a previous version of this proposal

Follows some observations:

1) The link of the pod BlockLooper is incorrect. I think you only have access to the current :git link. Replacing to "https://github.com/ashender/BlockLooper.git" works well for me;
2) The arrow to next and previous slide (in SlidesViewController) are breaking the app;
- There is a log message when I select a slide (in SlideViewController): "slide selection error: nil", please remove it;
- In SettingViewController when I (dis)able Needs Auth the fields do not hide or show;
- "Use precise slides scroll" is in embedded setting, but not in root settings (in Setting.app). As is possible to add to toggle in root setting, add to PSToggleSwitchSpecifier into Root.plist;
- The tests here are quite crazy. I had to add the AlamofireObjectMapper pod into test target, but I'm getting errors about swift version. It is only with me?

If possible, add a footer text after "Use precise slides scroll" explaining what is it. For this, add the key "FooterText" as a String in the dictionary of its GroupSpecifier.

review: Needs Fixing

Revision history for this message

Daniel Borges (danielborges93) wrote on 2017-01-22: Posted in a previous version of this proposal

> - "Use precise slides scroll" is in embedded setting, but not in root settings
> (in Setting.app). As is possible to add to toggle in root setting, add to
> PSToggleSwitchSpecifier into Root.plist;
And add the String "Use precise slides scroll" in Resources/Settings.bundle/en.lproj/Root.strings. We have to do this to all changes in Settings (for future translations).

Revision history for this message

andrei (dude-from-by) wrote on 2017-01-25: Posted in a previous version of this proposal

Fixed issues

Revision history for this message

Daniel Borges (danielborges93) wrote on 2017-01-27: Posted in a previous version of this proposal

Now the only thing is that the .string file is missing the character ; at the end os the last 2 lines. The file is not loading because this.

review: Needs Fixing

Revision history for this message

andrei (dude-from-by) wrote on 2017-01-30:

updated

Revision history for this message

Daniel Borges (danielborges93) on 2017-02-01:

review: Approve

lp://qastaging/~dude-from-by/openlp/my-ios-remote updated on 2017-02-04

55. By andrei <email address hidden> on 2017-02-04: Migrated to swift3. Add activity indicator on slide selection, increased polling interval from 0.5 to 2 seconds. And more...