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

clean up & implement same delete type selection

Browse Source
pull/941/head
Ryan Zhao 1 year ago
parent 9a66046e77
commit 7770d566df
1 changed files with 64 additions and 74 deletions
Show Stats Download Patch File Download Diff File

138
Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
Unescape Escape View File

@ -159,16 +159,21 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
} }
), ),
onTap: { onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection let updatedConfig: DisappearingMessagesConfiguration = {
.with( if (config.isEnabled == true && config.type == .disappearAfterRead) {
isEnabled: true, return config
durationSeconds: DisappearingMessagesConfiguration }
.DisappearingMessageType return currentSelection
.disappearAfterRead .with(
.defaultDuration, isEnabled: true,
type: .disappearAfterRead, // Default for 1-1 durationSeconds: DisappearingMessagesConfiguration
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs() .DisappearingMessageType
) .disappearAfterRead
.defaultDuration,
type: .disappearAfterRead, // Default for 1-1
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs()
)
}()
self?.shouldShowConfirmButton.send(updatedConfig != config) self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig) self?.currentSelection.send(updatedConfig)
} }
@ -197,16 +202,21 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
label: "Disappear after read option" label: "Disappear after read option"
), ),
onTap: { onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection let updatedConfig: DisappearingMessagesConfiguration = {
.with( if (config.isEnabled == true && config.type == .disappearAfterRead) {
isEnabled: true, return config
durationSeconds: DisappearingMessagesConfiguration }
.DisappearingMessageType return currentSelection
.disappearAfterRead .with(
.defaultDuration, isEnabled: true,
type: .disappearAfterRead, durationSeconds: DisappearingMessagesConfiguration
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs() .DisappearingMessageType
) .disappearAfterRead
.defaultDuration,
type: .disappearAfterRead,
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs()
)
}()
self?.shouldShowConfirmButton.send(updatedConfig != config) self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig) self?.currentSelection.send(updatedConfig)
} }
@ -234,16 +244,21 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
label: "Disappear after send option" label: "Disappear after send option"
), ),
onTap: { onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection let updatedConfig: DisappearingMessagesConfiguration = {
.with( if (config.isEnabled == true && config.type == .disappearAfterSend) {
isEnabled: true, return config
durationSeconds: DisappearingMessagesConfiguration }
.DisappearingMessageType return currentSelection
.disappearAfterSend .with(
.defaultDuration, isEnabled: true,
type: .disappearAfterSend, durationSeconds: DisappearingMessagesConfiguration
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs() .DisappearingMessageType
) .disappearAfterSend
.defaultDuration,
type: .disappearAfterSend,
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs()
)
}()
self?.shouldShowConfirmButton.send(updatedConfig != config) self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig) self?.currentSelection.send(updatedConfig)
} }
@ -335,16 +350,21 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
currentUserIsClosedGroupMember == true currentUserIsClosedGroupMember == true
), ),
onTap: { onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection let updatedConfig: DisappearingMessagesConfiguration = {
.with( if (config.isEnabled == true && config.type == .disappearAfterSend) {
isEnabled: true, return config
durationSeconds: DisappearingMessagesConfiguration }
.DisappearingMessageType return currentSelection
.disappearAfterSend .with(
.defaultDuration, isEnabled: true,
type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterSend, // Default for closed group & note to self durationSeconds: DisappearingMessagesConfiguration
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs() .DisappearingMessageType
) .disappearAfterSend
.defaultDuration,
type: .disappearAfterSend, // Default for closed group & note to self
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs()
)
}()
self?.shouldShowConfirmButton.send(updatedConfig != config) self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig) self?.currentSelection.send(updatedConfig)
} }
@ -353,39 +373,9 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
id: Item(title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized()), id: Item(title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized()),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(), title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(),
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_DESCRIPTION".localized(), subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_DESCRIPTION".localized(),
rightAccessory: .radio( rightAccessory: .radio(isSelected: { false }),
isSelected: { styling: SessionCell.StyleInfo(tintColor: .disabled),
(self?.currentSelection.value.isEnabled == true) && isEnabled: false
(self?.currentSelection.value.type == .disappearAfterSend) &&
Features.useNewDisappearingMessagesConfig
}
),
styling: SessionCell.StyleInfo(
tintColor: (Features.useNewDisappearingMessagesConfig ?
.textPrimary :
.disabled
)
),
isEnabled: (
Features.useNewDisappearingMessagesConfig && (
isNoteToSelf ||
currentUserIsClosedGroupMember == true
)
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: DisappearingMessagesConfiguration
.DisappearingMessageType
.disappearAfterSend
.defaultDuration,
type: .disappearAfterSend,
lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs()
)
self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig)
}
) )
] ]
) )
@ -434,7 +424,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
.compactMap { $0 } .compactMap { $0 }
.appending( .appending(
contentsOf: DisappearingMessagesConfiguration contentsOf: DisappearingMessagesConfiguration
.validDurationsSeconds(currentSelection.type ?? .disappearAfterSend) .validDurationsSeconds(.disappearAfterSend)
.map { duration in .map { duration in
let title: String = duration.formatted(format: .long) let title: String = duration.formatted(format: .long)

Write Preview
Loading…
Cancel
Save