From 3bcad97629c38b5b18beba09d1f20ba62f5bc04b Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 28 Apr 2020 16:15:19 +1000 Subject: [PATCH] Fix landing screen clipping bug --- SignalMessaging/Loki/Redesign/Style Guide/Values.swift | 2 +- .../src/Loki/Protocol/Utilities/GroupUtilities.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SignalMessaging/Loki/Redesign/Style Guide/Values.swift b/SignalMessaging/Loki/Redesign/Style Guide/Values.swift index 35f616454..18038c766 100644 --- a/SignalMessaging/Loki/Redesign/Style Guide/Values.swift +++ b/SignalMessaging/Loki/Redesign/Style Guide/Values.swift @@ -42,7 +42,7 @@ public final class Values : NSObject { @objc public static let modalButtonCornerRadius = CGFloat(5) @objc public static let fakeChatBubbleWidth = CGFloat(224) @objc public static let fakeChatBubbleCornerRadius = CGFloat(10) - @objc public static let fakeChatViewHeight = CGFloat(234) + @objc public static let fakeChatViewHeight = isSmallScreen ? CGFloat(234) : CGFloat(260) @objc public static let composeViewTextFieldBorderThickness = 1 / UIScreen.main.scale @objc public static let messageBubbleCornerRadius: CGFloat = 10 @objc public static let progressBarThickness: CGFloat = 2 diff --git a/SignalServiceKit/src/Loki/Protocol/Utilities/GroupUtilities.swift b/SignalServiceKit/src/Loki/Protocol/Utilities/GroupUtilities.swift index 0b5478ed1..e08b94939 100644 --- a/SignalServiceKit/src/Loki/Protocol/Utilities/GroupUtilities.swift +++ b/SignalServiceKit/src/Loki/Protocol/Utilities/GroupUtilities.swift @@ -13,7 +13,7 @@ public enum GroupUtilities { let storage = OWSPrimaryStorage.shared() let userHexEncodedPublicKey = getUserHexEncodedPublicKey() return closedGroup.groupModel.groupMemberIds.filter { member in - // Don't show any slave devices + // Don't show slave devices return storage.getMasterHexEncodedPublicKey(for: member, in: transaction) == nil } }