mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-25 17:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with various editor sheets

Browse source
This commit is contained in:
Thomas Ricouard 2024-09-18 15:38:42 +02:00
parent 7cef1c5786
commit b0846c9a3d
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Packages/StatusKit/Sources/StatusKit/Editor/Components/AccessoryView.swift
View file

@ -177,13 +177,8 @@ extension StatusEditor {
Image(systemName: customEmojiSheetIconName) Image(systemName: customEmojiSheetIconName)
} }
.accessibilityLabel("accessibility.editor.button.custom-emojis") .accessibilityLabel("accessibility.editor.button.custom-emojis")
.popover(isPresented: $isCustomEmojisSheetDisplay) { .sheet(isPresented: $isCustomEmojisSheetDisplay) {
if UIDevice.current.userInterfaceIdiom == .phone { CustomEmojisView(viewModel: focusedSEVM)
CustomEmojisView(viewModel: focusedSEVM)
} else {
CustomEmojisView(viewModel: focusedSEVM)
.frame(width: 400, height: 500)
}
} }
} }

2
Packages/StatusKit/Sources/StatusKit/Editor/Components/CustomEmojisView.swift
View file

@ -60,7 +60,7 @@ extension StatusEditor {
} }
.presentationBackground(.thinMaterial) .presentationBackground(.thinMaterial)
.presentationCornerRadius(16) .presentationCornerRadius(16)
.presentationDetents([.medium]) .presentationDetents([.medium, .large])
} }
} }
} }

13
Packages/StatusKit/Sources/StatusKit/Editor/Drafts/DraftsListView.swift
View file

@ -31,7 +31,12 @@ extension StatusEditor {
.font(.footnote) .font(.footnote)
.foregroundStyle(.gray) .foregroundStyle(.gray)
} }
}.listRowBackground(theme.primaryBackgroundColor) }
#if os(visionOS)
.foregroundStyle(theme.labelColor)
#else
.listRowBackground(theme.primaryBackgroundColor.opacity(0.4))
#endif
} }
.onDelete { indexes in .onDelete { indexes in
if let index = indexes.first { if let index = indexes.first {
@ -42,10 +47,14 @@ extension StatusEditor {
.toolbar { .toolbar {
CancelToolbarItem() CancelToolbarItem()
} }
.listStyle(.insetGrouped)
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.background(theme.secondaryBackgroundColor) .background(.clear)
.navigationTitle("status.editor.drafts.navigation-title") .navigationTitle("status.editor.drafts.navigation-title")
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
.presentationBackground(.thinMaterial)
.presentationCornerRadius(16)
.presentationDetents([.medium, .large])
} }
} }
} }

4
Packages/StatusKit/Sources/StatusKit/Editor/ToolbarItems.swift
View file

@ -34,13 +34,11 @@ extension StatusEditor {
Image(systemName: "pencil.and.list.clipboard") Image(systemName: "pencil.and.list.clipboard")
} }
.accessibilityLabel("accessibility.editor.button.drafts") .accessibilityLabel("accessibility.editor.button.drafts")
.popover(isPresented: $isDraftsSheetDisplayed) { .sheet(isPresented: $isDraftsSheetDisplayed) {
if UIDevice.current.userInterfaceIdiom == .phone { if UIDevice.current.userInterfaceIdiom == .phone {
draftsListView draftsListView
.presentationDetents([.medium])
} else { } else {
draftsListView draftsListView
.frame(width: 400, height: 500)
} }
} }
} }