Skip to content

[Design] #48 - design HomeDetailView #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ena-isme wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[Design] #48 - design HomeDetailView #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36186f0
[Feat] #48 - set base view and vc
Apr 30, 2024
455eeb9
[Design] #48 - design view
Apr 30, 2024
373a151
[Fix] #48 - resolve layout error
Apr 30, 2024
c0eb7e4
[Feat] #48 - create ViewModel
May 3, 2024
99c03f7
[Network] #48 - Network, DTO 구현
May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 72 additions & 6 deletions Puzzle-iOS/Puzzle-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
objects = {

/* Begin PBXBuildFile section */
2C02354E2BE519C7001FA169 /* HomeDetailDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C02354D2BE519C7001FA169 /* HomeDetailDTO.swift */; };
2C0235512BE51ACD001FA169 /* HomeDetailService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C0235502BE51ACD001FA169 /* HomeDetailService.swift */; };
2C11B7742BE08E0500CCACED /* HomeDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C11B7732BE08E0500CCACED /* HomeDetailViewController.swift */; };
2C11B7762BE08E7600CCACED /* HomeDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C11B7752BE08E7600CCACED /* HomeDetailView.swift */; };
2C11B7782BE08F4E00CCACED /* HomeDetailHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C11B7772BE08F4E00CCACED /* HomeDetailHeaderView.swift */; };
2C11B77A2BE0911F00CCACED /* HomeDetailDescriptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C11B7792BE0911F00CCACED /* HomeDetailDescriptionView.swift */; };
2C11B77C2BE0CAE700CCACED /* HomeDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C11B77B2BE0CAE700CCACED /* HomeDetailViewModel.swift */; };
2C1765002B71FB1D00CD789E /* KakaoSDKCommon in Frameworks */ = {isa = PBXBuildFile; productRef = 2C1764FF2B71FB1D00CD789E /* KakaoSDKCommon */; };
2C1765082B7279A000CD789E /* StringLiterals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C1765072B7279A000CD789E /* StringLiterals.swift */; };
2C17650A2B7283A500CD789E /* UIViewController+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C1765092B7283A500CD789E /* UIViewController+.swift */; };
Expand Down Expand Up @@ -144,9 +151,16 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
2C02354D2BE519C7001FA169 /* HomeDetailDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeDetailDTO.swift; sourceTree = "<group>"; };
2C0235502BE51ACD001FA169 /* HomeDetailService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeDetailService.swift; sourceTree = "<group>"; };
2C0235552BE52837001FA169 /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
2C11B7732BE08E0500CCACED /* HomeDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeDetailViewController.swift; sourceTree = "<group>"; };
2C11B7752BE08E7600CCACED /* HomeDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeDetailView.swift; sourceTree = "<group>"; };
2C11B7772BE08F4E00CCACED /* HomeDetailHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeDetailHeaderView.swift; sourceTree = "<group>"; };
2C11B7792BE0911F00CCACED /* HomeDetailDescriptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeDetailDescriptionView.swift; sourceTree = "<group>"; };
2C11B77B2BE0CAE700CCACED /* HomeDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeDetailViewModel.swift; sourceTree = "<group>"; };
2C1765072B7279A000CD789E /* StringLiterals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringLiterals.swift; sourceTree = "<group>"; };
2C1765092B7283A500CD789E /* UIViewController+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+.swift"; sourceTree = "<group>"; };
2C33B1712B763CFB00A9476D /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
2C33B1732B76404A00A9476D /* PuzzleMainButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PuzzleMainButton.swift; sourceTree = "<group>"; };
2C33B1772B764A7000A9476D /* OnboardingPlusViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingPlusViewController.swift; sourceTree = "<group>"; };
2C33B1792B764A8300A9476D /* OnboardingPlusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingPlusView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -294,6 +308,50 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
2C02354F2BE51ABB001FA169 /* HomeDetailService */ = {
isa = PBXGroup;
children = (
2C0235502BE51ACD001FA169 /* HomeDetailService.swift */,
);
path = HomeDetailService;
sourceTree = "<group>";
};
2C11B76F2BE08DC900CCACED /* HomeDetail */ = {
isa = PBXGroup;
children = (
2C11B7722BE08DE100CCACED /* ViewModel */,
2C11B7712BE08DDA00CCACED /* View */,
2C11B7702BE08DD200CCACED /* ViewController */,
);
path = HomeDetail;
sourceTree = "<group>";
};
2C11B7702BE08DD200CCACED /* ViewController */ = {
isa = PBXGroup;
children = (
2C11B7732BE08E0500CCACED /* HomeDetailViewController.swift */,
);
path = ViewController;
sourceTree = "<group>";
};
2C11B7712BE08DDA00CCACED /* View */ = {
isa = PBXGroup;
children = (
2C11B7752BE08E7600CCACED /* HomeDetailView.swift */,
2C11B7772BE08F4E00CCACED /* HomeDetailHeaderView.swift */,
2C11B7792BE0911F00CCACED /* HomeDetailDescriptionView.swift */,
);
path = View;
sourceTree = "<group>";
};
2C11B7722BE08DE100CCACED /* ViewModel */ = {
isa = PBXGroup;
children = (
2C11B77B2BE0CAE700CCACED /* HomeDetailViewModel.swift */,
);
path = ViewModel;
sourceTree = "<group>";
};
2C1765062B72799400CD789E /* Literals */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -341,6 +399,7 @@
2C372A412B6B8C29009B7BF6 /* Service */ = {
isa = PBXGroup;
children = (
2C02354F2BE51ABB001FA169 /* HomeDetailService */,
2CA684472BA807A80034C3E7 /* SplashService */,
2C372A3A2B6B7A60009B7BF6 /* AuthService */,
);
Expand All @@ -352,6 +411,7 @@
children = (
2C372A432B6B8C44009B7BF6 /* AuthDTO.swift */,
2CA6843A2BA806E10034C3E7 /* SpalshDTO.swift */,
2C02354D2BE519C7001FA169 /* HomeDetailDTO.swift */,
);
path = DTO;
sourceTree = "<group>";
Expand Down Expand Up @@ -425,7 +485,7 @@
isa = PBXGroup;
children = (
2C55EEBF2B711BB5001AD42E /* Config.swift */,
2C33B1712B763CFB00A9476D /* Config.xcconfig */,
2C0235552BE52837001FA169 /* Config.xcconfig */,
);
path = Config;
sourceTree = "<group>";
Expand Down Expand Up @@ -703,6 +763,7 @@
718150462B62953F005E4451 /* Presentation */ = {
isa = PBXGroup;
children = (
2C11B76F2BE08DC900CCACED /* HomeDetail */,
71F4F6BC2BB53DAF006C799B /* Splash */,
710309902B93139B0077EE17 /* Home */,
71A5BB0B2B9B2AE300655835 /* My */,
Expand Down Expand Up @@ -1048,6 +1109,7 @@
buildActionMask = 2147483647;
files = (
718D09352B80A3BF0021AD40 /* OnboardingCollectionView.swift in Sources */,
2C11B77A2BE0911F00CCACED /* HomeDetailDescriptionView.swift in Sources */,
7103099F2B9315CA0077EE17 /* MainView.swift in Sources */,
7122CCFD2BA815CF00CA56AC /* SettingHeaderView.swift in Sources */,
718D09192B7A94930021AD40 /* OnboardingBaseView.swift in Sources */,
Expand All @@ -1068,6 +1130,7 @@
7127DA502B81C9C000B262DA /* InterestViewModel.swift in Sources */,
71A5BB102B9B2CE300655835 /* MyProfileViewController.swift in Sources */,
2CA684402BA807290034C3E7 /* HTTPMethod.swift in Sources */,
2C02354E2BE519C7001FA169 /* HomeDetailDTO.swift in Sources */,
710309A12B931F1C0077EE17 /* LabelFactory.swift in Sources */,
71F4F6BE2BB53DCE006C799B /* SplashViewController.swift in Sources */,
2C372A3E2B6B7ACD009B7BF6 /* AuthAppleService.swift in Sources */,
Expand All @@ -1078,15 +1141,18 @@
2C17650A2B7283A500CD789E /* UIViewController+.swift in Sources */,
2C9813BB2B7CED2000C56D0B /* PuzzleDropdownView.swift in Sources */,
2C1765082B7279A000CD789E /* StringLiterals.swift in Sources */,
2C11B7782BE08F4E00CCACED /* HomeDetailHeaderView.swift in Sources */,
718150132B6291D7005E4451 /* ViewController.swift in Sources */,
71EB2E9A2BA4694900EB64B2 /* SettingView.swift in Sources */,
7118EAF32B9DBAEA00012D94 /* EmptyCell.swift in Sources */,
710309A62B9434B00077EE17 /* HomeFeedCell.swift in Sources */,
2CA684422BA807480034C3E7 /* NetworkError.swift in Sources */,
7127DA542B82071700B262DA /* LeftAlignedFlowLayout.swift in Sources */,
2CA684442BA8075E0034C3E7 /* NetworkLogger.swift in Sources */,
2C11B7762BE08E7600CCACED /* HomeDetailView.swift in Sources */,
718D09162B7A947F0021AD40 /* OnboardingViewController.swift in Sources */,
2CA6844B2BA807FD0034C3E7 /* SplashRepository.swift in Sources */,
2C11B7742BE08E0500CCACED /* HomeDetailViewController.swift in Sources */,
7127DA522B81EF6100B262DA /* InterestSelectionCollectionView.swift in Sources */,
71773C5F2B64BEFB0041605E /* PuzzleTabBarController.swift in Sources */,
2C5310F02B6E8CA000704371 /* CancelBag+.swift in Sources */,
Expand All @@ -1097,6 +1163,7 @@
2CA684462BA807840034C3E7 /* Networking.swift in Sources */,
718D093B2B80DC8E0021AD40 /* OnboardingSelectPositionViewController.swift in Sources */,
7118EAF12B9DB0D400012D94 /* MyProfileCell.swift in Sources */,
2C0235512BE51ACD001FA169 /* HomeDetailService.swift in Sources */,
710309952B9314530077EE17 /* HomeViewController.swift in Sources */,
710309812B8E47AE0077EE17 /* InputIdViewModel.swift in Sources */,
7118EAF82B9DC48F00012D94 /* DashedLineCollectionViewCell.swift in Sources */,
Expand Down Expand Up @@ -1144,6 +1211,7 @@
71355AEC2B80ECC1007E1822 /* InterestSelectionViewCell.swift in Sources */,
710309A32B932EA50077EE17 /* KeywordCell.swift in Sources */,
71814A872B76568B00B23378 /* UIView+.swift in Sources */,
2C11B77C2BE0CAE700CCACED /* HomeDetailViewModel.swift in Sources */,
7127DA592B82435500B262DA /* AreaViewModel.swift in Sources */,
2C33B17E2B76537300A9476D /* PuzzleBottomSheetViewController.swift in Sources */,
);
Expand Down Expand Up @@ -1203,7 +1271,7 @@
/* Begin XCBuildConfiguration section */
718150332B6291D8005E4451 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2C33B1712B763CFB00A9476D /* Config.xcconfig */;
baseConfigurationReference = 2C0235552BE52837001FA169 /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
Expand Down Expand Up @@ -1267,7 +1335,7 @@
};
718150342B6291D8005E4451 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2C33B1712B763CFB00A9476D /* Config.xcconfig */;
baseConfigurationReference = 2C0235552BE52837001FA169 /* Config.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
Expand Down Expand Up @@ -1324,7 +1392,6 @@
};
718150362B6291D8005E4451 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2C33B1712B763CFB00A9476D /* Config.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -1360,7 +1427,6 @@
};
718150372B6291D8005E4451 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2C33B1712B763CFB00A9476D /* Config.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down
131 changes: 131 additions & 0 deletions Puzzle-iOS/Puzzle-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Puzzle-iOS/Puzzle-iOS/Application/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
guard let windowScene = (scene as? UIWindowScene) else { return }

let window = UIWindow(windowScene: windowScene)
let navigationViewController = UINavigationController(rootViewController: ViewController())
let navigationViewController = UINavigationController(
rootViewController: HomeDetailViewController(
viewModel: HomeDetailViewModel(
homeDetailService: HomeDetailDefalutService()
),competitionId: 12))
window.rootViewController = navigationViewController
self.window = window
window.makeKeyAndVisible()
Expand Down
32 changes: 32 additions & 0 deletions Puzzle-iOS/Puzzle-iOS/Network/DTO/HomeDetailDTO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//
// HomeDetailDTO.swift
// Puzzle-iOS
//
// Created by 신지원 on 5/3/24.
//

import Foundation

struct HomeDetailDTO: Codable {
let success: Bool
let response: CompetitionDetail?
let error: String?
let jwt: String?
}

struct CompetitionDetail: Codable {
let competitionId: Int
let competitionName: String
let competitionUrl: String
let competitionHost: String
let competitionPoster: String
let competitionAwards: String
let competitionStart: String
let competitionEnd: String
let competitionContent: String
let competitionVisit: Int
let competitionLike: Int
let competitionMatching: Int
let competitionDDay: Int
let competitionTypes: [String]
}
Loading