minor fix on subtitle view

pull/941/head
Ryan Zhao 3 years ago
parent 0e242e57ef
commit a9065b90af

@ -79,7 +79,10 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
style: .bordered, style: .bordered,
title: "DISAPPERING_MESSAGES_SAVE_TITLE".localized(), title: "DISAPPERING_MESSAGES_SAVE_TITLE".localized(),
isEnabled: true, isEnabled: true,
onTap: { self?.saveChanges() } onTap: {
self?.saveChanges()
self?.dismissScreen()
}
) )
} }
.eraseToAnyPublisher() .eraseToAnyPublisher()

@ -38,7 +38,7 @@ final class ConversationTitleView: UIView {
private lazy var subtitleLabel: UILabel = { private lazy var subtitleLabel: UILabel = {
let result: UILabel = UILabel() let result: UILabel = UILabel()
result.font = .systemFont(ofSize: 13) result.font = .systemFont(ofSize: Values.verySmallFontSize)
result.themeTextColor = .textPrimary result.themeTextColor = .textPrimary
result.lineBreakMode = .byTruncatingTail result.lineBreakMode = .byTruncatingTail
@ -47,7 +47,7 @@ final class ConversationTitleView: UIView {
private lazy var userCountLabel: UILabel = { private lazy var userCountLabel: UILabel = {
let result: UILabel = UILabel() let result: UILabel = UILabel()
result.font = .systemFont(ofSize: 13) result.font = .systemFont(ofSize: Values.verySmallFontSize)
result.themeTextColor = .textPrimary result.themeTextColor = .textPrimary
result.lineBreakMode = .byTruncatingTail result.lineBreakMode = .byTruncatingTail
@ -56,7 +56,7 @@ final class ConversationTitleView: UIView {
private lazy var notificationSettingsLabel: UILabel = { private lazy var notificationSettingsLabel: UILabel = {
let result: UILabel = UILabel() let result: UILabel = UILabel()
result.font = .systemFont(ofSize: 13) result.font = .systemFont(ofSize: Values.verySmallFontSize)
result.themeTextColor = .textPrimary result.themeTextColor = .textPrimary
result.lineBreakMode = .byTruncatingTail result.lineBreakMode = .byTruncatingTail
@ -65,7 +65,7 @@ final class ConversationTitleView: UIView {
private lazy var disappearingMessageSettingLabel: UILabel = { private lazy var disappearingMessageSettingLabel: UILabel = {
let result: UILabel = UILabel() let result: UILabel = UILabel()
result.font = .systemFont(ofSize: 13) result.font = .systemFont(ofSize: Values.verySmallFontSize)
result.themeTextColor = .textPrimary result.themeTextColor = .textPrimary
result.lineBreakMode = .byTruncatingTail result.lineBreakMode = .byTruncatingTail
@ -194,8 +194,8 @@ final class ConversationTitleView: UIView {
imageAttachment.bounds = CGRect( imageAttachment.bounds = CGRect(
x: 0, x: 0,
y: -2, y: -2,
width: Values.smallFontSize, width: Values.verySmallFontSize,
height: Values.smallFontSize height: Values.verySmallFontSize
) )
self?.notificationSettingsLabel.attributedText = NSAttributedString(attachment: imageAttachment) self?.notificationSettingsLabel.attributedText = NSAttributedString(attachment: imageAttachment)
@ -229,12 +229,12 @@ final class ConversationTitleView: UIView {
imageAttachment.bounds = CGRect( imageAttachment.bounds = CGRect(
x: 0, x: 0,
y: -2, y: -2,
width: Values.smallFontSize, width: Values.verySmallFontSize,
height: Values.smallFontSize height: Values.verySmallFontSize
) )
self?.disappearingMessageSettingLabel.attributedText = NSAttributedString(attachment: imageAttachment) self?.disappearingMessageSettingLabel.attributedText = NSAttributedString(attachment: imageAttachment)
.appending(string: " ") .appending(string: " ")
.appending(string: config.type == .disappearAfterRead ? "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized() : "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized()) .appending(string: config.type == .disappearAfterRead ? "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized() : "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized())
.appending(string: " - ") .appending(string: " - ")
.appending(string: config.durationString) .appending(string: config.durationString)

Loading…
Cancel
Save