Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ internal fun NftListScene(

Column(modifier = Modifier.fillMaxSize()) {
LazyVerticalGrid(
modifier = Modifier.weight(1f).fillMaxWidth(),
modifier = Modifier
.then(if (items.isEmpty()) Modifier else Modifier.weight(1f))
.fillMaxWidth(),
columns = GridCells.Adaptive(minSize = 150.dp),
state = listState,
contentPadding = PaddingValues(paddingSmall, paddingDefault)
Expand Down
17 changes: 10 additions & 7 deletions ios/Features/NFT/Sources/Scenes/CollectionsScene.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ public struct CollectionsScene<ViewModel: CollectionsViewable>: View {
GeometryReader { geometry in
ScrollView {
VStack(spacing: .zero) {
LazyVGrid(columns: model.columns) {
collectionsView
}
.padding(.horizontal, Spacing.medium + Spacing.tiny)
if model.content.items.isNotEmpty {
LazyVGrid(columns: model.columns) {
collectionsView
}
.padding(.horizontal, Spacing.medium + Spacing.tiny)

Spacer(minLength: .medium)
Spacer(minLength: .medium)
}

if let unverifiedCount = model.content.unverifiedCount {
List {
Expand All @@ -36,17 +38,18 @@ public struct CollectionsScene<ViewModel: CollectionsViewable>: View {
)
}
}
.contentMargins(.top, .zero, for: .scrollContent)
.scrollDisabled(true)
.frame(height: .list.minHeight)
}
}
.frame(minHeight: geometry.size.height)
.frame(minHeight: geometry.size.height, alignment: .top)
}
}
.bindQuery(model.query)
.contentMargins(.top, .scene.top, for: .scrollContent)
.overlay {
if model.content.items.isEmpty {
if model.content.items.isEmpty, model.content.unverifiedCount == nil {
EmptyContentView(model: model.emptyContentModel)
}
}
Expand Down
2 changes: 1 addition & 1 deletion ios/Packages/Style/Sources/Spacing.swift
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public extension Sizing {

enum list {
/// 100
public static let minHeight: CGFloat = 100
public static let minHeight: CGFloat = 84
/// 16
public static let accessory: CGFloat = 16
/// 22
Expand Down
Loading