Skip to content

Commit dde68fa

Browse files
authored
Merge pull request #30 from Nexters/feature/conversation-end-card
[FEAT] 대화 종료 카드 UI 및 종이 접기/버리기 인터랙션
2 parents b2541f9 + cb2628e commit dde68fa

84 files changed

Lines changed: 1449 additions & 18 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

GAMSS.xcodeproj/project.pbxproj

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
F29C98F332A3EC127B809DD3 /* ChatViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE5C85E76690E41AE394895D /* ChatViewModelTests.swift */; };
5555
F2D4E5A40F2B3C4D5E6F7A9D /* RadiusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D4E5A50F2B3C4D5E6F7A9E /* RadiusTests.swift */; };
5656
FA90ADA39E7A145713881061 /* MainTabTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C15D652D0472A1EBD024674 /* MainTabTests.swift */; };
57+
3EA1E967FD5758D439B9562F /* EndConversationUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 022C2DDBA5CC65F023C72625 /* EndConversationUseCaseTests.swift */; };
58+
59B8600C3D1B9FD86501884C /* CreateCardUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16F98692DAD0EFA3A362F10A /* CreateCardUseCaseTests.swift */; };
59+
1831280D5A93BBA27EDAEA25 /* DefaultCardRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B8DCEEB8A4D7DDE8987325 /* DefaultCardRepositoryTests.swift */; };
60+
6C623FF45784475E33185488 /* CardResponseDTOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20B27264EF78F9AD4039D6 /* CardResponseDTOTests.swift */; };
61+
29260DC1DEE437ADC8399405 /* CreateCardRequestDTOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 411F8C36A4F71C3D2F78D616 /* CreateCardRequestDTOTests.swift */; };
5762
/* End PBXBuildFile section */
5863

5964
/* Begin PBXContainerItemProxy section */
@@ -116,6 +121,11 @@
116121
EB14F9D00BB8B80EFE9A40A4 /* Pods_GAMSS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GAMSS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
117122
ED231F0A80BD3A4AF9E50BBC /* diary_samples.json */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.json; path = diary_samples.json; sourceTree = "<group>"; };
118123
F1CC8FA289575E4B98C41539 /* Pods_GAMSSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GAMSSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
124+
022C2DDBA5CC65F023C72625 /* EndConversationUseCaseTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EndConversationUseCaseTests.swift; sourceTree = "<group>"; };
125+
16F98692DAD0EFA3A362F10A /* CreateCardUseCaseTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CreateCardUseCaseTests.swift; sourceTree = "<group>"; };
126+
90B8DCEEB8A4D7DDE8987325 /* DefaultCardRepositoryTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultCardRepositoryTests.swift; sourceTree = "<group>"; };
127+
BD20B27264EF78F9AD4039D6 /* CardResponseDTOTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CardResponseDTOTests.swift; sourceTree = "<group>"; };
128+
411F8C36A4F71C3D2F78D616 /* CreateCardRequestDTOTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CreateCardRequestDTOTests.swift; sourceTree = "<group>"; };
119129
/* End PBXFileReference section */
120130

121131
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -232,6 +242,8 @@
232242
9F31305F9DDE03A304202C57 /* DefaultFetchMyProfileUseCaseTests.swift */,
233243
B57C94EC067D840B994A661B /* UpdateConversationTitleUseCaseTests.swift */,
234244
83A67D7BECCB85A88C969AD7 /* GetMessagesUseCaseTests.swift */,
245+
022C2DDBA5CC65F023C72625 /* EndConversationUseCaseTests.swift */,
246+
16F98692DAD0EFA3A362F10A /* CreateCardUseCaseTests.swift */,
235247
);
236248
path = UseCase;
237249
sourceTree = "<group>";
@@ -245,6 +257,8 @@
245257
0ACAF83D4A9CCBB62EFD5C84 /* ConversationSummaryDTOTests.swift */,
246258
154AB84FDB8FA1B084D0B67D /* MemberProfileResponseDTOTests.swift */,
247259
95BC0A2F902BCC45D7A387D1 /* EmotionCharacterServerKeyMappingTests.swift */,
260+
BD20B27264EF78F9AD4039D6 /* CardResponseDTOTests.swift */,
261+
411F8C36A4F71C3D2F78D616 /* CreateCardRequestDTOTests.swift */,
248262
);
249263
path = DTO;
250264
sourceTree = "<group>";
@@ -277,6 +291,7 @@
277291
A17C099A15F7D9B1481998D0 /* DefaultSummaryRepositoryTests.swift */,
278292
CDBFC0FF1B12BFFA1F771ADA /* DefaultConversationRepositoryTests.swift */,
279293
DA7199AB4FF706448FF5C6F3 /* DefaultMemberRepositoryTests.swift */,
294+
90B8DCEEB8A4D7DDE8987325 /* DefaultCardRepositoryTests.swift */,
280295
);
281296
path = Repository;
282297
sourceTree = "<group>";
@@ -644,6 +659,11 @@
644659
96AB63E38D6D2755BA3BC839 /* ConversationPreviewTextFormatterTests.swift in Sources */,
645660
37CC583C76082794EA8ED2C3 /* ConversationListDateHeaderFormatterTests.swift in Sources */,
646661
49CAEB1FBF568E55C6C648B7 /* ConversationListViewModelTests.swift in Sources */,
662+
3EA1E967FD5758D439B9562F /* EndConversationUseCaseTests.swift in Sources */,
663+
59B8600C3D1B9FD86501884C /* CreateCardUseCaseTests.swift in Sources */,
664+
1831280D5A93BBA27EDAEA25 /* DefaultCardRepositoryTests.swift in Sources */,
665+
6C623FF45784475E33185488 /* CardResponseDTOTests.swift in Sources */,
666+
29260DC1DEE437ADC8399405 /* CreateCardRequestDTOTests.swift in Sources */,
647667
);
648668
runOnlyForDeploymentPostprocessing = 0;
649669
};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"images" : [
3+
{ "filename" : "cardDiscardArrow.png", "idiom" : "universal", "scale" : "1x" },
4+
{ "filename" : "cardDiscardArrow@2x.png", "idiom" : "universal", "scale" : "2x" },
5+
{ "filename" : "cardDiscardArrow@3x.png", "idiom" : "universal", "scale" : "3x" }
6+
],
7+
"info" : { "author" : "xcode", "version" : 1 }
8+
}
14.9 KB
46.7 KB
93.5 KB
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"images" : [
3+
{ "filename" : "cardEmotionAnger.png", "idiom" : "universal", "scale" : "1x" },
4+
{ "filename" : "cardEmotionAnger@2x.png", "idiom" : "universal", "scale" : "2x" },
5+
{ "filename" : "cardEmotionAnger@3x.png", "idiom" : "universal", "scale" : "3x" }
6+
],
7+
"info" : { "author" : "xcode", "version" : 1 }
8+
}
9.11 KB
19.6 KB
30.3 KB
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"images" : [
3+
{ "filename" : "cardEmotionAnxiety.png", "idiom" : "universal", "scale" : "1x" },
4+
{ "filename" : "cardEmotionAnxiety@2x.png", "idiom" : "universal", "scale" : "2x" },
5+
{ "filename" : "cardEmotionAnxiety@3x.png", "idiom" : "universal", "scale" : "3x" }
6+
],
7+
"info" : { "author" : "xcode", "version" : 1 }
8+
}

0 commit comments

Comments
 (0)