oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show profile picture at top of message stack

This commit is contained in:
Niels Andriesse 2019-12-10 11:22:14 +11:00
parent 783ab43311
commit 0e9fbb7474
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Signal/Signal-Info.plist
View File

@ -168,7 +168,11 @@
</array>
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<true/>
<false/>
</dict>
</plist>

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View File

@ -233,7 +233,7 @@ NS_ASSUME_NONNULL_BEGIN
// last line of the text (if any, or where it
// would be).
[self.messageBubbleView autoPinLeadingToTrailingEdgeOfView:self.avatarView offset:8],
[self.messageBubbleView autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.avatarView],
[self.messageBubbleView autoPinEdge:ALEdgeTop toEdge:ALEdgeTop ofView:self.avatarView],
]];
[self.viewConstraints addObjectsFromArray:@[

8
Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
View File

@ -1503,10 +1503,11 @@ static const int kYapDatabaseRangeMaxLength = 25000;
// the previous message has the same sender name and
// no "date break" separates us.
BOOL shouldShowSenderName = YES;
NSString *_Nullable previousIncomingSenderId = nil;
if (previousViewItem && previousViewItem.interaction.interactionType == interactionType) {
TSIncomingMessage *previousIncomingMessage = (TSIncomingMessage *)previousViewItem.interaction;
NSString *previousIncomingSenderId = previousIncomingMessage.authorId;
previousIncomingSenderId = previousIncomingMessage.authorId;
OWSAssertDebug(previousIncomingSenderId.length > 0);
shouldShowSenderName
@ -1539,9 +1540,8 @@ static const int kYapDatabaseRangeMaxLength = 25000;
// the next message has the same sender avatar and
// no "date break" separates us.
shouldShowSenderAvatar = YES;
if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {
shouldShowSenderAvatar = (![NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
|| nextViewItem.hasCellHeader);
if (previousViewItem && previousViewItem.interaction.interactionType == interactionType) {
shouldShowSenderAvatar = (![NSObject isNullableObject:previousIncomingSenderId equalTo:incomingSenderId]);
}
}
}

2
SignalMessaging/ViewControllers/OWSViewController.m
View File

@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
BOOL IsLandscapeOrientationEnabled(void)
{
return YES;
return NO;
}
UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void)

2
SignalServiceKit/src/Loki/Utilities/Debugging.swift
View File

@ -2,7 +2,7 @@
// For some reason NSLog doesn't seem to work. This is a workaround to still allow debugging from Obj-C.
@objc(LKLogger)
public final class Objc_Logger : NSObject {
public final class ObjC_Logger : NSObject {
private override init() { }