Skip to content

Commit 6d2b7bd

Browse files
chore: 바텀시트 높이 조절
1 parent 256c9ad commit 6d2b7bd

3 files changed

Lines changed: 20 additions & 6 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,11 @@ extension UIApplication {
4343
height = statusBarManager?.statusBarFrame.height ?? 0
4444
return height
4545
}
46+
47+
static func bottomSafeAreaHeight() -> CGFloat {
48+
let height: CGFloat
49+
let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene
50+
height = windowScene?.windows.first?.safeAreaInsets.bottom ?? 0
51+
return height
52+
}
4653
}

Koin/Presentation/LostItem/LostItemList/LostItemListViewController.swift

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,11 @@ extension LostItemListViewController {
199199
onFoundButtonTapped: onFoundButtonTapped,
200200
onLostButtonTapped: onLostButtonTapped
201201
)
202-
let bottomSheetViewController = BottomSheetViewController(contentViewController: postOptionViewController, defaultHeight: 225, cornerRadius: 32)
202+
let bottomSheetViewController = BottomSheetViewController(
203+
contentViewController: postOptionViewController,
204+
defaultHeight: 191 + UIApplication.bottomSafeAreaHeight(),
205+
cornerRadius: 32
206+
)
203207
bottomSheetViewController.modalTransitionStyle = .crossDissolve
204208
navigationController?.present(bottomSheetViewController, animated: true)
205209
}
@@ -250,7 +254,10 @@ extension LostItemListViewController {
250254
self?.inputSubject.send(.updateFilter(filter: filter))
251255
}
252256
)
253-
let bottomSheetViewController = BottomSheetViewController(contentViewController: filterViewController, defaultHeight: UIApplication.hasHomeButton() ? 661 - 35 : 661, cornerRadius: 32)
257+
let bottomSheetViewController = BottomSheetViewController(
258+
contentViewController: filterViewController,
259+
defaultHeight: 627 + UIApplication.bottomSafeAreaHeight(),
260+
cornerRadius: 32)
254261
bottomSheetViewController.modalTransitionStyle = .crossDissolve
255262
navigationController?.present(bottomSheetViewController, animated: true)
256263
}

koin.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
835DC1FB2C84B96500488506 /* FetchHotSearchingKeywordUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 835DC1FA2C84B96500488506 /* FetchHotSearchingKeywordUseCase.swift */; };
403403
835DC2042C84C39E00488506 /* ManageRecentSearchedWordUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 835DC2032C84C39E00488506 /* ManageRecentSearchedWordUseCase.swift */; };
404404
835DC2062C84D09400488506 /* FetchRecommendedSearchWordRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 835DC2052C84D09400488506 /* FetchRecommendedSearchWordRequest.swift */; };
405-
8360D28E2BEAFC2D00909861 /* UIApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8360D28D2BEAFC2D00909861 /* UIApplication.swift */; };
405+
8360D28E2BEAFC2D00909861 /* UIApplication+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8360D28D2BEAFC2D00909861 /* UIApplication+.swift */; };
406406
836242362BD9522400845499 /* FirebaseLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836242352BD9522400845499 /* FirebaseLog.swift */; };
407407
837BFA582BB8D6F7001FCBD4 /* UIViewcontroller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 837BFA572BB8D6F7001FCBD4 /* UIViewcontroller.swift */; };
408408
837BFA5D2BB9830C001FCBD4 /* UILabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 837BFA5C2BB9830C001FCBD4 /* UILabel.swift */; };
@@ -1190,7 +1190,7 @@
11901190
835DC2052C84D09400488506 /* FetchRecommendedSearchWordRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchRecommendedSearchWordRequest.swift; sourceTree = "<group>"; };
11911191
835DC2072C84F5FD00488506 /* RecentSearchedWordInfo+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RecentSearchedWordInfo+CoreDataClass.swift"; sourceTree = "<group>"; };
11921192
835DC2082C84F5FD00488506 /* RecentSearchedWordInfo+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RecentSearchedWordInfo+CoreDataProperties.swift"; sourceTree = "<group>"; };
1193-
8360D28D2BEAFC2D00909861 /* UIApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIApplication.swift; sourceTree = "<group>"; };
1193+
8360D28D2BEAFC2D00909861 /* UIApplication+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+.swift"; sourceTree = "<group>"; };
11941194
836242352BD9522400845499 /* FirebaseLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseLog.swift; sourceTree = "<group>"; };
11951195
837BFA572BB8D6F7001FCBD4 /* UIViewcontroller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewcontroller.swift; sourceTree = "<group>"; };
11961196
837BFA5C2BB9830C001FCBD4 /* UILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UILabel.swift; sourceTree = "<group>"; };
@@ -3582,7 +3582,7 @@
35823582
D2078BFD2BC4F9CB00A39861 /* String+.swift */,
35833583
D2078C042BC6792300A39861 /* UICollectionView+.swift */,
35843584
D2078C0F2BC7B56D00A39861 /* Int+.swift */,
3585-
8360D28D2BEAFC2D00909861 /* UIApplication.swift */,
3585+
8360D28D2BEAFC2D00909861 /* UIApplication+.swift */,
35863586
D249CD402C15CBAA000813F9 /* Date+.swift */,
35873587
D2A513422C5B43180064941A /* Bundle+APIKey.swift */,
35883588
D22C548F2C6ADE1A000826DA /* UITextFiled+Publisher.swift */,
@@ -5109,7 +5109,7 @@
51095109
D235829F2BC2F5D600D615DD /* ZoomedImageViewController.swift in Sources */,
51105110
D249CD262C12DC2C000813F9 /* FetchDiningListUseCase.swift in Sources */,
51115111
B46B8CC42E76CC6300A8E797 /* FetchOrderShopSummaryFromShopUseCase.swift in Sources */,
5112-
8360D28E2BEAFC2D00909861 /* UIApplication.swift in Sources */,
5112+
8360D28E2BEAFC2D00909861 /* UIApplication+.swift in Sources */,
51135113
D20AD70B2E036BC60067760A /* ResetPasswordEmailUseCase.swift in Sources */,
51145114
D27A5D9A2C6B97D200C4275F /* InsetLabel.swift in Sources */,
51155115
8380FDC32BC1CBB800120036 /* BusCourseDTO.swift in Sources */,

0 commit comments

Comments
 (0)