diff --git a/IceCubesApp/App/Tabs/ProfileTab.swift b/IceCubesApp/App/Tabs/ProfileTab.swift index e5978a13..66a7745a 100644 --- a/IceCubesApp/App/Tabs/ProfileTab.swift +++ b/IceCubesApp/App/Tabs/ProfileTab.swift @@ -27,6 +27,7 @@ struct ProfileTab: View { } else { AccountDetailView(account: .placeholder()) .redacted(reason: .placeholder) + .allowsHitTesting(false) } } .onChange(of: $popToRootTab.wrappedValue) { _, newValue in diff --git a/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift b/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift index efb825a8..1d37f034 100644 --- a/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift +++ b/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift @@ -213,6 +213,7 @@ struct AddAccountView: View { .foregroundColor(.gray) } .redacted(reason: .placeholder) + .allowsHitTesting(false) .shimmering() .listRowBackground(theme.primaryBackgroundColor) } diff --git a/IceCubesApp/App/Tabs/Settings/SupportAppView.swift b/IceCubesApp/App/Tabs/Settings/SupportAppView.swift index 5410a851..3adab52f 100644 --- a/IceCubesApp/App/Tabs/Settings/SupportAppView.swift +++ b/IceCubesApp/App/Tabs/Settings/SupportAppView.swift @@ -266,6 +266,7 @@ struct SupportAppView: View { .padding(.vertical, 8) } .redacted(reason: .placeholder) + .allowsHitTesting(false) .shimmering() } } diff --git a/Packages/Account/Sources/Account/AccountDetailView.swift b/Packages/Account/Sources/Account/AccountDetailView.swift index 895f24bf..fa5f6900 100644 --- a/Packages/Account/Sources/Account/AccountDetailView.swift +++ b/Packages/Account/Sources/Account/AccountDetailView.swift @@ -153,6 +153,7 @@ public struct AccountDetailView: View { account: .placeholder(), scrollViewProxy: proxy) .redacted(reason: .placeholder) + .allowsHitTesting(false) case let .data(account): AccountDetailHeaderView(viewModel: viewModel, account: account, diff --git a/Packages/Account/Sources/Account/AccountsList/AccountsListView.swift b/Packages/Account/Sources/Account/AccountsList/AccountsListView.swift index dd1df8df..8800dce7 100644 --- a/Packages/Account/Sources/Account/AccountsList/AccountsListView.swift +++ b/Packages/Account/Sources/Account/AccountsList/AccountsListView.swift @@ -23,6 +23,7 @@ public struct AccountsListView: View { ForEach(Account.placeholders()) { _ in AccountsListRow(viewModel: .init(account: .placeholder(), relationShip: .placeholder())) .redacted(reason: .placeholder) + .allowsHitTesting(false) .shimmering() .listRowBackground(theme.primaryBackgroundColor) } diff --git a/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift b/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift index b26abe11..c116ce73 100644 --- a/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift +++ b/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift @@ -82,6 +82,7 @@ public struct AppAccountsSelectorView: View { } else { AvatarView(url: nil, size: avatarSize) .redacted(reason: .placeholder) + .allowsHitTesting(false) } }.overlay(alignment: .topTrailing) { if !currentAccount.followRequests.isEmpty || showNotificationBadge, accountCreationEnabled { diff --git a/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift b/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift index 90ebdbf7..07990c0e 100644 --- a/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift +++ b/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift @@ -101,6 +101,7 @@ public struct ConversationDetailView: View { ForEach(Status.placeholders()) { message in ConversationMessageView(message: message, conversation: viewModel.conversation) .redacted(reason: .placeholder) + .allowsHitTesting(false) .padding(.vertical, 4) } } diff --git a/Packages/Conversations/Sources/Conversations/List/ConversationsListView.swift b/Packages/Conversations/Sources/Conversations/List/ConversationsListView.swift index 0d1a7c49..3ece0487 100644 --- a/Packages/Conversations/Sources/Conversations/List/ConversationsListView.swift +++ b/Packages/Conversations/Sources/Conversations/List/ConversationsListView.swift @@ -34,6 +34,7 @@ public struct ConversationsListView: View { ConversationsListRow(conversation: $conversation, viewModel: viewModel) .padding(.horizontal, .layoutPadding) .redacted(reason: .placeholder) + .allowsHitTesting(false) } else { ConversationsListRow(conversation: $conversation, viewModel: viewModel) .padding(.horizontal, .layoutPadding) diff --git a/Packages/Explore/Sources/Explore/ExploreView.swift b/Packages/Explore/Sources/Explore/ExploreView.swift index eb811f72..51dc3b60 100644 --- a/Packages/Explore/Sources/Explore/ExploreView.swift +++ b/Packages/Explore/Sources/Explore/ExploreView.swift @@ -126,6 +126,7 @@ public struct ExploreView: View { StatusRowView(viewModel: .init(status: status, client: client, routerPath: routerPath)) .padding(.vertical, 8) .redacted(reason: .placeholder) + .allowsHitTesting(false) .listRowBackground(theme.primaryBackgroundColor) } } diff --git a/Packages/Notifications/Sources/Notifications/NotificationsListView.swift b/Packages/Notifications/Sources/Notifications/NotificationsListView.swift index a91d331b..ba996f14 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationsListView.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationsListView.swift @@ -114,13 +114,13 @@ public struct NotificationsListView: View { client: client, routerPath: routerPath, followRequests: account.followRequests) - .redacted(reason: .placeholder) .listRowInsets(.init(top: 12, leading: .layoutPadding + 4, bottom: 12, trailing: .layoutPadding)) .listRowBackground(theme.primaryBackgroundColor) .redacted(reason: .placeholder) + .allowsHitTesting(false) } case let .display(notifications, nextPageState): diff --git a/Packages/Status/Sources/Status/Detail/StatusDetailView.swift b/Packages/Status/Sources/Status/Detail/StatusDetailView.swift index 3eb6b3bd..9a844f03 100644 --- a/Packages/Status/Sources/Status/Detail/StatusDetailView.swift +++ b/Packages/Status/Sources/Status/Detail/StatusDetailView.swift @@ -148,6 +148,7 @@ public struct StatusDetailView: View { ForEach(Status.placeholders()) { status in StatusRowView(viewModel: .init(status: status, client: client, routerPath: routerPath)) .redacted(reason: .placeholder) + .allowsHitTesting(false) } } diff --git a/Packages/Status/Sources/Status/List/StatusesListView.swift b/Packages/Status/Sources/Status/List/StatusesListView.swift index b924475a..7b91066b 100644 --- a/Packages/Status/Sources/Status/List/StatusesListView.swift +++ b/Packages/Status/Sources/Status/List/StatusesListView.swift @@ -31,6 +31,7 @@ public struct StatusesListView: View where Fetcher: StatusesFetcher { ForEach(Status.placeholders()) { status in StatusRowView(viewModel: .init(status: status, client: client, routerPath: routerPath)) .redacted(reason: .placeholder) + .allowsHitTesting(false) } case .error: ErrorView(title: "status.error.title",