From bdf5d3c783c15273a14b6d136c5fd1ead75a28ce Mon Sep 17 00:00:00 2001 From: Daniel Dickison Date: Wed, 22 Feb 2023 10:00:29 -0800 Subject: [PATCH] Always show buttons on focus status (#1015) I think it's helpful to have the buttons and their numeric badges visible when showing a status detail view for the focused status, even if the user has opted to hide them in timeline display settings. Co-authored-by: Thomas Ricouard --- Packages/Status/Sources/Status/Row/StatusRowView.swift | 2 +- .../Sources/Status/Row/Subviews/StatusRowActionsView.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/Status/Sources/Status/Row/StatusRowView.swift b/Packages/Status/Sources/Status/Row/StatusRowView.swift index 8ce37c17..4a84b2f4 100644 --- a/Packages/Status/Sources/Status/Row/StatusRowView.swift +++ b/Packages/Status/Sources/Status/Row/StatusRowView.swift @@ -70,7 +70,7 @@ public struct StatusRowView: View { .accessibilityAction { viewModel.navigateToDetail() } - if viewModel.showActions, theme.statusActionsDisplay != .none, !isInCaptureMode { + if viewModel.showActions, (viewModel.isFocused || theme.statusActionsDisplay != .none), !isInCaptureMode { StatusRowActionsView(viewModel: viewModel) .padding(.top, 8) .tint(viewModel.isFocused ? theme.tintColor : .gray) diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift index 373deddd..fee1db9e 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift @@ -37,7 +37,7 @@ struct StatusRowActionsView: View { } func count(viewModel: StatusRowViewModel, theme: Theme) -> Int? { - if theme.statusActionsDisplay == .discret { + if theme.statusActionsDisplay == .discret && !viewModel.isFocused { return nil } switch self {