tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove redundant rectangle in ImageCarousel

Browse Source
This commit is contained in:
William Casarin
2023-05-02 06:43:48 -07:00
parent 03931ef70e
commit a18ba86157
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
damus/Components/ImageCarousel.swift
View File

@@ -119,33 +119,29 @@ struct ImageCarousel: View {
var body: some View { var body: some View {
TabView { TabView {
ForEach(urls, id: \.absoluteString) { url in ForEach(urls, id: \.absoluteString) { url in
Rectangle() GeometryReader { geo in
.foregroundColor(Color.clear) KFAnimatedImage(url)
.overlay { .callbackQueue(.dispatch(.global(qos:.background)))
GeometryReader { geo in .backgroundDecode(true)
KFAnimatedImage(url) .imageContext(.note, disable_animation: state.settings.disable_animation)
.callbackQueue(.dispatch(.global(qos:.background))) .image_fade(duration: 0.25)
.backgroundDecode(true) .cancelOnDisappear(true)
.imageContext(.note, disable_animation: state.settings.disable_animation) .configure { view in
.image_fade(duration: 0.25) view.framePreloadCount = 3
.cancelOnDisappear(true)
.configure { view in
view.framePreloadCount = 3
}
.imageFill(for: geo.size, max: maxHeight, fill: fillHeight) { fill in
state.previews.cache_image_meta(evid: evid, image_fill: fill)
image_fill = fill
}
.background {
Placeholder(url: url, geo_size: geo.size)
}
.aspectRatio(contentMode: filling ? .fill : .fit)
.tabItem {
Text(url.absoluteString)
}
.id(url.absoluteString)
} }
} .imageFill(for: geo.size, max: maxHeight, fill: fillHeight) { fill in
state.previews.cache_image_meta(evid: evid, image_fill: fill)
image_fill = fill
}
.background {
Placeholder(url: url, geo_size: geo.size)
}
.aspectRatio(contentMode: filling ? .fill : .fit)
.tabItem {
Text(url.absoluteString)
}
.id(url.absoluteString)
}
} }
} }
.fullScreenCover(isPresented: $open_sheet) { .fullScreenCover(isPresented: $open_sheet) {