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

Minor tweaks

Browse Source
pull/970/head
Morgan Pretty 11 months ago
parent b198699c4f
commit da6c407e9f
6 changed files with 27 additions and 42 deletions
Show Stats Download Patch File Download Diff File

7
Scripts/LintLocalizableStrings.swift
Unescape Escape View File

@ -82,7 +82,8 @@ extension ProjectState {
.contains("SQL(", caseSensitive: false),
.regex(".*static var databaseTableName: String"),
.regex("case .* = "),
.regex("Error.*\\(")
.regex("Error.*\\("),
.belowLineContaining("PreviewProvider")
]
}
@ -550,6 +551,7 @@ indirect enum MatchType: Hashable {
case containsAnd(String, caseSensitive: Bool, MatchType)
case regex(String)
case previousLine(numEarlier: Int, MatchType)
case belowLineContaining(String)
func matches(_ value: String, _ index: Int, _ lines: [String]) -> Bool {
switch self {
@ -583,6 +585,9 @@ indirect enum MatchType: Hashable {
let targetIndex: Int = (index - numEarlier)
return type.matches(lines[targetIndex], targetIndex, lines)
case .belowLineContaining(let other):
return lines[0..<index].contains(where: { $0.lowercased().contains(other.lowercased()) })
}
}
}

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

@ -87,11 +87,12 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
let title: String = "DISAPPEARING_MESSAGES".localized()
lazy var subtitle: String? = {
if threadVariant == .contact && !isNoteToSelf {
return "DISAPPERING_MESSAGES_SUBTITLE_CONTACTS".localized()
switch (threadVariant, isNoteToSelf) {
case (.contact, false): return "DISAPPERING_MESSAGES_SUBTITLE_CONTACTS".localized()
case (.group, _): return "DISAPPERING_MESSAGES_SUBTITLE_GROUPS".localized()
case (.community, _): return nil
case (.legacyGroup, _), (_, true): return "DISAPPERING_MESSAGES_SUBTITLE_GROUPS".localized()
}
return "DISAPPERING_MESSAGES_SUBTITLE_GROUPS".localized()
}()
lazy var footerButtonInfo: AnyPublisher<SessionButton.Info?, Never> = shouldShowConfirmButton
@ -155,7 +156,6 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
(self?.currentSelection.value.type == .disappearAfterRead)
}
),
styling: SessionCell.StyleInfo(tintColor: .textPrimary),
accessibility: Accessibility(
identifier: "Disappear after read option",
label: "Disappear after read option"
@ -186,7 +186,6 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
(self?.currentSelection.value.type == .disappearAfterSend)
}
),
styling: SessionCell.StyleInfo(tintColor: .textPrimary),
accessibility: Accessibility(
identifier: "Disappear after send option",
label: "Disappear after send option"
@ -302,6 +301,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
// setting
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: true,
durationSeconds: duration,
type: .disappearAfterSend
)

20
Session/Conversations/Views & Modals/ConversationTitleView.swift
Unescape Escape View File

@ -228,19 +228,17 @@ final class ConversationTitleView: UIView {
height: Values.miniFontSize
)
let disappearingMessageSettingLabelString: NSAttributedString = NSAttributedString(attachment: imageAttachment)
.appending(string: " ")
.appending(string: String(
format: (config.type == .disappearAfterRead ?
"DISAPPERING_MESSAGES_SUMMARY_READ".localized() :
"DISAPPERING_MESSAGES_SUMMARY_SEND".localized()
),
floor(config.durationSeconds).formatted(format: .short)
))
labelInfos.append(
SessionLabelCarouselView.LabelInfo(
attributedText: disappearingMessageSettingLabelString,
attributedText: NSAttributedString(attachment: imageAttachment)
.appending(string: " ")
.appending(string: String(
format: (config.type == .disappearAfterRead ?
"DISAPPERING_MESSAGES_SUMMARY_READ".localized() :
"DISAPPERING_MESSAGES_SUMMARY_SEND".localized()
),
floor(config.durationSeconds).formatted(format: .short)
)),
accessibility: Accessibility(
identifier: "Disappearing messages type and time",
label: "Disappearing messages type and time"

9
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
Unescape Escape View File

@ -99,14 +99,5 @@ extension MessageReceiver {
db,
Contact.Columns.lastKnownClientVersion.set(to: version)
)
if contactId == getUserHexEncodedPublicKey(db) {
switch version {
case .legacyDisappearingMessages:
TopBannerController.show(warning: .outdatedUserConfig)
case .newDisappearingMessages:
TopBannerController.hide()
}
}
}
}

17
SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
Unescape Escape View File

@ -71,18 +71,10 @@ class ThreadDisappearingMessagesSettingsViewModelSpec: QuickSpec {
// Should only show one section of Disappearing Messages Type
expect(viewModel.tableData.count).to(equal(1))
if Features.useNewDisappearingMessagesConfig {
// Off
// Disappear After Read
// Disappear After Send
expect(viewModel.tableData.first?.elements.count).to(equal(3))
} else {
// Off
// Legacy
// Disappear After Read
// Disappear After Send
expect(viewModel.tableData.first?.elements.count).to(equal(4))
}
// Off
// Disappear After Read
// Disappear After Send
expect(viewModel.tableData.first?.elements.count).to(equal(3))
}
// MARK: -- has the correct default state
@ -117,7 +109,6 @@ class ThreadDisappearingMessagesSettingsViewModelSpec: QuickSpec {
rightAccessory: .radio(
isSelected: { false }
),
isEnabled: Features.useNewDisappearingMessagesConfig,
accessibility: Accessibility(
identifier: "Disappear after send option",
label: "Disappear after send option"

4
SessionUIKit/Components/TopBannerController.swift
Unescape Escape View File

@ -5,11 +5,11 @@ import SessionUtilitiesKit
public class TopBannerController: UIViewController {
public enum Warning: String, Codable {
case outdatedUserConfig
case invalid
var text: String {
switch self {
case .outdatedUserConfig: return "USER_CONFIG_OUTDATED_WARNING".localized()
case .invalid: return ""
}
}
}

Write Preview
Loading…
Cancel
Save