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/resources to bundle #686

Merged
merged 13 commits into from
Oct 27, 2020
Merged

Feature/resources to bundle #686

merged 13 commits into from
Oct 27, 2020

Conversation

khramtsoff
Copy link
Contributor

Fixes issue #613

Vladimir Khramtsov added 13 commits October 19, 2020 13:05
Add new target-bundle ChattoAdditionsResources
ecd093c
Move all xcassets to target ChattoAdditionsResources
66787a6
Move ChatInputBar.xib to target ChattoAdditionsResources
03b869a
Open ChatInputBar.xib with Xcode 11.7 (to separate IB changes)
b7ebf4e
Update module for classes used in ChatInputBar.xib from ChattoAdditio…
ddb6dec 
…ns target
Add ChattoAdditionsResources as a build dependency of ChattoAdditions
66b3060
Add copying of ChattoAdditionsResources bundle to ChattoAdditions` bu…
427a45b 
…ild phase
Create Bundle.resources helper property to easily access ChattoAdditi…
4edef2b 
…onsResources bundle
Replace all image loads Bundle(for:) with Bundle.resources
84bdcbc
Replace all xibs loads Bundle(for:) with Bundle.resources
6c0354a
Update podspec to use resource_bundles
4968e09
Run pod install for example application (ChattoApp) with Cocoapods …
a6ac1ae 
…1.9.3
Disable bitcode for bundle to fix error when building with Carthage
b2e0919 
```ld: -bundle and -bitcode_bundle (Xcode setting ENABLE_BITCODE=YES) cannot be used together```
@codecov-io
Copy link

codecov-io commented Oct 19, 2020 •
edited
Loading

Codecov Report

Merging #686 into master will increase coverage by 0.04%.
The diff coverage is 85.29%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #686      +/-   ##
==========================================
+ Coverage   58.18%   58.23%   +0.04%     
==========================================
  Files          98       99       +1     
  Lines        5132     5138       +6     
==========================================
+ Hits         2986     2992       +6     
  Misses       2146     2146
Impacted Files Coverage Δ
...ompoundMessage/Views/CompoundBubbleViewStyle.swift 0.00% <0.00%> (ø)
...hotos/Placeholder/PhotosInputPlaceholderCell.swift 0.00% <0.00%> (ø)
ChattoAdditions/Source/Input/ReusableXibView.swift 13.04% <0.00%> (ø)
...s/CircleProgressIndicatorView/CircleIconView.swift 67.11% <0.00%> (ø)
...ws/BaseMessageCollectionViewCellDefaultStyle.swift 96.59% <100.00%> (ø)
...s/PhotoMessageCollectionViewCellDefaultStyle.swift 83.90% <100.00%> (ø)
...ws/TextMessageCollectionViewCellDefaultStyle.swift 92.64% <100.00%> (ø)
...ource/Common/Bundle+ChattoAdditionsResources.swift 100.00% <100.00%> (ø)
ChattoAdditions/Source/Input/ChatInputBar.swift 78.76% <100.00%> (ø)
...ns/Source/Input/Photos/Camera/LiveCameraCell.swift 84.37% <100.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2085309...b2e0919. Read the comment docs.

@wiruzx wiruzx self-requested a review October 27, 2020 22:54
@wiruzx
Copy link
Contributor

wiruzx commented Oct 27, 2020

@khramtsoff Thanks for high quality PR 👍

@wiruzx wiruzx merged commit 79f9e40 into badoo:master Oct 27, 2020
@wiruzx wiruzx mentioned this pull request Oct 27, 2020
Closed
wiruzx added a commit that referenced this pull request Jan 27, 2021
@wiruzx
Revert "Merge pull request #686 from khramtsoff/feature/resources_to_…
a3da4bc 
…bundle"

This reverts commit 79f9e40, reversing
changes made to 2085309.
@wiruzx wiruzx mentioned this pull request Jan 27, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wiruzx wiruzx wiruzx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@khramtsoff @codecov-io @wiruzx