Skip to content

Commit e59186a

Browse files
authored
[NL-86] : 일부 값 수정 (#61)
* [NL-86] : home화면 reload 시점 갱신 * [NL-86] : fortune 사용자 정보 초기화 * [NL-86] : mypage 사용자 정보 초기화 시점 설정 - splashview layout 수정 * [NL-86] : onboarding + profileedit 화면 일부 로직 변경 * [NL-86] : 색상값 변경 * [NL-86] : Rebase 문제 해결
1 parent 609de5e commit e59186a

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

Common/Auth/Sources/UserDataManager.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import Combine
1010
import DIInjector
1111
import Foundation
1212
import NetworkCore
13+
import Combine
1314

1415
public final class UserDataManager {
1516

Feature/Fortune/Sources/Cells/ThumbnailCollectionViewCell.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,10 @@ extension ThumbnailCollectionViewCell {
408408

409409
stackView.addArrangedSubview(typeLabel)
410410
stackView.addArrangedSubview(infoLabel)
411+
412+
infoLabel.snp.makeConstraints { make in
413+
make.height.equalTo(28)
414+
}
411415

412416
infoLabel.snp.makeConstraints { make in
413417
make.height.equalTo(28)

Feature/Fortune/Sources/FourtuneViewModel.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Auth
99
import Combine
1010
import DIInjector
1111
import Foundation
12+
import Auth
1213

1314
public final class FortuneViewModel {
1415
enum Input {

Feature/Home/Sources/Home/HomeViewController.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public final class HomeViewController: BaseViewController {
5353
viewModel.send(input: .viewDidLoad)
5454
}
5555

56-
public override func viewWillAppear(_ animated: Bool) {
57-
super.viewWillAppear(animated)
58-
59-
}
60-
6156
private func setupUI() {
6257
setNavigationBarHidden(true)
6358

Feature/Home/Sources/Home/HomeViewModel.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Auth
99
import Combine
1010
import DIInjector
1111
import Foundation
12+
import Auth
1213

1314
protocol HomeCellModel {}
1415

@@ -70,9 +71,7 @@ public final class HomeViewModel {
7071
}
7172
}
7273
}
73-
7474
}
75-
7675
}
7776

7877
extension HomeViewModel {

Feature/Onboarding/Sources/Onboarding/OnboardingViewcontroller.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ extension OnboardingViewController {
292292
if !onBoardingStack.contains(bornTimeStack) && birthTextField.text?.count == 10 {
293293
birthTextField.resignFirstResponder()
294294
UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseInOut) {
295-
296295
self.onBoardingStack.insertArrangedSubview(self.bornTimeStack, at: 0)
297296

298297
self.bornTimeStack.snp.makeConstraints {
@@ -304,7 +303,7 @@ extension OnboardingViewController {
304303
}
305304
}
306305
if birthTextField.isFirstResponder {
307-
birthTextField.layer.borderColor = STColors.primary7.color.cgColor
306+
birthTextField.layer.borderColor = STColors.primary2.color.cgColor
308307
} else {
309308
birthTextField.layer.borderColor = STColors.gray7.color.cgColor
310309
}

Feature/Setting/Sources/MyPage/MyPageViewModel.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import DIInjector
1212
import Foundation
1313
import Lib
1414
import UIKit
15+
import Auth
1516

1617
public final class MyPageViewModel {
1718

0 commit comments

Comments
 (0)