-
Notifications
You must be signed in to change notification settings - Fork 0
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 #40 from Nexters/feature/19-choose-type-UI
[feature][#19] 주종 선택 UI
- Loading branch information
Showing
122 changed files
with
871 additions
and
11 deletions.
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/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 |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
23 changes: 23 additions & 0 deletions
23
...es/Asset.xcassets/Images/DrinkSelection/Background/beer_background.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "beer_background.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "beer_background@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "beer_background@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+228 KB
...s/Images/DrinkSelection/Background/beer_background.imageset/beer_background.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 added
BIN
+737 KB
...mages/DrinkSelection/Background/beer_background.imageset/beer_background@2x.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 added
BIN
+1.48 MB
...mages/DrinkSelection/Background/beer_background.imageset/beer_background@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
...sset.xcassets/Images/DrinkSelection/Background/cocktail_background.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "cocktail_background.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "cocktail_background@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "cocktail_background@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+228 KB
.../DrinkSelection/Background/cocktail_background.imageset/cocktail_background.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 added
BIN
+740 KB
...inkSelection/Background/cocktail_background.imageset/cocktail_background@2x.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 added
BIN
+1.49 MB
...inkSelection/Background/cocktail_background.imageset/cocktail_background@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
...sset.xcassets/Images/DrinkSelection/Background/highball_background.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "highball_background.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "highball_background@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "highball_background@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+229 KB
.../DrinkSelection/Background/highball_background.imageset/highball_background.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 added
BIN
+736 KB
...inkSelection/Background/highball_background.imageset/highball_background@2x.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 added
BIN
+1.48 MB
...inkSelection/Background/highball_background.imageset/highball_background@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
.../Asset.xcassets/Images/DrinkSelection/Background/liquor_background.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "liquor_background.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "liquor_background@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "liquor_background@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+228 KB
...ages/DrinkSelection/Background/liquor_background.imageset/liquor_background.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 added
BIN
+737 KB
...s/DrinkSelection/Background/liquor_background.imageset/liquor_background@2x.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 added
BIN
+1.49 MB
...s/DrinkSelection/Background/liquor_background.imageset/liquor_background@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
...set.xcassets/Images/DrinkSelection/Background/makgeolli_background.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "makgeolli_background.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "makgeolli_background@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "makgeolli_background@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+228 KB
...rinkSelection/Background/makgeolli_background.imageset/makgeolli_background.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 added
BIN
+738 KB
...kSelection/Background/makgeolli_background.imageset/makgeolli_background@2x.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 added
BIN
+1.48 MB
...kSelection/Background/makgeolli_background.imageset/makgeolli_background@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
...es/Asset.xcassets/Images/DrinkSelection/Background/sake_background.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "sake_background.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "sake_background@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "sake_background@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+228 KB
...s/Images/DrinkSelection/Background/sake_background.imageset/sake_background.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 added
BIN
+738 KB
...mages/DrinkSelection/Background/sake_background.imageset/sake_background@2x.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 added
BIN
+1.49 MB
...mages/DrinkSelection/Background/sake_background.imageset/sake_background@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
...es/Asset.xcassets/Images/DrinkSelection/Background/soju_background.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "soju_background.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "soju_background@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "soju_background@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+233 KB
...s/Images/DrinkSelection/Background/soju_background.imageset/soju_background.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 added
BIN
+757 KB
...mages/DrinkSelection/Background/soju_background.imageset/soju_background@2x.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 added
BIN
+1.53 MB
...mages/DrinkSelection/Background/soju_background.imageset/soju_background@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
...es/Asset.xcassets/Images/DrinkSelection/Background/wine_background.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "wine_background.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "wine_background@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "wine_background@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+229 KB
...s/Images/DrinkSelection/Background/wine_background.imageset/wine_background.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 added
BIN
+742 KB
...mages/DrinkSelection/Background/wine_background.imageset/wine_background@2x.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 added
BIN
+1.49 MB
...mages/DrinkSelection/Background/wine_background.imageset/wine_background@3x.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.7 KB
(110%)
...Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle.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
+84.2 KB
(120%)
...et.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@2x.png
Oops, something went wrong.
Binary file modified
BIN
+234 KB
(120%)
...et.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@3x.png
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
...ources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "cocktailBottle.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "cocktailBottle@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "cocktailBottle@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+175 KB
...assets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle.png
Oops, something went wrong.
Binary file added
BIN
+656 KB
...ets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle@2x.png
Oops, something went wrong.
Binary file added
BIN
+1.37 MB
...ets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle@3x.png
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
...ources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "highballBottle.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "highballBottle@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "highballBottle@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+211 KB
...assets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle.png
Oops, something went wrong.
Binary file added
BIN
+738 KB
...ets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle@2x.png
Oops, something went wrong.
Binary file added
BIN
+1.48 MB
...ets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle@3x.png
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
...esources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.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
Binary file removed
BIN
-215 KB
...t.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle.png
Diff not rendered.
Binary file removed
BIN
-753 KB
...cassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle@2x.png
Diff not rendered.
Binary file removed
BIN
-1.48 MB
...cassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle@3x.png
Diff not rendered.
Binary file added
BIN
+236 KB
...t.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle.png
Oops, something went wrong.
Binary file added
BIN
+832 KB
...cassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle@2x.png
Oops, something went wrong.
Binary file added
BIN
+1.65 MB
...cassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle@3x.png
Oops, something went wrong.
Binary file modified
BIN
+13.5 KB
(110%)
...sets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle.png
Oops, something went wrong.
Binary file modified
BIN
+52.9 KB
(110%)
...s/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@2x.png
Oops, something went wrong.
Binary file modified
BIN
+121 KB
(110%)
...s/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@3x.png
Oops, something went wrong.
Binary file modified
BIN
+19.5 KB
(110%)
...Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle.png
Oops, something went wrong.
Binary file modified
BIN
+94.1 KB
(110%)
...et.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@2x.png
Oops, something went wrong.
Binary file modified
BIN
+238 KB
(120%)
...et.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@3x.png
Oops, something went wrong.
Binary file modified
BIN
-17.2 KB
(89%)
...Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle.png
Oops, something went wrong.
Binary file modified
BIN
-56.1 KB
(91%)
...et.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@2x.png
Oops, something went wrong.
Binary file modified
BIN
-70 KB
(94%)
...et.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@3x.png
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
...raphy/sulbaby_typo.imageset/Contents.json → ...Bottles/wineBottle.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
Binary file added
BIN
+130 KB
...Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle.png
Oops, something went wrong.
Binary file added
BIN
+519 KB
...et.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle@2x.png
Oops, something went wrong.
Binary file added
BIN
+1.08 MB
...et.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle@3x.png
Oops, something went wrong.
File renamed without changes.
Binary file added
BIN
+1.97 KB
...sources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer.png
Oops, something went wrong.
Binary file added
BIN
+3.74 KB
...rces/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer@2x.png
Oops, something went wrong.
Binary file added
BIN
+5.29 KB
...rces/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer@3x.png
Oops, something went wrong.
Binary file removed
BIN
-1.64 KB
...es/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer.png
Diff not rendered.
Binary file removed
BIN
-3.32 KB
...Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer@2x.png
Diff not rendered.
Binary file removed
BIN
-5.03 KB
...Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer@3x.png
Diff not rendered.
6 changes: 3 additions & 3 deletions
6
...phy/makgeolli_typo.imageset/Contents.json → ...phography/cocktail.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
Binary file added
BIN
+2.45 KB
...Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail.png
Oops, something went wrong.
Binary file added
BIN
+4.93 KB
...et.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail@2x.png
Oops, something went wrong.
Binary file added
BIN
+7.35 KB
...et.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail@3x.png
Oops, something went wrong.
File renamed without changes.
Binary file added
BIN
+2.11 KB
...Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball.png
Oops, something went wrong.
Binary file added
BIN
+4.18 KB
...et.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball@2x.png
Oops, something went wrong.
Binary file added
BIN
+6.15 KB
...et.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball@3x.png
Oops, something went wrong.
Binary file removed
BIN
-3.25 KB
....xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball.png
Diff not rendered.
Binary file removed
BIN
-6.42 KB
...assets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball@2x.png
Diff not rendered.
Binary file removed
BIN
-9.8 KB
...assets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball@3x.png
Diff not rendered.
File renamed without changes.
Binary file added
BIN
+1.52 KB
...ces/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor.png
Oops, something went wrong.
Binary file added
BIN
+3.01 KB
.../Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor@2x.png
Oops, something went wrong.
Binary file added
BIN
+4.52 KB
.../Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor@3x.png
Oops, something went wrong.
Binary file removed
BIN
-1.38 KB
...sset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor.png
Diff not rendered.
Binary file removed
BIN
-2.62 KB
...t.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor@2x.png
Diff not rendered.
Binary file removed
BIN
-3.99 KB
...t.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor@3x.png
Diff not rendered.
23 changes: 23 additions & 0 deletions
23
...sources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "Frame 936.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "Frame 936@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "Frame 936@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+15.7 KB
...set.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936.png
Oops, something went wrong.
Binary file added
BIN
+49.8 KB
....xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936@2x.png
Oops, something went wrong.
Binary file added
BIN
+100 KB
....xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936@3x.png
Oops, something went wrong.
Binary file removed
BIN
-3.18 KB
...cassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli.png
Diff not rendered.
Binary file removed
BIN
-5.98 KB
...sets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli@2x.png
Diff not rendered.
Binary file removed
BIN
-9.39 KB
...sets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli@3x.png
Diff not rendered.
File renamed without changes.
Binary file added
BIN
+1.58 KB
...sources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake.png
Oops, something went wrong.
Binary file added
BIN
+3.22 KB
...rces/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake@2x.png
Oops, something went wrong.
Binary file added
BIN
+4.81 KB
...rces/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake@3x.png
Oops, something went wrong.
Binary file removed
BIN
-1.58 KB
...es/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake.png
Diff not rendered.
Binary file removed
BIN
-3.03 KB
...Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake@2x.png
Diff not rendered.
Binary file removed
BIN
-4.4 KB
...Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake@3x.png
Diff not rendered.
File renamed without changes.
Binary file added
BIN
+1.42 KB
...sources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju.png
Oops, something went wrong.
Binary file added
BIN
+2.81 KB
...rces/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju@2x.png
Oops, something went wrong.
Binary file added
BIN
+4.51 KB
...rces/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju@3x.png
Oops, something went wrong.
Binary file removed
BIN
-901 Bytes
...es/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju.png
Diff not rendered.
Binary file removed
BIN
-1.67 KB
...Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju@2x.png
Diff not rendered.
Binary file removed
BIN
-2.29 KB
...Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju@3x.png
Diff not rendered.
Binary file removed
BIN
-1.76 KB
...cassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight.png
Diff not rendered.
Binary file removed
BIN
-3.59 KB
...sets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight@2x.png
Diff not rendered.
Binary file removed
BIN
-5.68 KB
...sets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight@3x.png
Diff not rendered.
23 changes: 23 additions & 0 deletions
23
...ow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "wine.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "wine@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "wine@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+1.62 KB
...sources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine.png
Oops, something went wrong.
Binary file added
BIN
+3.05 KB
...rces/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine@2x.png
Oops, something went wrong.
Binary file added
BIN
+4.6 KB
...rces/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine@3x.png
Oops, something went wrong.
Oops, something went wrong.