Skip to content

Commit

Permalink
Merge pull request #54 from DeveloperAcademy-POSTECH/feature/14_Carou…
Browse files Browse the repository at this point in the history
…selView

[Merge] #14 미팅룸 카드 좌우스크롤 & 롱프레스드래그 애니메이션 구현
  • Loading branch information
YeeunKim-archive committed Jun 11, 2022
2 parents 22ab58f + 104b0fb commit 954245c
Show file tree
Hide file tree
Showing 16 changed files with 540 additions and 18 deletions.
4 changes: 4 additions & 0 deletions TeamOXY/TeamOXY.xcodeproj/project.pbxproj
Expand Up @@ -20,6 +20,7 @@
3F4E600A2853A30300BFAA65 /* FancyButtonViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F4E60072853A30300BFAA65 /* FancyButtonViewModel.swift */; };
3F4E600B2853A30300BFAA65 /* TestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F4E60082853A30300BFAA65 /* TestView.swift */; };
3F4E600E2853A37000BFAA65 /* ConfettiSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 3F4E600D2853A37000BFAA65 /* ConfettiSwiftUI */; };
4AC8DEEB2854F20E00500E0A /* CarouselView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AC8DEEA2854F20E00500E0A /* CarouselView.swift */; };
7BC5EFB02851E5C0004A27B5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7BC5EFAF2851E5C0004A27B5 /* Colors.xcassets */; };
7BC5EFB22851ECC5004A27B5 /* ColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC5EFB12851ECC5004A27B5 /* ColorExtension.swift */; };
F29BECE6285217A9005B4A1B /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = F29BECDD285217A8005B4A1B /* Pretendard-Medium.otf */; };
Expand Down Expand Up @@ -56,6 +57,7 @@
3F4E60062853A30200BFAA65 /* EmojiReactionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmojiReactionView.swift; sourceTree = "<group>"; };
3F4E60072853A30300BFAA65 /* FancyButtonViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FancyButtonViewModel.swift; sourceTree = "<group>"; };
3F4E60082853A30300BFAA65 /* TestView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestView.swift; sourceTree = "<group>"; };
4AC8DEEA2854F20E00500E0A /* CarouselView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarouselView.swift; sourceTree = "<group>"; };
7BC5EFAF2851E5C0004A27B5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
7BC5EFB12851ECC5004A27B5 /* ColorExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ColorExtension.swift; path = TeamOXY/Extensions/ColorExtension.swift; sourceTree = SOURCE_ROOT; };
F29BECDD285217A8005B4A1B /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -113,6 +115,7 @@
F29BECD628521540005B4A1B /* View */ = {
isa = PBXGroup;
children = (
4AC8DEEA2854F20E00500E0A /* CarouselView.swift */,
15634FA42854EB3F009264BF /* BreakTimeView.swift */,
15634FA52854EB3F009264BF /* CircularTimerView.swift */,
15634FA62854EB3F009264BF /* TimeSetView.swift */,
Expand Down Expand Up @@ -310,6 +313,7 @@
files = (
F29BED2528543123005B4A1B /* FieldType.swift in Sources */,
3F4E600B2853A30300BFAA65 /* TestView.swift in Sources */,
4AC8DEEB2854F20E00500E0A /* CarouselView.swift in Sources */,
F29BED1D28532DC3005B4A1B /* RoundButton.swift in Sources */,
F29BED232853B24C005B4A1B /* CreateMeetingRoomView.swift in Sources */,
212E5CE02853193100E10FF4 /* TempCardView.swift in Sources */,
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions TeamOXY/TeamOXY/Assets.xcassets/Card1.imageset/Contents.json
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Card1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions TeamOXY/TeamOXY/Assets.xcassets/Card2.imageset/Contents.json
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Card2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions TeamOXY/TeamOXY/Assets.xcassets/Card3.imageset/Contents.json
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Card3.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions TeamOXY/TeamOXY/Assets.xcassets/Card4.imageset/Contents.json
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Card4.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions TeamOXY/TeamOXY/Assets.xcassets/Card5.imageset/Contents.json
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Card5.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions TeamOXY/TeamOXY/Assets.xcassets/Card6.imageset/Contents.json
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Card6.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

0 comments on commit 954245c

Please sign in to comment.