Unfork/Update JSQMessagesViewController #1255
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michaelkirk
force-pushed
the
update-jsqmvc
branch
from
553c148 to
567c30f
Compare
|
Probably also fixes #1062? |
This was referenced Jul 14, 2016
michaelkirk
force-pushed
the
update-jsqmvc
branch
4 times, most recently
from
c36adb4 to
b172858
Compare
michaelkirk
force-pushed
the
update-jsqmvc
branch
from
b172858 to
2c90f06
Compare
Geting back on upstream fixes a couple bugs (see ##Bugfixes), and also will make future updates easier. The unforking process was basically this: * move custom message types (Calls and DisplayedMessages) classes from our custom JSQMVC fork into Signal-iOS. * Move any method customization into our subclass. Including ColletionView stuff, bubble sizing, and gesture behavior Bug Fixes --------- * Fix mis-sized incoming media bubbles. Bubble size was being cached by interaction id. Which broke when receiving an attachment. The problem is that incoming media messages were initially the height of a "Downloading Attachment" info message. Instead we use the mediaHash for media messages to expire the bubble size when the media changes. * fix missized bubble when MVC did appear The MessagesViewController isn't sized correctly until ViewWillAppear. This caused the first round of bubbles to be rendered incorrectly (they assumed a larger container than they had). I think is reflected in the current version of the app by a reflow occurring shortly after the view appears. Chores ------ * bump travis to build with xcode8 * specify RQV development team for device build. required by xcode 8 beta Cleanup ------ * Refactor messageing XIB so that elements are hangning outside of the views frame * Fix compiler warning with explicit cast * delete deprecated lineBreakmode, it's the default value anyway. // FREEBIE
This is part of unforking JSQMVC, but I'm only reformatting files otherwise changed rather than reformatting the entire project for git sanity. This is intentionally a second commit so we can separate formatting changes from code changes * brace should drop after method definition (this is common across almost all objc projects, and allows you to quickly differentiate multi-line method signatures from their implementation. * aligning consecutive assignments ongoingly muddies git history // FREEBIE
This was done as part of unforking JSQMessagesViewController, but is
intentionally a separate commit so we can separate formatting changes
from code changes in git history.
* Import frameworks like:
#import <FrameworkName/HeaderName.h>
* instead of:
#import "HeaderName.h"
// FREEBIE
// FREEBIE
* Use NS_DESIGNATE_INTIALIZER to ensure we're setting all the variables we need to be in OWSCall * no need to nil properties in dealloc on ARC * use declarative dictionaries for legability // FREEBIE use declarative dictionaries for clarity
// FREEBIE
* formatting * referencing TODOS * remove unnecessary logging // FREEBIE
Using upstream button and change notification allows us to delete some code. // FREEBIE
michaelkirk
force-pushed
the
update-jsqmvc
branch
from
2c90f06 to
4ddad06
Compare
The history here is that the radius I'm removing was added in #884 after having straight edges added in our custom fork for a while. So, rather than override our override, I'm just reverting to the upstream value, which is close in proximity, and closer to iMessages radius. // FREEBIE
michaelkirk
force-pushed
the
update-jsqmvc
branch
from
4ddad06 to
db3b2d4
Compare
This was referenced Jul 15, 2016
|
Hi, |
|
@Aureleme - That's the plan at this point, but when it happens depends on how many breaking changes are incorporated in the upstream release. It looks like some good (and ambitious) work is happening up there. ❤️ /cc @jessesquires |
|
See: jessesquires/JSQMessagesViewController#1216 for more details. Also, I would be more than happy to help Signal-iOS with the migration to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Getting back on upstream JSQMessagesViewController fixes a couple bugs (see ##Bugfixes), and makes future upgrades easier.
The unforking process was basically this:
custom JSQMVC fork into Signal-iOS.
CollectionView protocol stuff, styling, bubble sizing, and gesture behavior
BugFixes
FIXES: #1111 - incorrectly sized bubbles for incoming attachments:
FIXES: Bubble-size re-flow when first loading thread.
FIXES: #1062?
Maybe Fixes: #838 - Rendering Glitches
Maybe Fixes: #1181 - JumbledBubbles
Also, by getting back on upstream we pave the way for #792 and generally make keeping up-to-date easier.
This required a lot of changes. Code review appreciated. ❤️