sync resources

赵康
1 parent bc5e48d712
Showing 8 changed files with 40 additions and 23 deletions Side-by-side Diff
android/GameSDKRelease/res/drawable-hdpi/logo_cherry.png
android/GameSDKRelease/res/drawable-mdpi/logo_cherry.png
android/GameSDKRelease/res/drawable-xhdpi/logo_cherry.png
android/GameSDKRelease/res/drawable/com_facebook_button_blue.xml
android/GameSDKRelease/res/layout/fragment_payment_choice.xml
android/GameSDKRelease/res/layout/fragment_sign_choice.xml
android/GameSDKRelease/res/values/colors.xml
android/GameSDKRelease/res/values/strings.xml
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
  
-  <item
-      android:drawable="@drawable/com_facebook_button_blue_pressed"
-      android:state_focused="true"
-      android:state_pressed="true"
-      />
-  <item
-      android:drawable="@drawable/com_facebook_button_blue_pressed"
-      android:state_focused="false"
-      android:state_pressed="true"
-      />
-  <item
-      android:drawable="@drawable/com_facebook_button_blue_focused"
-      android:state_focused="true"
-      />
-  <item
-      android:drawable="@drawable/com_facebook_button_blue_normal"
-      android:state_focused="false"
-      android:state_pressed="false"
-      />
+    <item android:drawable="@drawable/com_facebook_button_blue_pressed" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/com_facebook_button_blue_pressed" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@drawable/com_facebook_button_blue_normal"/>
  
 </selector>
@@ -535,6 +535,29 @@
                 android:layout_marginRight="45dp"
                 android:src="@drawable/arrow_tag" />
         </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_cherry"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_cherry" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
     </LinearLayout>
  
 </ScrollView>
 \ No newline at end of file
@@ -38,7 +38,8 @@
         android:layout_marginTop="23dp"
         android:background="@drawable/btn_orange_bg"
         android:padding="5dp"
-        android:text="Play"
+        android:text="@string/quick_play"
+        android:textStyle="bold"
         android:textColor="@android:color/white"
         android:textSize="16sp" />
  
@@ -47,13 +48,18 @@
         android:layout_height="2dp"
         android:background="@drawable/dash_line" />
  
-    <com.facebook.widget.LoginButton
+    <Button
         android:id="@+id/fb_login"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="13dp"
         android:layout_marginRight="13dp"
-        android:layout_marginTop="10dp" />
+        android:layout_marginTop="10dp"
+        android:background="@drawable/com_facebook_button_blue"
+        android:text="@string/fb_login"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:textStyle="bold" />
  
     <Button
         android:id="@+id/gump_login"
@@ -67,6 +73,7 @@
         android:gravity="center"
         android:text="@string/gump_login"
         android:textColor="@android:color/white"
-        android:textSize="15sp" />
+        android:textSize="15sp"
+        android:textStyle="bold" />
  
 </LinearLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
  
+    <color name="white">#FFFFFF</color>
     <color name="line">#e5e5e5</color>
     <color name="light_gray">#c9c9c9</color>
     <color name="dark_gray">#d9d9d9</color>
@@ -22,6 +22,7 @@
     <string name="bind_fail">Bound failed</string>
     <string name="net_error">Internet unavailable, please check</string>
     <string name="gump_login">Login with Gumptech</string>
+    <string name="fb_login">Login with Facebook</string>
     <string name="signup_success">Sign Up Successfully</string>
     <!-- facebook -->
     <string name="com_facebook_dialogloginactivity_ok_button">OK</string>
@@ -77,6 +78,7 @@
     <string name="title_vnpt_vtt">Viettel</string>
     <string name="title_vnpt_mgc">MegaCard</string>
     <string name="title_coda">Coda Payment</string>
+    <string name="title_cherry">Cherry Credits</string>
     <string name="title_payment_choice">Select payment methods</string>
     <!-- summary title -->
     <string name="summary_title">Price list:</string>
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<selector xmlns:android="http://schemas.android.com/apk/res/android">
3	3
4		- <item
5		- android:drawable="@drawable/com_facebook_button_blue_pressed"
6		- android:state_focused="true"
7		- android:state_pressed="true"
8		- />
9		- <item
10		- android:drawable="@drawable/com_facebook_button_blue_pressed"
11		- android:state_focused="false"
12		- android:state_pressed="true"
13		- />
14		- <item
15		- android:drawable="@drawable/com_facebook_button_blue_focused"
16		- android:state_focused="true"
17		- />
18		- <item
19		- android:drawable="@drawable/com_facebook_button_blue_normal"
20		- android:state_focused="false"
21		- android:state_pressed="false"
22		- />
	4	+ <item android:drawable="@drawable/com_facebook_button_blue_pressed" android:state_focused="true" android:state_pressed="true"/>
	5	+ <item android:drawable="@drawable/com_facebook_button_blue_pressed" android:state_focused="false" android:state_pressed="true"/>
	6	+ <item android:drawable="@drawable/com_facebook_button_blue_normal"/>
23	7
24	8	</selector>
...	...	@@ -535,6 +535,29 @@
535	535	android:layout_marginRight="45dp"
536	536	android:src="@drawable/arrow_tag" />
537	537	</RelativeLayout>
	538	+
	539	+ <RelativeLayout
	540	+ android:id="@+id/item_cherry"
	541	+ android:layout_width="match_parent"
	542	+ android:layout_height="wrap_content"
	543	+ android:background="@drawable/payment_bg"
	544	+ android:visibility="gone" >
	545	+
	546	+ <ImageView
	547	+ android:layout_width="wrap_content"
	548	+ android:layout_height="wrap_content"
	549	+ android:layout_centerVertical="true"
	550	+ android:layout_marginLeft="10dp"
	551	+ android:src="@drawable/logo_cherry" />
	552	+
	553	+ <ImageView
	554	+ android:layout_width="wrap_content"
	555	+ android:layout_height="wrap_content"
	556	+ android:layout_alignParentRight="true"
	557	+ android:layout_centerVertical="true"
	558	+ android:layout_marginRight="45dp"
	559	+ android:src="@drawable/arrow_tag" />
	560	+ </RelativeLayout>
538	561	</LinearLayout>
539	562
540	563	</ScrollView>
541	564	\ No newline at end of file
...	...	@@ -38,7 +38,8 @@
38	38	android:layout_marginTop="23dp"
39	39	android:background="@drawable/btn_orange_bg"
40	40	android:padding="5dp"
41		- android:text="Play"
	41	+ android:text="@string/quick_play"
	42	+ android:textStyle="bold"
42	43	android:textColor="@android:color/white"
43	44	android:textSize="16sp" />
44	45
...	...	@@ -47,13 +48,18 @@
47	48	android:layout_height="2dp"
48	49	android:background="@drawable/dash_line" />
49	50
50		- <com.facebook.widget.LoginButton
	51	+ <Button
51	52	android:id="@+id/fb_login"
52	53	android:layout_width="fill_parent"
53	54	android:layout_height="wrap_content"
54	55	android:layout_marginLeft="13dp"
55	56	android:layout_marginRight="13dp"
56		- android:layout_marginTop="10dp" />
	57	+ android:layout_marginTop="10dp"
	58	+ android:background="@drawable/com_facebook_button_blue"
	59	+ android:text="@string/fb_login"
	60	+ android:textColor="@color/white"
	61	+ android:textSize="16sp"
	62	+ android:textStyle="bold" />
57	63
58	64	<Button
59	65	android:id="@+id/gump_login"
...	...	@@ -67,6 +73,7 @@
67	73	android:gravity="center"
68	74	android:text="@string/gump_login"
69	75	android:textColor="@android:color/white"
70		- android:textSize="15sp" />
	76	+ android:textSize="15sp"
	77	+ android:textStyle="bold" />
71	78
72	79	</LinearLayout>
73	80	\ No newline at end of file
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<resources>
3	3
	4	+ <color name="white">#FFFFFF</color>
4	5	<color name="line">#e5e5e5</color>
5	6	<color name="light_gray">#c9c9c9</color>
6	7	<color name="dark_gray">#d9d9d9</color>
...	...	@@ -22,6 +22,7 @@
22	22	<string name="bind_fail">Bound failed</string>
23	23	<string name="net_error">Internet unavailable, please check</string>
24	24	<string name="gump_login">Login with Gumptech</string>
	25	+ <string name="fb_login">Login with Facebook</string>
25	26	<string name="signup_success">Sign Up Successfully</string>
26	27	<!-- facebook -->
27	28	<string name="com_facebook_dialogloginactivity_ok_button">OK</string>
...	...	@@ -77,6 +78,7 @@
77	78	<string name="title_vnpt_vtt">Viettel</string>
78	79	<string name="title_vnpt_mgc">MegaCard</string>
79	80	<string name="title_coda">Coda Payment</string>
	81	+ <string name="title_cherry">Cherry Credits</string>
80	82	<string name="title_payment_choice">Select payment methods</string>
81	83	<!-- summary title -->
82	84	<string name="summary_title">Price list:</string>