Skip to content

Commit 910feff

Browse files
authored
[NL-54] : 운세 페이지 완성 (#38)
* [NL-54] : Chip Component 생성 - Forturne 에서 사용 가능한 ChipComponent 생성 * [NL-55] : OnboardingViewController + viewModel Refactor - Routing시 delegate 설정 * [NL-54] : rebase to develop * [NL-54] : Fortune first cell 제작 * [NL-54] : 종합 운세 생성과 제작 - pagecontroller custom 필요 * [NL-54] : Merge 피드백 수정 - pagecontrol 삭제 - 그래프 크기 조절 * [NL-54] : cherry-pic * [NL-54] : view 변경사항 반영 * [NL-54] : CollectionView Top layout constraint 수정
1 parent 1d571fe commit 910feff

File tree

26 files changed

+1555
-557
lines changed

26 files changed

+1555
-557
lines changed

App/Sources/AppDelegate+Assembly.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import Foundation
1111
import Lib
1212
import NetworkCore
1313
import Setting
14+
import Fortune
1415

1516
extension AppDelegate {
1617
func dependencyInjection() {
@@ -19,6 +20,7 @@ extension AppDelegate {
1920
AuthAssembly(),
2021
NetworkCoreAssembly(),
2122
LibAssembly(),
23+
FortuneAssembly()
2224
])
2325
}
2426
}

App/Sources/AppDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Auth
22
import Lib
33
import Onboarding
44
import Setting
5+
import Fortune
56
import UIKit
67

78
@main

Common/Base/Sources/NavigationBarItem.swift

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,32 @@ extension NaivgationBarButtonItem {
3434
return item
3535
}
3636
}
37+
38+
public final class NavigationImageItem : UIImageView, NavigationBarItem {
39+
40+
public override init(frame: CGRect) {
41+
super.init(frame: frame)
42+
setupUI()
43+
}
44+
45+
required init?(coder: NSCoder) {
46+
fatalError("init(coder:) has not been implemented")
47+
}
48+
49+
private func setupUI() {
50+
contentMode = .scaleAspectFit
51+
snp.makeConstraints { make in
52+
make.width.equalTo(74)
53+
make.height.equalTo(20)
54+
}
55+
}
56+
}
57+
58+
extension NavigationImageItem {
59+
public static var logo: NavigationImageItem {
60+
let item = NavigationImageItem(frame: .zero)
61+
item.image = STImages.navigationLogo.image
62+
return item
63+
}
64+
65+
}

Common/Lib/Sources/Router/OnbaordingRoute.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ import UIKit
1111
public enum OnboardingRoute {
1212
case splash
1313
case onboarding
14-
case agreement
15-
case timePicker
14+
case agreement
15+
case timePicker
1616
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// String+.swift
3+
// CoreLayer
4+
//
5+
// Created by 최재혁 on 8/14/25.
6+
//
7+
8+
extension String {
9+
public func insertLineBreaks(every n: Int) -> String {
10+
var result = ""
11+
for (index, character) in self.enumerated() {
12+
result.append(character)
13+
if(index + 1) % n == 0 && index != self.count - 1 {
14+
result.append("\n")
15+
}
16+
}
17+
return result
18+
}
19+
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//
2+
// ThumbnailRO.swift
3+
// CoreLayer
4+
//
5+
// Created by 최재혁 on 8/13/25.
6+
//
7+
8+
public struct ThumbnailRO {
9+
public let sajuMyeongSik: SajuMyeongSik
10+
public let overallFortuneText : String
11+
12+
public init(sajuMyeongSik: SajuMyeongSik, overallFortuneText: String) {
13+
self.sajuMyeongSik = sajuMyeongSik
14+
self.overallFortuneText = overallFortuneText
15+
}
16+
}
17+
18+
public struct SajuMyeongSik {
19+
public let siJu : SajuPair?
20+
public let ilJu : SajuPair
21+
public let wolJu : SajuPair
22+
public let nyeongJu : SajuPair
23+
24+
public init(siJu: SajuPair?, ilJu: SajuPair, wolJu: SajuPair, nyeongJu: SajuPair) {
25+
self.siJu = siJu
26+
self.ilJu = ilJu
27+
self.wolJu = wolJu
28+
self.nyeongJu = nyeongJu
29+
}
30+
}
31+
32+
public struct SajuPair {
33+
public let cheonGan : String
34+
public let jiji : String
35+
36+
public init(cheonGan: String, jiji: String) {
37+
self.cheonGan = cheonGan
38+
self.jiji = jiji
39+
}
40+
}
41+
42+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "EllipseBackground.svg",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "export_image.svg",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)