Skip to content

Commit

Permalink
Merge branch 'feature/#154-adjust-ipad' of https://github.com/YAPP-Giโ€ฆ
Browse files Browse the repository at this point in the history
โ€ฆthub/Pokit-iOS into feature/#154-adjust-ipad
  • Loading branch information
ShapeKim98 committed Nov 6, 2024
2 parents 5f8c4d7 + 04a50d4 commit 8a1b0a5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ public struct PokitSplitFeature {
Scope(state: \.ํฌํ‚ท, action: \.ํฌํ‚ท) {
PokitRootFeature()
}

Scope(state: \.๋งํฌ์ถ”๊ฐ€, action: \.๋งํฌ์ถ”๊ฐ€) {
ContentSettingFeature()
}
Expand Down
26 changes: 13 additions & 13 deletions Projects/App/Sources/MainTabSplit/Remind/RemindSplitFeature.swift
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ private extension RemindSplitFeature {
/// - Scope Effect
func handleScopeAction(_ action: Action.ScopeAction, state: inout State) -> Effect<Action> {
switch action {
// - MARK: ๋ฆฌ๋งˆ์ธ๋“œ
// - MARK: ๋ฆฌ๋งˆ์ธ๋“œ
case .๋ฆฌ๋งˆ์ธ๋“œ(.delegate(.๋งํฌ๋ชฉ๋ก_์•ˆ์ฝ์Œ)):
state.path.removeAll()
return .send(.inner(.๋งํฌ๋ชฉ๋ก_ํ™œ์„ฑํ™”(.unread)))
Expand All @@ -286,15 +286,15 @@ private extension RemindSplitFeature {
case .๋ฆฌ๋งˆ์ธ๋“œ:
return .none

// - MARK: ๋งํฌ๋ชฉ๋ก
// - MARK: ๋งํฌ๋ชฉ๋ก
case let .๋งํฌ๋ชฉ๋ก(.delegate(.๋งํฌ์ƒ์„ธ(content: content))):
return .send(.inner(.๋งํฌ์ƒ์„ธ_ํ™œ์„ฑํ™”(content.id)))
case let .๋งํฌ๋ชฉ๋ก(.delegate(.๋งํฌ์ˆ˜์ •(contentId: contentId))):
return .send(.inner(.๋งํฌ์ˆ˜์ •_ํ™œ์„ฑํ™”(contentId)))
case .๋งํฌ๋ชฉ๋ก:
return .none

// - MARK: ๋งํฌ์ถ”๊ฐ€๋ฐ์ˆ˜์ •
// - MARK: ๋งํฌ์ถ”๊ฐ€๋ฐ์ˆ˜์ •
case .๋งํฌ์ถ”๊ฐ€(.delegate(.dismiss)):
state.columnVisibility = .doubleColumn
return .none
Expand All @@ -309,14 +309,14 @@ private extension RemindSplitFeature {
return .send(.inner(.ํฌํ‚ท์ถ”๊ฐ€๋ฐ์ˆ˜์ •_ํ™œ์„ฑํ™”(nil)))
case .๋งํฌ์ถ”๊ฐ€:
return .none
// - MARK: ํฌํ‚ท์ถ”๊ฐ€๋ฐ์ˆ˜์ •

// - MARK: ํฌํ‚ท์ถ”๊ฐ€๋ฐ์ˆ˜์ •
case .ํฌํ‚ท์ถ”๊ฐ€๋ฐ์ˆ˜์ •(.presented(.delegate(.settingSuccess(_)))):
return .send(.ํฌํ‚ท์ถ”๊ฐ€๋ฐ์ˆ˜์ •(.dismiss))
case .ํฌํ‚ท์ถ”๊ฐ€๋ฐ์ˆ˜์ •:
return .none
// - MARK: ๊ฒ€์ƒ‰

// - MARK: ๊ฒ€์ƒ‰
case let .๊ฒ€์ƒ‰(_, .delegate(.๋งํฌ์ˆ˜์ •(contentId: contentId))):
return .send(.inner(.๋งํฌ์ˆ˜์ •_ํ™œ์„ฑํ™”(contentId)))
case let .๊ฒ€์ƒ‰(_, .delegate(.linkCardTapped(content: content))):
Expand All @@ -326,10 +326,10 @@ private extension RemindSplitFeature {
case .๊ฒ€์ƒ‰:
return .none

// - MARK: ๋งํฌ์ƒ์„ธ
// - MARK: ๋งํฌ์ƒ์„ธ
case .๋งํฌ์ƒ์„ธ(.presented(.delegate(.์ฆ๊ฒจ์ฐพ๊ธฐ_๊ฐฑ์‹ _์™„๋ฃŒ))),
.๋งํฌ์ƒ์„ธ(.presented(.delegate(.์ปจํ…์ธ _์กฐํšŒ_์™„๋ฃŒ))),
.๋งํฌ์ƒ์„ธ(.presented(.delegate(.์ปจํ…์ธ _์‚ญ์ œ_์™„๋ฃŒ))):
.๋งํฌ์ƒ์„ธ(.presented(.delegate(.์ปจํ…์ธ _์กฐํšŒ_์™„๋ฃŒ))),
.๋งํฌ์ƒ์„ธ(.presented(.delegate(.์ปจํ…์ธ _์‚ญ์ œ_์™„๋ฃŒ))):
var mergeEffect: [Effect<Action>] = [
.send(.๋ฆฌ๋งˆ์ธ๋“œ(.delegate(.์ปจํ…์ธ _์ƒ์„ธ๋ณด๊ธฐ_delegate_์œ„์ž„)))
]
Expand All @@ -348,15 +348,15 @@ private extension RemindSplitFeature {
case .๋งํฌ์ƒ์„ธ:
return .none

// - MARK: ์•Œ๋žŒ
// - MARK: ์•Œ๋žŒ
case let .์•Œ๋ฆผํ•จ(.presented(.delegate(.moveToContentEdit(id: contentId)))):
return .send(.inner(.๋งํฌ์ˆ˜์ •_ํ™œ์„ฑํ™”(contentId)))
case .์•Œ๋ฆผํ•จ(.presented(.delegate(.alertBoxDismiss))):
return .send(.์•Œ๋ฆผํ•จ(.dismiss))
case .์•Œ๋ฆผํ•จ:
return .none

// - MARK: ๋งํฌ์ˆ˜์ •
// - MARK: ๋งํฌ์ˆ˜์ •
case .๋งํฌ์ˆ˜์ •(.presented(.delegate(.์ €์žฅํ•˜๊ธฐ_์™„๋ฃŒ))):
var mergeEffect: [Effect<Action>] = [
.send(.๋ฆฌ๋งˆ์ธ๋“œ(.delegate(.์ปจํ…์ธ _์ƒ์„ธ๋ณด๊ธฐ_delegate_์œ„์ž„))),
Expand All @@ -379,7 +379,7 @@ private extension RemindSplitFeature {
case .๋งํฌ์ˆ˜์ •:
return .none

// - MARK: ํฌํ‚ท๊ณต์œ 
// - MARK: ํฌํ‚ท๊ณต์œ 
case let .ํฌํ‚ท๊ณต์œ (.presented(.delegate(.์ปจํ…์ธ _์•„์ดํ…œ_ํด๋ฆญ(categoryId, content)))):
state.๋งํฌ์ƒ์„ธ = .init(content: BaseContentDetail(
id: content.id,
Expand Down

0 comments on commit 8a1b0a5

Please sign in to comment.