[fix] #193 바텀버튼 패딩 수정

Author: stealmh

Projects/DSKit/Sources/Components/PokitBottomButton.swift

@@ -37,7 +37,7 @@ public struct PokitBottomButton: View {
         }
         .disabled(state == .disable)
         .padding(.top, 16)
-        .padding(.bottom, 36)
+//        .padding(.bottom, 36)
     }
 
     private var label: some View {

Projects/DSKit/Sources/Components/PokitBottomSwitchRadio.swift

@@ -20,7 +20,7 @@ public struct PokitBottomSwitchRadio<Content: View>: View {
         }
         .padding(.horizontal, 20)
         .padding(.top, 16)
-        .padding(.bottom, 28)
+//        .padding(.bottom, 28)
         .background(.pokit(.bg(.base)))
     }
 }

Projects/Feature/FeatureCategoryDetail/Sources/Sheet/CategoryFilterSheet.swift

@@ -113,6 +113,7 @@ private extension CategoryFilterSheet {
                 )
                 }
             )
+            .padding(.bottom, 36)
         }
         .padding(.horizontal, 20)
     }

Projects/Feature/FeatureContentSetting/Sources/ContentSetting/ContentSettingFeature.swift

@@ -26,6 +26,8 @@ public struct ContentSettingFeature {
     private var contentClient
     @Dependency(CategoryClient.self)
     private var categoryClient
+    @Dependency(KeyboardClient.self)
+    private var keyboardClient
     /// - State
     @ObservableState
     public struct State: Equatable {
@@ -71,6 +73,7 @@ public struct ContentSettingFeature {
         var showLinkPreview = false
         var isShareExtension: Bool
         var pokitAddSheetPresented: Bool = false
+        var isKeyboardVisible: Bool = false
     }
 
     /// - Action
@@ -110,6 +113,7 @@ public struct ContentSettingFeature {
             case 선택한_포킷_인메모리_삭제
             case 링크팝업_활성화(PokitLinkPopup.PopupType)
             case error(Error)
+            case 키보드_감지_반영(Bool)
         }
 
         public enum AsyncAction: Equatable {
@@ -119,6 +123,7 @@ public struct ContentSettingFeature {
             case 컨텐츠_수정_API
             case 컨텐츠_추가_API
             case 클립보드_감지
+            case 키보드_감지
         }
 
         public enum ScopeAction: Equatable { case 없음 }
@@ -188,7 +193,8 @@ private extension ContentSettingFeature {
             var mergeEffect: [Effect<Action>] = [
                 .send(.async(.카테고리_목록_조회_API)),
                 .send(.inner(.URL_유효성_확인)),
-                .send(.async(.클립보드_감지))
+                .send(.async(.클립보드_감지)),
+                .send(.async(.키보드_감지))
             ]
             if let id = state.domain.contentId {
                 mergeEffect.append(.send(.async(.컨텐츠_상세_조회_API(id: id))))
@@ -356,6 +362,9 @@ private extension ContentSettingFeature {
                 .inner(.링크팝업_활성화(.error(title: errorResponse.message))),
                 animation: .pokitSpring
             )
+        case let .키보드_감지_반영(response):
+            state.isKeyboardVisible = response
+            return .none
         }
     }
 
@@ -445,6 +454,13 @@ private extension ContentSettingFeature {
                     await send(.inner(.linkPopup(url)), animation: .pokitSpring)
                 }
             }
+        
+        case .키보드_감지:
+            return .run { send in
+                for await detect in await keyboardClient.isVisible() {
+                    await send(.inner(.키보드_감지_반영(detect)), animation: .pokitSpring)
+                }
+            }
         }
     }
 

Projects/Feature/FeatureContentSetting/Sources/ContentSetting/ContentSettingView.swift

@@ -67,6 +67,8 @@ public extension ContentSettingView {
                 )
                 .padding(.horizontal, 20)
                 .pokitMaxWidth()
+                .padding(.bottom, store.isKeyboardVisible ? -26 : 0)
+                .padding(.bottom, 36)
             }
             .pokitNavigationBar { navigationBar }
             .ignoresSafeArea(edges: focusedType == nil ? .bottom : [])

Projects/Feature/FeatureLogin/Sources/AgreeToTerms/AgreeToTermsView.swift

@@ -42,6 +42,7 @@ public extension AgreeToTermsView {
                     state: store.isPersonalAndUsageArgee && store.isServiceAgree ? .filled(.primary) : .disable,
                     action: { send(.다음_버튼_눌렀을때) }
                 )
+                .padding(.bottom, 36)
             }
             .pokitMaxWidth()
             .padding(.horizontal, 20)

Projects/Feature/FeatureLogin/Sources/RegisterNickname/RegisterNicknameFeature.swift

@@ -16,6 +16,7 @@ public struct RegisterNicknameFeature {
     @Dependency(\.dismiss) var dismiss
     @Dependency(\.mainQueue) var mainQueue
     @Dependency(UserClient.self) var userClient
+    @Dependency(KeyboardClient.self) var keyboardClient
     /// - State
     @ObservableState
     public struct State: Equatable {
@@ -32,6 +33,7 @@ public struct RegisterNicknameFeature {
         }
         var buttonActive: Bool = false
         var textfieldState: PokitInputStyle.State = .default
+        var isKeyboardVisible: Bool = false
     }
     /// - Action
     public enum Action: FeatureAction, ViewAction {
@@ -47,15 +49,18 @@ public struct RegisterNicknameFeature {
             /// - Button Tapped
             case 다음_버튼_눌렀을때
             case dismiss
+            case onAppear
         }
 
         public enum InnerAction: Equatable {
             case 닉네임_텍스트_변경되었을때
             case 닉네임_중복_체크_API_반영(Bool)
+            case 키보드_감지_반영(Bool)
         }
 
         public enum AsyncAction: Equatable {
             case 닉네임_중복_체크_API
+            case 키보드_감지
         }
         public enum ScopeAction: Equatable { case 없음 }
         public enum DelegateAction: Equatable {
@@ -110,6 +115,8 @@ private extension RegisterNicknameFeature {
             )
         case .binding:
             return .none
+        case .onAppear:
+            return .send(.async(.키보드_감지))
         }
     }
     /// - Inner Effect
@@ -146,6 +153,10 @@ private extension RegisterNicknameFeature {
                 state.buttonActive = true
             }
             return .none
+            
+        case let .키보드_감지_반영(response):
+            state.isKeyboardVisible = response
+            return .none
         }
     }
     /// - Async Effect
@@ -156,6 +167,13 @@ private extension RegisterNicknameFeature {
                 let result = try await userClient.닉네임_중복_체크(nickName)
                 await send(.inner(.닉네임_중복_체크_API_반영(result.isDuplicate)))
             }
+            
+        case .키보드_감지:
+            return .run { send in
+                for await detect in await keyboardClient.isVisible() {
+                    await send(.inner(.키보드_감지_반영(detect)), animation: .pokitSpring)
+                }
+            }
         }
     }
     /// - Scope Effect

Projects/Feature/FeatureLogin/Sources/RegisterNickname/RegisterNicknameView.swift

@@ -45,7 +45,9 @@ public extension RegisterNicknameView {
                     : .disable,
                     action: { send(.다음_버튼_눌렀을때) }
                 )
-                .setKeyboardHeight()
+                .padding(.bottom, store.isKeyboardVisible ? -26 : 0)
+                .padding(.bottom, 36)
+//                .setKeyboardHeight()
             }
             .pokitMaxWidth()
             .padding(.horizontal, 20)
@@ -59,6 +61,7 @@ public extension RegisterNicknameView {
                 }
             }
             .ignoresSafeArea(edges: .bottom)
+            .onAppear { send(.onAppear) }
         }
     }
 }

Projects/Feature/FeatureLogin/Sources/SelectField/SelectFieldView.swift

@@ -39,6 +39,7 @@ public extension SelectFieldView {
                     action: { send(.nextButtonTapped) }
                 )
                 .pokitMaxWidth()
+                .padding(.bottom, 36)
             }
             .padding(.horizontal, 20)
             .pokitNavigationBar {

Projects/Feature/FeatureLogin/Sources/SignUpDone/SignUpDoneView.swift

@@ -45,6 +45,7 @@ public extension SignUpDoneView {
                 )
                 .pokitMaxWidth()
                 .padding(.horizontal, 20)
+                .padding(.bottom, 36)
                 .background(.pokit(.bg(.base)))
             }
             .ignoresSafeArea(edges: .bottom)