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

disappearing message settings UI for closed groups

Browse Source
pull/941/head
ryanzhao 2 years ago
parent 9c165000c2
commit d01cda454c
4 changed files with 167 additions and 80 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,22 +18,23 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
public enum Section: SessionTableSection { public enum Section: SessionTableSection {
case type case type
case timer case timer
case timerWithOff
var title: String? { var title: String? {
switch self { switch self {
case .type: return "DISAPPERING_MESSAGES_TYPE_TITLE".localized() case .type: return "DISAPPERING_MESSAGES_TYPE_TITLE".localized()
case .timer: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized() case .timer: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
case .timerWithOff: return nil
} }
} }
var style: SessionTableSectionStyle { return .title } var style: SessionTableSectionStyle { return .title }
} }
public enum Item: Differentiable { public struct Item: Equatable, Hashable, Differentiable {
case off let title: String
case disappearAfterRead
case disappearAfterSend public var differenceIdentifier: String { title }
case currentSetting
} }
// MARK: - Variables // MARK: - Variables
@ -79,79 +80,135 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
private lazy var _observableSettingsData: ObservableData = { private lazy var _observableSettingsData: ObservableData = {
self.currentSelection self.currentSelection
.map { [weak self] currentSelection in .map { [weak self] currentSelection in
return [ guard let threadVariant = self?.threadVariant else { return [] }
SectionModel(
model: .type, switch threadVariant {
elements: [ case .contact:
SessionCell.Info( return [
id: .off, SectionModel(
title: "DISAPPEARING_MESSAGES_OFF".localized(), model: .type,
rightAccessory: .radio( elements: [
isSelected: { (self?.currentSelection.value.isEnabled == false) } SessionCell.Info(
), id: Item(title: "DISAPPEARING_MESSAGES_OFF".localized()),
onTap: { title: "DISAPPEARING_MESSAGES_OFF".localized(),
let updatedConfig: DisappearingMessagesConfiguration = currentSelection rightAccessory: .radio(
.with( isSelected: { (self?.currentSelection.value.isEnabled == false) }
isEnabled: false, ),
durationSeconds: 0, onTap: {
type: nil let updatedConfig: DisappearingMessagesConfiguration = currentSelection
) .with(
self?.currentSelection.send(updatedConfig) isEnabled: false,
} durationSeconds: 0,
), type: nil
SessionCell.Info( )
id: .disappearAfterRead, self?.currentSelection.send(updatedConfig)
title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized(), }
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_DESCRIPTION".localized(), ),
rightAccessory: .radio( SessionCell.Info(
isSelected: { (self?.currentSelection.value.type == .disappearAfterRead) } id: Item(title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized()),
), title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized(),
onTap: { subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_DESCRIPTION".localized(),
let updatedConfig: DisappearingMessagesConfiguration = currentSelection rightAccessory: .radio(
.with( isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.type == .disappearAfterRead) }
isEnabled: true, ),
durationSeconds: (24 * 60 * 60), onTap: {
type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterRead let updatedConfig: DisappearingMessagesConfiguration = currentSelection
) .with(
self?.currentSelection.send(updatedConfig) isEnabled: true,
} durationSeconds: (24 * 60 * 60),
), type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterRead
SessionCell.Info( )
id: .disappearAfterSend, self?.currentSelection.send(updatedConfig)
title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(), }
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_DESCRIPTION".localized(),
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.type == .disappearAfterSend) }
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: (24 * 60 * 60),
type: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterSend
)
self?.currentSelection.send(updatedConfig)
}
)
]
)
].appending(
(currentSelection.isEnabled == false) ? nil :
SectionModel(
model: .timer,
elements: [
SessionCell.Info(
id: .currentSetting,
title: currentSelection.durationSeconds.formatted(format: .long),
rightAccessory: .icon(
UIImage(named: "ic_chevron_down")?
.withRenderingMode(.alwaysTemplate)
), ),
onTap: { } 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
)
self?.currentSelection.send(updatedConfig)
}
)
]
)
].appending(
(currentSelection.isEnabled == false) ? nil :
SectionModel(
model: .timer,
elements: [
SessionCell.Info(
id: Item(title: "Current Setting"),
title: currentSelection.durationSeconds.formatted(format: .long),
rightAccessory: .icon(
UIImage(named: "ic_chevron_down")?
.withRenderingMode(.alwaysTemplate)
),
onTap: {
}
)
]
) )
]
) )
) case .closedGroup:
return [
SectionModel(
model: .timerWithOff,
elements: [
SessionCell.Info(
id: Item(title: "DISAPPEARING_MESSAGES_OFF".localized()),
title: "DISAPPEARING_MESSAGES_OFF".localized(),
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == false) }
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: false,
durationSeconds: 0,
type: nil
)
self?.currentSelection.send(updatedConfig)
}
)
].appending(
contentsOf: DisappearingMessagesConfiguration
.validDurationsSeconds(.disappearAfterRead)
.map { duration in
let title: String = duration.formatted(format: .long)
return SessionCell.Info(
id: Item(title: title),
title: title,
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.durationSeconds == duration) }
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: duration,
type: .disappearAfterRead
)
self?.currentSelection.send(updatedConfig)
}
)
}
)
)
]
case . openGroup:
return [] // Should not happen
}
} }
.removeDuplicates() .removeDuplicates()
.eraseToAnyPublisher() .eraseToAnyPublisher()

3
SessionMessagingKit/Configuration.swift
Unescape Escape View File

@ -24,7 +24,8 @@ public enum SNMessagingKit { // Just to make the external API nice
[ [
_008_EmojiReacts.self, _008_EmojiReacts.self,
_009_OpenGroupPermission.self, _009_OpenGroupPermission.self,
_010_AddThreadIdToFTS.self _010_AddThreadIdToFTS.self,
_011_DisappearingMessageType.self
] ]
] ]
) )

16
SessionMessagingKit/Database/Migrations/_011_DisappearingMessageType.swift
Unescape Escape View File

@ -11,10 +11,18 @@ enum _011_DisappearingMessageType: Migration {
static let minExpectedRunDuration: TimeInterval = 0.1 static let minExpectedRunDuration: TimeInterval = 0.1
static func migrate(_ db: GRDB.Database) throws { static func migrate(_ db: GRDB.Database) throws {
// try db.alter(table: DisappearingMessagesConfiguration.self) { t in try db.alter(table: DisappearingMessagesConfiguration.self) { t in
// t.add(.permissions, .integer) t.add(.type, .integer)
// .defaults(to: OpenGroup.Permissions.all) }
// }
_ = try DisappearingMessagesConfiguration
.filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
.updateAll(
db,
DisappearingMessagesConfiguration.Columns.type.set(
to: DisappearingMessagesConfiguration.DisappearingMessageType.disappearAfterRead
)
)
Storage.update(progress: 1, for: self, in: target) // In case this is the last migration Storage.update(progress: 1, for: self, in: target) // In case this is the last migration
} }

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

@ -134,6 +134,27 @@ extension DisappearingMessagesConfiguration {
public static var maxDurationSeconds: TimeInterval = { public static var maxDurationSeconds: TimeInterval = {
return (validDurationsSeconds.max() ?? 0) return (validDurationsSeconds.max() ?? 0)
}() }()
public static func validDurationsSeconds(_ type: DisappearingMessageType) -> [TimeInterval] {
switch type {
case .disappearAfterRead:
return [
(5 * 60),
(1 * 60 * 60),
(12 * 60 * 60),
(24 * 60 * 60),
(7 * 24 * 60 * 60),
(2 * 7 * 24 * 60 * 60)
]
case .disappearAfterSend:
return [
(12 * 60 * 60),
(24 * 60 * 60),
(7 * 24 * 60 * 60),
(2 * 7 * 24 * 60 * 60)
]
}
}
} }
// MARK: - Objective-C Support // MARK: - Objective-C Support

Write Preview
Loading…
Cancel
Save