Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various fixes

This commit is contained in:
Thomas Ricouard 2024-02-06 19:19:53 +01:00
parent a0e022b8de
commit 3020d831e4
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/Account/Sources/Account/AccountDetailView.swift
View File

@ -254,7 +254,11 @@ public struct AccountDetailView: View {
StatusRowView(viewModel: .init(status: status, client: client, routerPath: routerPath))
}
Rectangle()
#if os(visionOS)
.fill(Color.clear)
#else
.fill(theme.secondaryBackgroundColor)
#endif
.frame(height: 12)
.listRowInsets(.init())
.listRowSeparator(.hidden)

2
Packages/Env/Sources/Env/UserPreferences.swift
View File

@ -52,7 +52,7 @@ import SwiftUI
@AppStorage("collapse-long-posts") public var collapseLongPosts = true
@AppStorage("share-button-behavior") public var shareButtonBehavior: PreferredShareButtonBehavior = .linkAndText
@AppStorage("share-button-behavior") public var shareButtonBehavior: PreferredShareButtonBehavior = .linkOnly
@AppStorage("fast_refresh") public var fastRefreshEnabled: Bool = false

2
Packages/StatusKit/Sources/StatusKit/List/StatusesListView.swift
View File

@ -83,6 +83,8 @@ public struct StatusesListView<Fetcher>: View where Fetcher: StatusesFetcher {
Spacer()
}
.padding(.horizontal, .layoutPadding)
#if !os(visionOS)
.listRowBackground(theme.primaryBackgroundColor)
#endif
}
}

21
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowActionsView.swift
View File

@ -143,6 +143,10 @@ struct StatusRowActionsView: View {
case .linkOnly:
ShareLink(item: url) {
action.image(dataController: statusDataController)
.foregroundColor(Color(UIColor.secondaryLabel))
.padding(.vertical, 6)
.padding(.horizontal, 8)
.contentShape(Rectangle())
#if targetEnvironment(macCatalyst)
.font(.scaledBody)
#else
@ -150,12 +154,8 @@ struct StatusRowActionsView: View {
.dynamicTypeSize(.large)
#endif
}
.padding(.vertical, 6)
.padding(.horizontal, 8)
#if os(visionOS)
.buttonStyle(.borderless)
#else
.buttonStyle(.statusAction())
#if !os(visionOS)
.offset(x: -8)
#endif
.accessibilityElement(children: .combine)
@ -166,6 +166,10 @@ struct StatusRowActionsView: View {
message: Text(viewModel.finalStatus.content.asRawText))
{
action.image(dataController: statusDataController)
.foregroundColor(Color(UIColor.secondaryLabel))
.padding(.vertical, 6)
.padding(.horizontal, 8)
.contentShape(Rectangle())
#if targetEnvironment(macCatalyst)
.font(.scaledBody)
#else
@ -173,12 +177,8 @@ struct StatusRowActionsView: View {
.dynamicTypeSize(.large)
#endif
}
.padding(.vertical, 6)
.padding(.horizontal, 8)
#if os(visionOS)
.buttonStyle(.borderless)
#else
.buttonStyle(.statusAction())
#if !os(visionOS)
.offset(x: -8)
#endif
.accessibilityElement(children: .combine)
@ -270,6 +270,7 @@ struct StatusRowActionsView: View {
}
#if os(visionOS)
.buttonStyle(.borderless)
.foregroundColor(Color(UIColor.secondaryLabel))
#else
.buttonStyle(
.statusAction(