DO cocoa

inter/sgp/menu/lang.tsv

@@ -43,7 +43,7 @@ TextID	Note	English	Thai
 		Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
 		Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,Align=Center
 		Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0xCFCFCF,Align=Center
-000040		Not sweet	ไม่หวาน
+ 		Not sweet	ไม่หวาน
 000041		Little	หวานจุบจิบ
 000042		Less	หวานน้อย
 000043		Perfect	หวานพอดี

inter/sgp/xml/page_brewing3.lxml

@@ -2,9 +2,14 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+
+	If UsePepsiTheme = 1 Then
+		Open "ROOT/taobin_project/inter/sgp/xml/page_brewing3_blue.lxml"
+	EndIf
+
 	Var SendNotiPaySuccess = 2
 
 	Var GetMoreStrawCount = 2
@@ -27,6 +32,12 @@
 
 	Var DirImageDoing = CountryRootPath + "/image/page_doing"
 
+	If UsePepsiTheme = 1 Then
+		Var DirImageDoing = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing"
+	EndIf
+
+	DEBUGVAR BackgroundColor
+
 	Var SelectDrink = Seeker.selected_a_drink
 	Var ExtendData = Seeker.ExtendData
 
@@ -56,7 +67,6 @@
 		Var IMG_CNT = DirImageDoing + "/img2_eng.png"
 
 		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
-
 		Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw_en.png"
 		Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw_en.png"
 
@@ -73,6 +83,19 @@
 		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
 		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
 
+		DEBUGVAR bnGetMoreStrawFileName
+		DEBUGVAR bnStrawProblemReport
+		DEBUGVAR bnLidProblemReport
+		DEBUGVAR bn_get_lid_image
+
+		;If UsePepsiTheme = 1 Then
+		;	Var brew_txt2 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv3_en.png"
+		;	Var brew_txt1 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv1_en.png"
+		;EndIf
+
+		DEBUGVAR EnableGetMoreStrawFileName
+		DEBUGVAR GetLidButtonState
+
 		Var XStraw = 274
 	Else
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
@@ -232,6 +255,11 @@
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment"
+			Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en"
+		EndIf
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
@@ -436,6 +464,10 @@
 		Var ShowCountdown = "Invisible"
 
 		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
+		EndIf
 	EndIf
 
 	If XPercent = 0 Then
@@ -1585,7 +1617,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> BodyTextColor </Color>
 <Value> XPercent </Value>
 </Text>
 

inter/sgp/xml/page_collect_point_1.lxml

@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 ;<Refresh> "Partial" </Refresh>
 <EventOpen>
@@ -40,6 +40,13 @@
 		;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+			Var DirImage = DirImage + "/image/collect_point1_en"
+
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_eng.png"
+		EndIf
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collect_point1"
 		;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
@@ -425,6 +432,11 @@
 		Var ShowCountdown = "Invisible"
 
 		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
+
+		EndIf
 	EndIf
 
 	If XPercent = 0 Then
@@ -433,6 +445,51 @@
 		Var XPercent = 0
 	EndIf
 
+	Var AlphaBg = "ROOT/taobin_project/image/collectiing/alpha.png"
+	Var NumImgDir = "ROOT/taobin_project/image/collectiing/"
+
+	If UsePepsiTheme = 1 Then
+		Var AlphaBg = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/alpha.png"
+		Var NumImgDir = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/"
+	EndIf
+
+	Var bn_NumPad1 = NumImgDir + "bn_1.png"
+	Var bp_NumPad1 = NumImgDir + "bp_1.png"
+
+	Var bn_NumPad2 = NumImgDir + "bn_2.png"
+	Var bp_NumPad2 = NumImgDir + "bp_2.png"
+
+	Var bn_NumPad3 = NumImgDir + "bn_3.png"
+	Var bp_NumPad3 = NumImgDir + "bp_3.png"
+
+	Var bn_NumPad4 = NumImgDir + "bn_4.png"
+	Var bp_NumPad4 = NumImgDir + "bp_4.png"
+
+	Var bn_NumPad5 = NumImgDir + "bn_5.png"
+	Var bp_NumPad5 = NumImgDir + "bp_5.png"
+
+	Var bn_NumPad6 = NumImgDir + "bn_6.png"
+	Var bp_NumPad6 = NumImgDir + "bp_6.png"
+
+	Var bn_NumPad7 = NumImgDir + "bn_7.png"
+	Var bp_NumPad7 = NumImgDir + "bp_7.png"
+
+	Var bn_NumPad8 = NumImgDir + "bn_8.png"
+	Var bp_NumPad8 = NumImgDir + "bp_8.png"
+
+	Var bn_NumPad9 = NumImgDir + "bn_9.png"
+	Var bp_NumPad9 = NumImgDir + "bp_9.png"
+
+	Var bn_NumPad0 = NumImgDir + "bn_0.png"
+	Var bp_NumPad0 = NumImgDir + "bp_0.png"
+
+	Var bn_NumPadBack = NumImgDir + "bn_back-1.png"
+	Var bp_NumPadBack = NumImgDir + "bp_back-1.png"
+
+	Var TextEditImg = DirImage + "/text_edit.png"
+
+	DEBUGVAR TextEditImg
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -509,7 +566,7 @@
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+<Filename> AlphaBg </Filename>
 </Image>
 
 
@@ -524,8 +581,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
+<Filename> bn_NumPad1 </Filename>
+<FilenamePress> bp_NumPad1 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -554,8 +611,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
+<Filename> bn_NumPad2 </Filename>
+<FilenamePress> bp_NumPad2 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -579,8 +636,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
+<Filename> bn_NumPad3 </Filename>
+<FilenamePress> bp_NumPad3 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -604,8 +661,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
+<Filename> bn_NumPad4 </Filename>
+<FilenamePress> bp_NumPad4 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -629,8 +686,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
+<Filename> bn_NumPad5 </Filename>
+<FilenamePress> bp_NumPad5 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -654,8 +711,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
+<Filename> bn_NumPad6 </Filename>
+<FilenamePress> bp_NumPad6 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -679,8 +736,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
+<Filename> bn_NumPad7 </Filename>
+<FilenamePress> bp_NumPad7 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -704,8 +761,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
+<Filename> bn_NumPad8 </Filename>
+<FilenamePress> bp_NumPad8 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -729,8 +786,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
+<Filename> bn_NumPad9 </Filename>
+<FilenamePress> bp_NumPad9 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -755,8 +812,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1517 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
+<Filename> bn_NumPad0 </Filename>
+<FilenamePress> bp_NumPad0 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -780,8 +837,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1517 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
+<Filename> bn_NumPadBack </Filename>
+<FilenamePress> bp_NumPadBack </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -813,7 +870,7 @@
 <Align> Center </Align>
 <Size> 62 </Size>
 <Font> RobotoBlack </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> TelephoneNumber </Value>
 <Format> Telnum-mask-3 </Format>
 </Text>
@@ -1023,14 +1080,14 @@
 <Image>
 <X> 217 </X>
 <Y> 866 </Y>
-<Filename> "ROOT/taobin_project/image/collect_point1/img3.png" </Filename>
+<Filename> Var( DirImage + "/img3.png") </Filename>
 </Image>
 
 <Image>
 <X> 157 </X>
 <Y> 868 </Y>
 <State> ShowTextNumber </State>
-<Filename> Var( DirImage + "/text_edit.png") </Filename>
+<Filename> TextEditImg </Filename>
 </Image>
 
 
@@ -1104,7 +1161,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> XPercent </Value>
 </Text>
 

inter/sgp/xml/page_member_prompt.lxml

@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
 
@@ -22,12 +22,20 @@
 
     ; img
     Var ImgDir = CountryRootPath + "/image/page_member/"
+    Var ImgDirStatic = CountryRootPath + "/image/page_member/"
+
+    If UsePepsiTheme = 1 Then
+        Var ImgDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var ImgDir = ImgDir + "/image/page_member/"
+    EndIf
+
+
     Var PromptDialogImg = ImgDir + "ask_member_dialog.png"
     Var YesButton = ImgDir + "bn_yes.png"
     Var NoButton = ImgDir + "bn_no.png"
     Var YesPressButton = ImgDir + "bp_yes.png"
     Var NoPressButton = ImgDir + "bp_no.png"
-    Var QRImg = ImgDir + "qr_regis.png"
+    Var QRImg = ImgDirStatic + "qr_regis.png"
     
     Var UseSGPCollectFlag = 0
 
@@ -35,6 +43,7 @@
     DEBUGVAR ChangeFlag2
 
     Var IMG_CNT = ImgDir + "img2_sp_eng.png"
+    DEBUGVAR IMG_CNT
 
 </EventOpen>
 
@@ -123,7 +132,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> RemainingInThisPage </Value>
 </Text>
 
@@ -136,7 +145,7 @@
 <Width> 1080 </Width>
 <Font> KanitRegularTTF </Font>
 <State> DisplayQR </State>
-<Color> 0xDE794E </Color>
+<Color> HeadlineColor </Color>
 <Value> "Please scan QR to register" </Value>
 </Text>