diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/Contents.json similarity index 64% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/Contents.json index ba7982b0..d2ff78ab 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/Contents.json @@ -7,17 +7,17 @@ }, { "filename" : "imgBalanceLeft@2x.png", - "scale" : "2x", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "2x" }, { "filename" : "imgBalanceLeft@3x.png", - "scale" : "3x", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/imgBalanceLeft.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/imgBalanceLeft.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/imgBalanceLeft.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/imgBalanceLeft.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/imgBalanceLeft@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/imgBalanceLeft@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/imgBalanceLeft@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/imgBalanceLeft@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/imgBalanceLeft@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/imgBalanceLeft@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceLeft.imageset/imgBalanceLeft@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceLeft.imageset/imgBalanceLeft@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/Contents.json similarity index 73% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/Contents.json index a6f36d3b..6f1bdd02 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/Contents.json @@ -1,13 +1,13 @@ { "images" : [ { - "scale" : "1x", + "filename" : "imgBalanceRight.png", "idiom" : "universal", - "filename" : "imgBalanceRight.png" + "scale" : "1x" }, { - "idiom" : "universal", "filename" : "imgBalanceRight@2x.png", + "idiom" : "universal", "scale" : "2x" }, { @@ -17,7 +17,7 @@ } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/imgBalanceRight.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/imgBalanceRight.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/imgBalanceRight.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/imgBalanceRight.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/imgBalanceRight@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/imgBalanceRight@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/imgBalanceRight@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/imgBalanceRight@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/imgBalanceRight@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/imgBalanceRight@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgBalanceRight.imageset/imgBalanceRight@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTaste/imgBalanceRight.imageset/imgBalanceRight@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/Contents.json deleted file mode 100644 index 43e88983..00000000 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "scale" : "1x", - "filename" : "imgHyun.png", - "idiom" : "universal" - }, - { - "filename" : "imgHyun@2x.png", - "scale" : "2x", - "idiom" : "universal" - }, - { - "filename" : "imgHyun@3x.png", - "scale" : "3x", - "idiom" : "universal" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/Contents.json deleted file mode 100644 index ce2a3a4c..00000000 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "scale" : "1x", - "filename" : "imgMin.png", - "idiom" : "universal" - }, - { - "filename" : "imgMin@2x.png", - "scale" : "2x", - "idiom" : "universal" - }, - { - "filename" : "imgMin@3x.png", - "scale" : "3x", - "idiom" : "universal" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/Contents.json deleted file mode 100644 index edda54dc..00000000 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "imgYun.png", - "scale" : "1x", - "idiom" : "universal" - }, - { - "scale" : "2x", - "idiom" : "universal", - "filename" : "imgYun@2x.png" - }, - { - "scale" : "3x", - "idiom" : "universal", - "filename" : "imgYun@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgDa.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgDa.imageset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgDa.imageset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgDa.imageset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgDa.imageset/imgDa 1.jpeg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgDa.imageset/imgDa 1.jpeg similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgDa.imageset/imgDa 1.jpeg rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgDa.imageset/imgDa 1.jpeg diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgDa.imageset/imgDa 2.jpeg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgDa.imageset/imgDa 2.jpeg similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgDa.imageset/imgDa 2.jpeg rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgDa.imageset/imgDa 2.jpeg diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgDa.imageset/imgDa.jpeg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgDa.imageset/imgDa.jpeg similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgDa.imageset/imgDa.jpeg rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgDa.imageset/imgDa.jpeg diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/Contents.json new file mode 100644 index 00000000..b9bbc1a3 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "imgHyun.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "imgHyun@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "imgHyun@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/imgHyun.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/imgHyun.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/imgHyun.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/imgHyun.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/imgHyun@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/imgHyun@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/imgHyun@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/imgHyun@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/imgHyun@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/imgHyun@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgHyun.imageset/imgHyun@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgHyun.imageset/imgHyun@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/Contents.json new file mode 100644 index 00000000..05bc5f0e --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "imgMin.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "imgMin@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "imgMin@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/imgMin.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/imgMin.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/imgMin.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/imgMin.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/imgMin@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/imgMin@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/imgMin@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/imgMin@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/imgMin@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/imgMin@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgMin.imageset/imgMin@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgMin.imageset/imgMin@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/Contents.json similarity index 73% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/Contents.json index b8b73203..c17fed87 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "scale" : "1x", + "filename" : "imgYe.png", "idiom" : "universal", - "filename" : "imgYe.png" + "scale" : "1x" }, { - "idiom" : "universal", "filename" : "imgYe@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "imgYe@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/imgYe.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/imgYe.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/imgYe.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/imgYe.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/imgYe@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/imgYe@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/imgYe@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/imgYe@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/imgYe@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/imgYe@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYe.imageset/imgYe@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYe.imageset/imgYe@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/Contents.json similarity index 58% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/Contents.json index a0a66ce4..e0fb69b2 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/Contents.json @@ -1,9 +1,9 @@ { "images" : [ { + "filename" : "imgYi.png", "idiom" : "universal", - "scale" : "1x", - "filename" : "imgYi.png" + "scale" : "1x" }, { "filename" : "imgYi@2x.png", @@ -11,13 +11,13 @@ "scale" : "2x" }, { - "scale" : "3x", + "filename" : "imgYi@3x.png", "idiom" : "universal", - "filename" : "imgYi@3x.png" + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/imgYi.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/imgYi.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/imgYi.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/imgYi.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/imgYi@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/imgYi@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/imgYi@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/imgYi@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/imgYi@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/imgYi@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYi.imageset/imgYi@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYi.imageset/imgYi@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYoung.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYoung.imageset/Contents.json similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYoung.imageset/Contents.json rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYoung.imageset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYoung.imageset/imgYoung 1.jpg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYoung.imageset/imgYoung 1.jpg similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYoung.imageset/imgYoung 1.jpg rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYoung.imageset/imgYoung 1.jpg diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYoung.imageset/imgYoung 2.jpg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYoung.imageset/imgYoung 2.jpg similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYoung.imageset/imgYoung 2.jpg rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYoung.imageset/imgYoung 2.jpg diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYoung.imageset/imgYoung.jpg b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYoung.imageset/imgYoung.jpg similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYoung.imageset/imgYoung.jpg rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYoung.imageset/imgYoung.jpg diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/Contents.json new file mode 100644 index 00000000..6802eaac --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "imgYun.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "imgYun@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "imgYun@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/imgYun.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/imgYun.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/imgYun.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/imgYun.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/imgYun@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/imgYun@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/imgYun@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/imgYun@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/imgYun@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/imgYun@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgYun.imageset/imgYun@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/teamNADA/imgYun.imageset/imgYun@3x.png diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/EmptyCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/EmptyCardCell.swift index 84dcbeef..c21ea27d 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/EmptyCardCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/EmptyCardCell.swift @@ -10,11 +10,6 @@ import VerticalCardSwiper class EmptyCardCell: CardCell { - override func awakeFromNib() { - super.awakeFromNib() - // Initialization code - } - // MARK: - Methods static func nib() -> UINib { diff --git a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift index ef10415a..ded1ab17 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift @@ -12,22 +12,11 @@ class CardListTableViewCell: UITableViewCell { @IBOutlet weak var pinButton: UIButton! @IBOutlet weak var titleLabel: UILabel! @IBOutlet weak var reorderButton: UIButton! - - override func awakeFromNib() { - super.awakeFromNib() - - } static func nib() -> UINib { return UINib(nibName: Const.Xib.cardListTableViewCell, bundle: nil) } - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - - // Configure the view for the selected state - } - func initData(title: String) { titleLabel.text = title } diff --git a/NADA-iOS-forRelease/Sources/Cells/CardList/EmptyCardListTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardList/EmptyCardListTableViewCell.swift index 975592da..12b670ff 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardList/EmptyCardListTableViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardList/EmptyCardListTableViewCell.swift @@ -9,17 +9,6 @@ import UIKit class EmptyCardListTableViewCell: UITableViewCell { - override func awakeFromNib() { - super.awakeFromNib() - // Initialization code - } - - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - - // Configure the view for the selected state - } - static func nib() -> UINib { return UINib(nibName: Const.Xib.EmptyCardListTableViewCell, bundle: Bundle(for: EmptyCardListTableViewCell.self)) } diff --git a/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift index 92238586..ba87b9f4 100644 --- a/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.swift @@ -24,10 +24,6 @@ class CardInGroupCollectionViewCell: UICollectionViewCell { var groupID: Int? var cardUUID: String? - override func awakeFromNib() { - super.awakeFromNib() - } - override func prepareForReuse() { super.prepareForReuse() diff --git a/NADA-iOS-forRelease/Sources/Cells/GroupEdit/EmptyGroupEditTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/GroupEdit/EmptyGroupEditTableViewCell.swift index 67129986..f5055c63 100644 --- a/NADA-iOS-forRelease/Sources/Cells/GroupEdit/EmptyGroupEditTableViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/GroupEdit/EmptyGroupEditTableViewCell.swift @@ -9,17 +9,6 @@ import UIKit class EmptyGroupEditTableViewCell: UITableViewCell { - override func awakeFromNib() { - super.awakeFromNib() - // Initialization code - } - - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - - // Configure the view for the selected state - } - static func nib() -> UINib { return UINib(nibName: Const.Xib.EmptyGroupEditTableViewCell, bundle: Bundle(for: EmptyGroupEditTableViewCell.self)) } diff --git a/NADA-iOS-forRelease/Sources/Cells/GroupEdit/GroupEditTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/GroupEdit/GroupEditTableViewCell.swift index 23efa9a3..84493c32 100644 --- a/NADA-iOS-forRelease/Sources/Cells/GroupEdit/GroupEditTableViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/GroupEdit/GroupEditTableViewCell.swift @@ -11,24 +11,12 @@ class GroupEditTableViewCell: UITableViewCell { // MARK: - @IBOutlet Properties @IBOutlet weak var titleLabel: UILabel! - - // MARK: - View Life Cycle - override func awakeFromNib() { - super.awakeFromNib() - - } // MARK: - Functions static func nib() -> UINib { return UINib(nibName: "GroupEditTableViewCell", bundle: nil) } - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - - // Configure the view for the selected state - } - func initData(title: String) { titleLabel.text = title } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/VC/AroundMeViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/VC/AroundMeViewController.swift index fb156b18..8267d5d7 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/VC/AroundMeViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/VC/AroundMeViewController.swift @@ -277,7 +277,7 @@ extension AroundMeViewController: CLLocationManagerDelegate { } func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) { - //location5 + // location5 switch status { case .authorizedAlways, .authorizedWhenInUse: print("GPS 권한 설정됨") diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/View/AroundMeCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/View/AroundMeCollectionViewCell.swift index 373a7362..26a3027d 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/View/AroundMeCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/View/AroundMeCollectionViewCell.swift @@ -54,10 +54,6 @@ class AroundMeCollectionViewCell: UICollectionViewCell { fatalError("init(coder:) has not been implemented") } - override func prepareForReuse() { - super.prepareForReuse() - } - // MARK: - Methods public func setData(_ model: AroundMeResponse) { diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index e9df6f63..294a7a4c 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -201,7 +201,7 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { longitude = locationManager.location?.coordinate.longitude ?? 0 if isActivate { - //TODO: 여기서 활성화된 명함 정보/위치정보 API로 쏴주기 + // TODO: 여기서 활성화된 명함 정보/위치정보 API로 쏴주기 timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(processTimer), userInfo: nil, repeats: true) print("✅✅ activated") @@ -237,7 +237,7 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { _ = isActivate ? lottieImage.play() : lottieImage.stop() if isActivate { - //TODO: 여기서 활성화된 명함 정보/위치정보 API로 쏴주기 + // TODO: 여기서 활성화된 명함 정보/위치정보 API로 쏴주기 if secondsLeft < 0 { postNearByCardWithAPI(nearByRequest: NearByRequest(cardUUID: cardDataModel?.cardUUID ?? "", isActive: false, latitude: latitude, longitude: longitude)) } @@ -555,7 +555,7 @@ extension CardShareBottomSheetViewController: CLLocationManagerDelegate { } func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) { - //location5 + // location5 switch status { case .authorizedAlways, .authorizedWhenInUse: print("GPS 권한 설정됨") @@ -599,12 +599,13 @@ extension CardShareBottomSheetViewController { if let nearByUUIDResponse = data as? NearByUUIDResponse { print("✅✅✅") let interval = Date() - (nearByUUIDResponse.activeTime?.toDate() ?? Date()) - self.timesLeft = 600 - (interval.second ?? 0) ?? 600 + self.timesLeft = 600 - (interval.second ?? 0) print("✅ now: ", Date()) print("✅ activated Time: ", nearByUUIDResponse.activeTime?.toDate()) print("✅ timesleft: ", self.timesLeft) self.nearByTimeLabel.text = "" - self.setCardActivationUI(with: nearByUUIDResponse.isActive, secondsLeft: self.timesLeft ?? 0) + self.setCardActivationUI(with: nearByUUIDResponse.isActive, + secondsLeft: self.timesLeft) } print("nearByUUIDFetchWithAPI - success") case .requestErr(let message): diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift index 86dfdf9e..1bf2baba 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift @@ -147,7 +147,6 @@ extension MoreViewController { if let acToken = UserDefaults.appGroup.string(forKey: Const.UserDefaultsKey.accessToken) { UserDefaults.appGroup.removeObject(forKey: Const.UserDefaultsKey.accessToken) WidgetCenter.shared.reloadTimelines(ofKind: "MyCardWidget") -// self.defaults.removeObject(forKey: Const.UserDefaultsKey.refreshToken) self.defaults.removeObject(forKey: Const.UserDefaultsKey.darkModeState) let nextVC = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.loginViewController) @@ -174,7 +173,6 @@ extension MoreViewController { self?.makeOKAlert(title: "", message: "나다를 이용해주셔서 감사합니다.\n다음에 또 뵈어요! 🥺") { _ in UserDefaults.appGroup.removeObject(forKey: Const.UserDefaultsKey.accessToken) WidgetCenter.shared.reloadTimelines(ofKind: "MyCardWidget") -// self.defaults.removeObject(forKey: Const.UserDefaultsKey.refreshToken) self?.defaults.removeObject(forKey: Const.UserDefaultsKey.darkModeState) let nextVC = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.loginViewController) diff --git a/NADA-iOS-forRelease/Sources/Views/CardView/CardView.swift b/NADA-iOS-forRelease/Sources/Views/CardView/CardView.swift index 35ff0732..73ef7653 100644 --- a/NADA-iOS-forRelease/Sources/Views/CardView/CardView.swift +++ b/NADA-iOS-forRelease/Sources/Views/CardView/CardView.swift @@ -27,10 +27,6 @@ class CardView: UIView { xibSetup() } - override func prepareForInterfaceBuilder() { - super.prepareForInterfaceBuilder() - } - required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) xibSetup()