mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Updates to File Info Bottom Sheet (#5667)
* Updates to File Info Bottom Sheet Removing buttons, changing labels, adding a title * Update the underlying actions rather than fixing it at the screen-level. * Fix the media details sheet height now there's a navigation title. * Record preview snapshots --------- Co-authored-by: Doug <douglase@element.io> Co-authored-by: Element CI <ci@element.io>
This commit is contained in:
@@ -65,7 +65,7 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
|
||||
case removeCaption
|
||||
case editPoll
|
||||
case copyPermalink
|
||||
case redact
|
||||
case redact(isMedia: Bool)
|
||||
case reply(isThread: Bool)
|
||||
case replyInThread
|
||||
case forward(itemID: TimelineItemIdentifier)
|
||||
@@ -77,8 +77,7 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
|
||||
case pin
|
||||
case unpin
|
||||
case viewInRoomTimeline
|
||||
case share
|
||||
case save
|
||||
case downloadMedia
|
||||
|
||||
var id: Self {
|
||||
self
|
||||
@@ -135,7 +134,7 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
|
||||
|
||||
var canAppearInMediaDetails: Bool {
|
||||
switch self {
|
||||
case .viewInRoomTimeline, .share, .save, .redact, .forward:
|
||||
case .viewInRoomTimeline, .downloadMedia, .redact, .forward:
|
||||
true
|
||||
default:
|
||||
false
|
||||
@@ -171,8 +170,8 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
|
||||
Label(L10n.actionReplyInThread, icon: \.threads)
|
||||
case .forward:
|
||||
Label(L10n.actionForward, icon: \.forward)
|
||||
case .redact:
|
||||
Label(L10n.actionRemoveMessage, icon: \.delete)
|
||||
case .redact(let isMedia):
|
||||
Label(isMedia ? L10n.actionDeleteFile : L10n.actionRemoveMessage, icon: \.delete)
|
||||
case .viewSource:
|
||||
Label(L10n.actionViewSource, icon: \.code)
|
||||
case .report:
|
||||
@@ -190,10 +189,8 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
|
||||
Label(L10n.actionUnpin, icon: \.unpin)
|
||||
case .viewInRoomTimeline:
|
||||
Label(L10n.actionViewInTimeline, icon: \.visibilityOn)
|
||||
case .share:
|
||||
Label(L10n.actionShare, icon: \.shareIos)
|
||||
case .save:
|
||||
Label(L10n.actionSave, icon: \.downloadIos)
|
||||
case .downloadMedia:
|
||||
Label(L10n.actionDownload, icon: \.downloadIos)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -114,7 +114,8 @@ struct TimelineItemMenuActionProvider {
|
||||
}
|
||||
|
||||
if canRedactItem(item) {
|
||||
secondaryActions.append(.redact)
|
||||
let isMedia = if case .media = timelineKind { true } else { false }
|
||||
secondaryActions.append(.redact(isMedia: isMedia))
|
||||
}
|
||||
|
||||
switch timelineKind {
|
||||
@@ -122,8 +123,7 @@ struct TimelineItemMenuActionProvider {
|
||||
actions = actions.filter(\.canAppearInPinnedEventsTimeline)
|
||||
secondaryActions = secondaryActions.filter(\.canAppearInPinnedEventsTimeline)
|
||||
case .media:
|
||||
actions.append(.share)
|
||||
actions.append(.save)
|
||||
actions.append(.downloadMedia)
|
||||
actions = actions.filter(\.canAppearInMediaDetails)
|
||||
secondaryActions = secondaryActions.filter(\.canAppearInMediaDetails)
|
||||
case .live, .detached, .thread:
|
||||
|
||||
Reference in New Issue
Block a user