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

ui: add legacy option for 1-1 disappearing messages and clean

Browse Source
pull/941/head
Ryan Zhao 2 years ago
parent 984aee4aa9
commit f0b3044e89
31 changed files with 106 additions and 84 deletions
Show Stats Download Patch File Download Diff File

119
Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
Unescape Escape View File

@ -17,7 +17,6 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
public enum Section: SessionTableSection {
case type
case timerLegacy
case timerDisappearAfterSend
case timerDisappearAfterRead
case noteToSelf
@ -26,7 +25,6 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
var title: String? {
switch self {
case .type: return "DISAPPERING_MESSAGES_TYPE_TITLE".localized()
case .timerLegacy: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
case .timerDisappearAfterSend: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
case .timerDisappearAfterRead: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
case .noteToSelf: return nil
@ -195,46 +193,85 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
self?.shouldShowConfirmButton.send(updatedConfig != self?.config)
self?.currentSelection.send(updatedConfig)
}
),
SessionCell.Info(
id: Item(title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized()),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized(),
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_DESCRIPTION".localized(),
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.type == .disappearAfterRead) }
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: (24 * 60 * 60),
type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterRead,
lastChangeTimestampMs: Int64(floor((Date().timeIntervalSince1970 * 1000)))
)
self?.shouldShowConfirmButton.send(updatedConfig != self?.config)
self?.currentSelection.send(updatedConfig)
}
),
SessionCell.Info(
id: Item(title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized()),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(),
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_DESCRIPTION".localized(),
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.type == .disappearAfterSend) }
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: (24 * 60 * 60),
type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterSend,
lastChangeTimestampMs: Int64(floor((Date().timeIntervalSince1970 * 1000)))
)
self?.shouldShowConfirmButton.send(updatedConfig != self?.config)
self?.currentSelection.send(updatedConfig)
}
)
]
].appending(
DisappearingMessagesConfiguration.isNewConfigurationEnabled ? nil :
SessionCell.Info(
id: Item(title: "DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE".localized()),
title: "DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE".localized(),
subtitle: "DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION".localized(),
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
!DisappearingMessagesConfiguration.isNewConfigurationEnabled
}
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: (24 * 60 * 60),
type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterRead, // Default for 1-1
lastChangeTimestampMs: Int64(floor((Date().timeIntervalSince1970 * 1000)))
)
self?.shouldShowConfirmButton.send(updatedConfig != self?.config)
self?.currentSelection.send(updatedConfig)
}
)
).appending(
contentsOf: [
SessionCell.Info(
id: Item(title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized()),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized(),
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_DESCRIPTION".localized(),
tintColor: DisappearingMessagesConfiguration.isNewConfigurationEnabled ? .textPrimary : .disabled,
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
(self?.currentSelection.value.type == .disappearAfterRead) &&
DisappearingMessagesConfiguration.isNewConfigurationEnabled
}
),
isEnabled: DisappearingMessagesConfiguration.isNewConfigurationEnabled,
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: (24 * 60 * 60),
type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterRead,
lastChangeTimestampMs: Int64(floor((Date().timeIntervalSince1970 * 1000)))
)
self?.shouldShowConfirmButton.send(updatedConfig != self?.config)
self?.currentSelection.send(updatedConfig)
}
),
SessionCell.Info(
id: Item(title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized()),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(),
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_DESCRIPTION".localized(),
tintColor: DisappearingMessagesConfiguration.isNewConfigurationEnabled ? .textPrimary : .disabled,
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
(self?.currentSelection.value.type == .disappearAfterSend) &&
DisappearingMessagesConfiguration.isNewConfigurationEnabled
}
),
isEnabled: DisappearingMessagesConfiguration.isNewConfigurationEnabled,
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: (24 * 60 * 60),
type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterSend,
lastChangeTimestampMs: Int64(floor((Date().timeIntervalSince1970 * 1000)))
)
self?.shouldShowConfirmButton.send(updatedConfig != self?.config)
self?.currentSelection.send(updatedConfig)
}
)
]
)
)
].appending(
(currentSelection.isEnabled == false) ? nil :

2
Session/Meta/Translations/de.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/es.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/fa.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/fi.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/fr.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/hi.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/hr.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/id-ID.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/it.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/ja.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/nl.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/pl.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/pt_BR.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/ru.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/si.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/sk.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/sv.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/th.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/vi-VN.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

2
Session/Meta/Translations/zh_CN.lproj/Localizable.strings
Unescape Escape View File

@ -602,5 +602,5 @@
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "Use the original version of disappearing messages.";
"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";

4
Session/Shared/Views/SessionCell+AccessoryView.swift
Unescape Escape View File

@ -302,7 +302,7 @@ extension SessionCell {
.radioButton_unselectedBorder
)
} else {
radioBorderView.themeBorderColor = .radioButton_border_disabled
radioBorderView.themeBorderColor = .disabled
}
radioBorderView.layer.cornerRadius = (size.borderSize / 2)
@ -315,7 +315,7 @@ extension SessionCell {
)
} else {
radioView.themeBackgroundColor = (isSelected || wasOldSelection ?
.radioButton_selectedBackground_disabled :
.disabled :
.radioButton_unselectedBackground
)
}

2
Session/Shared/Views/SessionCell.swift
Unescape Escape View File

@ -104,7 +104,7 @@ public class SessionCell: UITableViewCell {
private let subtitleLabel: UILabel = {
let result: UILabel = UILabel()
result.translatesAutoresizingMaskIntoConstraints = false
result.font = .systemFont(ofSize: 13)
result.font = .systemFont(ofSize: 12)
result.themeTextColor = .textPrimary
result.numberOfLines = 0
result.isHidden = true

11
SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
Unescape Escape View File

@ -23,27 +23,22 @@ public struct DisappearingMessagesConfiguration: Codable, Identifiable, Equatabl
public enum DisappearingMessageType: Int, Codable, Hashable, DatabaseValueConvertible {
case disappearAfterRead
case disappearAfterSend
case legacy
init(protoType: SNProtoContent.SNProtoContentExpirationType?) {
init(protoType: SNProtoContent.SNProtoContentExpirationType) {
switch protoType {
case .deleteAfterSend:
self = .disappearAfterSend
case .deleteAfterRead:
self = .disappearAfterRead
case .none:
self = .legacy
}
}
func toProto() -> SNProtoContent.SNProtoContentExpirationType? {
func toProto() -> SNProtoContent.SNProtoContentExpirationType {
switch self {
case .disappearAfterRead:
return .deleteAfterRead
case .disappearAfterSend:
return .deleteAfterSend
case .legacy:
return nil
}
}
}
@ -192,7 +187,7 @@ extension DisappearingMessagesConfiguration {
public static func validDurationsSeconds(_ type: DisappearingMessageType) -> [TimeInterval] {
switch type {
case .disappearAfterRead, .legacy:
case .disappearAfterRead:
return [
60, // TODO: remove this, for test purpose only
(5 * 60),

2
SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift
Unescape Escape View File

@ -43,11 +43,9 @@ internal enum Theme_ClassicDark: ThemeColors {
// RadioButton
.radioButton_selectedBackground: .primary,
.radioButton_selectedBackground_disabled: .disabledDark,
.radioButton_unselectedBackground: .clear,
.radioButton_selectedBorder: .classicDark6,
.radioButton_unselectedBorder: .classicDark6,
.radioButton_border_disabled: .disabledDark,
// SessionButton
.sessionButton_text: .primary,

2
SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift
Unescape Escape View File

@ -43,11 +43,9 @@ internal enum Theme_ClassicLight: ThemeColors {
// RadioButton
.radioButton_selectedBackground: .primary,
.radioButton_selectedBackground_disabled: .disabledLight,
.radioButton_unselectedBackground: .clear,
.radioButton_selectedBorder: .classicLight0,
.radioButton_unselectedBorder: .classicLight0,
.radioButton_border_disabled: .disabledLight,
// OutlineButton
.sessionButton_text: .classicLight0,

2
SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift
Unescape Escape View File

@ -43,11 +43,9 @@ internal enum Theme_OceanDark: ThemeColors {
// RadioButton
.radioButton_selectedBackground: .primary,
.radioButton_selectedBackground_disabled: .disabledDark,
.radioButton_unselectedBackground: .clear,
.radioButton_selectedBorder: .oceanDark7,
.radioButton_unselectedBorder: .oceanDark7,
.radioButton_border_disabled: .disabledDark,
// SessionButton
.sessionButton_text: .primary,

2
SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift
Unescape Escape View File

@ -43,11 +43,9 @@ internal enum Theme_OceanLight: ThemeColors {
// RadioButton
.radioButton_selectedBackground: .primary,
.radioButton_selectedBackground_disabled: .disabledLight,
.radioButton_unselectedBackground: .clear,
.radioButton_selectedBorder: .oceanLight1,
.radioButton_unselectedBorder: .oceanLight3,
.radioButton_border_disabled: .disabledLight,
// SessionButton
.sessionButton_text: .oceanLight1,

2
SessionUIKit/Style Guide/Themes/Theme.swift
Unescape Escape View File

@ -131,11 +131,9 @@ public indirect enum ThemeValue: Hashable {
// RadioButton
case radioButton_selectedBackground
case radioButton_selectedBackground_disabled
case radioButton_unselectedBackground
case radioButton_selectedBorder
case radioButton_unselectedBorder
case radioButton_border_disabled
// SessionButton
case sessionButton_text

Write Preview
Loading…
Cancel
Save