Skip to content

Commit a10d522

Browse files
cchanmicchanmi
authored
Merge pull request #23 from Nexters/feature/home-ui
[FEAT] 홈 화면 UI 전면 개편 및 서버 연동
2 parents cce6eee + 20fbff4 commit a10d522

61 files changed

Lines changed: 1198 additions & 74 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: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@
1010
06BCF4ADC30405F292D7B64C /* EmotionTestViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F056320618BF2744EAC909 /* EmotionTestViewModelTests.swift */; };
1111
10B076C4CBD5237ECB6B305D /* DefaultAnalyzeEmotionUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6E353FF7D86EAC9E125F484 /* DefaultAnalyzeEmotionUseCaseTests.swift */; };
1212
16FD4F6D002D9911BCDA46DD /* GAMSSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7674D757C326ABEDB6302AA6 /* GAMSSTests.swift */; };
13+
1997D517BF9366E6F99231DC /* MemberProfileResponseDTOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 154AB84FDB8FA1B084D0B67D /* MemberProfileResponseDTOTests.swift */; };
14+
1B749C406C1D1BDD368D3CF0 /* EmotionCharacterServerKeyMappingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BC0A2F902BCC45D7A387D1 /* EmotionCharacterServerKeyMappingTests.swift */; };
1315
1CE64E3A4D746FFBE391D949 /* DefaultConversationSummaryStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 032B0D990023EAA1E72E1E82 /* DefaultConversationSummaryStoreTests.swift */; };
1416
1D8DF6DFC7E7383B9B8C5850 /* DefaultSummaryRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A17C099A15F7D9B1481998D0 /* DefaultSummaryRepositoryTests.swift */; };
17+
228C37F390B54C3FA3796868 /* DefaultFetchMyProfileUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F31305F9DDE03A304202C57 /* DefaultFetchMyProfileUseCaseTests.swift */; };
18+
91789B140656BAFCCDEB8E50 /* UpdateConversationTitleUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57C94EC067D840B994A661B /* UpdateConversationTitleUseCaseTests.swift */; };
1519
24EED49AAB4C574B02E9C077 /* EmotionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEB4219C48B0B2A51FA9457C /* EmotionTests.swift */; };
1620
26A84A0255BB5BB7139414C5 /* Tokenizers in Frameworks */ = {isa = PBXBuildFile; productRef = 4F92A4F86371ED0E8E85D78F /* Tokenizers */; };
1721
37CC583C76082794EA8ED2C3 /* ConversationListDateHeaderFormatterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 279ECD6F38C25ADFF48996F2 /* ConversationListDateHeaderFormatterTests.swift */; };
@@ -36,6 +40,7 @@
3640
A9E97BA8DEC5EE7635B77D1F /* ChatComposerViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5DF3BD54F67AE200949A44 /* ChatComposerViewTests.swift */; };
3741
ABF5C91182F3B409C1AA9E8E /* GetMessagesUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83A67D7BECCB85A88C969AD7 /* GetMessagesUseCaseTests.swift */; };
3842
B32ACCF04698A89364EDDECE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 316EA002FAC5D3328796EF90 /* Foundation.framework */; };
43+
B6A398A4770795906F2B9DD0 /* DefaultMemberRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA7199AB4FF706448FF5C6F3 /* DefaultMemberRepositoryTests.swift */; };
3944
BA7748118B0D2759E0F6A207 /* Pods_GAMSSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1CC8FA289575E4B98C41539 /* Pods_GAMSSTests.framework */; };
4045
C63AB33F1424E4237FF76F6B /* SummaryErrorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 162D28B313B7D3B6D79FE039 /* SummaryErrorTests.swift */; };
4146
C8DE812C64C04B4EE47E3636 /* DefaultConversationRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDBFC0FF1B12BFFA1F771ADA /* DefaultConversationRepositoryTests.swift */; };
@@ -64,6 +69,7 @@
6469
/* Begin PBXFileReference section */
6570
032B0D990023EAA1E72E1E82 /* DefaultConversationSummaryStoreTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultConversationSummaryStoreTests.swift; sourceTree = "<group>"; };
6671
0ACAF83D4A9CCBB62EFD5C84 /* ConversationSummaryDTOTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConversationSummaryDTOTests.swift; sourceTree = "<group>"; };
72+
154AB84FDB8FA1B084D0B67D /* MemberProfileResponseDTOTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MemberProfileResponseDTOTests.swift; sourceTree = "<group>"; };
6773
162D28B313B7D3B6D79FE039 /* SummaryErrorTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SummaryErrorTests.swift; sourceTree = "<group>"; };
6874
1A8F630A15A80F5FAB52F2C1 /* Pods-GAMSSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GAMSSTests.debug.xcconfig"; path = "Target Support Files/Pods-GAMSSTests/Pods-GAMSSTests.debug.xcconfig"; sourceTree = "<group>"; };
6975
1B68677BF01B5A8971B85AC4 /* QuotedReplyHeaderTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = QuotedReplyHeaderTests.swift; sourceTree = "<group>"; };
@@ -87,6 +93,9 @@
8793
8157B3B43D20FE0CB425BCC3 /* ISO8601FlexibleParserTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ISO8601FlexibleParserTests.swift; sourceTree = "<group>"; };
8894
83A67D7BECCB85A88C969AD7 /* GetMessagesUseCaseTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = GetMessagesUseCaseTests.swift; sourceTree = "<group>"; };
8995
86563A77A8A674E7F050119E /* CommentRevealPolicyTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CommentRevealPolicyTests.swift; sourceTree = "<group>"; };
96+
95BC0A2F902BCC45D7A387D1 /* EmotionCharacterServerKeyMappingTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EmotionCharacterServerKeyMappingTests.swift; sourceTree = "<group>"; };
97+
9F31305F9DDE03A304202C57 /* DefaultFetchMyProfileUseCaseTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultFetchMyProfileUseCaseTests.swift; sourceTree = "<group>"; };
98+
B57C94EC067D840B994A661B /* UpdateConversationTitleUseCaseTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UpdateConversationTitleUseCaseTests.swift; sourceTree = "<group>"; };
9099
A17C099A15F7D9B1481998D0 /* DefaultSummaryRepositoryTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultSummaryRepositoryTests.swift; sourceTree = "<group>"; };
91100
B35175B780592B411BDD6B82 /* ConversationMessageDTOTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConversationMessageDTOTests.swift; sourceTree = "<group>"; };
92101
B816EE4A02D0B23C50F35FF9 /* DefaultEmotionAnalysisRepositoryTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultEmotionAnalysisRepositoryTests.swift; sourceTree = "<group>"; };
@@ -99,6 +108,7 @@
99108
CDBFC0FF1B12BFFA1F771ADA /* DefaultConversationRepositoryTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultConversationRepositoryTests.swift; sourceTree = "<group>"; };
100109
CEB4219C48B0B2A51FA9457C /* EmotionTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EmotionTests.swift; sourceTree = "<group>"; };
101110
D4BE9D664889F13369325DC9 /* sample_sentences.json */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.json; path = sample_sentences.json; sourceTree = "<group>"; };
111+
DA7199AB4FF706448FF5C6F3 /* DefaultMemberRepositoryTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultMemberRepositoryTests.swift; sourceTree = "<group>"; };
102112
DD4444444444444444444444 /* TypographyTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TypographyTests.swift; sourceTree = "<group>"; };
103113
E5370238416571DC93C29121 /* MessageTimestampFormatterTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MessageTimestampFormatterTests.swift; sourceTree = "<group>"; };
104114
E7BE3E28AC7871B572DD4B7E /* Pods-GAMSSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GAMSSTests.release.xcconfig"; path = "Target Support Files/Pods-GAMSSTests/Pods-GAMSSTests.release.xcconfig"; sourceTree = "<group>"; };
@@ -219,6 +229,8 @@
219229
children = (
220230
C6E353FF7D86EAC9E125F484 /* DefaultAnalyzeEmotionUseCaseTests.swift */,
221231
4DDF78D0118869F3D9E1E269 /* SendMessageUseCaseTests.swift */,
232+
9F31305F9DDE03A304202C57 /* DefaultFetchMyProfileUseCaseTests.swift */,
233+
B57C94EC067D840B994A661B /* UpdateConversationTitleUseCaseTests.swift */,
222234
83A67D7BECCB85A88C969AD7 /* GetMessagesUseCaseTests.swift */,
223235
);
224236
path = UseCase;
@@ -231,6 +243,8 @@
231243
B35175B780592B411BDD6B82 /* ConversationMessageDTOTests.swift */,
232244
8157B3B43D20FE0CB425BCC3 /* ISO8601FlexibleParserTests.swift */,
233245
0ACAF83D4A9CCBB62EFD5C84 /* ConversationSummaryDTOTests.swift */,
246+
154AB84FDB8FA1B084D0B67D /* MemberProfileResponseDTOTests.swift */,
247+
95BC0A2F902BCC45D7A387D1 /* EmotionCharacterServerKeyMappingTests.swift */,
234248
);
235249
path = DTO;
236250
sourceTree = "<group>";
@@ -262,6 +276,7 @@
262276
B816EE4A02D0B23C50F35FF9 /* DefaultEmotionAnalysisRepositoryTests.swift */,
263277
A17C099A15F7D9B1481998D0 /* DefaultSummaryRepositoryTests.swift */,
264278
CDBFC0FF1B12BFFA1F771ADA /* DefaultConversationRepositoryTests.swift */,
279+
DA7199AB4FF706448FF5C6F3 /* DefaultMemberRepositoryTests.swift */,
265280
);
266281
path = Repository;
267282
sourceTree = "<group>";
@@ -546,10 +561,14 @@
546561
inputFileListPaths = (
547562
"${PODS_ROOT}/Target Support Files/Pods-GAMSS/Pods-GAMSS-resources-${CONFIGURATION}-input-files.xcfilelist",
548563
);
564+
inputPaths = (
565+
);
549566
name = "[CP] Copy Pods Resources";
550567
outputFileListPaths = (
551568
"${PODS_ROOT}/Target Support Files/Pods-GAMSS/Pods-GAMSS-resources-${CONFIGURATION}-output-files.xcfilelist",
552569
);
570+
outputPaths = (
571+
);
553572
runOnlyForDeploymentPostprocessing = 0;
554573
shellPath = /bin/sh;
555574
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GAMSS/Pods-GAMSS-resources.sh\"\n";
@@ -611,16 +630,21 @@
611630
5F8A6F3F851E20BCFE3F805D /* CommentRevealPolicyTests.swift in Sources */,
612631
1CE64E3A4D746FFBE391D949 /* DefaultConversationSummaryStoreTests.swift in Sources */,
613632
573CFD0A1638F27B889EF865 /* SendMessageUseCaseTests.swift in Sources */,
633+
228C37F390B54C3FA3796868 /* DefaultFetchMyProfileUseCaseTests.swift in Sources */,
634+
91789B140656BAFCCDEB8E50 /* UpdateConversationTitleUseCaseTests.swift in Sources */,
614635
ABF5C91182F3B409C1AA9E8E /* GetMessagesUseCaseTests.swift in Sources */,
615636
A8FEE0AD9A4A60908DC5F5F1 /* CreateMessageRequestDTOTests.swift in Sources */,
616637
5E6EF3C5D7CE4FF3EE4392EC /* ConversationMessageDTOTests.swift in Sources */,
617638
C8DE812C64C04B4EE47E3636 /* DefaultConversationRepositoryTests.swift in Sources */,
639+
B6A398A4770795906F2B9DD0 /* DefaultMemberRepositoryTests.swift in Sources */,
618640
EA9C48AD6033E92B4734D506 /* MessageTimestampFormatterTests.swift in Sources */,
619641
66BC114B170E43E9C900F517 /* QuotedReplyHeaderTests.swift in Sources */,
620642
58652E08F4413DEA2016C082 /* MessageBubbleLayoutTests.swift in Sources */,
621643
A9E97BA8DEC5EE7635B77D1F /* ChatComposerViewTests.swift in Sources */,
622644
7651811B18BCC6B77AD9FB7B /* ISO8601FlexibleParserTests.swift in Sources */,
623645
A2EE79F9D91A740A8F752761 /* ConversationSummaryDTOTests.swift in Sources */,
646+
1997D517BF9366E6F99231DC /* MemberProfileResponseDTOTests.swift in Sources */,
647+
1B749C406C1D1BDD368D3CF0 /* EmotionCharacterServerKeyMappingTests.swift in Sources */,
624648
96AB63E38D6D2755BA3BC839 /* ConversationPreviewTextFormatterTests.swift in Sources */,
625649
37CC583C76082794EA8ED2C3 /* ConversationListDateHeaderFormatterTests.swift in Sources */,
626650
49CAEB1FBF568E55C6C648B7 /* ConversationListViewModelTests.swift in Sources */,

‎GAMSS/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>ITSAppUsesNonExemptEncryption</key>
6+
<false/>
57
<key>APP_NAME</key>
68
<string>$(APP_NAME)</string>
79
<key>BASE_URL</key>

‎GAMSS/Resources/Assets.xcassets/homeBackgroundPaper.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "homeBackgroundPaper.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "homeBackgroundPaper@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "homeBackgroundPaper@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

‎GAMSS/Resources/Assets.xcassets/homeBackgroundPaper.imageset/homeBackgroundPaper.png‎

416 KB
Loading

‎GAMSS/Resources/Assets.xcassets/homeBackgroundPaper.imageset/homeBackgroundPaper@2x.png‎

1.5 MB
Loading

‎GAMSS/Resources/Assets.xcassets/homeBackgroundPaper.imageset/homeBackgroundPaper@3x.png‎

2.85 MB
Loading

‎GAMSS/Resources/Assets.xcassets/homeMenuIcon.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "homeMenuIcon.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "homeMenuIcon@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "homeMenuIcon@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

‎GAMSS/Resources/Assets.xcassets/homeMenuIcon.imageset/homeMenuIcon.png‎

213 Bytes
Loading

‎GAMSS/Resources/Assets.xcassets/homeMenuIcon.imageset/homeMenuIcon@2x.png‎

256 Bytes
Loading

‎GAMSS/Resources/Assets.xcassets/homeMenuIcon.imageset/homeMenuIcon@3x.png‎

323 Bytes
Loading

0 commit comments

Comments
 (0)