Skip to content

Commit 3ff4997

Browse files
github-actions[bot]WilhelmOkssamwyndham
authored
feat: share link indicator icon improvement - WPB-23084 πŸ’ (#4219)
Co-authored-by: Wilhelm Oks <50032051+WilhelmOks@users.noreply.github.com> Co-authored-by: Sam Wyndham <samwyndham@users.noreply.github.com>
1 parent cbe081e commit 3ff4997

17 files changed

+46
-42
lines changed

β€ŽWireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesViewItemView.swiftβ€Ž

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ struct FilesItemView: View {
2929

3030
@StateObject private var viewModel: FilesItemViewModel
3131

32-
@ScaledMetric private var iconSpaceWidth: CGFloat = 56
32+
private let iconSpaceWidth: CGFloat = 56 // this is explicitly not supposed to scale.
3333
@ScaledMetric private var iconSpaceHeight: CGFloat = 28
34+
@ScaledMetric private var iconHorizontalPadding: CGFloat = 7
3435

3536
@Environment(\.wireAccentColor) private var wireAccentColor
3637

@@ -160,8 +161,9 @@ struct FilesItemView: View {
160161
PublicLinkBadge(forIcon: viewModel.item.icon)
161162
}
162163
}
163-
.frame(width: iconSpaceWidth, height: iconSpaceHeight)
164-
.padding(.horizontal, 4)
164+
.padding(.horizontal, iconHorizontalPadding)
165+
.frame(minWidth: iconSpaceWidth)
166+
.frame(height: iconSpaceHeight)
165167
}
166168

167169
@ViewBuilder
@@ -371,12 +373,14 @@ private extension View {
371373
}
372374

373375
#Preview {
374-
VStack(spacing: 0) {
375-
FilesItemView(viewModel: .preview())
376-
FilesItemView(viewModel: .preview(publicLinkID: "link"))
377-
FilesItemView(viewModel: .preview(icon: .audio, publicLinkID: "link"))
378-
FilesItemView(viewModel: .preview(kind: .folder, icon: .folder, publicLinkID: "link"))
379-
FilesItemView(viewModel: .preview(tags: ["urgent"]))
380-
FilesItemView(viewModel: .preview(tags: ["urgent", "funny", "important"]))
376+
ScrollView {
377+
VStack(spacing: 0) {
378+
FilesItemView(viewModel: .preview())
379+
FilesItemView(viewModel: .preview(publicLinkID: "link"))
380+
FilesItemView(viewModel: .preview(icon: .audio, publicLinkID: "link"))
381+
FilesItemView(viewModel: .preview(kind: .folder, icon: .folder, publicLinkID: "link"))
382+
FilesItemView(viewModel: .preview(tags: ["urgent"]))
383+
FilesItemView(viewModel: .preview(tags: ["urgent", "funny", "important"]))
384+
}
381385
}
382386
}
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
Β (0)