From a5a485e98912935e3b9d4371193c54de070d66de Mon Sep 17 00:00:00 2001
From: wutaian <Wutaian@psunsky.com>
Date: Thu, 14 Mar 2019 15:05:19 +0800
Subject: [PATCH] 修改提交，弃权，反对按钮样式，添加颜色

---
 C5/app/src/main/res/drawable/agree_selector.xml        |  8 ++++----
 C5/app/src/main/res/drawable/darkgrey_round_button.xml |  9 +++++++++
 C5/app/src/main/res/drawable/green_round_button.xml    |  9 +++++++++
 C5/app/src/main/res/drawable/oppos_selector.xml        |  8 ++++----
 C5/app/src/main/res/drawable/red_round_button.xml      |  9 +++++++++
 C5/app/src/main/res/drawable/signin_selector.xml       |  2 --
 C5/app/src/main/res/drawable/yellow_round_button.xml   |  9 +++++++++
 C5/app/src/main/res/layout/fragment_election.xml       | 23 ++++++++++++-----------
 C5/app/src/main/res/values/color.xml                   |  3 +++
 9 files changed, 59 insertions(+), 21 deletions(-)
 create mode 100644 C5/app/src/main/res/drawable/darkgrey_round_button.xml
 create mode 100644 C5/app/src/main/res/drawable/green_round_button.xml
 create mode 100644 C5/app/src/main/res/drawable/red_round_button.xml
 create mode 100644 C5/app/src/main/res/drawable/yellow_round_button.xml

diff --git a/C5/app/src/main/res/drawable/agree_selector.xml b/C5/app/src/main/res/drawable/agree_selector.xml
index 55ca8fe..eb57388 100644
--- a/C5/app/src/main/res/drawable/agree_selector.xml
+++ b/C5/app/src/main/res/drawable/agree_selector.xml
@@ -2,10 +2,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     
 	<!-- 点击后的颜色 -->
-	<item android:state_pressed="true" android:drawable="@drawable/btn_signin_d"/>
-	<item android:state_focused="true" android:drawable="@drawable/btn_agree"/>
+	<item android:state_pressed="true" android:drawable="@drawable/darkgrey_round_button"/>
+	<item android:state_focused="true" android:drawable="@drawable/green_round_button"/>
 
-	<item android:state_enabled="false" android:drawable="@drawable/btn_signin_d"/>
+	<item android:state_enabled="false" android:drawable="@drawable/darkgrey_round_button"/>
 	<!-- 默认 -->
-	<item android:drawable="@drawable/btn_agree"/>
+	<item android:drawable="@drawable/green_round_button"/>
 </selector>
diff --git a/C5/app/src/main/res/drawable/darkgrey_round_button.xml b/C5/app/src/main/res/drawable/darkgrey_round_button.xml
new file mode 100644
index 0000000..7aefa95
--- /dev/null
+++ b/C5/app/src/main/res/drawable/darkgrey_round_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/darkgrey" />
+    <!-- 圆角的半径 -->
+    <corners android:radius="@dimen/px2dp_10" />
+</shape>
diff --git a/C5/app/src/main/res/drawable/green_round_button.xml b/C5/app/src/main/res/drawable/green_round_button.xml
new file mode 100644
index 0000000..9bd57c3
--- /dev/null
+++ b/C5/app/src/main/res/drawable/green_round_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/green1" />
+    <!-- 圆角的半径 -->
+    <corners android:radius="@dimen/px2dp_10" />
+</shape>
diff --git a/C5/app/src/main/res/drawable/oppos_selector.xml b/C5/app/src/main/res/drawable/oppos_selector.xml
index 2dd9cd7..0a2e8ff 100644
--- a/C5/app/src/main/res/drawable/oppos_selector.xml
+++ b/C5/app/src/main/res/drawable/oppos_selector.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <!-- 点击后的颜色 -->
-	<item android:state_pressed="true" android:drawable="@drawable/btn_signin_d"/>
-	<item android:state_focused="true" android:drawable="@drawable/btn_oppose"/>
+	<item android:state_pressed="true" android:drawable="@drawable/darkgrey_round_button"/>
+	<item android:state_focused="true" android:drawable="@drawable/red_round_button"/>
 
-	<item android:state_enabled="false" android:drawable="@drawable/btn_signin_d"/>
+	<item android:state_enabled="false" android:drawable="@drawable/darkgrey_round_button"/>
 	<!-- 默认 -->
-	<item android:drawable="@drawable/btn_oppose"/>
+	<item android:drawable="@drawable/red_round_button"/>
 	    
 </selector>
diff --git a/C5/app/src/main/res/drawable/red_round_button.xml b/C5/app/src/main/res/drawable/red_round_button.xml
new file mode 100644
index 0000000..5848916
--- /dev/null
+++ b/C5/app/src/main/res/drawable/red_round_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/red1" />
+    <!-- 圆角的半径 -->
+    <corners android:radius="@dimen/px2dp_10" />
+</shape>
diff --git a/C5/app/src/main/res/drawable/signin_selector.xml b/C5/app/src/main/res/drawable/signin_selector.xml
index d085e8e..4feecf5 100644
--- a/C5/app/src/main/res/drawable/signin_selector.xml
+++ b/C5/app/src/main/res/drawable/signin_selector.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     
-    
     <!-- 点击后的颜色 -->
 	<item android:state_pressed="true" android:drawable="@drawable/btn_signin_disable"/>
 	<item android:state_focused="true" android:drawable="@drawable/btn_signin_enable"/>
@@ -10,5 +9,4 @@
 	<!-- 默认 -->
 	<item android:drawable="@drawable/btn_signin_enable"/>
     
-
 </selector>
diff --git a/C5/app/src/main/res/drawable/yellow_round_button.xml b/C5/app/src/main/res/drawable/yellow_round_button.xml
new file mode 100644
index 0000000..8da50fa
--- /dev/null
+++ b/C5/app/src/main/res/drawable/yellow_round_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/yellow" />
+    <!-- 圆角的半径 -->
+    <corners android:radius="@dimen/px2dp_10" />
+</shape>
diff --git a/C5/app/src/main/res/layout/fragment_election.xml b/C5/app/src/main/res/layout/fragment_election.xml
index 79df4c8..53ceefe 100644
--- a/C5/app/src/main/res/layout/fragment_election.xml
+++ b/C5/app/src/main/res/layout/fragment_election.xml
@@ -37,12 +37,12 @@
 
         <Button
             android:id="@+id/list_election_item_add_btn"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
+            android:layout_width="@dimen/px2dp_320"
+            android:layout_height="@dimen/px2dp_90"
             android:background="@drawable/agree_selector"
             android:text="@string/select_other"
             android:textColor="@color/white"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="@dimen/px2dp_206"
             android:textSize="@dimen/big_text_p5" />
 
     </LinearLayout>
@@ -100,7 +100,7 @@
     <RelativeLayout
         android:id="@+id/election_pannal_bottom"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/linear_heigh"
+        android:layout_height="@dimen/px2dp_138"
         android:layout_alignParentBottom="true"
         android:alpha="0.9"
         android:background="@drawable/gray_alpha"
@@ -108,26 +108,26 @@
 
         <Button
             android:id="@+id/election_btn_confirm"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/px2dp_420"
+            android:layout_height="@dimen/px2dp_110"
             android:layout_centerInParent="true"
             android:layout_marginRight="@dimen/content_margin"
             android:background="@drawable/oppos_selector"
             android:text="@string/confirm_submit"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5"
+            android:textSize="@dimen/px2sp_60"
             android:textStyle="bold" />
 
         <Button
             android:id="@+id/election_btn_modify"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/px2dp_420"
+            android:layout_height="@dimen/px2dp_110"
             android:layout_centerInParent="true"
             android:layout_marginRight="@dimen/content_margin"
             android:background="@drawable/signin_selector"
             android:text="@string/modify"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5"
+            android:textSize="@dimen/px2sp_60"
             android:textStyle="bold"
             android:visibility="invisible" />
     </RelativeLayout>
@@ -220,7 +220,8 @@
         android:layout_marginRight="20dp"
         android:layout_marginTop="50dp"
         android:background="@drawable/right_control"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone">
 
         <ImageView
             android:id="@+id/election_pageup"
diff --git a/C5/app/src/main/res/values/color.xml b/C5/app/src/main/res/values/color.xml
index e45cfd7..b2fded4 100644
--- a/C5/app/src/main/res/values/color.xml
+++ b/C5/app/src/main/res/values/color.xml
@@ -164,4 +164,7 @@
 
     <color name="titile_background_1">#450603</color>
 
+    <color name="green1">#00964d</color> <!--绿色 -->
+    <color name="red1">#d50c00</color> <!--红色 -->
+
 </resources>
\ No newline at end of file
--
libgit2 0.21.4