diff --git a/NADA-iOS-forRelease/Info.plist b/NADA-iOS-forRelease/Info.plist
index 56e6bd19..3cb4a541 100644
--- a/NADA-iOS-forRelease/Info.plist
+++ b/NADA-iOS-forRelease/Info.plist
@@ -7,8 +7,6 @@
NSAllowsArbitraryLoads
- UIUserInterfaceStyle
- Dark
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo.png
deleted file mode 100644
index 2266fc22..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo@2x.png
deleted file mode 100644
index cd3431cb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo@3x.png
deleted file mode 100644
index ba29679f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Apple Logo@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1.png
deleted file mode 100644
index 01eae409..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1@2x.png
deleted file mode 100644
index 3ca8b60a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1@3x.png
deleted file mode 100644
index 2356d1e7..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/pngaaa 1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1.png
deleted file mode 100644
index 7ce689fe..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1@2x.png
deleted file mode 100644
index 0dd078b5..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1@3x.png
deleted file mode 100644
index f12ff1bc..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Group 1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/Contents.json
deleted file mode 100644
index 5539f0d4..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "addCircleBlack24Dp1.png",
- "scale" : "1x",
- "idiom" : "universal"
- },
- {
- "filename" : "addCircleBlack24Dp1@2x.png",
- "scale" : "2x",
- "idiom" : "universal"
- },
- {
- "filename" : "addCircleBlack24Dp1@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/addCircleBlack.imageset/addCircleBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/addCircleBlack24Dp1.png
deleted file mode 100644
index dfbd85f4..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/addCircleBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/addCircleBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/addCircleBlack24Dp1@2x.png
deleted file mode 100644
index d9052812..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/addCircleBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/addCircleBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/addCircleBlack24Dp1@3x.png
deleted file mode 100644
index 2ec350d3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addCircleBlack.imageset/addCircleBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/Contents.json
new file mode 100644
index 00000000..d122339b
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "addPhoto.png",
+ "scale" : "1x",
+ "idiom" : "universal"
+ },
+ {
+ "filename" : "addPhoto@2x.png",
+ "scale" : "2x",
+ "idiom" : "universal"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "addPhoto@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto.png
new file mode 100644
index 00000000..e99944f2
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@2x.png
new file mode 100644
index 00000000..46e185c4
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@3x.png
new file mode 100644
index 00000000..33748952
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/Contents.json
deleted file mode 100644
index 7083fe6f..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "scale" : "1x",
- "idiom" : "universal",
- "filename" : "addPhotoAlternateBlack24Dp1.png"
- },
- {
- "filename" : "addPhotoAlternateBlack24Dp1@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "addPhotoAlternateBlack24Dp1@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/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1.png
deleted file mode 100644
index 93169408..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1@2x.png
deleted file mode 100644
index 6d860890..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1@3x.png
deleted file mode 100644
index 4dfa4fba..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhotoAlternateBlack.imageset/addPhotoAlternateBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/Contents.json
deleted file mode 100644
index ea4648e4..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "scale" : "1x",
- "idiom" : "universal",
- "filename" : "arrowBackIosNewWhite24Dp1.png"
- },
- {
- "scale" : "2x",
- "idiom" : "universal",
- "filename" : "arrowBackIosNewWhite24Dp1@2x.png"
- },
- {
- "filename" : "arrowBackIosNewWhite24Dp1@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/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1.png
deleted file mode 100644
index c4b620bd..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1@2x.png
deleted file mode 100644
index 3e877a52..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1@3x.png
deleted file mode 100644
index 940755b3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/arrowBackWhite.imageset/arrowBackIosNewWhite24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1.png
deleted file mode 100644
index 5d3272d5..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1@2x.png
deleted file mode 100644
index 78409da2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1@3x.png
deleted file mode 100644
index af7ecd7a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/bg1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2.png
deleted file mode 100644
index f2d21fe6..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2@2x.png
deleted file mode 100644
index f582c8f3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2@3x.png
deleted file mode 100644
index 34931a41..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/bg2@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3.png
deleted file mode 100644
index 1eac9cf2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3@2x.png
deleted file mode 100644
index e5497653..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3@3x.png
deleted file mode 100644
index 98efd4c7..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/bg3@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4.png
deleted file mode 100644
index ee532001..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4@2x.png
deleted file mode 100644
index a9dd4c11..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4@3x.png
deleted file mode 100644
index d62b1097..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/bg4@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5.png
deleted file mode 100644
index 822893d9..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5@2x.png
deleted file mode 100644
index 7d0b0005..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5@3x.png
deleted file mode 100644
index 376b99d2..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/bg5@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/Contents.json
index a9284b99..756a9f80 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg4.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/Contents.json
@@ -2,16 +2,16 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "bg4.png",
+ "filename" : "btnMainAdd.png",
"scale" : "1x"
},
{
- "idiom" : "universal",
"scale" : "2x",
- "filename" : "bg4@2x.png"
+ "idiom" : "universal",
+ "filename" : "btnMainAdd@2x.png"
},
{
- "filename" : "bg4@3x.png",
+ "filename" : "btnMainAdd@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd.png
new file mode 100644
index 00000000..7f1d49e9
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd@2x.png
new file mode 100644
index 00000000..4c77ee36
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd@3x.png
new file mode 100644
index 00000000..94ee7024
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainAdd.imageset/btnMainAdd@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/Contents.json
similarity index 66%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/Contents.json
index 2cbbc731..46d360f4 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "idiom" : "universal",
"scale" : "1x",
- "filename" : "reorderBlack24Dp1.png"
+ "idiom" : "universal",
+ "filename" : "btnMainCreate.png"
},
{
"idiom" : "universal",
"scale" : "2x",
- "filename" : "reorderBlack24Dp1@2x.png"
+ "filename" : "btnMainCreate@2x.png"
},
{
"scale" : "3x",
"idiom" : "universal",
- "filename" : "reorderBlack24Dp1@3x.png"
+ "filename" : "btnMainCreate@3x.png"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate.png
new file mode 100644
index 00000000..ab913f27
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate@2x.png
new file mode 100644
index 00000000..27f8c816
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate@3x.png
new file mode 100644
index 00000000..93b2c463
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainCreate.imageset/btnMainCreate@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/Contents.json
similarity index 68%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/Contents.json
index bf2dbaab..2c720654 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/Contents.json
@@ -3,15 +3,15 @@
{
"scale" : "1x",
"idiom" : "universal",
- "filename" : "oval.png"
+ "filename" : "btnMainDisable.png"
},
{
- "idiom" : "universal",
"scale" : "2x",
- "filename" : "oval@2x.png"
+ "idiom" : "universal",
+ "filename" : "btnMainDisable@2x.png"
},
{
- "filename" : "oval@3x.png",
+ "filename" : "btnMainDisable@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable.png
new file mode 100644
index 00000000..55c60ef6
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable@2x.png
new file mode 100644
index 00000000..c933bf77
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable@3x.png
new file mode 100644
index 00000000..f447efa1
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDisable.imageset/btnMainDisable@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/Contents.json
new file mode 100644
index 00000000..1a107a8c
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "btnMainDone.png",
+ "scale" : "1x",
+ "idiom" : "universal"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "btnMainDone@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "btnMainDone@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone.png
new file mode 100644
index 00000000..9064e98f
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone@2x.png
new file mode 100644
index 00000000..5c4a60e2
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone@3x.png
new file mode 100644
index 00000000..17a70884
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainDone.imageset/btnMainDone@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/Contents.json
similarity index 66%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/Contents.json
index 9950177c..256674b2 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/Contents.json
@@ -1,18 +1,18 @@
{
"images" : [
{
- "filename" : "pushPinBlack24Dp1.png",
"idiom" : "universal",
+ "filename" : "btnMainMatch.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
- "filename" : "pushPinBlack24Dp1@2x.png"
+ "filename" : "btnMainMatch@2x.png"
},
{
- "filename" : "pushPinBlack24Dp1@3x.png",
"idiom" : "universal",
+ "filename" : "btnMainMatch@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch.png
new file mode 100644
index 00000000..54151677
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch@2x.png
new file mode 100644
index 00000000..e9e8deaa
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch@3x.png
new file mode 100644
index 00000000..90fdfc04
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainMatch.imageset/btnMainMatch@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/Contents.json
similarity index 62%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/Contents.json
index d6a34dd4..5294f3bd 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
+ "scale" : "1x",
"idiom" : "universal",
- "filename" : "group36.png",
- "scale" : "1x"
+ "filename" : "buttonShareImg.png"
},
{
- "idiom" : "universal",
"scale" : "2x",
- "filename" : "group36@2x.png"
+ "idiom" : "universal",
+ "filename" : "buttonShareImg@2x.png"
},
{
- "scale" : "3x",
"idiom" : "universal",
- "filename" : "group36@3x.png"
+ "scale" : "3x",
+ "filename" : "buttonShareImg@3x.png"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg.png
new file mode 100644
index 00000000..8bb5df9e
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg@2x.png
new file mode 100644
index 00000000..02766e42
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg@3x.png
new file mode 100644
index 00000000..d4d260ae
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareImg.imageset/buttonShareImg@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/Contents.json
similarity index 61%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/Contents.json
index fc447cf7..722ab1e9 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/Contents.json
@@ -1,18 +1,18 @@
{
"images" : [
{
- "scale" : "1x",
- "filename" : "deleteWhite24Dp1.png",
- "idiom" : "universal"
+ "idiom" : "universal",
+ "filename" : "buttonShareKkt.png",
+ "scale" : "1x"
},
{
- "idiom" : "universal",
+ "filename" : "buttonShareKkt@2x.png",
"scale" : "2x",
- "filename" : "deleteWhite24Dp1@2x.png"
+ "idiom" : "universal"
},
{
+ "filename" : "buttonShareKkt@3x.png",
"scale" : "3x",
- "filename" : "deleteWhite24Dp1@3x.png",
"idiom" : "universal"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt.png
new file mode 100644
index 00000000..7ceecd5a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt@2x.png
new file mode 100644
index 00000000..59dda54d
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt@3x.png
new file mode 100644
index 00000000..88f73b8c
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonShareKkt.imageset/buttonShareKkt@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/Contents.json
similarity index 65%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/Contents.json
index ddb09f17..d559915c 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "filename" : "group38.png",
"scale" : "1x",
+ "filename" : "card.png",
"idiom" : "universal"
},
{
- "filename" : "group38@2x.png",
+ "filename" : "card@2x.png",
"scale" : "2x",
"idiom" : "universal"
},
{
- "scale" : "3x",
"idiom" : "universal",
- "filename" : "group38@3x.png"
+ "filename" : "card@3x.png",
+ "scale" : "3x"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card.png
new file mode 100644
index 00000000..203a47d8
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card@2x.png
new file mode 100644
index 00000000..69df8f69
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card@3x.png
new file mode 100644
index 00000000..610eb36a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/card.imageset/card@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/Contents.json
deleted file mode 100644
index a1084fce..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "check_circle_black_24dp 1.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "check_circle_black_24dp 1@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "check_circle_black_24dp 1@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1.png
deleted file mode 100644
index 114fe957..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1@2x.png
deleted file mode 100644
index 19a7703b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1@3x.png
deleted file mode 100644
index 0d7c7667..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/checkCircleBlack.imageset/check_circle_black_24dp 1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1.png
deleted file mode 100644
index 366b1feb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1@2x.png
deleted file mode 100644
index 5f678329..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1@3x.png
deleted file mode 100644
index 13c5b215..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/contentCopyBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1.png
deleted file mode 100644
index 253462f7..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1@2x.png
deleted file mode 100644
index 65ae0be6..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1@3x.png
deleted file mode 100644
index 2e65cffb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/deleteRed.imageset/deleteWhite24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1.png
deleted file mode 100644
index 75d58d42..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1@2x.png
deleted file mode 100644
index 7812f662..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1@3x.png
deleted file mode 100644
index 365c845b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/editWhite24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/Contents.json
deleted file mode 100644
index 1b3ba531..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "error_black_24dp 1.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "error_black_24dp 1@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "error_black_24dp 1@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1.png
deleted file mode 100644
index 8a5fe93c..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1@2x.png
deleted file mode 100644
index af3a0d65..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1@3x.png
deleted file mode 100644
index ed9acebf..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/errorRed.imageset/error_black_24dp 1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/Contents.json
similarity index 71%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/Contents.json
index 2ac716b1..ff65a51b 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/Contents.json
@@ -2,17 +2,17 @@
"images" : [
{
"scale" : "1x",
- "filename" : "group39.png",
+ "filename" : "frame74.png",
"idiom" : "universal"
},
{
- "idiom" : "universal",
"scale" : "2x",
- "filename" : "group39@2x.png"
+ "idiom" : "universal",
+ "filename" : "frame74@2x.png"
},
{
"idiom" : "universal",
- "filename" : "group39@3x.png",
+ "filename" : "frame74@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74.png
new file mode 100644
index 00000000..5b63e225
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74@2x.png
new file mode 100644
index 00000000..4f77c79a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74@3x.png
new file mode 100644
index 00000000..702f9e60
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/frame74.imageset/frame74@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/Contents.json
deleted file mode 100644
index 668f218c..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "homeBtnOnClick.png",
- "scale" : "1x",
- "idiom" : "universal"
- },
- {
- "idiom" : "universal",
- "filename" : "homeBtnOnClick@2x.png",
- "scale" : "2x"
- },
- {
- "filename" : "homeBtnOnClick@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/homeBtnOnClick.imageset/homeBtnOnClick.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/homeBtnOnClick.png
deleted file mode 100644
index c04de515..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/homeBtnOnClick.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/homeBtnOnClick@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/homeBtnOnClick@2x.png
deleted file mode 100644
index 044f07b3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/homeBtnOnClick@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/homeBtnOnClick@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/homeBtnOnClick@3x.png
deleted file mode 100644
index 6c7d364c..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/homeBtnOnClick.imageset/homeBtnOnClick@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/Contents.json
index 043f8e7a..7b6a894a 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg2.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/Contents.json
@@ -1,18 +1,18 @@
{
"images" : [
{
- "filename" : "bg2.png",
+ "filename" : "icnApple.png",
"scale" : "1x",
"idiom" : "universal"
},
{
+ "filename" : "icnApple@2x.png",
"idiom" : "universal",
- "filename" : "bg2@2x.png",
"scale" : "2x"
},
{
+ "filename" : "icnApple@3x.png",
"idiom" : "universal",
- "filename" : "bg2@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple.png
new file mode 100644
index 00000000..2efeba0d
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple@2x.png
new file mode 100644
index 00000000..653cce8d
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple@3x.png
new file mode 100644
index 00000000..dee4a7b6
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnApple.imageset/icnApple@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/Contents.json
index 241c236d..7d870a8b 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg1.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/Contents.json
@@ -1,17 +1,17 @@
{
"images" : [
{
- "filename" : "bg1.png",
+ "filename" : "icnKakao.png",
"scale" : "1x",
"idiom" : "universal"
},
{
+ "filename" : "icnKakao@2x.png",
"scale" : "2x",
- "filename" : "bg1@2x.png",
"idiom" : "universal"
},
{
- "filename" : "bg1@3x.png",
+ "filename" : "icnKakao@3x.png",
"scale" : "3x",
"idiom" : "universal"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao.png
new file mode 100644
index 00000000..dde2eaa7
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao@2x.png
new file mode 100644
index 00000000..7ea39bcb
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao@3x.png
new file mode 100644
index 00000000..9f7de136
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnKakao.imageset/icnKakao@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/Contents.json
similarity index 71%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/Contents.json
index 24367767..b5a6b599 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/Contents.json
@@ -2,16 +2,16 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "group42.png",
+ "filename" : "iconAdd.png",
"scale" : "1x"
},
{
- "filename" : "group42@2x.png",
+ "filename" : "iconAdd@2x.png",
"scale" : "2x",
"idiom" : "universal"
},
{
- "filename" : "group42@3x.png",
+ "filename" : "iconAdd@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png
new file mode 100644
index 00000000..d93a2f06
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png
new file mode 100644
index 00000000..b40b9293
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png
new file mode 100644
index 00000000..40b10e0c
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/Contents.json
similarity index 64%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/Contents.json
index 9ca1f802..cb88c785 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/contentCopyBlack.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/Contents.json
@@ -1,17 +1,17 @@
{
"images" : [
{
- "filename" : "contentCopyBlack24Dp1.png",
"idiom" : "universal",
+ "filename" : "iconAddPhoto.png",
"scale" : "1x"
},
{
- "filename" : "contentCopyBlack24Dp1@2x.png",
"idiom" : "universal",
+ "filename" : "iconAddPhoto@2x.png",
"scale" : "2x"
},
{
- "filename" : "contentCopyBlack24Dp1@3x.png",
+ "filename" : "iconAddPhoto@3x.png",
"scale" : "3x",
"idiom" : "universal"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.png
new file mode 100644
index 00000000..33be0bb9
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@2x.png
new file mode 100644
index 00000000..6c46f776
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@3x.png
new file mode 100644
index 00000000..309d6455
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAddPhoto.imageset/iconAddPhoto@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json
index 8b8fbe5f..7085ad59 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json
@@ -1,18 +1,18 @@
{
"images" : [
{
- "filename" : "group45.png",
"idiom" : "universal",
+ "filename" : "iconArrow.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
- "filename" : "group45@2x.png"
+ "filename" : "iconArrow@2x.png"
},
{
"idiom" : "universal",
- "filename" : "group45@3x.png",
+ "filename" : "iconArrow@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.png
new file mode 100644
index 00000000..7afc0c59
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x.png
new file mode 100644
index 00000000..b7b5a240
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x.png
new file mode 100644
index 00000000..ca80e69a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json
index a47f3b35..aef2e6a5 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg3.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json
@@ -1,18 +1,18 @@
{
"images" : [
{
- "idiom" : "universal",
"scale" : "1x",
- "filename" : "bg3.png"
+ "idiom" : "universal",
+ "filename" : "iconCards.png"
},
{
- "filename" : "bg3@2x.png",
+ "filename" : "iconCards@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
- "filename" : "bg3@3x.png",
+ "filename" : "iconCards@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.png
new file mode 100644
index 00000000..4bd0d014
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@2x.png
new file mode 100644
index 00000000..ee4155ce
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@3x.png
new file mode 100644
index 00000000..9237e43e
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/iconCards@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/Contents.json
similarity index 66%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/Contents.json
index 7124a7bf..397045b7 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/Contents.json
@@ -3,16 +3,16 @@
{
"idiom" : "universal",
"scale" : "1x",
- "filename" : "moreVertBlack24Dp1.png"
+ "filename" : "iconCardsSelected.png"
},
{
- "idiom" : "universal",
"scale" : "2x",
- "filename" : "moreVertBlack24Dp1@2x.png"
+ "idiom" : "universal",
+ "filename" : "iconCardsSelected@2x.png"
},
{
"idiom" : "universal",
- "filename" : "moreVertBlack24Dp1@3x.png",
+ "filename" : "iconCardsSelected@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.png
new file mode 100644
index 00000000..cfc64b4c
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@2x.png
new file mode 100644
index 00000000..14108e65
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@3x.png
new file mode 100644
index 00000000..68168494
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCardsSelected.imageset/iconCardsSelected@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/Contents.json
index a1c61430..5c3221dc 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "filename" : "group37.png",
"idiom" : "universal",
+ "filename" : "iconClear.png",
"scale" : "1x"
},
{
- "filename" : "group37@2x.png",
+ "idiom" : "universal",
"scale" : "2x",
- "idiom" : "universal"
+ "filename" : "iconClear@2x.png"
},
{
- "idiom" : "universal",
"scale" : "3x",
- "filename" : "group37@3x.png"
+ "filename" : "iconClear@3x.png",
+ "idiom" : "universal"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/closeBlack24Dp.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear.png
similarity index 100%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/closeBlack24Dp.png
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear.png
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/closeBlack24Dp@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@2x.png
similarity index 100%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/closeBlack24Dp@2x.png
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@2x.png
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/closeBlack24Dp@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@3x.png
similarity index 100%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/closeBlack24Dp@3x.png
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconClear.imageset/iconClear@3x.png
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/Contents.json
index 1be9f412..701f1409 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/Contents.json
@@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "image478.png",
+ "filename" : "iconCopy.png",
"scale" : "1x"
},
{
- "filename" : "image478@2x.png",
+ "filename" : "iconCopy@2x.png",
"scale" : "2x",
"idiom" : "universal"
},
{
+ "filename" : "iconCopy@3x.png",
"idiom" : "universal",
- "filename" : "image478@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy.png
new file mode 100644
index 00000000..f5217be3
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy@2x.png
new file mode 100644
index 00000000..f44cc782
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy@3x.png
new file mode 100644
index 00000000..84c7cf36
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCopy.imageset/iconCopy@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/Contents.json
index a267c881..95d381b9 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/Contents.json
@@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "group44.png",
+ "filename" : "iconDone.png",
"scale" : "1x"
},
{
- "filename" : "group44@2x.png",
"idiom" : "universal",
+ "filename" : "iconDone@2x.png",
"scale" : "2x"
},
{
- "filename" : "group44@3x.png",
"idiom" : "universal",
+ "filename" : "iconDone@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.png
new file mode 100644
index 00000000..be049b70
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@2x.png
new file mode 100644
index 00000000..292b9ffc
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@3x.png
new file mode 100644
index 00000000..7da06c7a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconDone.imageset/iconDone@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/Contents.json
index e0a30834..55b45d04 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/Contents.json
@@ -1,18 +1,18 @@
{
"images" : [
{
- "idiom" : "universal",
"scale" : "1x",
- "filename" : "ovalCopy.png"
+ "filename" : "iconError.png",
+ "idiom" : "universal"
},
{
"scale" : "2x",
- "filename" : "ovalCopy@2x.png",
- "idiom" : "universal"
+ "idiom" : "universal",
+ "filename" : "iconError@2x.png"
},
{
- "filename" : "ovalCopy@3x.png",
"idiom" : "universal",
+ "filename" : "iconError@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError.png
new file mode 100644
index 00000000..adef3f53
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError@2x.png
new file mode 100644
index 00000000..aa30e3ad
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError@3x.png
new file mode 100644
index 00000000..1a725c3f
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconError.imageset/iconError@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/Contents.json
index c920bc42..72e90120 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "filename" : "image54.png",
+ "filename" : "iconFolder.png",
"scale" : "1x",
"idiom" : "universal"
},
{
- "filename" : "image54@2x.png",
+ "idiom" : "universal",
"scale" : "2x",
- "idiom" : "universal"
+ "filename" : "iconFolder@2x.png"
},
{
+ "filename" : "iconFolder@3x.png",
"scale" : "3x",
- "idiom" : "universal",
- "filename" : "image54@3x.png"
+ "idiom" : "universal"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder.png
new file mode 100644
index 00000000..279941c4
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@2x.png
new file mode 100644
index 00000000..6f190e73
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@3x.png
new file mode 100644
index 00000000..8588c6b7
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconFolder.imageset/iconFolder@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/Contents.json
similarity index 61%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/Contents.json
index 4fad52d5..a482d8be 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/Contents.json
@@ -3,17 +3,17 @@
{
"scale" : "1x",
"idiom" : "universal",
- "filename" : "group41.png"
+ "filename" : "iconHomeSelected.png"
},
{
"idiom" : "universal",
- "filename" : "group41@2x.png",
+ "filename" : "iconHomeSelected@2x.png",
"scale" : "2x"
},
{
- "scale" : "3x",
+ "filename" : "iconHomeSelected@3x.png",
"idiom" : "universal",
- "filename" : "group41@3x.png"
+ "scale" : "3x"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.png
new file mode 100644
index 00000000..6b2495bb
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@2x.png
new file mode 100644
index 00000000..ea4a4204
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@3x.png
new file mode 100644
index 00000000..e32e19bb
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconHomeSelected.imageset/iconHomeSelected@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/Contents.json
similarity index 67%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/Contents.json
index 93eadc48..8e74c20a 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/editWhite.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "filename" : "editWhite24Dp1.png",
"scale" : "1x",
+ "filename" : "iconInstagram.png",
"idiom" : "universal"
},
{
+ "filename" : "iconInstagram@2x.png",
"idiom" : "universal",
- "filename" : "editWhite24Dp1@2x.png",
"scale" : "2x"
},
{
"scale" : "3x",
"idiom" : "universal",
- "filename" : "editWhite24Dp1@3x.png"
+ "filename" : "iconInstagram@3x.png"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.png
new file mode 100644
index 00000000..e3eda38a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@2x.png
new file mode 100644
index 00000000..95344825
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@3x.png
new file mode 100644
index 00000000..782e81c3
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconInstagram.imageset/iconInstagram@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/Contents.json
similarity index 67%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/Contents.json
index 20f70fd7..22be47d8 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/Contents.json
@@ -1,18 +1,18 @@
{
"images" : [
{
+ "filename" : "iconList.png",
"idiom" : "universal",
- "filename" : "linkBlack24Dp1.png",
"scale" : "1x"
},
{
- "filename" : "linkBlack24Dp1@2x.png",
+ "filename" : "iconList@2x.png",
"scale" : "2x",
"idiom" : "universal"
},
{
- "filename" : "linkBlack24Dp1@3x.png",
"idiom" : "universal",
+ "filename" : "iconList@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png
new file mode 100644
index 00000000..5c5e3a41
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png
new file mode 100644
index 00000000..ed2207ed
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png
new file mode 100644
index 00000000..b01ec7c0
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/Contents.json
similarity index 66%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/Contents.json
index 54028ef6..697bc036 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/Contents.json
@@ -3,15 +3,15 @@
{
"idiom" : "universal",
"scale" : "1x",
- "filename" : "pushPinBlack24Dp1.png"
+ "filename" : "iconMoreHoriz.png"
},
{
+ "filename" : "iconMoreHoriz@2x.png",
"idiom" : "universal",
- "filename" : "pushPinBlack24Dp1@2x.png",
"scale" : "2x"
},
{
- "filename" : "pushPinBlack24Dp1@3x.png",
+ "filename" : "iconMoreHoriz@3x.png",
"scale" : "3x",
"idiom" : "universal"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.png
new file mode 100644
index 00000000..d0f86605
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x.png
new file mode 100644
index 00000000..cb534e49
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x.png
new file mode 100644
index 00000000..78e21402
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHoriz.imageset/iconMoreHoriz@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/Contents.json
similarity index 64%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/Contents.json
index 11c046c4..3531fc4c 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/bg5.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "filename" : "bg5.png",
"idiom" : "universal",
+ "filename" : "iconMoreHorizSelected.png",
"scale" : "1x"
},
{
+ "filename" : "iconMoreHorizSelected@2x.png",
"scale" : "2x",
- "filename" : "bg5@2x.png",
"idiom" : "universal"
},
{
"scale" : "3x",
"idiom" : "universal",
- "filename" : "bg5@3x.png"
+ "filename" : "iconMoreHorizSelected@3x.png"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.png
new file mode 100644
index 00000000..5bac4085
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@2x.png
new file mode 100644
index 00000000..4c26e271
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@3x.png
new file mode 100644
index 00000000..0ce2d481
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconMoreHorizSelected.imageset/iconMoreHorizSelected@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/Contents.json
index 9891f9fd..e676e59c 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "scale" : "1x",
"idiom" : "universal",
- "filename" : "group46.png"
+ "scale" : "1x",
+ "filename" : "iconOption.png"
},
{
"idiom" : "universal",
- "filename" : "group46@2x.png",
+ "filename" : "iconOption@2x.png",
"scale" : "2x"
},
{
- "idiom" : "universal",
"scale" : "3x",
- "filename" : "group46@3x.png"
+ "idiom" : "universal",
+ "filename" : "iconOption@3x.png"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption.png
new file mode 100644
index 00000000..32b71f10
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption@2x.png
new file mode 100644
index 00000000..bba4b466
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption@3x.png
new file mode 100644
index 00000000..364e786b
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconOption.imageset/iconOption@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/Contents.json
similarity index 65%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/Contents.json
index 7a555a5f..ee26a149 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/Contents.json
@@ -2,18 +2,18 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "group34.png",
+ "filename" : "iconPin.png",
"scale" : "1x"
},
{
+ "filename" : "iconPin@2x.png",
"scale" : "2x",
- "filename" : "group34@2x.png",
"idiom" : "universal"
},
{
+ "filename" : "iconPin@3x.png",
"idiom" : "universal",
- "scale" : "3x",
- "filename" : "group34@3x.png"
+ "scale" : "3x"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin.png
new file mode 100644
index 00000000..cd727cb7
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin@2x.png
new file mode 100644
index 00000000..a3446553
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin@3x.png
new file mode 100644
index 00000000..a0ffe361
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPin.imageset/iconPin@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/Contents.json
similarity index 67%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/Contents.json
index 2a6a2e2c..62561485 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/Contents.json
@@ -2,18 +2,18 @@
"images" : [
{
"scale" : "1x",
- "idiom" : "universal",
- "filename" : "group47.png"
+ "filename" : "iconPinInactive.png",
+ "idiom" : "universal"
},
{
- "filename" : "group47@2x.png",
"scale" : "2x",
- "idiom" : "universal"
+ "idiom" : "universal",
+ "filename" : "iconPinInactive@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x",
- "filename" : "group47@3x.png"
+ "filename" : "iconPinInactive@3x.png"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive.png
new file mode 100644
index 00000000..37cc6254
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive@2x.png
new file mode 100644
index 00000000..7244baac
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive@3x.png
new file mode 100644
index 00000000..21a61859
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconPinInactive.imageset/iconPinInactive@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/Contents.json
similarity index 65%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/Contents.json
index 32115e8c..9ce12789 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/Contents.json
@@ -1,17 +1,17 @@
{
"images" : [
{
- "filename" : "viewListBlack24Dp1.png",
"idiom" : "universal",
+ "filename" : "iconReorder.png",
"scale" : "1x"
},
{
- "filename" : "viewListBlack24Dp1@2x.png",
"scale" : "2x",
+ "filename" : "iconReorder@2x.png",
"idiom" : "universal"
},
{
- "filename" : "viewListBlack24Dp1@3x.png",
+ "filename" : "iconReorder@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder.png
similarity index 50%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1.png
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder.png
index 443e9b4c..dcd3de25 100644
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder@2x.png
new file mode 100644
index 00000000..825a8eb5
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder@3x.png
new file mode 100644
index 00000000..3773938f
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconReorder.imageset/iconReorder@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/Contents.json
new file mode 100644
index 00000000..c31ab5fd
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "scale" : "1x",
+ "filename" : "iconShare.png",
+ "idiom" : "universal"
+ },
+ {
+ "filename" : "iconShare@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "iconShare@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.png
new file mode 100644
index 00000000..2e38620a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@2x.png
new file mode 100644
index 00000000..d17583c9
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@3x.png
new file mode 100644
index 00000000..07d8c340
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconShare.imageset/iconShare@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/Contents.json
new file mode 100644
index 00000000..d39714cd
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_off_banmincho.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_off_banmincho@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_off_banmincho@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho.png
new file mode 100644
index 00000000..57eb6f12
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho@2x.png
new file mode 100644
index 00000000..abb93056
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho@3x.png
new file mode 100644
index 00000000..8284c405
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBanmincho.imageset/icon_taste_off_banmincho@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/Contents.json
similarity index 65%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/Contents.json
index 46a33a58..576ee5d4 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogo.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/Contents.json
@@ -1,17 +1,17 @@
{
"images" : [
{
- "filename" : "Apple Logo.png",
+ "filename" : "icon_taste_off_beer.png",
"idiom" : "universal",
"scale" : "1x"
},
{
- "filename" : "Apple Logo@2x.png",
+ "filename" : "icon_taste_off_beer@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "Apple Logo@3x.png",
+ "filename" : "icon_taste_off_beer@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer.png
new file mode 100644
index 00000000..3b6cde59
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer@2x.png
new file mode 100644
index 00000000..e1cb1fe7
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer@3x.png
new file mode 100644
index 00000000..9b3c8407
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBeer.imageset/icon_taste_off_beer@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/Contents.json
new file mode 100644
index 00000000..537c84b2
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_off_bumeok.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_off_bumeok@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_off_bumeok@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok.png
new file mode 100644
index 00000000..45992c4c
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok@2x.png
new file mode 100644
index 00000000..6a5cadf9
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok@3x.png
new file mode 100644
index 00000000..6e4df2e2
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffBumeok.imageset/icon_taste_off_bumeok@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/Contents.json
new file mode 100644
index 00000000..481582db
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_off_fried.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_off_fried@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_off_fried@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried.png
new file mode 100644
index 00000000..bfce5a22
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried@2x.png
new file mode 100644
index 00000000..1cdd80d8
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried@3x.png
new file mode 100644
index 00000000..9adebb2a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffFried.imageset/icon_taste_off_fried@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/Contents.json
new file mode 100644
index 00000000..cb3d8a4e
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_off_mincho.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_off_mincho@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_off_mincho@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho.png
new file mode 100644
index 00000000..6cedae98
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho@2x.png
new file mode 100644
index 00000000..9de51d7c
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho@3x.png
new file mode 100644
index 00000000..ed2b8639
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffMincho.imageset/icon_taste_off_mincho@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/Contents.json
new file mode 100644
index 00000000..89206124
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_off_seasoned.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_off_seasoned@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_off_seasoned@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned.png
new file mode 100644
index 00000000..4964820f
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned@2x.png
new file mode 100644
index 00000000..e8a4b02c
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned@3x.png
new file mode 100644
index 00000000..f199e6b5
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSeasoned.imageset/icon_taste_off_seasoned@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/Contents.json
new file mode 100644
index 00000000..ca4c06fa
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_off_soju.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_off_soju@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_off_soju@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju.png
new file mode 100644
index 00000000..3f1e3c36
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju@2x.png
new file mode 100644
index 00000000..cf912017
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju@3x.png
new file mode 100644
index 00000000..b43b7d43
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffSoju.imageset/icon_taste_off_soju@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/Contents.json
new file mode 100644
index 00000000..cb491844
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_off_zzik.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_off_zzik@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_off_zzik@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik.png
new file mode 100644
index 00000000..baee19dd
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik@2x.png
new file mode 100644
index 00000000..92eb22d3
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik@3x.png
new file mode 100644
index 00000000..dbc977f9
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOffZzik.imageset/icon_taste_off_zzik@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/Contents.json
new file mode 100644
index 00000000..2e07a567
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_on_banmincho.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_on_banmincho@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_on_banmincho@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho.png
new file mode 100644
index 00000000..0c710fde
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho@2x.png
new file mode 100644
index 00000000..a61e34dc
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho@3x.png
new file mode 100644
index 00000000..763d6c7a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBanmincho.imageset/icon_taste_on_banmincho@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/Contents.json
similarity index 65%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/Contents.json
index 781af2c1..70412279 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/KakaoLogo.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/Contents.json
@@ -1,17 +1,17 @@
{
"images" : [
{
- "filename" : "pngaaa 1.png",
+ "filename" : "icon_taste_on_beer.png",
"idiom" : "universal",
"scale" : "1x"
},
{
- "filename" : "pngaaa 1@2x.png",
+ "filename" : "icon_taste_on_beer@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "pngaaa 1@3x.png",
+ "filename" : "icon_taste_on_beer@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer.png
new file mode 100644
index 00000000..8f3fdda8
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer@2x.png
new file mode 100644
index 00000000..4600533f
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer@3x.png
new file mode 100644
index 00000000..31fd883d
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBeer.imageset/icon_taste_on_beer@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/Contents.json
new file mode 100644
index 00000000..63fd054e
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_on_bumeok.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_on_bumeok@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_on_bumeok@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok.png
new file mode 100644
index 00000000..e1589f9d
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok@2x.png
new file mode 100644
index 00000000..0d5e2d8f
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok@3x.png
new file mode 100644
index 00000000..84482979
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnBumeok.imageset/icon_taste_on_bumeok@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/Contents.json
new file mode 100644
index 00000000..96821aec
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_on_fried.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_on_fried@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_on_fried@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried.png
new file mode 100644
index 00000000..91b417ad
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried@2x.png
new file mode 100644
index 00000000..a37ff834
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried@3x.png
new file mode 100644
index 00000000..1fde040f
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnFried.imageset/icon_taste_on_fried@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/Contents.json
new file mode 100644
index 00000000..a7bf2385
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_on_mincho.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_on_mincho@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_on_mincho@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho.png
new file mode 100644
index 00000000..0d4103a5
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho@2x.png
new file mode 100644
index 00000000..aa8bba0b
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho@3x.png
new file mode 100644
index 00000000..4e12b181
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnMincho.imageset/icon_taste_on_mincho@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/Contents.json
new file mode 100644
index 00000000..5dc4d0fe
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "icon_taste_on_seasoned.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "icon_taste_on_seasoned@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "icon_taste_on_seasoned@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned.png
new file mode 100644
index 00000000..5781e1ad
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned@2x.png
new file mode 100644
index 00000000..beddb69d
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned@3x.png
new file mode 100644
index 00000000..baf5569b
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSeasoned.imageset/icon_taste_on_seasoned@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/Contents.json
similarity index 65%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/Contents.json
index ad6d3af5..e487963f 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/NADALogo.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/Contents.json
@@ -1,17 +1,17 @@
{
"images" : [
{
- "filename" : "Group 1.png",
+ "filename" : "icon_taste_on_soju.png",
"idiom" : "universal",
"scale" : "1x"
},
{
- "filename" : "Group 1@2x.png",
+ "filename" : "icon_taste_on_soju@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "Group 1@3x.png",
+ "filename" : "icon_taste_on_soju@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju.png
new file mode 100644
index 00000000..a3e59131
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju@2x.png
new file mode 100644
index 00000000..a56e4c87
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju@3x.png
new file mode 100644
index 00000000..2bbed16e
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnSoju.imageset/icon_taste_on_soju@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/Contents.json
similarity index 65%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/Contents.json
index 8be40ae6..bbec5943 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/closeBlack.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/Contents.json
@@ -1,17 +1,17 @@
{
"images" : [
{
- "filename" : "closeBlack24Dp.png",
+ "filename" : "icon_taste_on_zzik.png",
"idiom" : "universal",
"scale" : "1x"
},
{
- "filename" : "closeBlack24Dp@2x.png",
+ "filename" : "icon_taste_on_zzik@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "closeBlack24Dp@3x.png",
+ "filename" : "icon_taste_on_zzik@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik.png
new file mode 100644
index 00000000..48f95c70
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik@2x.png
new file mode 100644
index 00000000..9ca1dab8
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik@3x.png
new file mode 100644
index 00000000..558585cb
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconTasteOnZzik.imageset/icon_taste_on_zzik@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/Contents.json
index 874e97df..aa19a4eb 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/Contents.json
@@ -2,16 +2,16 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "ovalCopy2.png",
+ "filename" : "iconUrl.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "ovalCopy2@2x.png",
+ "filename" : "iconUrl@2x.png",
"scale" : "2x"
},
{
- "filename" : "ovalCopy2@3x.png",
+ "filename" : "iconUrl@3x.png",
"scale" : "3x",
"idiom" : "universal"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.png
new file mode 100644
index 00000000..ee278642
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@2x.png
new file mode 100644
index 00000000..b153b452
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@3x.png
new file mode 100644
index 00000000..2c3343f0
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconUrl.imageset/iconUrl@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/Contents.json
similarity index 64%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/Contents.json
index 738cda06..516e7ee6 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/Contents.json
@@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "personWhite24Dp1.png",
+ "filename" : "iconographyCaesarzkn.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "personWhite24Dp1@2x.png",
+ "filename" : "iconographyCaesarzkn@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
- "filename" : "personWhite24Dp1@3x.png",
+ "filename" : "iconographyCaesarzkn@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn.png
new file mode 100644
index 00000000..be25d553
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn@2x.png
new file mode 100644
index 00000000..f7542440
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn@3x.png
new file mode 100644
index 00000000..fe0d96e8
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconographyCaesarzkn.imageset/iconographyCaesarzkn@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/Contents.json
similarity index 71%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/Contents.json
index f91bfa0a..865145ed 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/Contents.json
@@ -2,18 +2,18 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "group35.png",
+ "filename" : "image020.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "group35@2x.png",
+ "filename" : "image020@2x.png",
"scale" : "2x"
},
{
- "scale" : "3x",
"idiom" : "universal",
- "filename" : "group35@3x.png"
+ "scale" : "3x",
+ "filename" : "image020@3x.png"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020.png
new file mode 100644
index 00000000..5b96f3ff
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020@2x.png
new file mode 100644
index 00000000..28c5013e
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020@3x.png
new file mode 100644
index 00000000..42387540
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image020.imageset/image020@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/Contents.json
index 0177aa82..26efb8c4 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/Contents.json
@@ -2,18 +2,18 @@
"images" : [
{
"scale" : "1x",
- "filename" : "group48.png",
- "idiom" : "universal"
+ "idiom" : "universal",
+ "filename" : "image2140.png"
},
{
+ "filename" : "image2140@2x.png",
"scale" : "2x",
- "filename" : "group48@2x.png",
"idiom" : "universal"
},
{
+ "filename" : "image2140@3x.png",
"scale" : "3x",
- "idiom" : "universal",
- "filename" : "group48@3x.png"
+ "idiom" : "universal"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140.png
new file mode 100644
index 00000000..33ab6e2c
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140@2x.png
new file mode 100644
index 00000000..c216eb23
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140@3x.png
new file mode 100644
index 00000000..e7f520c1
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image2140.imageset/image2140@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/Contents.json
index 6d0ce53d..41e3a554 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "filename" : "group43.png",
+ "idiom" : "universal",
"scale" : "1x",
- "idiom" : "universal"
+ "filename" : "image4160.png"
},
{
+ "filename" : "image4160@2x.png",
"idiom" : "universal",
- "filename" : "group43@2x.png",
"scale" : "2x"
},
{
+ "filename" : "image4160@3x.png",
"scale" : "3x",
- "idiom" : "universal",
- "filename" : "group43@3x.png"
+ "idiom" : "universal"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160.png
new file mode 100644
index 00000000..1a4cb986
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160@2x.png
new file mode 100644
index 00000000..af9ecd5a
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160@3x.png
new file mode 100644
index 00000000..63ad9dfa
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image4160.imageset/image4160@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478.png
deleted file mode 100644
index 6bee0d04..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478@2x.png
deleted file mode 100644
index c2f54e38..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478@3x.png
deleted file mode 100644
index 29138330..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image478.imageset/image478@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54.png
deleted file mode 100644
index 52344598..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54@2x.png
deleted file mode 100644
index 1edb76ce..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54@3x.png
deleted file mode 100644
index 70276f7a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image54.imageset/image54@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/Contents.json
new file mode 100644
index 00000000..e4107609
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "image6180.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "image6180@2x.png",
+ "scale" : "2x",
+ "idiom" : "universal"
+ },
+ {
+ "filename" : "image6180@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/image6180.imageset/image6180.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/image6180.png
new file mode 100644
index 00000000..8d7575c8
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/image6180.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/image6180@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/image6180@2x.png
new file mode 100644
index 00000000..3846416b
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/image6180@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/image6180@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/image6180@3x.png
new file mode 100644
index 00000000..dadf6bee
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image6180.imageset/image6180@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/Contents.json
similarity index 70%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/Contents.json
index 90631a7b..bec6762c 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/Contents.json
@@ -1,18 +1,18 @@
{
"images" : [
{
+ "filename" : "image81100.png",
"scale" : "1x",
- "idiom" : "universal",
- "filename" : "group49.png"
+ "idiom" : "universal"
},
{
- "filename" : "group49@2x.png",
+ "idiom" : "universal",
"scale" : "2x",
- "idiom" : "universal"
+ "filename" : "image81100@2x.png"
},
{
"idiom" : "universal",
- "filename" : "group49@3x.png",
+ "filename" : "image81100@3x.png",
"scale" : "3x"
}
],
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100.png
new file mode 100644
index 00000000..9432d926
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100@2x.png
new file mode 100644
index 00000000..8199b519
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100@3x.png
new file mode 100644
index 00000000..5e0284ce
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/image81100.imageset/image81100@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/Contents.json
deleted file mode 100644
index 8b937971..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x",
- "filename" : "instagramWhite.png"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "instagramWhite@2x.png"
- },
- {
- "filename" : "instagramWhite@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/instagramWhite.imageset/instagramWhite.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/instagramWhite.png
deleted file mode 100644
index f2801d1e..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/instagramWhite.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/instagramWhite@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/instagramWhite@2x.png
deleted file mode 100644
index f0aef8df..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/instagramWhite@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/instagramWhite@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/instagramWhite@3x.png
deleted file mode 100644
index 38f985cc..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/instagramWhite.imageset/instagramWhite@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/Contents.json
deleted file mode 100644
index 20f4291e..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "ios_share_white_24dp 1.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "ios_share_white_24dp 1@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "ios_share_white_24dp 1@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1.png
deleted file mode 100644
index f318da5f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1@2x.png
deleted file mode 100644
index a360deee..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1@3x.png
deleted file mode 100644
index 46376de9..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iosShareWhite.imageset/ios_share_white_24dp 1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1.png
deleted file mode 100644
index 98833ee1..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1@2x.png
deleted file mode 100644
index 960e1a60..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1@3x.png
deleted file mode 100644
index d5c56735..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/linkWhite.imageset/linkBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/Contents.json
similarity index 63%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/Contents.json
index aa8171be..cff873cd 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/Contents.json
@@ -1,19 +1,19 @@
{
"images" : [
{
- "filename" : "group40.png",
"scale" : "1x",
+ "filename" : "logoNadaTxt2.png",
"idiom" : "universal"
},
{
"scale" : "2x",
"idiom" : "universal",
- "filename" : "group40@2x.png"
+ "filename" : "logoNadaTxt2@2x.png"
},
{
"idiom" : "universal",
- "scale" : "3x",
- "filename" : "group40@3x.png"
+ "filename" : "logoNadaTxt2@3x.png",
+ "scale" : "3x"
}
],
"info" : {
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2.png
new file mode 100644
index 00000000..6a6642da
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2@2x.png
new file mode 100644
index 00000000..3d5d2efd
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2@3x.png
new file mode 100644
index 00000000..7307ba0b
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/logoNadaTxt2.imageset/logoNadaTxt2@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Contents.json
deleted file mode 100644
index 35363756..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "Mask Group.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "Mask Group@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "Mask Group@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group.png
deleted file mode 100644
index e74da23d..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group@2x.png
deleted file mode 100644
index e04e2e55..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group@3x.png
deleted file mode 100644
index 1f206b4a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/maskGroup.imageset/Mask Group@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1.png
deleted file mode 100644
index 0e182f56..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1@2x.png
deleted file mode 100644
index 4e1c311b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1@3x.png
deleted file mode 100644
index 00579527..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/moreVertBlack.imageset/moreVertBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn.png
deleted file mode 100644
index 0ad13291..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn@2x.png
deleted file mode 100644
index c4cf5b89..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn@3x.png
deleted file mode 100644
index 1e975d90..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/mycardBtn@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43.png
deleted file mode 100644
index 240a5867..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43@2x.png
deleted file mode 100644
index b1c44954..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43@3x.png
deleted file mode 100644
index 88e38df1..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Select.imageset/group43@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34.png
deleted file mode 100644
index 3643839f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34@2x.png
deleted file mode 100644
index 8c46a24f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34@3x.png
deleted file mode 100644
index 8920a2ff..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt1Unselect.imageset/group34@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35.png
deleted file mode 100644
index 5593194b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35@2x.png
deleted file mode 100644
index 408d7756..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35@3x.png
deleted file mode 100644
index e115a40a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Select.imageset/group35@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42.png
deleted file mode 100644
index 564bb89f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42@2x.png
deleted file mode 100644
index 188886e8..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42@3x.png
deleted file mode 100644
index 8c469e76..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt2Unselect.imageset/group42@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36.png
deleted file mode 100644
index ba28a010..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36@2x.png
deleted file mode 100644
index 8ffd4e9a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36@3x.png
deleted file mode 100644
index ee07b9af..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Select.imageset/group36@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44.png
deleted file mode 100644
index 7d5b670c..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44@2x.png
deleted file mode 100644
index 60065495..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44@3x.png
deleted file mode 100644
index fa897185..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt3Unselect.imageset/group44@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47.png
deleted file mode 100644
index 25d88c0e..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47@2x.png
deleted file mode 100644
index 038acc19..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47@3x.png
deleted file mode 100644
index 8c2d797a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Select.imageset/group47@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37.png
deleted file mode 100644
index 42a43d40..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37@2x.png
deleted file mode 100644
index b296b3bc..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37@3x.png
deleted file mode 100644
index 2209f61b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt4Unselect.imageset/group37@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49.png
deleted file mode 100644
index a215786e..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49@2x.png
deleted file mode 100644
index 3db35436..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49@3x.png
deleted file mode 100644
index 9a7af3d3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Select.imageset/group49@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38.png
deleted file mode 100644
index 867ff269..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38@2x.png
deleted file mode 100644
index 1bdd845d..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38@3x.png
deleted file mode 100644
index 35ff1ea1..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt5Unselect.imageset/group38@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48.png
deleted file mode 100644
index faf9dbe1..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48@2x.png
deleted file mode 100644
index bb0b3dd8..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48@3x.png
deleted file mode 100644
index 7b79135f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Select.imageset/group48@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45.png
deleted file mode 100644
index 747e3ef6..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45@2x.png
deleted file mode 100644
index a3cf387f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45@3x.png
deleted file mode 100644
index a64790a7..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt6Unselect.imageset/group45@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39.png
deleted file mode 100644
index de60ae7b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39@2x.png
deleted file mode 100644
index f43358eb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39@3x.png
deleted file mode 100644
index b3a01e3d..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Select.imageset/group39@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40.png
deleted file mode 100644
index afc91e1b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40@2x.png
deleted file mode 100644
index 9b142ce5..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40@3x.png
deleted file mode 100644
index af3819dd..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt7Unselect.imageset/group40@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41.png
deleted file mode 100644
index 536fd118..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41@2x.png
deleted file mode 100644
index 28ab3eef..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41@3x.png
deleted file mode 100644
index 71397ec9..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Select.imageset/group41@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46.png
deleted file mode 100644
index ec357a4c..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46@2x.png
deleted file mode 100644
index 2e540992..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46@3x.png
deleted file mode 100644
index e164ae2d..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/opt8Unselect.imageset/group46@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval.png
deleted file mode 100644
index 09783789..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval@2x.png
deleted file mode 100644
index b24614e7..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval@3x.png
deleted file mode 100644
index e2a5ec87..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/oval.imageset/oval@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Contents.json
deleted file mode 100644
index 40a6ef61..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "Oval Copy.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "Oval Copy@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "Oval Copy@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy.png
deleted file mode 100644
index eb153f73..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy@2x.png
deleted file mode 100644
index d4e15c71..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy@3x.png
deleted file mode 100644
index 0dbba042..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy.imageset/Oval Copy@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2.png
deleted file mode 100644
index b33433fd..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2@2x.png
deleted file mode 100644
index 9492eb73..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2@3x.png
deleted file mode 100644
index bc7cae47..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy2.imageset/ovalCopy2@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/Contents.json
deleted file mode 100644
index 09228ac5..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x",
- "filename" : "ovalCopy3.png"
- },
- {
- "filename" : "ovalCopy3@2x.png",
- "scale" : "2x",
- "idiom" : "universal"
- },
- {
- "idiom" : "universal",
- "scale" : "3x",
- "filename" : "ovalCopy3@3x.png"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3.png
deleted file mode 100644
index 59ae2af3..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3@2x.png
deleted file mode 100644
index 97a55b35..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3@3x.png
deleted file mode 100644
index 9706dc92..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopy3.imageset/ovalCopy3@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy.png
deleted file mode 100644
index a5ef549a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy@2x.png
deleted file mode 100644
index 291924dd..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy@3x.png
deleted file mode 100644
index 31de2580..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/ovalCopyCheck1.imageset/ovalCopy@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/Contents.json
similarity index 68%
rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/Contents.json
index a04b8850..356013f0 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/mycardBtn.imageset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/Contents.json
@@ -1,17 +1,17 @@
{
"images" : [
{
- "filename" : "mycardBtn.png",
+ "filename" : "personAddAlt1.png",
"scale" : "1x",
"idiom" : "universal"
},
{
+ "filename" : "personAddAlt1@2x.png",
"scale" : "2x",
- "filename" : "mycardBtn@2x.png",
"idiom" : "universal"
},
{
- "filename" : "mycardBtn@3x.png",
+ "filename" : "personAddAlt1@3x.png",
"scale" : "3x",
"idiom" : "universal"
}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1.png
new file mode 100644
index 00000000..adb4c092
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1@2x.png
new file mode 100644
index 00000000..79fdbeec
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1@2x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1@3x.png
new file mode 100644
index 00000000..d9822483
Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personAddAlt1.imageset/personAddAlt1@3x.png differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1.png
deleted file mode 100644
index e8d5bc4a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1@2x.png
deleted file mode 100644
index 708e9cdb..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1@3x.png
deleted file mode 100644
index a66b2eea..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/personWhite.imageset/personWhite24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1.png
deleted file mode 100644
index 5c9675e8..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1@2x.png
deleted file mode 100644
index 43916d4b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1@3x.png
deleted file mode 100644
index 828ac058..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlack.imageset/pushPinBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1.png
deleted file mode 100644
index 4708fb4b..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1@2x.png
deleted file mode 100644
index eabfe997..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1@3x.png
deleted file mode 100644
index e8161d3f..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/pushPinBlackFilled.imageset/pushPinBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/Contents.json
deleted file mode 100644
index 219b8731..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "qr_code_black_24dp 1.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "qr_code_black_24dp 1@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "qr_code_black_24dp 1@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1.png
deleted file mode 100644
index 39dd6216..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1@2x.png
deleted file mode 100644
index c1e473d6..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1@3x.png
deleted file mode 100644
index 142358fc..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/qrCodeBlack.imageset/qr_code_black_24dp 1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1@2x.png
deleted file mode 100644
index 6e2dd517..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1@3x.png
deleted file mode 100644
index bfd02db6..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/reorderBlack.imageset/reorderBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/Contents.json
deleted file mode 100644
index 397fb5bd..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "restartAltBlack24Dp1.png",
- "scale" : "1x",
- "idiom" : "universal"
- },
- {
- "idiom" : "universal",
- "filename" : "restartAltBlack24Dp1@2x.png",
- "scale" : "2x"
- },
- {
- "filename" : "restartAltBlack24Dp1@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/restartAltBlack.imageset/restartAltBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/restartAltBlack24Dp1.png
deleted file mode 100644
index 41018f11..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/restartAltBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/restartAltBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/restartAltBlack24Dp1@2x.png
deleted file mode 100644
index 58d8cb9a..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/restartAltBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/restartAltBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/restartAltBlack24Dp1@3x.png
deleted file mode 100644
index bf6fa653..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/restartAltBlack.imageset/restartAltBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1.png
deleted file mode 100644
index 97479508..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1@2x.png
deleted file mode 100644
index c33635d5..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1@3x.png
deleted file mode 100644
index cdae2ddc..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/viewListBlack.imageset/viewListBlack24Dp1@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Contents.json
deleted file mode 100644
index df240cf1..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "filename" : "Vector.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "Vector@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "Vector@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector.png
deleted file mode 100644
index 9b4908ce..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector@2x.png
deleted file mode 100644
index 81f58ba8..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector@2x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector@3x.png
deleted file mode 100644
index 3b1131fa..00000000
Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/warningYellow.imageset/Vector@3x.png and /dev/null differ
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/background.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/background.colorset/Contents.json
new file mode 100644
index 00000000..4d7ab39a
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/background.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "255",
+ "green" : "255",
+ "red" : "255"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "22",
+ "green" : "20",
+ "red" : "19"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents 2.json
deleted file mode 100644
index 95a50e5d..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "0",
- "green" : "0",
- "red" : "0"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents 2.json
deleted file mode 100644
index 1f50e6a8..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "27",
- "green" : "27",
- "red" : "27"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents.json
deleted file mode 100644
index 1f50e6a8..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black2.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "27",
- "green" : "27",
- "red" : "27"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents 2.json
deleted file mode 100644
index 84b11664..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "31",
- "green" : "31",
- "red" : "31"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents 2.json
deleted file mode 100644
index d6e4aae0..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "0.500",
- "blue" : "0",
- "green" : "0",
- "red" : "0"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents.json
deleted file mode 100644
index d6e4aae0..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black4.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "0.500",
- "blue" : "0",
- "green" : "0",
- "red" : "0"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents 2.json
deleted file mode 100644
index ce238cf5..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "14",
- "green" : "14",
- "red" : "14"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents 2.json
deleted file mode 100644
index a2bf5e10..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "40",
- "green" : "40",
- "red" : "40"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents.json
deleted file mode 100644
index a2bf5e10..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black6.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "40",
- "green" : "40",
- "red" : "40"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/button.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/button.colorset/Contents.json
new file mode 100644
index 00000000..635d23a0
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/button.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "239",
+ "green" : "236",
+ "red" : "233"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "61",
+ "green" : "56",
+ "red" : "53"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/buttonText.colorset/Contents.json
similarity index 76%
rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/buttonText.colorset/Contents.json
index 84b11664..2891c230 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black3.colorset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/buttonText.colorset/Contents.json
@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
- "blue" : "31",
- "green" : "31",
- "red" : "31"
+ "blue" : "143",
+ "green" : "136",
+ "red" : "131"
}
},
"idiom" : "universal"
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/error.colorset/Contents.json
similarity index 76%
rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/error.colorset/Contents.json
index 95a50e5d..3c4e9e0a 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black1.colorset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/error.colorset/Contents.json
@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
- "blue" : "0",
- "green" : "0",
- "red" : "0"
+ "blue" : "53",
+ "green" : "66",
+ "red" : "243"
}
},
"idiom" : "universal"
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents 2.json
deleted file mode 100644
index 52ba7fc1..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "108",
- "green" : "108",
- "red" : "108"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents.json
deleted file mode 100644
index 52ba7fc1..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/gray1.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "108",
- "green" : "108",
- "red" : "108"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents 2.json
deleted file mode 100644
index b0724a13..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "79",
- "green" : "179",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents.json
deleted file mode 100644
index b0724a13..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp1.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "79",
- "green" : "179",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents 2.json
deleted file mode 100644
index 3d79929b..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "255",
- "green" : "0",
- "red" : "158"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents.json
deleted file mode 100644
index 3d79929b..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp2.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "255",
- "green" : "0",
- "red" : "158"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents 2.json
deleted file mode 100644
index e5e6a39f..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "97",
- "green" : "97",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents.json
deleted file mode 100644
index e5e6a39f..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp3.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "97",
- "green" : "97",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents 2.json
deleted file mode 100644
index 1b958771..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "98",
- "green" : "195",
- "red" : "65"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents.json
deleted file mode 100644
index 1b958771..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/grp4.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "98",
- "green" : "195",
- "red" : "65"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/mainBlue.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/mainBlue.colorset/Contents 2.json
deleted file mode 100644
index 6b8b4651..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/mainBlue.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "255",
- "green" : "116",
- "red" : "54"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/mainBlue.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/mainBlue.colorset/Contents.json
deleted file mode 100644
index 6b8b4651..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/mainBlue.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "255",
- "green" : "116",
- "red" : "54"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/nadaMain.colorset/Contents.json
similarity index 76%
rename from NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents.json
rename to NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/nadaMain.colorset/Contents.json
index ce238cf5..6a0255f1 100644
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/black5.colorset/Contents.json
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/nadaMain.colorset/Contents.json
@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
- "blue" : "14",
- "green" : "14",
- "red" : "14"
+ "blue" : "102",
+ "green" : "112",
+ "red" : "246"
}
},
"idiom" : "universal"
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/primary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/primary.colorset/Contents.json
new file mode 100644
index 00000000..5991659b
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/primary.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "22",
+ "green" : "20",
+ "red" : "19"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "1.000",
+ "green" : "1.000",
+ "red" : "1.000"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json
new file mode 100644
index 00000000..a290db51
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "179",
+ "green" : "172",
+ "red" : "168"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "118",
+ "green" : "108",
+ "red" : "102"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents 2.json
deleted file mode 100644
index d80faf6a..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "81",
- "green" : "81",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents.json
deleted file mode 100644
index d80faf6a..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red1.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "81",
- "green" : "81",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents 2.json
deleted file mode 100644
index f58a604a..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "48",
- "green" : "59",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents.json
deleted file mode 100644
index f58a604a..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red2.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "48",
- "green" : "59",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents 2.json
deleted file mode 100644
index fed052af..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "14",
- "green" : "18",
- "red" : "76"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents.json
deleted file mode 100644
index fed052af..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/red3.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "14",
- "green" : "18",
- "red" : "76"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json
new file mode 100644
index 00000000..0dc1dac8
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "49",
+ "green" : "45",
+ "red" : "43"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "245",
+ "green" : "243",
+ "red" : "241"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/tertiary.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/tertiary.colorset/Contents.json
new file mode 100644
index 00000000..0310beb6
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/tertiary.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "118",
+ "green" : "108",
+ "red" : "102"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "179",
+ "green" : "172",
+ "red" : "168"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/textBox.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/textBox.colorset/Contents.json
new file mode 100644
index 00000000..a52a200b
--- /dev/null
+++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/textBox.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "245",
+ "green" : "243",
+ "red" : "241"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "49",
+ "green" : "45",
+ "red" : "43"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents 2.json
deleted file mode 100644
index 97650a1a..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "1.000",
- "green" : "1.000",
- "red" : "1.000"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents.json
deleted file mode 100644
index 97650a1a..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white1.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "1.000",
- "green" : "1.000",
- "red" : "1.000"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents 2.json
deleted file mode 100644
index 3e605134..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "0.410",
- "blue" : "255",
- "green" : "255",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents.json
deleted file mode 100644
index 3e605134..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white2.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "0.410",
- "blue" : "255",
- "green" : "255",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents 2.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents 2.json
deleted file mode 100644
index 0967f4bd..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents 2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "0.300",
- "blue" : "255",
- "green" : "255",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents.json
deleted file mode 100644
index 0967f4bd..00000000
--- a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/white3.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "colors" : [
- {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "0.300",
- "blue" : "255",
- "green" : "255",
- "red" : "255"
- }
- },
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
index a28329ab..de4653a8 100644
--- a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
+++ b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
@@ -9,77 +9,115 @@ import Foundation
import UIKit
extension UIColor {
-
- @nonobjc class var black1: UIColor {
- return UIColor(white: 0.0, alpha: 1.0)
- }
-
- @nonobjc class var inputBlack2: UIColor {
- return UIColor(white: 27.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var deleteRed1: UIColor {
- return UIColor(red: 1.0, green: 81.0 / 255.0, blue: 81.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var hintGray1: UIColor {
- return UIColor(white: 108.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var errorTextRed2: UIColor {
- return UIColor(red: 1.0, green: 59.0 / 255.0, blue: 48.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var errorbgRed3: UIColor {
- return UIColor(red: 76.0 / 255.0, green: 18.0 / 255.0, blue: 14.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var white1: UIColor {
- return UIColor(white: 1.0, alpha: 1.0)
- }
-
- @nonobjc class var unSelecteDoptWhite2: UIColor {
- return UIColor(white: 1.0, alpha: 0.41)
- }
-
- @nonobjc class var matchBtnWhite3: UIColor {
- return UIColor(white: 1.0, alpha: 0.3)
- }
-
- @nonobjc class var mainBlue: UIColor {
- return UIColor(red: 54.0 / 255.0, green: 116.0 / 255.0, blue: 1.0, alpha: 1.0)
- }
-
- @nonobjc class var grp1: UIColor {
- return UIColor(red: 1.0, green: 179.0 / 255.0, blue: 79.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var grp2: UIColor {
- return UIColor(red: 158.0 / 255.0, green: 0.0, blue: 1.0, alpha: 1.0)
- }
-
- @nonobjc class var grp3: UIColor {
- return UIColor(red: 1.0, green: 97.0 / 255.0, blue: 97.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var grp4: UIColor {
- return UIColor(red: 65.0 / 255.0, green: 195.0 / 255.0, blue: 98.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var listSelectedBlack3: UIColor {
- return UIColor(white: 31.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var modalBgBlack4: UIColor {
- return UIColor(white: 0.0, alpha: 0.5)
- }
-
- @nonobjc class var stepBlack5: UIColor {
- return UIColor(white: 14.0 / 255.0, alpha: 1.0)
- }
-
- @nonobjc class var btnModalBlack6: UIColor {
- return UIColor(white: 40.0 / 255.0, alpha: 1.0)
- }
-
+
+ @nonobjc class var mainColorNadaMain: UIColor {
+ return UIColor(red: 246.0 / 255.0, green: 112.0 / 255.0, blue: 102.0 / 255.0, alpha: 1.0)
+ }
+
+ @nonobjc class var mainColorButtonText: UIColor {
+ return UIColor(red: 131.0 / 255.0, green: 136.0 / 255.0, blue: 143.0 / 255.0, alpha: 1.0)
+ }
+
+ @nonobjc class var primary: UIColor {
+ if #available(iOS 13, *) {
+ return UIColor { (traitCollection: UITraitCollection) -> UIColor in
+ if traitCollection.userInterfaceStyle == .light {
+ return UIColor(red: 19.0 / 255.0, green: 20.0 / 255.0, blue: 22.0 / 255.0, alpha: 1.0)
+ } else {
+ return UIColor(white: 1.0, alpha: 1.0)
+ }
+ }
+ } else {
+ return UIColor(red: 19.0 / 255.0, green: 20.0 / 255.0, blue: 22.0 / 255.0, alpha: 1.0)
+ }
+ }
+
+ @nonobjc class var secondary: UIColor {
+ if #available(iOS 13, *) {
+ return UIColor { (traitCollection: UITraitCollection) -> UIColor in
+ if traitCollection.userInterfaceStyle == .light {
+ return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0)
+ } else {
+ return UIColor(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0, alpha: 1.0)
+ }
+ }
+ } else {
+ return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0)
+ }
+ }
+
+ @nonobjc class var quaternary: UIColor {
+ if #available(iOS 13, *) {
+ return UIColor { (traitCollection: UITraitCollection) -> UIColor in
+ if traitCollection.userInterfaceStyle == .light {
+ return UIColor(red: 168.0 / 255.0, green: 172.0 / 255.0, blue: 179.0 / 255.0, alpha: 1.0)
+ } else {
+ return UIColor(red: 102.0 / 255.0, green: 108.0 / 255.0, blue: 118.0 / 255.0, alpha: 1.0)
+ }
+ }
+ } else {
+ return UIColor(red: 168.0 / 255.0, green: 172.0 / 255.0, blue: 179.0 / 255.0, alpha: 1.0)
+ }
+ }
+
+ @nonobjc class var textBox: UIColor {
+ if #available(iOS 13, *) {
+ return UIColor { (traitCollection: UITraitCollection) -> UIColor in
+ if traitCollection.userInterfaceStyle == .light {
+ return UIColor(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0, alpha: 1.0)
+ } else {
+ return UIColor(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0)
+ }
+ }
+ } else {
+ return UIColor(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0, alpha: 1.0)
+ }
+ }
+
+ @nonobjc class var tertiary: UIColor {
+ if #available(iOS 13, *) {
+ return UIColor { (traitCollection: UITraitCollection) -> UIColor in
+ if traitCollection.userInterfaceStyle == .light {
+ return UIColor(red: 102.0 / 255.0, green: 108.0 / 255.0, blue: 118.0 / 255.0, alpha: 1.0)
+ } else {
+ return UIColor(red: 168.0 / 255.0, green: 172.0 / 255.0, blue: 179.0 / 255.0, alpha: 1.0)
+ }
+ }
+ } else {
+ return UIColor(red: 102.0 / 255.0, green: 108.0 / 255.0, blue: 118.0 / 255.0, alpha: 1.0)
+ }
+ }
+
+ @nonobjc class var background: UIColor {
+ if #available(iOS 13, *) {
+ return UIColor { (traitCollection: UITraitCollection) -> UIColor in
+ if traitCollection.userInterfaceStyle == .light {
+ return UIColor(white: 1.0, alpha: 1.0)
+ } else {
+ return UIColor(red: 19.0 / 255.0, green: 20.0 / 255.0, blue: 22.0 / 255.0, alpha: 1.0)
+ }
+ }
+ } else {
+ return UIColor(white: 1.0, alpha: 1.0)
+ }
+ }
+
+ @nonobjc class var button: UIColor {
+ if #available(iOS 13, *) {
+ return UIColor { (traitCollection: UITraitCollection) -> UIColor in
+ if traitCollection.userInterfaceStyle == .light {
+ return UIColor(red: 233.0 / 255.0, green: 236.0 / 255.0, blue: 239.0 / 255.0, alpha: 1.0)
+ } else {
+ return UIColor(red: 53.0 / 255.0, green: 56.0 / 255.0, blue: 61.0 / 255.0, alpha: 1.0)
+ }
+ }
+ } else {
+ return UIColor(red: 233.0 / 255.0, green: 236.0 / 255.0, blue: 239.0 / 255.0, alpha: 1.0)
+ }
+ }
+
+ @nonobjc class var stateColorError: UIColor {
+ return UIColor(red: 243.0 / 255.0, green: 66.0 / 255.0, blue: 53.0 / 255.0, alpha: 1.0)
+ }
+
}
diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift
index 4586d57e..b490cb97 100644
--- a/NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift
+++ b/NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift
@@ -21,7 +21,7 @@ extension UIViewController {
alertViewController.setTitle(font: UIFont.boldSystemFont(ofSize: 17), color: UIColor.white)
alertViewController.setMessage(font: UIFont.systemFont(ofSize: 13), color: UIColor.white)
- alertViewController.setTint(color: .mainBlue)
+ // alertViewController.setTint(color: .mainBlue)
alertViewController.view.subviews.first?.subviews.first?.subviews.first?.backgroundColor = UIColor(red: 30/255, green: 30/255, blue: 30/255, alpha: 3/4)
diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard
index 06a0d6e4..f9e75158 100644
--- a/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard
+++ b/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard
index e7f64bf2..a05106e1 100644
--- a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard
+++ b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard
@@ -76,7 +76,7 @@
-
+
@@ -91,7 +91,7 @@
-
+
@@ -136,6 +136,9 @@
+
+
+
diff --git a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift
index 362ecbbf..b6af5bbd 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/CardList/CardListTableViewCell.swift
@@ -34,10 +34,8 @@ class CardListTableViewCell: UITableViewCell {
if pinButton.currentImage == pinImage {
pinButton.setImage(UIImage(named: "pushPinBlack"), for: UIControl.State.normal)
- self.contentView.backgroundColor = UIColor.black1
} else {
pinButton.setImage(UIImage(named: "pushPinBlackFilled"), for: UIControl.State.normal)
- self.contentView.backgroundColor = UIColor.listSelectedBlack3
}
}
diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift
index dcfc9a63..92296015 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift
@@ -48,40 +48,39 @@ class BackCardCreationCollectionViewCell: UICollectionViewCell {
}
// MARK: - Extensions
-
extension BackCardCreationCollectionViewCell {
private func setUI() {
initUITextFieldList()
initCollectionViewList()
scrollView.indicatorStyle = .white
- scrollView.backgroundColor = .black1
+ // scrollView.backgroundColor = .black1
- bgView.backgroundColor = .black1
+ // bgView.backgroundColor = .black1
- _ = requiredCollectionViewList.map { $0.backgroundColor = .stepBlack5 }
+ // _ = requiredCollectionViewList.map { $0.backgroundColor = .stepBlack5 }
- requiredInfoView.backgroundColor = .stepBlack5
+ // requiredInfoView.backgroundColor = .stepBlack5
- optionInfoView.backgroundColor = .stepBlack5
+ // optionInfoView.backgroundColor = .stepBlack5
requiredInfoTextLabel.text = "1 필수 정보"
requiredInfoTextLabel.font = .step
- requiredInfoTextLabel.textColor = .white1
+ // requiredInfoTextLabel.textColor = .white1
optionalInfoTextLabel.text = "2 선택 정보"
optionalInfoTextLabel.font = .step
- optionalInfoTextLabel.textColor = .white1
+ // optionalInfoTextLabel.textColor = .white1
- firstQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 1", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- firstAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 1", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- secondQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 2", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- secondAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 2", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // firstQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 1", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // firstAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 1", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // secondQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 2", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // secondAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 2", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
_ = textFieldList.map {
$0.font = .hint
- $0.backgroundColor = .inputBlack2
- $0.textColor = .white1
+ // $0.backgroundColor = .inputBlack2
+ // $0.textColor = .white1
$0.layer.cornerRadius = 5
$0.borderStyle = .none
}
@@ -114,7 +113,6 @@ extension BackCardCreationCollectionViewCell {
}
// MARK: - UICollectionViewDelegate
-
extension BackCardCreationCollectionViewCell: UICollectionViewDelegate {
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
if isMinchoCollectionView.indexPathsForSelectedItems?.isEmpty == false &&
@@ -140,7 +138,6 @@ extension BackCardCreationCollectionViewCell: UICollectionViewDelegate {
}
// MARK: - UICollectionViewDataSource
-
extension BackCardCreationCollectionViewCell: UICollectionViewDataSource {
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
return 2
@@ -165,7 +162,6 @@ extension BackCardCreationCollectionViewCell: UICollectionViewDataSource {
}
// MARK: - UICollectionViewDelegateFlowLayout
-
extension BackCardCreationCollectionViewCell: UICollectionViewDelegateFlowLayout {
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
return 0
@@ -185,12 +181,11 @@ extension BackCardCreationCollectionViewCell: UICollectionViewDelegateFlowLayout
}
// MARK: - UITextFieldDelegate
-
extension BackCardCreationCollectionViewCell: UITextFieldDelegate {
func textFieldDidBeginEditing(_ textField: UITextField) {
textField.becomeFirstResponder()
textField.borderWidth = 1
- textField.borderColor = .white1
+ // textField.borderColor = .white1
}
func textFieldDidEndEditing(_ textField: UITextField) {
textField.borderWidth = 0
diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.xib b/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.xib
index cbd163b1..505504c5 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.xib
+++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.xib
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift
index 6623aac7..a0b4ccbd 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift
@@ -49,55 +49,54 @@ class FrontCardCreationCollectionViewCell: UICollectionViewCell {
}
// MARK: - Extensions
-
extension FrontCardCreationCollectionViewCell {
private func setUI() {
initUITextFieldList()
cardBackgroundSettingCollectionView.showsHorizontalScrollIndicator = false
scrollView.indicatorStyle = .white
- scrollView.backgroundColor = .black1
- bgView.backgroundColor = .black1
- setBackgroundView.backgroundColor = .stepBlack5
- requiredInfoView.backgroundColor = .stepBlack5
- optionalInfoView.backgroundColor = .stepBlack5
- cardBackgroundSettingCollectionView.backgroundColor = .stepBlack5
+ // scrollView.backgroundColor = .black1
+ // bgView.backgroundColor = .black1
+ // setBackgroundView.backgroundColor = .stepBlack5
+ // requiredInfoView.backgroundColor = .stepBlack5
+ // optionalInfoView.backgroundColor = .stepBlack5
+ // cardBackgroundSettingCollectionView.backgroundColor = .stepBlack5
let collectionViewLayout = cardBackgroundSettingCollectionView.collectionViewLayout as? UICollectionViewFlowLayout
collectionViewLayout?.scrollDirection = .horizontal
setBackgroundTextLabel.text = "1 배경 지정"
setBackgroundTextLabel.font = .step
- setBackgroundTextLabel.textColor = .white1
+ // setBackgroundTextLabel.textColor = .white1
requiredInfoTextLabel.text = "2 필수 정보"
requiredInfoTextLabel.font = .step
- requiredInfoTextLabel.textColor = .white1
+ // requiredInfoTextLabel.textColor = .white1
optionalInfoTextLabel.text = "3 선택 정보"
optionalInfoTextLabel.font = .step
- optionalInfoTextLabel.textColor = .white1
+ // optionalInfoTextLabel.textColor = .white1
- cardNameTextField.attributedPlaceholder = NSAttributedString(string: "명함이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- userNameTextField.attributedPlaceholder = NSAttributedString(string: "이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- birthTextField.attributedPlaceholder = NSAttributedString(string: "생년월일", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- mbtiTextField.attributedPlaceholder = NSAttributedString(string: "MBTI", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // cardNameTextField.attributedPlaceholder = NSAttributedString(string: "명함이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // userNameTextField.attributedPlaceholder = NSAttributedString(string: "이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // birthTextField.attributedPlaceholder = NSAttributedString(string: "생년월일", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // mbtiTextField.attributedPlaceholder = NSAttributedString(string: "MBTI", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- instagramTextField.attributedPlaceholder = NSAttributedString(string: "Instagram", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- linkNameTextField.attributedPlaceholder = NSAttributedString(string: "링크 이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- linkURLTextField.attributedPlaceholder = NSAttributedString(string: "링크", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
- clubNameTextField.attributedPlaceholder = NSAttributedString(string: "동아리 기수 / 파트", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // instagramTextField.attributedPlaceholder = NSAttributedString(string: "Instagram", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // linkNameTextField.attributedPlaceholder = NSAttributedString(string: "링크 이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // linkURLTextField.attributedPlaceholder = NSAttributedString(string: "링크", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
+ // clubNameTextField.attributedPlaceholder = NSAttributedString(string: "동아리 기수 / 파트", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1])
_ = requiredTextFieldList.map {
$0.font = .hint
- $0.backgroundColor = .inputBlack2
- $0.textColor = .white1
+ // $0.backgroundColor = .inputBlack2
+ // $0.textColor = .white1
$0.layer.cornerRadius = 5
$0.borderStyle = .none
}
_ = optionalTextFieldList.map {
$0.font = .hint
- $0.backgroundColor = .inputBlack2
- $0.textColor = .white1
+ // $0.backgroundColor = .inputBlack2
+ // $0.textColor = .white1
$0.layer.cornerRadius = 5
$0.borderStyle = .none
}
@@ -128,11 +127,9 @@ extension FrontCardCreationCollectionViewCell {
}
// MARK: - UICollectionViewDelegate
-
extension FrontCardCreationCollectionViewCell: UICollectionViewDelegate { }
// MARK: - UICollectionViewDataSource
-
extension FrontCardCreationCollectionViewCell: UICollectionViewDataSource {
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
return backgroundList.count
@@ -149,7 +146,6 @@ extension FrontCardCreationCollectionViewCell: UICollectionViewDataSource {
}
// MARK: - UICollectionViewDelegateFlowLayout
-
extension FrontCardCreationCollectionViewCell: UICollectionViewDelegateFlowLayout {
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
return UIEdgeInsets(top: 0, left: 28, bottom: 7, right: 28)
@@ -164,12 +160,11 @@ extension FrontCardCreationCollectionViewCell: UICollectionViewDelegateFlowLayou
}
// MARK: - UITextFieldDelegate
-
extension FrontCardCreationCollectionViewCell: UITextFieldDelegate {
func textFieldDidBeginEditing(_ textField: UITextField) {
textField.becomeFirstResponder()
textField.borderWidth = 1
- textField.borderColor = .white1
+ // textField.borderColor = .white1
}
func textFieldDidEndEditing(_ textField: UITextField) {
if cardNameTextField.hasText && userNameTextField.hasText && birthTextField.hasText && mbtiTextField.hasText {
diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift
index 777a6296..b483294b 100644
--- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift
+++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift
@@ -24,11 +24,11 @@ class RequiredFlavorCollectionViewCell: UICollectionViewCell {
extension RequiredFlavorCollectionViewCell {
private func setUI() {
- bgView.backgroundColor = .inputBlack2
+ // bgView.backgroundColor = .inputBlack2
bgView.cornerRadius = 10
flavorLabel.font = .hint
- flavorLabel.textColor = .hintGray1
+ // flavorLabel.textColor = .hintGray1
flavorLabel.lineBreakMode = .byTruncatingTail
flavorLabel.textAlignment = .center
}
@@ -41,11 +41,11 @@ extension RequiredFlavorCollectionViewCell {
override var isSelected: Bool {
didSet {
if isSelected {
- bgView.backgroundColor = .white1
- flavorLabel.textColor = .black1
+ // bgView.backgroundColor = .white1
+ // flavorLabel.textColor = .black1
} else {
- bgView.backgroundColor = .inputBlack2
- flavorLabel.textColor = .hintGray1
+ // bgView.backgroundColor = .inputBlack2
+ // flavorLabel.textColor = .hintGray1
}
}
}
diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift
index abaf20a4..8ed0757b 100644
--- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift
+++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift
@@ -110,25 +110,24 @@ class CardCreationViewController: UIViewController {
}
// MARK: - Extensions
-
extension CardCreationViewController {
private func setUI() {
- view.backgroundColor = .black1
- statusMovedView.backgroundColor = .white1
- cardCreationCollectionView.backgroundColor = .black1
+ // view.backgroundColor = .white1
+ // statusMovedView.backgroundColor = .white1
+ // cardCreationCollectionView.backgroundColor = .black1
cardCreationCollectionView.isPagingEnabled = true
creationTextLabel.text = "명함 생성"
creationTextLabel.font = .menu
- creationTextLabel.textColor = .white1
+ // creationTextLabel.textColor = .white1
frontTextLabel.text = "앞면"
frontTextLabel.font = .menuSub
- frontTextLabel.textColor = .white1
+ // frontTextLabel.textColor = .white1
backTextLabel.text = "뒷면"
backTextLabel.font = .menuSub
- backTextLabel.textColor = .hintGray1
+ // backTextLabel.textColor = .hintGray1
closeButton.setImage(UIImage(named: "closeBlack"), for: .normal)
closeButton.setTitle("", for: .normal)
@@ -146,22 +145,22 @@ extension CardCreationViewController {
switch button.state {
case .disabled:
button.configuration?.title = "완료"
- button.configuration?.baseBackgroundColor = .inputBlack2
- button.configuration?.baseForegroundColor = .hintGray1
+ // button.configuration?.baseBackgroundColor = .inputBlack2
+ // button.configuration?.baseForegroundColor = .hintGray1
default:
button.configuration?.title = "완료"
- button.configuration?.baseBackgroundColor = .mainBlue
- button.configuration?.baseForegroundColor = .white1
+ // button.configuration?.baseBackgroundColor = .mainBlue
+ // button.configuration?.baseForegroundColor = .white1
}
}
completeButton.configurationUpdateHandler = configHandler
} else {
completeButton.setTitle("완료", for: .normal)
- completeButton.setTitleColor(.white1, for: .normal)
+ // completeButton.setTitleColor(.white1, for: .normal)
// TODO: - 뷰 확정되면 이미지로 background 세팅
// completeButton.setBackgroundImage(, for: .normal)
- completeButton.setTitleColor(.hintGray1, for: .disabled)
+ // completeButton.setTitleColor(.hintGray1, for: .disabled)
// completeButton.setBackgroundImage(, for: .disabled)
}
@@ -198,8 +197,8 @@ extension CardCreationViewController {
self.statusMovedView.transform = CGAffineTransform(translationX: self.backTextLabel.frame.origin.x - self.statusMovedView.frame.origin.x + 5, y: 0)
}
currentIndex = 1
- self.frontTextLabel.textColor = .hintGray1
- self.backTextLabel.textColor = .white1
+ // self.frontTextLabel.textColor = .hintGray1
+ // self.backTextLabel.textColor = .white1
}
}
@objc
@@ -211,14 +210,13 @@ extension CardCreationViewController {
self.statusMovedView.transform = .identity
}
currentIndex = 0
- self.frontTextLabel.textColor = .white1
- self.backTextLabel.textColor = .hintGray1
+ // self.frontTextLabel.textColor = .white1
+ // self.backTextLabel.textColor = .hintGray1
}
}
}
// MARK: - Network
-
extension CardCreationViewController {
func cardDetailFetchWithAPI(cardID: String) {
CardAPI.shared.cardDetailFetch(cardID: cardID) { response in
@@ -292,7 +290,6 @@ extension CardCreationViewController {
}
// MARK: - UICollectionViewDelegate
-
extension CardCreationViewController: UICollectionViewDelegate {
func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer) {
let targetIndex = targetContentOffset.pointee.x / scrollView.frame.size.width
@@ -301,21 +298,20 @@ extension CardCreationViewController: UICollectionViewDelegate {
self.statusMovedView.transform = CGAffineTransform(translationX: self.backTextLabel.frame.origin.x - self.statusMovedView.frame.origin.x + 5, y: 0)
}
currentIndex = 1
- self.frontTextLabel.textColor = .hintGray1
- self.backTextLabel.textColor = .white
+ // self.frontTextLabel.textColor = .hintGray1
+ // self.backTextLabel.textColor = .white
} else if targetIndex == 0 && currentIndex == 1 {
UIView.animate(withDuration: 0.2) {
self.statusMovedView.transform = .identity
}
currentIndex = 0
- self.frontTextLabel.textColor = .white1
- self.backTextLabel.textColor = .hintGray1
+ // self.frontTextLabel.textColor = .white1
+ // self.backTextLabel.textColor = .hintGray1
}
}
}
// MARK: - UICollectionViewDataSource
-
extension CardCreationViewController: UICollectionViewDataSource {
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
return 2
@@ -342,7 +338,6 @@ extension CardCreationViewController: UICollectionViewDataSource {
}
// MARK: - UICollectionViewDelegateFlowLayout
-
extension CardCreationViewController: UICollectionViewDelegateFlowLayout {
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
let height = collectionView.frame.height