mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-26 10:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Format

Browse source
This commit is contained in:
Thomas Ricouard 2023-11-07 11:24:03 +01:00
parent 4266ac4b42
commit 32f96ac1ce
1 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
Packages/Status/Sources/Status/Row/Subviews/StatusRowMediaPreviewView.swift
View file

@ -100,7 +100,7 @@ public struct StatusRowMediaPreviewView: View {
@ViewBuilder @ViewBuilder
private func makeAttachmentView(for index: Int) -> some View { private func makeAttachmentView(for index: Int) -> some View {
if if
attachments.count > index, attachments.count > index,
let data = DisplayData(from: attachments[index]) let data = DisplayData(from: attachments[index])
{ {
@ -278,7 +278,6 @@ struct BlurOverLay: View {
@Environment(UserPreferences.self) private var preferences @Environment(UserPreferences.self) private var preferences
@Environment(\.isCompact) private var isCompact: Bool @Environment(\.isCompact) private var isCompact: Bool
@Namespace var buttonSpace @Namespace var buttonSpace
var body: some View { var body: some View {
@ -289,40 +288,41 @@ struct BlurOverLay: View {
.background(.ultraThinMaterial) .background(.ultraThinMaterial)
.frame( .frame(
width: isFrameExpanded ? nil : 0, width: isFrameExpanded ? nil : 0,
height: isFrameExpanded ? nil : 0) height: isFrameExpanded ? nil : 0
)
if !isCompact { if !isCompact {
Button { Button {
withAnimation(.spring(duration: 0.2)) { withAnimation(.spring(duration: 0.2)) {
isTextExpanded.toggle() isTextExpanded.toggle()
} completion: { } completion: {
withAnimation(.spring(duration: 0.3)) { withAnimation(.spring(duration: 0.3)) {
isFrameExpanded.toggle() isFrameExpanded.toggle()
}
}
} label: {
if isTextExpanded {
ViewThatFits(in: .horizontal) {
HStack {
Image(systemName: "eye")
Text(sensitive ? "status.media.sensitive.show" : "status.media.content.show" )
}
HStack {
Image(systemName: "eye")
Text("Show")
}
Image(systemName: "eye")
}
.lineLimit(1)
.foregroundColor(theme.labelColor)
.matchedGeometryEffect(id: "text", in: buttonSpace)
} else {
Image(systemName: "eye.slash")
.matchedGeometryEffect(id: "text", in: buttonSpace)
} }
} }
.foregroundColor(theme.labelColor) } label: {
.buttonStyle(.borderedProminent) if isTextExpanded {
.padding(theme.statusDisplayStyle == .compact ? 0 : 10) ViewThatFits(in: .horizontal) {
HStack {
Image(systemName: "eye")
Text(sensitive ? "status.media.sensitive.show" : "status.media.content.show")
}
HStack {
Image(systemName: "eye")
Text("Show")
}
Image(systemName: "eye")
}
.lineLimit(1)
.foregroundColor(theme.labelColor)
.matchedGeometryEffect(id: "text", in: buttonSpace)
} else {
Image(systemName: "eye.slash")
.matchedGeometryEffect(id: "text", in: buttonSpace)
}
}
.foregroundColor(theme.labelColor)
.buttonStyle(.borderedProminent)
.padding(theme.statusDisplayStyle == .compact ? 0 : 10)
} }
} }
.font(font) .font(font)
@ -362,7 +362,7 @@ struct AltTextButton: View {
var body: some View { var body: some View {
if !isInCaptureMode, if !isInCaptureMode,
let text = text, let text,
!text.isEmpty, !text.isEmpty,
!isCompact, !isCompact,
preferences.showAltTextForMedia preferences.showAltTextForMedia
@ -373,7 +373,7 @@ struct AltTextButton: View {
ZStack { ZStack {
// use to sync button with show/hide content button // use to sync button with show/hide content button
Image(systemName: "eye.slash").opacity(0) Image(systemName: "eye.slash").opacity(0)
Text("status.image.alt-text.abbreviation") Text("status.image.alt-text.abbreviation")
} }
} }
.buttonStyle(.borderless) .buttonStyle(.borderless)
@ -412,7 +412,7 @@ private struct DisplayData: Identifiable, Hashable {
id = attachment.id id = attachment.id
self.url = url self.url = url
self.previewUrl = attachment.previewUrl ?? attachment.url previewUrl = attachment.previewUrl ?? attachment.url
description = attachment.description description = attachment.description
self.type = DisplayType(from: type) self.type = DisplayType(from: type)
accessibilityText = Self.getAccessibilityString(from: attachment) accessibilityText = Self.getAccessibilityString(from: attachment)
@ -457,7 +457,7 @@ struct WrapperForPreview: View {
VStack { VStack {
ScrollView { ScrollView {
VStack { VStack {
ForEach(1..<5) { number in ForEach(1 ..< 5) { number in
VStack { VStack {
Text("Preview for \(number) item(s)") Text("Preview for \(number) item(s)")
StatusRowMediaPreviewView( StatusRowMediaPreviewView(
@ -484,7 +484,7 @@ struct WrapperForPreview: View {
.padding() .padding()
} }
static private let url = URL(string: "https://www.upwork.com/catalog-images/c5dffd9b5094556adb26e0a193a1c494")! private static let url = URL(string: "https://www.upwork.com/catalog-images/c5dffd9b5094556adb26e0a193a1c494")!
static private let attachment = MediaAttachment.imageWith(url: url) private static let attachment = MediaAttachment.imageWith(url: url)
static private let local = Locale(identifier: "en") private static let local = Locale(identifier: "en")
} }