From 32a0e59cb1e0894a1c524dd6a2991f1204fe4a1d Mon Sep 17 00:00:00 2001 From: Jeongbae Kong Date: Wed, 22 Apr 2020 10:59:52 +0900 Subject: [PATCH] merged and enable to compile for coupon+profile --- .DS_Store | Bin 10244 -> 10244 bytes .../User Interface/View/CouponBox.storyboard | 84 +++++++++--------- .../couponImage.imageset/Contents.json | 21 +++++ .../couponImage.imageset/couponImage.png | Bin 0 -> 1025 bytes .../right.imageset/Contents.json | 21 +++++ .../Assets.xcassets/right.imageset/right.png | Bin 0 -> 671 bytes 6 files changed, 83 insertions(+), 43 deletions(-) create mode 100644 GME Remit/Supported Files/Assets.xcassets/couponImage.imageset/Contents.json create mode 100644 GME Remit/Supported Files/Assets.xcassets/couponImage.imageset/couponImage.png create mode 100644 GME Remit/Supported Files/Assets.xcassets/right.imageset/Contents.json create mode 100644 GME Remit/Supported Files/Assets.xcassets/right.imageset/right.png diff --git a/.DS_Store b/.DS_Store index 05cbe10831f59cd2b3465377ea2b942303892b80..748fb0e1b78ab95f8ce86ea6e005e438b82fe232 100644 GIT binary patch delta 37 rcmZn(XbITxMx1Hk&B+E529xC^CNN!Km|Q5Ou=#?73_nPCgSZ#~7N!mU delta 37 rcmZn(XbITxMx3cVc(Q?n!DKm!2}~OpCKpO6Y`!2N!w(YPAT9;~|AP#k diff --git a/GME Remit/Modules/RewardModules/CouponBox/User Interface/View/CouponBox.storyboard b/GME Remit/Modules/RewardModules/CouponBox/User Interface/View/CouponBox.storyboard index 57a2bd00..b5af98fe 100644 --- a/GME Remit/Modules/RewardModules/CouponBox/User Interface/View/CouponBox.storyboard +++ b/GME Remit/Modules/RewardModules/CouponBox/User Interface/View/CouponBox.storyboard @@ -1,9 +1,9 @@ - + - + @@ -26,7 +26,7 @@ - + @@ -52,23 +52,23 @@ - + - + - - + + - - + + - + - - + - - + - - - + + - - + + - - - - - - + + + + + - - - - - + + + + - - - - - - + + + + + + - + - + diff --git a/GME Remit/Supported Files/Assets.xcassets/couponImage.imageset/Contents.json b/GME Remit/Supported Files/Assets.xcassets/couponImage.imageset/Contents.json new file mode 100644 index 00000000..5a69434f --- /dev/null +++ b/GME Remit/Supported Files/Assets.xcassets/couponImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "couponImage.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GME Remit/Supported Files/Assets.xcassets/couponImage.imageset/couponImage.png b/GME Remit/Supported Files/Assets.xcassets/couponImage.imageset/couponImage.png new file mode 100644 index 0000000000000000000000000000000000000000..f0bb16e29eb9a4da625ac87769b85b9c7bb08c52 GIT binary patch literal 1025 zcmV+c1pfPpP)PcYPpP z=)y${#k7?Qqfn#_z6*_DeIN?8WTAqOEOjHO&`O0um0E~GlajQiA+MQ9CNp#AyPu0Y znYlCfCTSwXP5!Hy^L^j>pa1#Jcg}@PY~p{047~LDyEr<97Gooc4Z%UnDGNuZ{^@Ho zoUr&dHD4_Nu+SUjxnzikTdYPm5blQ3sQcIK0IMC)P#OVkL%0VdN(1jqwUO@@eQqpSlt znum+T|0)HntW`ar=Rwa_$;-BbA)+mb@O9UBx&68AAuG2#f)n-JiqdETf?KQlDjW)n zWiI}Bo#D&3R8!m|%_c#H5qsjnbATi~k?FEKrl`8}5_ z?mGO=^UqoUsWS(!0FQofV(`sv=kv$Mo{q<~P%Xf^T3EMw_~FYxi-Ladz_9}-mTYxJ zI32!rvSo7n-q5Y`1Er)DP=v1f%tsecGj_!`58?3qdeiNw~~SCC&scM`sZ{y z?Rf3JKA^SMS}Ki6X>{4Mf1P(<^Np|LHDFI9%V|H=>Yt5D{Aj vj+}cNabDf%k5UmSYweucNX|`cA`t%qa0sgd6Tm9b00000NkvXXu0mjf2u$)h literal 0 HcmV?d00001 diff --git a/GME Remit/Supported Files/Assets.xcassets/right.imageset/Contents.json b/GME Remit/Supported Files/Assets.xcassets/right.imageset/Contents.json new file mode 100644 index 00000000..9d750f4f --- /dev/null +++ b/GME Remit/Supported Files/Assets.xcassets/right.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "right.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GME Remit/Supported Files/Assets.xcassets/right.imageset/right.png b/GME Remit/Supported Files/Assets.xcassets/right.imageset/right.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e822c8c7eca5968aa84c4b921a17b7a31ebdb8 GIT binary patch literal 671 zcmV;Q0$}}#P)t1UgP#>KzR)=4c1cQ?w-rK?+)L$ z`^+NeE6EVo-}BC!jQpRIU~Ft%jZX z%}bPnMi~73c-%{@Hiue?yuVF|K! zH$LAieC{Z;9(_XaqW5N5F6(P6!9JsO9zNHD&;L2e=0qN2sHbL4e(TjHHdA&Y{f2#C z$ELy0z35MHug&&>l_qVS2Y(X&z$WZD?9aVf*F8zTpqyD-W6K=MzhRBU_Advegs}5) zYpi_HOS64{1)Xzf>#(85fE)&8p|lA7XgQl813Wh?r}uhrg-v)YLMuT<+^3qbS+Op_ zBV%NcM`ru}!w$7}L!kIs4lGFMOh2Z*GTUd^_Jgp)Xjwv6VY&`xhigN&7R1^csm65u z%?<-vh|yJ;cEN0&P1n<`E2i(RTQ{!9J+s3%{jDF@i`aGR&P2DrX5-`J=!)b z7Nu6Y8nbSiE=J8}@x$QvZNhD^TZLJ7O^a`Os2Dd}D%Ywo>$>TZRVYlM3bXE;M(7`C zx;nG&o3;V^tIo0rn?bY0W3&B3i!!vy4??BO=l$)X0INg!wHKN;UlG{;2Tb3!kQOtW zPrxs-17LrR58h!!1A{4~F*>tDW>|FK2kS<`C>RB!007fD(y18h8dCrO002ovPDHLk FV1jgMLGAzm literal 0 HcmV?d00001