merge :: MyPage - RewardPointDetail UI #137
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import NeedleFoundation | ||
| import NetworkModule | ||
| import DomainModule | ||
| import DataModule | ||
|
|
||
| public extension AppComponent { | ||
| var remotePointsDataSource: any RemotePointsDataSource { | ||
| shared { | ||
| RemotePointsDataSourceStub() | ||
| } | ||
| // RemotePointsDataSourceImpl(keychain: keychain) | ||
| } | ||
|
|
||
| var pointsRepository: any PointsRepository { | ||
| shared { | ||
| PointsRepositoryImpl(remotePointsDataSource: remotePointsDataSource) | ||
| } | ||
| } | ||
|
|
||
| var fetchPointListUseCase: any FetchPointListUseCase { | ||
| shared { | ||
| FetchPointListUseCaseImpl(pointsRepository: pointsRepository) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import DomainModule | ||
| import NeedleFoundation | ||
| import SwiftUI | ||
|
|
||
| public protocol RewardPointDetailDependency: Dependency { | ||
| var fetchPointListUseCase: any FetchPointListUseCase { get } | ||
| var rewardPointDetailComponent: RewardPointDetailComponent { get } | ||
| } | ||
|
|
||
| public final class RewardPointDetailComponent: Component<RewardPointDetailDependency> { | ||
| public func makeView() -> some View { | ||
| RewardPointDetailView( | ||
| viewModel: .init( | ||
| fetchPointListUseCase: self.dependency.fetchPointListUseCase | ||
| ), | ||
| rewardPointDetailComponent: dependency.rewardPointDetailComponent | ||
| ) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| import DesignSystem | ||
| import DataMappingModule | ||
| import SwiftUI | ||
|
|
||
| struct RewardPointDetailView: View { | ||
| @StateObject var viewModel: RewardPointDetailViewModel | ||
| private let rewardPointDetailComponent: RewardPointDetailComponent | ||
|
|
||
| init( | ||
| viewModel: RewardPointDetailViewModel, | ||
| rewardPointDetailComponent: RewardPointDetailComponent | ||
| ) { | ||
| _viewModel = StateObject(wrappedValue: viewModel) | ||
| self.rewardPointDetailComponent = rewardPointDetailComponent | ||
| } | ||
|
|
||
| var body: some View { | ||
| NavigationView { | ||
| VStack(alignment: .leading) { | ||
| HStack { | ||
| ForEach(PointsType.allCases, id: \.self) { point in | ||
| DMSButton(text: point.display, | ||
| style: viewModel.pointsType == point ? .contained : .outlined, | ||
| color: viewModel.pointsType == point ? .PrimaryVariant.primary : .GrayScale.gray6) { | ||
|
|
||
| viewModel.pointsType = point | ||
| viewModel.fetchPointList() | ||
| } | ||
| .padding(.trailing, 12) | ||
| } | ||
| } | ||
| .padding(.leading, 24) | ||
| .padding(.top, 16) | ||
|
|
||
| Text("\(viewModel.point?.totalPoint ?? 0)" + " 점") | ||
| .dmsFont(.title(.large), color: .GrayScale.gray6) | ||
| .padding(.top, 44) | ||
| .padding(.horizontal, 24) | ||
| .padding(.bottom, 44) | ||
| ScrollView { | ||
| VStack { | ||
| ForEach(viewModel.point?.poinsts ?? [], id: \.self) { pointList in | ||
| pointsListCellView( | ||
| date: pointList.date.toSmallDMSDateString(), | ||
| name: pointList.name, | ||
| score: "\(pointList.score)" | ||
| ) | ||
| .padding(.top, 5) | ||
| .listRowInsets(EdgeInsets()) | ||
| } | ||
| } | ||
| .padding(.horizontal, 24) | ||
| } | ||
| .navigationTitle("상벌점 현황") | ||
| .navigationBarTitleDisplayMode(.inline) | ||
| .dmsBackground() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @ViewBuilder | ||
| func pointsListCellView(date: String, name: String, score: String) -> some View { | ||
| ZStack { | ||
| Color.System.surface | ||
| .cornerRadius(6) | ||
|
|
||
| HStack { | ||
| VStack(alignment: .leading, spacing: 8) { | ||
| Text(date) | ||
| .dmsFont(.text(.extraSmall), color: .System.title) | ||
|
|
||
| Text(name) | ||
| .dmsFont(.text(.medium), color: .System.text) | ||
| } | ||
| HStack { | ||
| Spacer() | ||
|
|
||
| Text(score) | ||
| .dmsFont(.text(.medium), color: score.contains("-") ? .System.error : .PrimaryVariant.darken2) | ||
| } | ||
|
|
||
| Spacer() | ||
| } | ||
| .padding(.horizontal, 16) | ||
| } | ||
| .frame(height: 68) | ||
| .shadow(color: .GrayScale.gray5.opacity(0.15), blur: 20) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import BaseFeature | ||
| import Foundation | ||
| import DomainModule | ||
| import ErrorModule | ||
| import Combine | ||
| import DataMappingModule | ||
| import DesignSystem | ||
|
|
||
| final class RewardPointDetailViewModel: BaseViewModel { | ||
| @Published var point: PointEntity? | ||
| @Published var pointsType: PointsType = .all | ||
|
|
||
| private let fetchPointListUseCase: any FetchPointListUseCase | ||
|
|
||
| init( | ||
| fetchPointListUseCase: any FetchPointListUseCase | ||
| ) { | ||
| self.fetchPointListUseCase = fetchPointListUseCase | ||
| super.init() | ||
| fetchPointList() | ||
| } | ||
|
|
||
| func fetchPointList() { | ||
| addCancellable( | ||
| self.fetchPointListUseCase.execute( | ||
| type: pointsType | ||
| )) { [weak self] point in | ||
| self?.point = point | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,18 @@ | ||
| import Foundation | ||
|
|
||
| public enum PointsType: String, CaseIterable { | ||
| case all = "ALL" | ||
| case bonus = "BONUS" | ||
| case minus = "MINUS" | ||
|
|
||
| public var display: String { | ||
| switch self { | ||
| case .all: | ||
| return "전체" | ||
| case .bonus: | ||
| return "상점" | ||
| case .minus: | ||
| return "벌점" | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rewardPointDetailComponent가 rewardPointDetailComponent를 주입받네요..?