Skip to content

Commit

Permalink
Merge branch 'develop' into feedLottie
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jae-eun
Jae-eun authored Mar 15, 2019
2 parents baf0462 + 9ee944c commit 6ba261d
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 81 deletions.
63 changes: 9 additions & 54 deletions Toonie.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,8 @@
0957B41AD138D0A49135F214132A015A /* ToonieTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8BEF0670CA0E9737AC0D8BB4C759F3D /* ToonieTests.swift */; };
19D70C5FD733A11319F2B4D5C382CB99 /* UIImageView+imageFromUrl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 307197284628654A8308DA52AEF4572F /* UIImageView+imageFromUrl.swift */; };
16B5F805D0B84D4BAE707BAAED697F08 /* giphy.gif in Resources */ = {isa = PBXBuildFile; fileRef = D8E1AD8B779448DA04C464E96AECF285 /* giphy.gif */; };
CAA846D62AB9AD2D72906DDE2C71CD0A /* logo.json in Resources */ = {isa = PBXBuildFile; fileRef = DF3F0E0EA77DF5D9B394D0B2C1063970 /* logo.json */; };
DF9380E6054C041E4A4F6709EF9B6863 /* logo_0.png in Resources */ = {isa = PBXBuildFile; fileRef = C0E63CD475F1D8DDE6DABBED76584E9D /* logo_0.png */; };
3D69E4FABD3A0CA64D9C45ACEDA5447D /* logo_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BD683C2D042E9E71AE36B6FDF6F91EFF /* logo_1.png */; };
A015E9745944183908CFB5EB622D8E1C /* logo_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 265C5019F75CD55A9F3E65DD1EB81778 /* logo_2.png */; };
2C5AB8160CD5EFBE5F7A784CEFF293BD /* logo_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 52261860A2CA22E4E4549FFF254178B4 /* logo_3.png */; };
EDECAA8A9C647CEC64310FC8C59ECC0D /* logo_4.png in Resources */ = {isa = PBXBuildFile; fileRef = F19B7C7DBA42C8BADE36E3EB635D0580 /* logo_4.png */; };
EA9A483AFB1A71A49124F85C18438FCC /* logo_5.png in Resources */ = {isa = PBXBuildFile; fileRef = 41A9444A982E152A60D019D70582C518 /* logo_5.png */; };
655E7C6DA37B63F408CDC8318128AD43 /* logo_6.png in Resources */ = {isa = PBXBuildFile; fileRef = 8631F846AECAC3D28B3C2B42703929E8 /* logo_6.png */; };
96A867D901E71622E9E989B52C5E0F65 /* logo_7.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EC8E23335E325CABFFECB779B5D9F44 /* logo_7.png */; };
613B0B6FD28864159F2BFAEC91BDFE5A /* logo_8.png in Resources */ = {isa = PBXBuildFile; fileRef = F0D48B3952E3F15B80DD34CB855A9801 /* logo_8.png */; };
42C9F1D0BE9554E33B9D52C08E676107 /* tag.json in Resources */ = {isa = PBXBuildFile; fileRef = CB4CC3F62E900540AB7D0805DE646065 /* tag.json */; };

/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -91,17 +82,8 @@
D32B5ACD1A82F7A257245C24D4210ADC /* ToonieTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ToonieTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
307197284628654A8308DA52AEF4572F /* UIImageView+imageFromUrl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "UIImageView+imageFromUrl.swift"; path = "Toonie/MyPage/UIImageView+imageFromUrl.swift"; sourceTree = SOURCE_ROOT; };
D8E1AD8B779448DA04C464E96AECF285 /* giphy.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = giphy.gif; path = "toonie/Supporting Files/giphy.gif"; sourceTree = SOURCE_ROOT; };
DF3F0E0EA77DF5D9B394D0B2C1063970 /* logo.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = logo.json; sourceTree = "<group>"; };
C0E63CD475F1D8DDE6DABBED76584E9D /* logo_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_0.png; sourceTree = "<group>"; };
BD683C2D042E9E71AE36B6FDF6F91EFF /* logo_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_1.png; sourceTree = "<group>"; };
265C5019F75CD55A9F3E65DD1EB81778 /* logo_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_2.png; sourceTree = "<group>"; };
52261860A2CA22E4E4549FFF254178B4 /* logo_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_3.png; sourceTree = "<group>"; };
F19B7C7DBA42C8BADE36E3EB635D0580 /* logo_4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_4.png; sourceTree = "<group>"; };
41A9444A982E152A60D019D70582C518 /* logo_5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_5.png; sourceTree = "<group>"; };
8631F846AECAC3D28B3C2B42703929E8 /* logo_6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_6.png; sourceTree = "<group>"; };
9EC8E23335E325CABFFECB779B5D9F44 /* logo_7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_7.png; sourceTree = "<group>"; };
F0D48B3952E3F15B80DD34CB855A9801 /* logo_8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_8.png; sourceTree = "<group>"; };
CB4CC3F62E900540AB7D0805DE646065 /* tag.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = tag.json; sourceTree = "<group>"; };

/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -141,23 +123,6 @@
path = MyPage;
sourceTree = "<group>";
};
2043341A73508475E2C3AF559DC5BA15 /* logo.json */ = {
isa = PBXGroup;
children = (
DF3F0E0EA77DF5D9B394D0B2C1063970 /* logo.json */,
C0E63CD475F1D8DDE6DABBED76584E9D /* logo_0.png */,
BD683C2D042E9E71AE36B6FDF6F91EFF /* logo_1.png */,
265C5019F75CD55A9F3E65DD1EB81778 /* logo_2.png */,
52261860A2CA22E4E4549FFF254178B4 /* logo_3.png */,
F19B7C7DBA42C8BADE36E3EB635D0580 /* logo_4.png */,
41A9444A982E152A60D019D70582C518 /* logo_5.png */,
8631F846AECAC3D28B3C2B42703929E8 /* logo_6.png */,
9EC8E23335E325CABFFECB779B5D9F44 /* logo_7.png */,
F0D48B3952E3F15B80DD34CB855A9801 /* logo_8.png */,
);
path = logo.json;
sourceTree = "<group>";
};
262BC765159E6BB88A72DE819C145C06 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -247,7 +212,6 @@
20EDEEDFB2A92FFAA9328EB4B2086305 /* KeywordCell.swift */,
7369E794AEA4E0B7187CBD9AE26AFB2E /* KeywordSelectViewController.swift */,
D181587B82E1BF344A7F8A87649CE2A5 /* SplashViewController.swift */,
2043341A73508475E2C3AF559DC5BA15 /* logo.json */,
);
path = Splash;
sourceTree = "<group>";
Expand Down Expand Up @@ -321,7 +285,7 @@
0A03A8E701D8806A7558B618CCC2B0D5 /* [CP] Check Pods Manifest.lock */,
7B171198A32EB3EFBC3D890069B09B16 /* Sources */,
CE5F455DCBC4B8425D238EF8FF886C7F /* Frameworks */,
F6B7743005D9067ED5559530A50CE69C /* [CP] Embed Pods Frameworks */,
CF120053B284775B4869DE30ACAECF1F /* [CP] Embed Pods Frameworks */,
177D19B0706A07426A4F6DC7872AF528 /* Resources */,
130436991E1155E6C5F84FFA8B34B848 /* ShellScript */,
);
Expand Down Expand Up @@ -404,17 +368,8 @@
4FFEF2D3318AC791E3F9C6ECC7710F1B /* Main.storyboard in Resources */,
3603ED7C6D7679C3634C60C341C440F4 /* MyPage.storyboard in Resources */,
16B5F805D0B84D4BAE707BAAED697F08 /* giphy.gif in Resources */,
CAA846D62AB9AD2D72906DDE2C71CD0A /* logo.json in Resources */,
DF9380E6054C041E4A4F6709EF9B6863 /* logo_0.png in Resources */,
3D69E4FABD3A0CA64D9C45ACEDA5447D /* logo_1.png in Resources */,
A015E9745944183908CFB5EB622D8E1C /* logo_2.png in Resources */,
2C5AB8160CD5EFBE5F7A784CEFF293BD /* logo_3.png in Resources */,
EDECAA8A9C647CEC64310FC8C59ECC0D /* logo_4.png in Resources */,
EA9A483AFB1A71A49124F85C18438FCC /* logo_5.png in Resources */,
655E7C6DA37B63F408CDC8318128AD43 /* logo_6.png in Resources */,
96A867D901E71622E9E989B52C5E0F65 /* logo_7.png in Resources */,
613B0B6FD28864159F2BFAEC91BDFE5A /* logo_8.png in Resources */,
42C9F1D0BE9554E33B9D52C08E676107 /* tag.json in Resources */,

);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -489,15 +444,15 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
F6B7743005D9067ED5559530A50CE69C /* [CP] Embed Pods Frameworks */ = {
CF120053B284775B4869DE30ACAECF1F /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Toonie/Pods-Toonie-frameworks.sh",
"${SRCROOT}/Pods/Target Support Files/Pods-Toonie/Pods-Toonie-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/KTCenterFlowLayout/KTCenterFlowLayout.framework",
"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
"${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
Expand All @@ -512,7 +467,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Toonie/Pods-Toonie-frameworks.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Toonie/Pods-Toonie-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -606,7 +561,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = R78643UTJ5;
DEVELOPMENT_TEAM = 9Q6DDFULNZ;
INFOPLIST_FILE = Toonie/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -626,7 +581,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = R78643UTJ5;
DEVELOPMENT_TEAM = 9Q6DDFULNZ;
INFOPLIST_FILE = Toonie/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
Loading

0 comments on commit 6ba261d

Please sign in to comment.