cleanup; dismiss

This commit is contained in:
Levitating Pineapple
2024-09-23 23:55:05 +03:00
parent f154a0bcb4
commit b4ec4df687
3 changed files with 4 additions and 10 deletions
@@ -60,7 +60,7 @@ struct ChatListView: View {
}
.modifier(
SwiftUISheet(height: 400, isPresented: $userPickerShown) {
UserPicker(activeSheet: $activeUserPickerSheet)
UserPicker(userPickerShown: $userPickerShown, activeSheet: $activeUserPickerSheet)
}
)
.sheet(item: $activeUserPickerSheet) { sheet in
@@ -12,7 +12,7 @@ struct UserPicker: View {
@Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
@Environment(\.scenePhase) private var scenePhase: ScenePhase
@Environment(\.colorScheme) private var colorScheme: ColorScheme
@Environment(\.dismiss) private var dismiss: DismissAction
@Binding var userPickerShown: Bool
@Binding var activeSheet: UserPickerSheet?
@State private var currentUser: Int64?
@State private var switchingProfile = false
@@ -133,7 +133,7 @@ struct UserPicker: View {
.clipShape(sectionShape)
.onTapGesture {
switchingProfile = true
dismiss()
userPickerShown = false
Task {
do {
try await changeActiveUserAsync_(u.user.userId, viewPwd: nil)
@@ -181,6 +181,7 @@ struct UserPicker_Previews: PreviewProvider {
let m = ChatModel()
m.users = [UserInfo.sampleData, UserInfo.sampleData]
return UserPicker(
userPickerShown: .constant(true),
activeSheet: $activeSheet
)
.environmentObject(m)
@@ -57,13 +57,6 @@ struct SwiftUISheet<SheetContent: View>: ViewModifier {
.onChange(of: isPresented) { _ in animate() }
}
private var bottomSafeAreaInset: Double {
if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
let window = windowScene.windows.first {
window.safeAreaInsets.bottom
} else { 0 }
}
private func animate() {
let newOffset: Double = isPresented ? 1 : 0
let distance: Double = abs(newOffset - relativeOffset)