mirror of
https://github.com/Dimillian/IceCubesApp.git
synced 2024-09-28 22:41:55 +00:00
VisionOS fixes
This commit is contained in:
parent
a4927fd30c
commit
0dea624060
4 changed files with 40 additions and 31 deletions
|
@ -68,8 +68,8 @@
|
||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/kean/Nuke",
|
"location" : "https://github.com/kean/Nuke",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "1694798e876113d44f6ec6ead965d7286695981d",
|
"revision" : "15fde63470d782c897816a74bdd516a907e33147",
|
||||||
"version" : "12.2.0"
|
"version" : "12.3.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -43,8 +43,9 @@ struct SideBarView<Content: View>: View {
|
||||||
makeBadgeView(count: badge)
|
makeBadgeView(count: badge)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.contentShape(Rectangle())
|
.frame(width: .sidebarWidth - 24, height: 50)
|
||||||
.frame(width: .sidebarWidth, height: 50)
|
.background(tab == selectedTab ? theme.secondaryBackgroundColor : .clear,
|
||||||
|
in: RoundedRectangle(cornerRadius: 8))
|
||||||
}
|
}
|
||||||
|
|
||||||
private func makeBadgeView(count: Int) -> some View {
|
private func makeBadgeView(count: Int) -> some View {
|
||||||
|
@ -131,7 +132,6 @@ struct SideBarView<Content: View>: View {
|
||||||
} label: {
|
} label: {
|
||||||
makeIconForTab(tab: tab)
|
makeIconForTab(tab: tab)
|
||||||
}
|
}
|
||||||
.background(tab == selectedTab ? theme.secondaryBackgroundColor : .clear)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -153,14 +153,19 @@ struct SideBarView<Content: View>: View {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
postButton
|
|
||||||
.padding(.top, 12)
|
|
||||||
Spacer()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.frame(width: .sidebarWidth)
|
.frame(width: .sidebarWidth)
|
||||||
.scrollContentBackground(.hidden)
|
.scrollContentBackground(.hidden)
|
||||||
.background(.thinMaterial)
|
.background(.thinMaterial)
|
||||||
|
.safeAreaInset(edge: .bottom, content: {
|
||||||
|
HStack {
|
||||||
|
postButton
|
||||||
|
.padding(.vertical, 24)
|
||||||
|
}
|
||||||
|
.frame(width: .sidebarWidth)
|
||||||
|
.background(.thinMaterial)
|
||||||
|
})
|
||||||
Divider().edgesIgnoringSafeArea(.all)
|
Divider().edgesIgnoringSafeArea(.all)
|
||||||
}
|
}
|
||||||
content()
|
content()
|
||||||
|
|
|
@ -29,31 +29,31 @@ extension StatusEditor {
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
@Bindable var viewModel = focusedSEVM
|
@Bindable var viewModel = focusedSEVM
|
||||||
VStack(spacing: 0) {
|
#if os(visionOS)
|
||||||
#if os(visionOS)
|
HStack {
|
||||||
HStack {
|
contentView
|
||||||
contentView
|
.buttonStyle(.borderless)
|
||||||
}
|
|
||||||
.frame(height: 24)
|
|
||||||
.padding(16)
|
|
||||||
.background(.thickMaterial)
|
|
||||||
.cornerRadius(8)
|
|
||||||
#else
|
|
||||||
Divider()
|
|
||||||
HStack {
|
|
||||||
contentView
|
|
||||||
}
|
|
||||||
.frame(height: 20)
|
|
||||||
.padding(.vertical, 12)
|
|
||||||
.background(.thinMaterial)
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
.frame(width: 32)
|
||||||
|
.padding(16)
|
||||||
|
.glassBackgroundEffect()
|
||||||
|
.cornerRadius(8)
|
||||||
|
.padding(.trailing, 78)
|
||||||
|
#else
|
||||||
|
Divider()
|
||||||
|
HStack {
|
||||||
|
contentView
|
||||||
|
}
|
||||||
|
.frame(height: 20)
|
||||||
|
.padding(.vertical, 12)
|
||||||
|
.background(.thinMaterial)
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private var contentView: some View {
|
private var contentView: some View {
|
||||||
#if os(visionOS)
|
#if os(visionOS)
|
||||||
HStack(spacing: 8) {
|
VStack(spacing: 8) {
|
||||||
actionsView
|
actionsView
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -85,13 +85,17 @@ extension StatusEditor {
|
||||||
AutoCompleteView(viewModel: focusedSEVM)
|
AutoCompleteView(viewModel: focusedSEVM)
|
||||||
}
|
}
|
||||||
#if os(visionOS)
|
#if os(visionOS)
|
||||||
.ornament(attachmentAnchor: .scene(.bottom)) {
|
.ornament(attachmentAnchor: .scene(.leading)) {
|
||||||
AccessoryView(isSpoilerTextFocused: $isSpoilerTextFocused, focusedSEVM: focusedSEVM, followUpSEVMs: $followUpSEVMs)
|
AccessoryView(isSpoilerTextFocused: $isSpoilerTextFocused,
|
||||||
}
|
focusedSEVM: focusedSEVM,
|
||||||
|
followUpSEVMs: $followUpSEVMs)
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
.safeAreaInset(edge: .bottom) {
|
.safeAreaInset(edge: .bottom) {
|
||||||
if presentationDetent == .large || presentationDetent == .medium {
|
if presentationDetent == .large || presentationDetent == .medium {
|
||||||
AccessoryView(isSpoilerTextFocused: $isSpoilerTextFocused, focusedSEVM: focusedSEVM, followUpSEVMs: $followUpSEVMs)
|
AccessoryView(isSpoilerTextFocused: $isSpoilerTextFocused,
|
||||||
|
focusedSEVM: focusedSEVM,
|
||||||
|
followUpSEVMs: $followUpSEVMs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue