Skip to content

Commit

Permalink
[Refactor] 아티스트 홈 UI 변경사항 반영 (#117)
Browse files Browse the repository at this point in the history 
* 아티스트 홈 RF 디자인 오늘 예약 콜렉션 뷰 구현

* 아티스트 홈 UI 변경사항 반영

* SPM 관련 충돌 해결

* UI 세부 수정
  • Loading branch information
@woongaaaa
woongaaaa authored Jul 26, 2024
1 parent 1191d1d commit 92ad1da
Show file tree
Hide file tree
Showing 10 changed files with 527 additions and 496 deletions.
28 changes: 20 additions & 8 deletions MEME/MEME.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
09275E822B518D150033EF34 /* ArtistHomeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 09275E812B518D150033EF34 /* ArtistHomeViewController.xib */; };
09275E892B528A610033EF34 /* ArtistReservationStatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09275E872B528A610033EF34 /* ArtistReservationStatusTableViewCell.swift */; };
09275E8A2B528A610033EF34 /* ArtistReservationStatusTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 09275E882B528A610033EF34 /* ArtistReservationStatusTableViewCell.xib */; };
093CE0812BE1602E0043F36F /* memeSecret.plist in Resources */ = {isa = PBXBuildFile; fileRef = 093CE07F2BE1602E0043F36F /* memeSecret.plist */; };
094884C72B584B7000C233E0 /* ArtistMakeupTagCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094884C52B584B7000C233E0 /* ArtistMakeupTagCollectionViewCell.swift */; };
094884C82B584B7000C233E0 /* ArtistMakeupTagCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 094884C62B584B7000C233E0 /* ArtistMakeupTagCollectionViewCell.xib */; };
094884CB2B584B8F00C233E0 /* ArtistPortfolioCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094884C92B584B8F00C233E0 /* ArtistPortfolioCollectionViewCell.swift */; };
094884CC2B584B8F00C233E0 /* ArtistPortfolioCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 094884CA2B584B8F00C233E0 /* ArtistPortfolioCollectionViewCell.xib */; };
094884DB2B59915500C233E0 /* SingleReservationManageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094884D92B59915400C233E0 /* SingleReservationManageViewController.swift */; };
094884DC2B59915500C233E0 /* SingleReservationManageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 094884DA2B59915400C233E0 /* SingleReservationManageViewController.xib */; };
095417022C3D12850012B04D /* ReservationHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095417012C3D12850012B04D /* ReservationHeaderView.swift */; };
095742512B66153E0011B580 /* ArtistPortfolioEditingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0957424F2B66153E0011B580 /* ArtistPortfolioEditingViewController.swift */; };
095742522B66153E0011B580 /* ArtistPortfolioEditingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 095742502B66153E0011B580 /* ArtistPortfolioEditingViewController.xib */; };
09919FBC2C2AB7F900894119 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 09919FBA2C2AB7F900894119 /* GoogleService-Info.plist */; };
09919FBD2C2AB7F900894119 /* memeSecret.plist in Resources */ = {isa = PBXBuildFile; fileRef = 09919FBB2C2AB7F900894119 /* memeSecret.plist */; };
09A6B0A02B9B0EE6007DCC0A /* PortfolioCategories.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A6B09F2B9B0EE6007DCC0A /* PortfolioCategories.swift */; };
2D0A19012B4EC9A000C1CECA /* ModelReservationConfirmViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2D0A19002B4EC9A000C1CECA /* ModelReservationConfirmViewCell.xib */; };
2D0A19052B4ED07B00C1CECA /* SelectMakeupCardViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2D0A19042B4ED07B00C1CECA /* SelectMakeupCardViewCell.xib */; };
Expand Down Expand Up @@ -73,7 +75,6 @@
2DA208192B7CF9EE006EB9B9 /* PortfolioDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DA208182B7CF9EE006EB9B9 /* PortfolioDTO.swift */; };
2DB303E82B8286EF00D9E394 /* (null) in Sources */ = {isa = PBXBuildFile; };
2DB303F32B829EF200D9E394 /* BusinessLocationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DB303F22B829EF200D9E394 /* BusinessLocationModel.swift */; };
2DC54B552BB749A800464DB2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2DC54B512BB7487100464DB2 /* GoogleService-Info.plist */; };
2DD60FFB2BC5AE1700B362F1 /* RecommendHeaderReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DD60FFA2BC5AE1700B362F1 /* RecommendHeaderReusableView.swift */; };
2DD60FFF2BC5AE5A00B362F1 /* ModelHomeViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DD60FFE2BC5AE5A00B362F1 /* ModelHomeViewItem.swift */; };
2DD610022BC5AE7400B362F1 /* ModelHomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DD610012BC5AE7400B362F1 /* ModelHomeViewModel.swift */; };
Expand Down Expand Up @@ -348,15 +349,17 @@
09275E812B518D150033EF34 /* ArtistHomeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ArtistHomeViewController.xib; sourceTree = "<group>"; };
09275E872B528A610033EF34 /* ArtistReservationStatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtistReservationStatusTableViewCell.swift; sourceTree = "<group>"; };
09275E882B528A610033EF34 /* ArtistReservationStatusTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ArtistReservationStatusTableViewCell.xib; sourceTree = "<group>"; };
093CE07F2BE1602E0043F36F /* memeSecret.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = memeSecret.plist; sourceTree = "<group>"; };
094884C52B584B7000C233E0 /* ArtistMakeupTagCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtistMakeupTagCollectionViewCell.swift; sourceTree = "<group>"; };
094884C62B584B7000C233E0 /* ArtistMakeupTagCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ArtistMakeupTagCollectionViewCell.xib; sourceTree = "<group>"; };
094884C92B584B8F00C233E0 /* ArtistPortfolioCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtistPortfolioCollectionViewCell.swift; sourceTree = "<group>"; };
094884CA2B584B8F00C233E0 /* ArtistPortfolioCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ArtistPortfolioCollectionViewCell.xib; sourceTree = "<group>"; };
094884D92B59915400C233E0 /* SingleReservationManageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleReservationManageViewController.swift; sourceTree = "<group>"; };
094884DA2B59915400C233E0 /* SingleReservationManageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SingleReservationManageViewController.xib; sourceTree = "<group>"; };
095417012C3D12850012B04D /* ReservationHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReservationHeaderView.swift; sourceTree = "<group>"; };
0957424F2B66153E0011B580 /* ArtistPortfolioEditingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtistPortfolioEditingViewController.swift; sourceTree = "<group>"; };
095742502B66153E0011B580 /* ArtistPortfolioEditingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ArtistPortfolioEditingViewController.xib; sourceTree = "<group>"; };
09919FBA2C2AB7F900894119 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
09919FBB2C2AB7F900894119 /* memeSecret.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = memeSecret.plist; sourceTree = "<group>"; };
09A6B09F2B9B0EE6007DCC0A /* PortfolioCategories.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortfolioCategories.swift; sourceTree = "<group>"; };
2D0A19002B4EC9A000C1CECA /* ModelReservationConfirmViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ModelReservationConfirmViewCell.xib; sourceTree = "<group>"; };
2D0A19042B4ED07B00C1CECA /* SelectMakeupCardViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SelectMakeupCardViewCell.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -409,7 +412,6 @@
2DA208162B7CF87B006EB9B9 /* PortfolioManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortfolioManager.swift; sourceTree = "<group>"; };
2DA208182B7CF9EE006EB9B9 /* PortfolioDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortfolioDTO.swift; sourceTree = "<group>"; };
2DB303F22B829EF200D9E394 /* BusinessLocationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BusinessLocationModel.swift; sourceTree = "<group>"; };
2DC54B512BB7487100464DB2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
2DD60FFA2BC5AE1700B362F1 /* RecommendHeaderReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendHeaderReusableView.swift; sourceTree = "<group>"; };
2DD60FFE2BC5AE5A00B362F1 /* ModelHomeViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelHomeViewItem.swift; sourceTree = "<group>"; };
2DD610012BC5AE7400B362F1 /* ModelHomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelHomeViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -802,6 +804,7 @@
children = (
3142B9AE2B4D08380066CD5A /* ArtistHomeViewController.swift */,
09275E812B518D150033EF34 /* ArtistHomeViewController.xib */,
09A12F972C3D0E9200378980 /* ReservationDateHeader */,
);
path = ArtistHomeView;
sourceTree = "<group>";
Expand Down Expand Up @@ -833,6 +836,14 @@
path = ManagementReservation;
sourceTree = "<group>";
};
09A12F972C3D0E9200378980 /* ReservationDateHeader */ = {
isa = PBXGroup;
children = (
095417012C3D12850012B04D /* ReservationHeaderView.swift */,
);
path = ReservationDateHeader;
sourceTree = "<group>";
};
09A6B0A42B9B22B3007DCC0A /* ArtistHome */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1116,8 +1127,8 @@
3142B9612B4CFFED0066CD5A /* Assets.xcassets */,
314F74E92B52DDF200CACF20 /* Font */,
3142B9662B4CFFED0066CD5A /* Info.plist */,
2DC54B512BB7487100464DB2 /* GoogleService-Info.plist */,
093CE07F2BE1602E0043F36F /* memeSecret.plist */,
09919FBA2C2AB7F900894119 /* GoogleService-Info.plist */,
09919FBB2C2AB7F900894119 /* memeSecret.plist */,
3142B9632B4CFFED0066CD5A /* LaunchScreen.storyboard */,
3156D1FD2B69438800559820 /* Network */,
3142B9992B4D01FB0066CD5A /* extenstions */,
Expand Down Expand Up @@ -2108,7 +2119,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2DC54B552BB749A800464DB2 /* GoogleService-Info.plist in Resources */,
CCAB5A632B67B6CA00067FA4 /* ModelDetailSettingView.xib in Resources */,
094884CC2B584B8F00C233E0 /* ArtistPortfolioCollectionViewCell.xib in Resources */,
094884DC2B59915500C233E0 /* SingleReservationManageViewController.xib in Resources */,
Expand Down Expand Up @@ -2143,12 +2153,13 @@
091CCCDB2B64158B00ADD21C /* ArtistPortfolioManageViewController.xib in Resources */,
31B263502B57EE7D00304FBE /* SetProfileImageViewController.xib in Resources */,
31B263572B57EE9500304FBE /* RegistrationCompletionViewController.xib in Resources */,
093CE0812BE1602E0043F36F /* memeSecret.plist in Resources */,
312B304C2B550FF9008D17FC /* Pretendard-Black.otf in Resources */,
312B30542B550FF9008D17FC /* Pretendard-Regular.otf in Resources */,
31F6F8462B52C7A500EC621D /* NavigationBarView.xib in Resources */,
31B263482B57EE4800304FBE /* LoginViewController.xib in Resources */,
312B30512B550FF9008D17FC /* Pretendard-SemiBold.otf in Resources */,
09919FBD2C2AB7F900894119 /* memeSecret.plist in Resources */,
09919FBC2C2AB7F900894119 /* GoogleService-Info.plist in Resources */,
31B263442B57EDE300304FBE /* TermDetailViewController.xib in Resources */,
315EE2D62B6658B50042A082 /* SetBusinessInfoViewController.xib in Resources */,
);
Expand Down Expand Up @@ -2381,6 +2392,7 @@
3142B99D2B4D021A0066CD5A /* UIView+.swift in Sources */,
CC9C388F2B81B3530073A257 /* ContactAPI.swift in Sources */,
CCB3190E2B8309CC003B4738 /* ProvisionViewController.swift in Sources */,
095417022C3D12850012B04D /* ReservationHeaderView.swift in Sources */,
CCAB5A4D2B65938F00067FA4 /* InterestArtistCollectionViewCell.swift in Sources */,
CC2F3AC22B54361100508DA5 /* MyPageInfoViewController.swift in Sources */,
2DA208012B7AB514006EB9B9 /* SearchAPI.swift in Sources */,
Expand Down
43 changes: 21 additions & 22 deletions MEME/MEME.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"originHash" : "6fca7f2af149821944265304d5e3334bcedc5b888fd37cfca509d25af23d8be1",
"pins" : [
{
"identity" : "abseil-cpp-binary",
Expand Down Expand Up @@ -69,8 +68,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "bc27fad73504f3d4af235de451f02ee22586ebd3",
"version" : "7.12.1"
"revision" : "57a1d307f42df690fdef2637f3e5b776da02aad6",
"version" : "7.13.3"
}
},
{
Expand All @@ -87,8 +86,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "76135c9f4e1ac85459d5fec61b6f76ac47ab3a4c",
"version" : "3.3.1"
"revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
"version" : "3.5.0"
}
},
{
Expand All @@ -105,26 +104,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/kakao/kakao-ios-sdk",
"state" : {
"revision" : "b7a78bac4cb015fc3b1de34255b96421091fcf42",
"version" : "2.22.0"
"revision" : "08089eeffc9b442da1c7343a70bf66c6de1a72c9",
"version" : "2.22.4"
}
},
{
"identity" : "kakao-ios-sdk-rx",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kakao/kakao-ios-sdk-rx",
"state" : {
"revision" : "b282310c0b67e7f6e50bd05f4d0db275eb8f5a05",
"version" : "2.22.0"
"revision" : "bdcb118183ef59a75753a69ac5d3cc93def0baa3",
"version" : "2.22.4"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "9d108e9112aa1d65ce508facf804674546116d9c",
"version" : "1.22.3"
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
"version" : "1.22.5"
}
},
{
Expand All @@ -141,8 +140,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
"version" : "2.30909.0"
"revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
"version" : "2.30910.0"
}
},
{
Expand All @@ -159,8 +158,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
"version" : "2.3.1"
"revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
"version" : "2.4.0"
}
},
{
Expand All @@ -186,28 +185,28 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/ReactiveX/RxSwift.git",
"state" : {
"revision" : "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
"version" : "6.6.0"
"revision" : "b06a8c8596e4c3e8e7788e08e720e3248563ce6a",
"version" : "6.7.1"
}
},
{
"identity" : "snapkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SnapKit/SnapKit.git",
"state" : {
"revision" : "e74fe2a978d1216c3602b129447c7301573cc2d8",
"version" : "5.7.0"
"revision" : "2842e6e84e82eb9a8dac0100ca90d9444b0307f4",
"version" : "5.7.1"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8",
"version" : "1.25.2"
"revision" : "d57a5aecf24a25b32ec4a74be2f5d0a995a47c4b",
"version" : "1.27.0"
}
}
],
"version" : 3
"version" : 2
}
Loading

0 comments on commit 92ad1da

Please sign in to comment.