diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/Contents.json new file mode 100644 index 0000000..83bc091 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background.png new file mode 100644 index 0000000..d1ad819 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background@2x.png new file mode 100644 index 0000000..316923d Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background@3x.png new file mode 100644 index 0000000..5ce10a7 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/beer_background.imageset/beer_background@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/Contents.json new file mode 100644 index 0000000..485818b --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background.png new file mode 100644 index 0000000..402a864 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background@2x.png new file mode 100644 index 0000000..f47a72b Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background@3x.png new file mode 100644 index 0000000..b44aea1 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/cocktail_background.imageset/cocktail_background@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/Contents.json new file mode 100644 index 0000000..ad551dc --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background.png new file mode 100644 index 0000000..7362354 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background@2x.png new file mode 100644 index 0000000..9878d2a Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background@3x.png new file mode 100644 index 0000000..9c2ced2 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/highball_background.imageset/highball_background@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/Contents.json new file mode 100644 index 0000000..0a37b8d --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background.png new file mode 100644 index 0000000..7bc7cf7 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background@2x.png new file mode 100644 index 0000000..0c7fcae Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background@3x.png new file mode 100644 index 0000000..a6e9225 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/liquor_background.imageset/liquor_background@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/Contents.json new file mode 100644 index 0000000..7075a22 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background.png new file mode 100644 index 0000000..6499a91 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background@2x.png new file mode 100644 index 0000000..1383c5b Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background@3x.png new file mode 100644 index 0000000..e6dff02 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/makgeolli_background.imageset/makgeolli_background@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/Contents.json new file mode 100644 index 0000000..634fd3a --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background.png new file mode 100644 index 0000000..c3b1c6b Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background@2x.png new file mode 100644 index 0000000..4e7ca76 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background@3x.png new file mode 100644 index 0000000..8914437 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/sake_background.imageset/sake_background@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/Contents.json new file mode 100644 index 0000000..0b72ee8 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background.png new file mode 100644 index 0000000..57627aa Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background@2x.png new file mode 100644 index 0000000..42ee34c Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background@3x.png new file mode 100644 index 0000000..ca4ea89 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/soju_background.imageset/soju_background@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/Contents.json new file mode 100644 index 0000000..95b9030 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background.png new file mode 100644 index 0000000..dbc47b6 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background@2x.png new file mode 100644 index 0000000..f314210 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background@3x.png new file mode 100644 index 0000000..39da205 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Background/wine_background.imageset/wine_background@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle.png index eaf9b05..a3ec8e5 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@2x.png index 0d55ea6..069c008 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@2x.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@3x.png index af42d76..cef2bfd 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@3x.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/beerBottle.imageset/beerBottle@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/Contents.json new file mode 100644 index 0000000..fa50cc4 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle.png new file mode 100644 index 0000000..1050ded Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle@2x.png new file mode 100644 index 0000000..2a451ee Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle@3x.png new file mode 100644 index 0000000..e5fa136 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/cocktailBottle.imageset/cocktailBottle@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/Contents.json new file mode 100644 index 0000000..0b4b549 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle.png new file mode 100644 index 0000000..ae378e6 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle@2x.png new file mode 100644 index 0000000..88aaae9 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle@3x.png new file mode 100644 index 0000000..7ecf703 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/highballBottle.imageset/highballBottle@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/Contents.json index 89e9f0f..7b80e80 100644 --- a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/Contents.json +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "liqourBottle.png", + "filename" : "liquorBottle.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "liqourBottle@2x.png", + "filename" : "liquorBottle@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "liqourBottle@3x.png", + "filename" : "liquorBottle@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle.png deleted file mode 100644 index f5a5fc2..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle@2x.png deleted file mode 100644 index b14542a..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle@2x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle@3x.png deleted file mode 100644 index 7e75961..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liqourBottle@3x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle.png new file mode 100644 index 0000000..5a7af63 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle@2x.png new file mode 100644 index 0000000..1d4843b Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle@3x.png new file mode 100644 index 0000000..4a8ea85 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/liquorBottle.imageset/liquorBottle@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle.png index f3d429e..0c5db1d 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@2x.png index e3512b6..19718b3 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@2x.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@3x.png index 868e14d..b7e1d4d 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@3x.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/makgeolliBottle.imageset/makgeolliBottle@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle.png index 1e75918..c53857c 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@2x.png index b33aa5c..a548fff 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@2x.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@3x.png index 86b5a3f..3135bb7 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@3x.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sakeBottle.imageset/sakeBottle@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle.png index b9ecd1c..40f83a6 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@2x.png index ad9bf5f..48d8885 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@2x.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@3x.png index ef78699..c8b216e 100644 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@3x.png and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/sojuBottle.imageset/sojuBottle@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/Contents.json similarity index 69% rename from Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/Contents.json rename to Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/Contents.json index 37cf810..96df4e9 100644 --- a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/Contents.json +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "lightweight.png", + "filename" : "wineBottle.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "lightweight@2x.png", + "filename" : "wineBottle@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "lightweight@3x.png", + "filename" : "wineBottle@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle.png new file mode 100644 index 0000000..43616be Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle@2x.png new file mode 100644 index 0000000..40dcb16 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle@3x.png new file mode 100644 index 0000000..9903424 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Bottles/wineBottle.imageset/wineBottle@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/Contents.json similarity index 100% rename from Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/Contents.json rename to Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/Contents.json diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer.png new file mode 100644 index 0000000..8b389c8 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer@2x.png new file mode 100644 index 0000000..f3c6d37 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer@3x.png new file mode 100644 index 0000000..fba800a Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer.imageset/beer@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer.png deleted file mode 100644 index ce82632..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer@2x.png deleted file mode 100644 index 4484d8d..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer@2x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer@3x.png deleted file mode 100644 index 8d1aaca..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/beer_typo.imageset/beer@3x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/Contents.json similarity index 70% rename from Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/Contents.json rename to Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/Contents.json index b0fe1bb..d7dd8c2 100644 --- a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/Contents.json +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "makgeolli.png", + "filename" : "cocktail.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "makgeolli@2x.png", + "filename" : "cocktail@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "makgeolli@3x.png", + "filename" : "cocktail@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail.png new file mode 100644 index 0000000..df23a45 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail@2x.png new file mode 100644 index 0000000..d713893 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail@3x.png new file mode 100644 index 0000000..926e830 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/cocktail.imageset/cocktail@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/Contents.json similarity index 100% rename from Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/Contents.json rename to Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/Contents.json diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball.png new file mode 100644 index 0000000..407b0a7 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball@2x.png new file mode 100644 index 0000000..167b88f Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball@3x.png new file mode 100644 index 0000000..3152bc7 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball.imageset/highball@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball.png deleted file mode 100644 index ee8ff22..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball@2x.png deleted file mode 100644 index d98a886..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball@2x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball@3x.png deleted file mode 100644 index 71d8ad1..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/highball_typo.imageset/highball@3x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/Contents.json similarity index 100% rename from Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/Contents.json rename to Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/Contents.json diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor.png new file mode 100644 index 0000000..74d65ba Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor@2x.png new file mode 100644 index 0000000..d91d83e Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor@3x.png new file mode 100644 index 0000000..6dfa143 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor.imageset/liquor@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor.png deleted file mode 100644 index 105986f..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor@2x.png deleted file mode 100644 index e920838..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor@2x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor@3x.png deleted file mode 100644 index 8d8e1b5..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/liquor_typo.imageset/liquor@3x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Contents.json new file mode 100644 index 0000000..09c4fa0 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936.png new file mode 100644 index 0000000..cb6f604 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936@2x.png new file mode 100644 index 0000000..7213fa8 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936@3x.png new file mode 100644 index 0000000..f0ec7f5 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli.imageset/Frame 936@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli.png deleted file mode 100644 index e38e0e4..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli@2x.png deleted file mode 100644 index 3496ebb..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli@2x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli@3x.png deleted file mode 100644 index 1c474b0..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/makgeolli_typo.imageset/makgeolli@3x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/Contents.json similarity index 100% rename from Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/Contents.json rename to Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/Contents.json diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake.png new file mode 100644 index 0000000..65700be Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake@2x.png new file mode 100644 index 0000000..b52de9b Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake@3x.png new file mode 100644 index 0000000..46961b6 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake.imageset/sake@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake.png deleted file mode 100644 index 55d86b4..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake@2x.png deleted file mode 100644 index 439e36e..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake@2x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake@3x.png deleted file mode 100644 index 8c8b8b8..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sake_typo.imageset/sake@3x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/Contents.json similarity index 100% rename from Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/Contents.json rename to Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/Contents.json diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju.png new file mode 100644 index 0000000..86ee068 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju@2x.png new file mode 100644 index 0000000..136e16f Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju@3x.png new file mode 100644 index 0000000..70b1b05 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju.imageset/soju@3x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju.png deleted file mode 100644 index c1b9501..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju@2x.png deleted file mode 100644 index 861956b..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju@2x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju@3x.png deleted file mode 100644 index 835fb20..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/soju_typo.imageset/soju@3x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight.png deleted file mode 100644 index 61095e5..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight@2x.png deleted file mode 100644 index 7edba8a..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight@2x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight@3x.png deleted file mode 100644 index bb15d52..0000000 Binary files a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/sulbaby_typo.imageset/lightweight@3x.png and /dev/null differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/Contents.json b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/Contents.json new file mode 100644 index 0000000..ef8f129 --- /dev/null +++ b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/Contents.json @@ -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 + } +} diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine.png new file mode 100644 index 0000000..d2e8478 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine@2x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine@2x.png new file mode 100644 index 0000000..071bbf9 Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine@2x.png differ diff --git a/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine@3x.png b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine@3x.png new file mode 100644 index 0000000..c9a21da Binary files /dev/null and b/Targets/Mashow/Resources/Asset.xcassets/Images/DrinkSelection/Typhography/wine.imageset/wine@3x.png differ diff --git a/Targets/Mashow/Sources/Common/Model/DrinkType.swift b/Targets/Mashow/Sources/Common/Model/DrinkType.swift index 224b40d..d8aa884 100644 --- a/Targets/Mashow/Sources/Common/Model/DrinkType.swift +++ b/Targets/Mashow/Sources/Common/Model/DrinkType.swift @@ -8,6 +8,69 @@ import Foundation -enum DrinkType: CaseIterable { - case soju, liquor, makgeoli, sake, beer, wine, cocktail, highball +enum DrinkType: String, CaseIterable { + case soju, liquor, makgeolli, sake, beer, wine, cocktail, highball + + var colorHexValues: [String] { + switch self { + case .soju: + ["8EFFA7", "CCFFD1"] + case .liquor: + ["8EEBFF", "CCF3FF"] + case .makgeolli: + ["E2FF8E", "F2FFCC"] + case .sake: + ["FF8EED", "FFA9F1"] + case .beer: + ["FFC93F", "FFE040"] + case .wine: + ["DCA3FF", "F6DCFF"] + case .cocktail: + ["FFC46B", "FFF0BC"] + case .highball: + ["FFFA81", "FFFCBC"] + } + } + + var korean: String { + switch self { + case .soju: + "소주" + case .liquor: + "양주" + case .makgeolli: + "막걸리" + case .sake: + "사케" + case .beer: + "맥주" + case .wine: + "와인" + case .cocktail: + "칵테일" + case .highball: + "하이볼" + } + } + + var tag: Int { + switch self { + case .soju: + 0 + case .liquor: + 1 + case .makgeolli: + 2 + case .sake: + 3 + case .beer: + 4 + case .wine: + 5 + case .cocktail: + 6 + case .highball: + 7 + } + } } diff --git a/Targets/Mashow/Sources/DrinkSelection/View/DrinkSelectionViewController.swift b/Targets/Mashow/Sources/DrinkSelection/View/DrinkSelectionViewController.swift new file mode 100644 index 0000000..888c8d0 --- /dev/null +++ b/Targets/Mashow/Sources/DrinkSelection/View/DrinkSelectionViewController.swift @@ -0,0 +1,291 @@ +// +// DrinkSelectionViewController.swift +// Mashow +// +// Created by ZENA on 8/3/24. +// Copyright © 2024 com.alcoholers. All rights reserved. +// + +import UIKit +import Combine +import SnapKit + +final class DrinkSelectionViewController: UIViewController { + + init(viewModel: DrinkSelectionViewModel) { + self.viewModel = viewModel + super.init(nibName: nil, bundle: nil) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + let viewModel: DrinkSelectionViewModel + private var cancellables = Set() + private let drinkTypeList = DrinkType.allCases + + private var removedButtonTag: Int? + typealias TypeButtonTag = Int + private var addedDrinkTypeButtons = [TypeButtonTag: UIButton]() + + private let pageViewController = UIPageViewController( + transitionStyle: .scroll, + navigationOrientation: .horizontal + ) + + private lazy var leftArrowButton: UIButton = { + let button = UIButton() + button.setImage(UIImage(systemName: "arrowtriangle.left.fill"), for: .normal) + button.tintColor = .white + return button + }() + + var backgroundView = UIImageView() + + private lazy var rightArrowButton: UIButton = { + let button = UIButton() + button.setImage(UIImage(systemName: "arrowtriangle.right.fill"), for: .normal) + button.tintColor = .white + return button + }() + + private lazy var addedTypesStackView: UIStackView = { + let stack = UIStackView() + stack.axis = .horizontal + stack.spacing = 4 + stack.alignment = .center + return stack + }() + + private lazy var bottomNextButton: UIButton = { + let button = UIButton() + button.setTitle("다음", for: .normal) + button.titleLabel?.font = .pretendard(size: 20, weight: .bold) + button.tintColor = .white + button.layer.cornerRadius = 13 + button.backgroundColor = UIColor.clear + button.layer.masksToBounds = true + + let blurEffect = UIBlurEffect(style: .systemUltraThinMaterialDark) + let blurEffectView = UIVisualEffectView(effect: blurEffect) + blurEffectView.layer.cornerRadius = 13 + blurEffectView.layer.masksToBounds = true + blurEffectView.isUserInteractionEnabled = false + blurEffectView.translatesAutoresizingMaskIntoConstraints = false + button.insertSubview(blurEffectView, at: 0) + + NSLayoutConstraint.activate([ + blurEffectView.leadingAnchor.constraint(equalTo: button.leadingAnchor), + blurEffectView.trailingAnchor.constraint(equalTo: button.trailingAnchor), + blurEffectView.topAnchor.constraint(equalTo: button.topAnchor), + blurEffectView.bottomAnchor.constraint(equalTo: button.bottomAnchor) + ]) + return button + }() + + // MARK: - Lifecycle + override func viewDidLoad() { + super.viewDidLoad() + bind() + setupNavigationBar() + setupLayouts() + setupHandlers() + } +} + +extension DrinkSelectionViewController { + + private func bind() { + viewModel.state.currentType + .receive(on: DispatchQueue.main) + .sink { [weak self] currentType in + guard let self = self else { return } + setupBackground(currentType.rawValue) + } + .store(in: &cancellables) + + viewModel.state.addedTypes + .receive(on: DispatchQueue.main) + .sink { [weak self] addedTypes in + guard let self = self else { return } + if let tag = self.removedButtonTag { + // If type removed + UIView.transition(with: addedTypesStackView, duration: 0.5, options: .transitionCrossDissolve) { + self.addedDrinkTypeButtons[tag]!.removeFromSuperview() + self.addedDrinkTypeButtons[tag] = nil + self.removedButtonTag = nil + } + } else { + guard !addedTypes.isEmpty else { return } + // If type added + let newButton = self.makeAddedTypeButton(for: viewModel.state.currentType.value) + newButton.addTarget(self, action: #selector(didTapToRemoveType), for: .touchUpInside) + self.addedDrinkTypeButtons[viewModel.state.currentType.value.tag] = newButton + UIView.transition(with: addedTypesStackView, duration: 0.5, options: .transitionCrossDissolve) { + self.addedTypesStackView.addArrangedSubview(newButton) + } + } + } + .store(in: &cancellables) + } + + @objc private func didTapToRemoveType(_ sender: UIButton) { + removedButtonTag = sender.tag + guard let index = drinkTypeList.firstIndex(where: { $0.tag == removedButtonTag }) else { return } + viewModel.removeType(drinkTypeList[index]) + } + + private func makeAddedTypeButton(for type: DrinkType) -> UIButton { + let stackView = UIStackView() + stackView.axis = .horizontal + stackView.spacing = 5 + stackView.isUserInteractionEnabled = false + + let label = UILabel() + label.text = type.korean + label.font = .pretendard(size: 16, weight: .semibold) + label.textColor = .white + + let icon = UIImageView(image: UIImage(systemName: "xmark")) + icon.tintColor = .white + icon.contentMode = .scaleAspectFit + icon.frame = CGRect(x: 0, y: 0, width: 12, height: 12) + + stackView.addArrangedSubview(label) + stackView.addArrangedSubview(icon) + let button = UIButton() + button.addSubview(stackView) + stackView.snp.makeConstraints { make in + make.leading.equalToSuperview().offset(20) + make.trailing.equalToSuperview().offset(-20) + make.top.equalToSuperview().offset(6) + make.bottom.equalToSuperview().offset(-6) + } + button.backgroundColor = UIColor.hex("151515").withAlphaComponent(0.5) + button.clipsToBounds = true + button.layer.cornerRadius = 15 + button.tag = type.tag + return button + } + + private func setupNavigationBar() { + self.navigationController?.navigationBar.tintColor = .white + navigationController?.navigationBar.titleTextAttributes = [.foregroundColor: UIColor.white] + + navigationItem.title = "7월 16일 화요일" // FIXME: set formmatted date string + navigationItem.hidesBackButton = true + navigationItem.leftBarButtonItem = UIBarButtonItem( + title: "취소", + style: .done, + target: self, + action: #selector(didTapBackButton) + ) + navigationItem.rightBarButtonItem = UIBarButtonItem( + title: "저장", + style: .plain, + target: self, + action: nil // FIXME: set action + ) + } + + @objc private func didTapBackButton() { + navigationController?.popViewController(animated: true) + } + + private func setupBackground(_ currentType: String) { + UIView.transition(with: backgroundView, duration: 0.5, options: .transitionCrossDissolve) { + self.backgroundView.image = UIImage(named: "\(currentType)_background") + } + } + + private func setupLayouts() { + backgroundView.contentMode = .scaleAspectFill + view.addSubview(backgroundView) + backgroundView.snp.makeConstraints { make in + make.horizontalEdges.equalToSuperview() + make.verticalEdges.equalToSuperview() + } + + pageViewController.dataSource = self + pageViewController.setViewControllers( + [DrinkTypeViewController(viewModel: viewModel, drinkType: drinkTypeList.first!)], + direction: .forward, + animated: false + ) + addChild(pageViewController) + view.addSubview(pageViewController.view) + pageViewController.didMove(toParent: self) + pageViewController.view.backgroundColor = .clear + + view.addSubview(leftArrowButton) + leftArrowButton.snp.makeConstraints { make in + make.leading.equalTo(view).offset(30) + make.top.equalTo(view.safeAreaLayoutGuide).offset(40) + } + + view.addSubview(rightArrowButton) + rightArrowButton.snp.makeConstraints { make in + make.trailing.equalTo(view).offset(-30) + make.top.equalTo(view.safeAreaLayoutGuide).offset(40) + } + + view.addSubview(bottomNextButton) + bottomNextButton.snp.makeConstraints { make in + make.bottom.equalTo(view).offset(-30) + make.leading.equalTo(view).offset(20) + make.trailing.equalTo(view).offset(-20) + make.height.equalTo(56) + } + + view.addSubview(addedTypesStackView) + addedTypesStackView.snp.makeConstraints { make in + make.bottom.equalTo(bottomNextButton.snp_topMargin).offset(-20) + make.centerX.equalToSuperview() + } + } + + private func setupHandlers() { + leftArrowButton.addTarget(self, action: #selector(didTapLeftArrow), for: .touchUpInside) + rightArrowButton.addTarget(self, action: #selector(didTapRightArrow), for: .touchUpInside) + } + + @objc private func didTapLeftArrow() { + pageViewController.moveToPrevPage() + } + + @objc private func didTapRightArrow() { + pageViewController.moveToNextPage() + } +} + +extension DrinkSelectionViewController: UIPageViewControllerDataSource { + func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? { + guard let viewController = viewController as? DrinkTypeViewController else { return nil } + guard var prevIndex = drinkTypeList.firstIndex(of: viewController.drinkType) else { return nil } + prevIndex = prevIndex == 0 ? drinkTypeList.count - 1 : prevIndex - 1 + return DrinkTypeViewController(viewModel: viewModel, drinkType: drinkTypeList[prevIndex]) + } + + func pageViewController(_: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? { + guard let viewController = viewController as? DrinkTypeViewController else { return nil } + guard var nextIndex = drinkTypeList.firstIndex(of: viewController.drinkType) else { return nil } + nextIndex = nextIndex == drinkTypeList.count - 1 ? 0 : nextIndex + 1 + return DrinkTypeViewController(viewModel: viewModel, drinkType: drinkTypeList[nextIndex]) + } +} + +extension UIPageViewController { + + func moveToNextPage() { + guard let currentViewController = self.viewControllers?.first else { return } + guard let nextViewController = dataSource?.pageViewController(self, viewControllerAfter: currentViewController) else { return } + setViewControllers([nextViewController], direction: .forward, animated: true) + } + + func moveToPrevPage() { + guard let currentViewController = self.viewControllers?.first else { return } + guard let previousViewController = dataSource?.pageViewController(self, viewControllerBefore: currentViewController) else { return } + setViewControllers([previousViewController], direction: .reverse, animated: true) + } +} diff --git a/Targets/Mashow/Sources/DrinkSelection/View/DrinkTypeViewController.swift b/Targets/Mashow/Sources/DrinkSelection/View/DrinkTypeViewController.swift new file mode 100644 index 0000000..68e80cc --- /dev/null +++ b/Targets/Mashow/Sources/DrinkSelection/View/DrinkTypeViewController.swift @@ -0,0 +1,184 @@ +// +// DrinkTypeViewController.swift +// Mashow +// +// Created by ZENA on 8/5/24. +// Copyright © 2024 com.alcoholers. All rights reserved. +// + +import UIKit +import Combine +import SnapKit + +final class DrinkTypeViewController: UIViewController { + + let viewModel: DrinkSelectionViewModel + var drinkType: DrinkType + var cancellables = Set() + + init(viewModel: DrinkSelectionViewModel, drinkType: DrinkType) { + self.viewModel = viewModel + self.drinkType = drinkType + super.init(nibName: nil, bundle: nil) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + private lazy var typeTitleImageView: UIImageView = { + let image = UIImage(named: drinkType.rawValue) + let imageView = UIImageView(image: image) + return imageView + }() + + private lazy var addDrinkTypeButton: UIButton = { + let button = UIButton(frame: CGRect(x: 0, y: 0, width: 127, height: 40)) + button.layer.cornerRadius = 20 + button.layer.masksToBounds = true + button.backgroundColor = .white.withAlphaComponent(0.15) + + let stackView = UIStackView() + stackView.axis = .horizontal + stackView.spacing = 4 + stackView.alignment = .center + stackView.bounds = button.bounds + stackView.isUserInteractionEnabled = false + + let label = UILabel() + label.font = .pretendard(size: 16, weight: .bold) + label.text = "주종 추가" + label.textColor = .white.withAlphaComponent(0.7) + + var icon = UIImageView(image: UIImage(systemName: "plus")) + icon.tintColor = .white.withAlphaComponent(0.7) + + stackView.addArrangedSubview(label) + stackView.addArrangedSubview(icon) + button.addSubview(stackView) + stackView.snp.makeConstraints { make in + make.center.equalTo(button) + } + if viewModel.state.addedTypes.value.count >= 3 { + button.isEnabled = false + button.layer.opacity = 0.3 + } + return button + }() + + private lazy var addedDrinkTypeButton: UIButton = { + let button = UIButton(frame: CGRect(x: 0, y: 0, width: 127, height: 40)) + button.layer.cornerRadius = 20 + button.layer.masksToBounds = true + + let stackView = UIStackView() + stackView.axis = .horizontal + stackView.spacing = 4 + stackView.alignment = .center + stackView.bounds = button.bounds + + let label = UILabel() + label.font = .pretendard(size: 16, weight: .bold) + label.text = "추가됨" + label.textColor = UIColor.hex("434343") + + var icon = UIImageView(image: UIImage(systemName: "plus")) + icon = UIImageView(image: UIImage(systemName: "checkmark")) + icon.tintColor = UIColor.hex("434343") + + let gradient = CAGradientLayer() + gradient.frame = button.bounds + gradient.colors = [ + UIColor.hex(drinkType.colorHexValues[0]).cgColor, + UIColor.hex(drinkType.colorHexValues[1]).cgColor + ] + gradient.startPoint = CGPoint(x: 0.0, y: 0.0) + gradient.endPoint = CGPoint(x: 1.0, y: 0.0) + button.layer.insertSublayer(gradient, at: 0) + + stackView.addArrangedSubview(label) + stackView.addArrangedSubview(icon) + button.addSubview(stackView) + stackView.snp.makeConstraints { make in + make.center.equalTo(button) + } + button.isEnabled = false + return button + }() + + private lazy var drinkBottleImageView: UIImageView = { + let image = UIImage(named: drinkType.rawValue + "Bottle") + let imageView = UIImageView(image: image) + imageView.contentMode = .scaleAspectFill + return imageView + }() + + override func viewDidLoad() { + super.viewDidLoad() + bind() + setupLayouts() + setupHandlers() + viewModel.state.currentType.send(drinkType) // FIXME: - 드래그 조금만 해도 호출돼서 버그있음 + } +} + +private extension DrinkTypeViewController { + + private func bind() { + viewModel.state.addedTypes + .receive(on: DispatchQueue.main) + .sink { [weak self] addedTypes in + guard let self = self else { return } + let isTypeAdded = addedTypes.contains(self.drinkType) + UIView.transition(with: view, duration: 0.5, options: .transitionCrossDissolve) { + self.addDrinkTypeButton.isHidden = isTypeAdded + self.addedDrinkTypeButton.isHidden = !isTypeAdded + } + if !isTypeAdded, addedTypes.count < 3 { + self.addDrinkTypeButton.isEnabled = true + self.addDrinkTypeButton.layer.opacity = 1.0 + } + } + .store(in: &cancellables) + } + + private func setupLayouts() { + view.addSubview(typeTitleImageView) + typeTitleImageView.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.top.equalTo(view.safeAreaLayoutGuide) + } + + view.addSubview(addDrinkTypeButton) + addDrinkTypeButton.snp.makeConstraints { make in + make.top.equalTo(typeTitleImageView.snp_bottomMargin).offset(30) + make.centerX.equalToSuperview() + make.height.equalTo(40) + make.width.equalTo(110) + } + + view.addSubview(addedDrinkTypeButton) + addedDrinkTypeButton.snp.makeConstraints { make in + make.top.equalTo(typeTitleImageView.snp_bottomMargin).offset(30) + make.centerX.equalToSuperview() + make.height.equalTo(40) + make.width.equalTo(110) + } + addedDrinkTypeButton.isHidden = true + + view.addSubview(drinkBottleImageView) + drinkBottleImageView.snp.makeConstraints { make in + make.bottom.equalToSuperview() + make.width.equalToSuperview() + make.centerX.equalToSuperview() + } + } + + private func setupHandlers() { + addDrinkTypeButton.addTarget(self, action: #selector(addDrinkType), for: .touchUpInside) + } + + @objc private func addDrinkType() { + viewModel.addType(drinkType) + } +} diff --git a/Targets/Mashow/Sources/DrinkSelection/ViewModel/DrinkSelectionViewModel.swift b/Targets/Mashow/Sources/DrinkSelection/ViewModel/DrinkSelectionViewModel.swift new file mode 100644 index 0000000..f5f0ffe --- /dev/null +++ b/Targets/Mashow/Sources/DrinkSelection/ViewModel/DrinkSelectionViewModel.swift @@ -0,0 +1,39 @@ +// +// DrinkSelectionViewModel.swift +// Mashow +// +// Created by ZENA on 8/5/24. +// Copyright © 2024 com.alcoholers. All rights reserved. +// + +import UIKit +import Combine + +class DrinkSelectionViewModel { + + struct State { + var currentType = CurrentValueSubject(DrinkType.soju) + var addedTypes = CurrentValueSubject<[DrinkType], Never>([]) + } + + var state: State + + init(state: State) { + self.state = state + } + + func addType(_ type: DrinkType) { + var current = state.addedTypes.value + guard state.addedTypes.value.count < 3, !current.contains(type) else { return } + current.append(type) + state.addedTypes.send(current) + } + + func removeType(_ type: DrinkType) { + var current = state.addedTypes.value + guard current.contains(type) else { return } + guard let targetIndex = current.firstIndex(of: type) else { return } + current.remove(at: targetIndex) + state.addedTypes.send(current) + } +} diff --git a/Targets/Mashow/Sources/Root/MashowRootViewController.swift b/Targets/Mashow/Sources/Root/MashowRootViewController.swift index 822a011..f965f46 100644 --- a/Targets/Mashow/Sources/Root/MashowRootViewController.swift +++ b/Targets/Mashow/Sources/Root/MashowRootViewController.swift @@ -22,6 +22,7 @@ class MashowRootViewController: UIViewController { // Remove back button title("Back") navigationItem.backButtonTitle = "" + navigationController?.pushViewController(DrinkSelectionViewController(viewModel: DrinkSelectionViewModel(state: DrinkSelectionViewModel.State())), animated: true) } private func bind() {