signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Slightly adjust navbar spacing

Browse Source
This commit is contained in:
Nora Trapp 2020-08-21 17:52:35 -07:00
parent 5d97da4fd4
commit af079bc0ad
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -1423,6 +1423,9 @@ typedef enum : NSUInteger {
NSForegroundColorAttributeName : [Theme.navbarTitleColor colorWithAlphaComponent:(CGFloat)0.9],
};
NSString *hairSpace = @"\u200a";
NSString *thinSpace = @"\u2009";
NSString *iconSpacer = UIDevice.currentDevice.isNarrowerThanIPhone6 ? hairSpace : thinSpace;
NSString *betweenItemSpacer = UIDevice.currentDevice.isNarrowerThanIPhone6 ? @" " : @" ";
BOOL isMuted = self.thread.isMuted;
BOOL hasTimer = self.disappearingMessagesConfiguration.isEnabled;
@ -1437,7 +1440,7 @@ typedef enum : NSUInteger {
if (isMuted) {
[subtitleText appendTemplatedImageNamed:@"bell-disabled-outline-24" font:subtitleFont];
if (!isVerified) {
[subtitleText append:hairSpace attributes:attributes];
[subtitleText append:iconSpacer attributes:attributes];
[subtitleText append:NSLocalizedString(@"MUTED_BADGE", @"Badge indicating that the user is muted.")
attributes:attributes];
}
@ -1445,11 +1448,11 @@ typedef enum : NSUInteger {
if (hasTimer) {
if (isMuted) {
[subtitleText append:@" " attributes:attributes];
[subtitleText append:betweenItemSpacer attributes:attributes];
}
[subtitleText appendTemplatedImageNamed:@"timer-outline-16" font:subtitleFont];
[subtitleText append:hairSpace attributes:attributes];
[subtitleText append:iconSpacer attributes:attributes];
[subtitleText append:[NSString formatDurationSeconds:self.disappearingMessagesConfiguration.durationSeconds
useShortFormat:YES]
attributes:attributes];
@ -1457,11 +1460,11 @@ typedef enum : NSUInteger {
if (isVerified) {
if (hasTimer || isMuted) {
[subtitleText append:@" " attributes:attributes];
[subtitleText append:betweenItemSpacer attributes:attributes];
}
[subtitleText appendTemplatedImageNamed:@"check-12" font:subtitleFont];
[subtitleText append:hairSpace attributes:attributes];
[subtitleText append:iconSpacer attributes:attributes];
[subtitleText append:NSLocalizedString(
@"PRIVACY_IDENTITY_IS_VERIFIED_BADGE", @"Badge indicating that the user is verified.")
attributes:attributes];