Explorar o código

1.修改Android RAImage调整扫码按钮和照片删除按钮。

Pen Li %!s(int64=7) %!d(string=hai) anos
pai
achega
58d1be71e0

+ 3 - 6
ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/zxing/codescanner/CaptureActivity.java

@@ -136,8 +136,7 @@ public final class CaptureActivity extends Activity implements
 
 		swith_button = (Button) findViewById(R.id.btn_switch);
 		swith_button.setTag("false");
-		swith_button.setBackgroundColor(getResources().getColor(
-				R.color.message_fail));
+		swith_button.setBackground(getDrawable(R.drawable.ra_redbg_round_corner_25));
 		swith_button.setOnClickListener(new OnClickListener()
 		{
 
@@ -151,16 +150,14 @@ public final class CaptureActivity extends Activity implements
 				{
 					// inactivityTimer.onResume();
 					v.setTag("true");
-					v.setBackgroundColor(getResources().getColor(
-							R.color.message_success));
+					v.setBackground(getDrawable(R.drawable.ra_greenbg_round_corner_25));
 				}
 				else
 				{
 
 					// inactivityTimer.onPause();
 					v.setTag("false");
-					v.setBackgroundColor(getResources().getColor(
-							R.color.message_fail));
+					v.setBackground(getDrawable(R.drawable.ra_redbg_round_corner_25));
 				}
 
 			}

+ 12 - 0
ApexDrivers/RAUtilsLibrary/src/main/res/drawable/ra_greenbg_round_corner_25.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="25dp"
+        />
+
+    <solid
+        android:color="#ee00ff00"
+        />
+
+</shape>

+ 12 - 0
ApexDrivers/RAUtilsLibrary/src/main/res/drawable/ra_redbg_round_corner_25.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="25dp"
+        />
+
+    <solid
+        android:color="#eeff0000"
+        />
+
+</shape>

+ 1 - 0
ApexDrivers/RAUtilsLibrary/src/main/res/layout/capture.xml

@@ -210,6 +210,7 @@
       android:layout_height="50dp"
       android:layout_marginRight="20dp"
       android:layout_gravity="center_vertical|right"
+      android:background="@drawable/ra_redbg_round_corner_25"
       android:text="" />
 
 </merge>

+ 36 - 0
ApexDrivers/raimage/src/main/res/drawable/delete_btn_bg.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+
+        <shape>
+
+            <corners
+                android:radius="10dp"
+                />
+
+            <solid
+                android:color="#00000000"
+                />
+
+        </shape>
+
+    </item>
+
+    <item android:state_pressed="true">
+
+        <shape>
+
+            <corners
+                android:radius="10dp"
+                />
+
+            <solid
+                android:color="#aaeeeeee"
+                />
+
+        </shape>
+
+    </item>
+
+</selector>

+ 19 - 7
ApexDrivers/raimage/src/main/res/layout/activity_photo_grid.xml

@@ -26,14 +26,26 @@
         android:background="@color/dark_gray"
         />
 
-    <Button
-        android:id="@+id/grid_photo_delete_btn"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="delete"
-        android:textSize="15sp"
-        android:textAllCaps="false"
-        />
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        >
+
+        <Button
+            android:id="@+id/grid_photo_delete_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="15dp"
+            android:background="@drawable/delete_btn_bg"
+            android:text="delete"
+            android:textSize="20sp"
+            android:textColor="#3283FF"
+            android:textAllCaps="false"
+            />
 
+    </RelativeLayout>
 
 </LinearLayout>