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

Fix reaction picker on iPhone 5/SE

Browse Source
This commit is contained in:
Nora Trapp 2020-02-03 14:19:46 -08:00
parent 1f965cfd68
commit 630bfdd36e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Signal/src/ViewControllers/MessageReactionPicker.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// Copyright (c) 2020 Open Whisper Systems. All rights reserved.
//
import Foundation
@ -9,7 +9,8 @@ protocol MessageReactionPickerDelegate: class {
}
class MessageReactionPicker: UIStackView {
let pickerDiameter: CGFloat = 56
let pickerDiameter: CGFloat = UIDevice.current.isNarrowerThanIPhone6 ? 50 : 56
let reactionFontSize: CGFloat = UIDevice.current.isNarrowerThanIPhone6 ? 30 : 32
let pickerPadding: CGFloat = 6
var reactionHeight: CGFloat { return pickerDiameter - (pickerPadding * 2) }
var selectedBackgroundHeight: CGFloat { return pickerDiameter - 4 }
@ -50,7 +51,7 @@ class MessageReactionPicker: UIStackView {
for emoji in ReactionManager.emojiSet {
let button = OWSFlatButton()
button.autoSetDimensions(to: CGSize(square: reactionHeight))
button.setTitle(title: emoji, font: .systemFont(ofSize: 32), titleColor: Theme.primaryTextColor)
button.setTitle(title: emoji, font: .systemFont(ofSize: reactionFontSize), titleColor: Theme.primaryTextColor)
button.setPressedBlock { [weak self] in
self?.delegate?.didSelectReaction(reaction: emoji, isRemoving: emoji == self?.selectedEmoji)
}

6
SignalMessaging/categories/UIDevice+featureSupport.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// Copyright (c) 2020 Open Whisper Systems. All rights reserved.
//
import Foundation
@ -43,6 +43,10 @@ public extension UIDevice {
}
}
var isNarrowerThanIPhone6: Bool {
return CurrentAppContext().frame.width < 375
}
var isShorterThanIPhone5: Bool {
return CurrentAppContext().frame.height < 568
}