-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #398 from jeongyeob97/223_lint,236_space,372_font,…
- Loading branch information
Showing
90 changed files
with
674 additions
and
497 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "icAngry14Black.png", | ||
"scale" : "1x", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
"filename" : "icAngry14Black.png" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
|
@@ -17,7 +17,7 @@ | |
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
-14 Bytes
(96%)
MoMo/MoMo/Resources/Assets.xcassets/icAngry14Black.imageset/icAngry14Black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+17 Bytes
(100%)
MoMo/MoMo/Resources/Assets.xcassets/icAngry14Black.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-18 Bytes
(98%)
MoMo/MoMo/Resources/Assets.xcassets/icAngry14Black.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions
18
MoMo/MoMo/Resources/Assets.xcassets/icAngryBlue.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "icAngryBlue.png", | ||
"scale" : "1x", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
"filename" : "icAngryBlue.png" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"scale" : "2x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"scale" : "3x", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
"filename" : "[email protected]" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
-118 Bytes
(82%)
MoMo/MoMo/Resources/Assets.xcassets/icAngryBlue.imageset/icAngryBlue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-249 Bytes
(78%)
MoMo/MoMo/Resources/Assets.xcassets/icAngryBlue.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-163 Bytes
(88%)
MoMo/MoMo/Resources/Assets.xcassets/icAngryBlue.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,18 +6,18 @@ | |
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"scale" : "2x", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"filename" : "[email protected]" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"filename" : "[email protected]", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
+29 Bytes
(110%)
MoMo/MoMo/Resources/Assets.xcassets/icBored14Black.imageset/icBored14Black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+28 Bytes
(110%)
MoMo/MoMo/Resources/Assets.xcassets/icBored14Black.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-7 Bytes
(98%)
MoMo/MoMo/Resources/Assets.xcassets/icBored14Black.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,12 +12,12 @@ | |
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
"scale" : "3x", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
-21 Bytes
(93%)
MoMo/MoMo/Resources/Assets.xcassets/icBoredBlue.imageset/icBoredBlue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1 Byte
(100%)
MoMo/MoMo/Resources/Assets.xcassets/icBoredBlue.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+54 Bytes
(120%)
MoMo/MoMo/Resources/Assets.xcassets/icBoredBlue.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions
14
MoMo/MoMo/Resources/Assets.xcassets/icConsole14Black.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "icConsole14Black.png", | ||
"idiom" : "universal", | ||
"filename" : "icConsole14Black.png", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"scale" : "2x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"filename" : "[email protected]", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
-12 Bytes
(96%)
MoMo/MoMo/Resources/Assets.xcassets/icConsole14Black.imageset/icConsole14Black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+28 Bytes
(110%)
...oMo/Resources/Assets.xcassets/icConsole14Black.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-29 Bytes
(96%)
...oMo/Resources/Assets.xcassets/icConsole14Black.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,13 +2,13 @@ | |
"images" : [ | ||
{ | ||
"filename" : "icConsoleBlue.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
"scale" : "1x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"scale" : "2x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
|
@@ -17,7 +17,7 @@ | |
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
-26 Bytes
(95%)
MoMo/MoMo/Resources/Assets.xcassets/icConsoleBlue.imageset/icConsoleBlue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-137 Bytes
(88%)
MoMo/MoMo/Resources/Assets.xcassets/icConsoleBlue.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-83 Bytes
(94%)
MoMo/MoMo/Resources/Assets.xcassets/icConsoleBlue.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions
18
MoMo/MoMo/Resources/Assets.xcassets/icDaily14Black.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "icDaily14Black.png", | ||
"scale" : "1x", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
"filename" : "icDaily14Black.png" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"scale" : "2x", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"filename" : "[email protected]" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
"scale" : "3x", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
+19 Bytes
(110%)
MoMo/MoMo/Resources/Assets.xcassets/icDaily14Black.imageset/icDaily14Black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+32 Bytes
(110%)
MoMo/MoMo/Resources/Assets.xcassets/icDaily14Black.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+3 Bytes
(100%)
MoMo/MoMo/Resources/Assets.xcassets/icDaily14Black.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,22 +2,22 @@ | |
"images" : [ | ||
{ | ||
"filename" : "icDailyBlue.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
"scale" : "1x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"scale" : "2x", | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
"scale" : "3x", | ||
"filename" : "[email protected]" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
-73 Bytes
(90%)
MoMo/MoMo/Resources/Assets.xcassets/icDailyBlue.imageset/icDailyBlue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-159 Bytes
(89%)
MoMo/MoMo/Resources/Assets.xcassets/icDailyBlue.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+73 Bytes
(100%)
MoMo/MoMo/Resources/Assets.xcassets/icDailyBlue.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,9 +6,9 @@ | |
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"scale" : "2x", | ||
"filename" : "[email protected]" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
|
@@ -17,7 +17,7 @@ | |
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
+0 Bytes
(100%)
MoMo/MoMo/Resources/Assets.xcassets/icHappy14Black.imageset/icHappy14Black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+68 Bytes
(110%)
MoMo/MoMo/Resources/Assets.xcassets/icHappy14Black.imageset/[email protected]
Oops, something went wrong.
Binary file modified
BIN
-47 Bytes
(96%)
MoMo/MoMo/Resources/Assets.xcassets/icHappy14Black.imageset/[email protected]
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "icHappyBlue.png", | ||
"idiom" : "universal", | ||
"filename" : "icHappyBlue.png", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"filename" : "[email protected]", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
|
@@ -17,7 +17,7 @@ | |
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
-152 Bytes
(85%)
MoMo/MoMo/Resources/Assets.xcassets/icHappyBlue.imageset/icHappyBlue.png
Oops, something went wrong.
Binary file modified
BIN
-542 Bytes
(74%)
MoMo/MoMo/Resources/Assets.xcassets/icHappyBlue.imageset/[email protected]
Oops, something went wrong.
Binary file modified
BIN
-153 Bytes
(94%)
MoMo/MoMo/Resources/Assets.xcassets/icHappyBlue.imageset/[email protected]
Oops, something went wrong.
18 changes: 9 additions & 9 deletions
18
MoMo/MoMo/Resources/Assets.xcassets/icLove14Black.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "icLove14Black.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
"scale" : "1x", | ||
"filename" : "icLove14Black.png" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"scale" : "2x", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"filename" : "[email protected]" | ||
}, | ||
{ | ||
"scale" : "3x", | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
-11 Bytes
(97%)
MoMo/MoMo/Resources/Assets.xcassets/icLove14Black.imageset/icLove14Black.png
Oops, something went wrong.
Binary file modified
BIN
+36 Bytes
(110%)
MoMo/MoMo/Resources/Assets.xcassets/icLove14Black.imageset/[email protected]
Oops, something went wrong.
Binary file modified
BIN
-17 Bytes
(98%)
MoMo/MoMo/Resources/Assets.xcassets/icLove14Black.imageset/[email protected]
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-88 Bytes
(88%)
MoMo/MoMo/Resources/Assets.xcassets/icLoveBlue.imageset/icLoveBlue.png
Oops, something went wrong.
Binary file modified
BIN
-201 Bytes
(86%)
MoMo/MoMo/Resources/Assets.xcassets/icLoveBlue.imageset/[email protected]
Oops, something went wrong.
Binary file modified
BIN
+4 Bytes
(100%)
MoMo/MoMo/Resources/Assets.xcassets/icLoveBlue.imageset/[email protected]
Oops, something went wrong.
16 changes: 8 additions & 8 deletions
16
MoMo/MoMo/Resources/Assets.xcassets/icMemory14Black.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "icMemory14Black.png", | ||
"idiom" : "universal", | ||
"filename" : "icMemory14Black.png", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
"scale" : "2x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"filename" : "[email protected]", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
"scale" : "3x", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} | ||
} |
Binary file modified
BIN
+42 Bytes
(110%)
MoMo/MoMo/Resources/Assets.xcassets/icMemory14Black.imageset/icMemory14Black.png
Oops, something went wrong.
Binary file modified
BIN
+30 Bytes
(100%)
.../MoMo/Resources/Assets.xcassets/icMemory14Black.imageset/[email protected]
Oops, something went wrong.
Binary file modified
BIN
-59 Bytes
(95%)
.../MoMo/Resources/Assets.xcassets/icMemory14Black.imageset/[email protected]
Oops, something went wrong.
Oops, something went wrong.