mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-10 01:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes on detail view

Browse source
This commit is contained in:
Thomas Ricouard 2023-09-17 14:07:41 +02:00
parent 194b36590f
commit 4e0be3bd75
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Packages/Status/Sources/Status/Row/StatusRowView.swift
View file

@ -13,11 +13,12 @@ public struct StatusRowView: View {
@Environment(\.isCompact) private var isCompact: Bool
@Environment(\.accessibilityVoiceOverEnabled) private var accessibilityVoiceOverEnabled
@Environment(\.isStatusFocused) private var isFocused
@Environment(\.isStatusDetailLoaded) private var isStatusDetailLoaded
@Environment(QuickLook.self) private var quickLook
@EnvironmentObject private var theme: Theme
@State var viewModel: StatusRowViewModel
@State private var viewModel: StatusRowViewModel
public init(viewModel: StatusRowViewModel) {
_viewModel = .init(initialValue: viewModel)
@ -28,6 +29,7 @@ public struct StatusRowView: View {
}
public var body: some View {
let _ = Self._printChanges()
VStack(alignment: .leading) {
if viewModel.isFiltered, let filter = viewModel.filter {
switch filter.filter.filterAction {
@ -75,15 +77,21 @@ public struct StatusRowView: View {
}
}
}
if viewModel.showActions, isFocused || theme.statusActionsDisplay != .none, !isInCaptureMode {
StatusRowActionsView(viewModel: viewModel)
.padding(.top, 8)
.tint(isFocused ? theme.tintColor : .gray)
.contentShape(Rectangle())
.onTapGesture {
guard !isFocused else { return }
viewModel.navigateToDetail()
}
VStack(alignment: .leading, spacing: 12) {
if viewModel.showActions, isFocused || theme.statusActionsDisplay != .none, !isInCaptureMode {
StatusRowActionsView(viewModel: viewModel)
.padding(.top, 8)
.tint(isFocused ? theme.tintColor : .gray)
.contentShape(Rectangle())
.onTapGesture {
guard !isFocused else { return }
viewModel.navigateToDetail()
}
}
if isFocused, isStatusDetailLoaded {
StatusRowDetailView(viewModel: viewModel)
}
}
}
}

9
Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift
View file

@ -11,10 +11,9 @@ struct StatusRowActionsView: View {
@EnvironmentObject private var userPreferences: UserPreferences
@Environment(\.isStatusFocused) private var isFocused
@Environment(\.isStatusDetailLoaded) private var isStatusDetailLoaded
var viewModel: StatusRowViewModel
func privateBoost() -> Bool {
viewModel.status.visibility == .priv && viewModel.status.account.id == currentAccount.account?.id
}
@ -152,12 +151,6 @@ struct StatusRowActionsView: View {
}
}
}
if isStatusDetailLoaded {
StatusRowDetailView(viewModel: viewModel)
.transition(.move(edge: .bottom))
.animation(.snappy)
}
}
}