Move safeAreaInset ref to Theme
This commit is contained in:
@@ -127,14 +127,6 @@ struct ImageView: View {
|
|||||||
@State private var selectedIndex = 0
|
@State private var selectedIndex = 0
|
||||||
@State var showMenu = true
|
@State var showMenu = true
|
||||||
|
|
||||||
var safeAreaInsets: UIEdgeInsets? {
|
|
||||||
return UIApplication
|
|
||||||
.shared
|
|
||||||
.connectedScenes
|
|
||||||
.flatMap { ($0 as? UIWindowScene)?.windows ?? [] }
|
|
||||||
.first { $0.isKeyWindow }?.safeAreaInsets
|
|
||||||
}
|
|
||||||
|
|
||||||
var navBarView: some View {
|
var navBarView: some View {
|
||||||
VStack {
|
VStack {
|
||||||
HStack {
|
HStack {
|
||||||
@@ -180,8 +172,8 @@ struct ImageView: View {
|
|||||||
ZoomableScrollView {
|
ZoomableScrollView {
|
||||||
ImageContainerView(url: urls[index])
|
ImageContainerView(url: urls[index])
|
||||||
.aspectRatio(contentMode: .fit)
|
.aspectRatio(contentMode: .fit)
|
||||||
.padding(.top, safeAreaInsets?.top)
|
.padding(.top, Theme.safeAreaInsets?.top)
|
||||||
.padding(.bottom, safeAreaInsets?.bottom)
|
.padding(.bottom, Theme.safeAreaInsets?.bottom)
|
||||||
}
|
}
|
||||||
.modifier(SwipeToDismissModifier(minDistance: 50, onDismiss: {
|
.modifier(SwipeToDismissModifier(minDistance: 50, onDismiss: {
|
||||||
presentationMode.wrappedValue.dismiss()
|
presentationMode.wrappedValue.dismiss()
|
||||||
@@ -210,7 +202,7 @@ struct ImageView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.animation(.easeInOut, value: showMenu)
|
.animation(.easeInOut, value: showMenu)
|
||||||
.padding(.bottom, safeAreaInsets?.bottom)
|
.padding(.bottom, Theme.safeAreaInsets?.bottom)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,4 +25,12 @@ class Theme {
|
|||||||
|
|
||||||
UINavigationBar.appearance().tintColor = tintColor ?? titleColor ?? .black
|
UINavigationBar.appearance().tintColor = tintColor ?? titleColor ?? .black
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static var safeAreaInsets: UIEdgeInsets? {
|
||||||
|
return UIApplication
|
||||||
|
.shared
|
||||||
|
.connectedScenes
|
||||||
|
.flatMap { ($0 as? UIWindowScene)?.windows ?? [] }
|
||||||
|
.first { $0.isKeyWindow }?.safeAreaInsets
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user