孙向锦 / VoteC5

Commit a5a485e98912935e3b9d4371193c54de070d66de

Authored by wutaian
1 parent 74a0ade9

修改提交，弃权，反对按钮样式，添加颜色

Inline Side-by-side
Showing 9 changed files with 59 additions and 21 deletions
C5/app/src/main/res/drawable/agree_selector.xml
  View file @a5a485e
... ... @@ -2,10 +2,10 @@
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
3 3  
4 4 <!-- 点击后的颜色 -->
5   - <item android:state_pressed="true" android:drawable="@drawable/btn_signin_d"/>
6   - <item android:state_focused="true" android:drawable="@drawable/btn_agree"/>
  5 + <item android:state_pressed="true" android:drawable="@drawable/darkgrey_round_button"/>
  6 + <item android:state_focused="true" android:drawable="@drawable/green_round_button"/>
7 7  
8   - <item android:state_enabled="false" android:drawable="@drawable/btn_signin_d"/>
  8 + <item android:state_enabled="false" android:drawable="@drawable/darkgrey_round_button"/>
9 9 <!-- 默认 -->
10   - <item android:drawable="@drawable/btn_agree"/>
  10 + <item android:drawable="@drawable/green_round_button"/>
11 11 </selector>
... ...
C5/app/src/main/res/drawable/darkgrey_round_button.xml 0 → 100644
  View file @a5a485e
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<shape
  3 + xmlns:android="http://schemas.android.com/apk/res/android"
  4 + android:shape="rectangle">
  5 + <!-- 填充的颜色 -->
  6 + <solid android:color="@color/darkgrey" />
  7 + <!-- 圆角的半径 -->
  8 + <corners android:radius="@dimen/px2dp_10" />
  9 +</shape>
... ...
C5/app/src/main/res/drawable/green_round_button.xml 0 → 100644
  View file @a5a485e
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<shape
  3 + xmlns:android="http://schemas.android.com/apk/res/android"
  4 + android:shape="rectangle">
  5 + <!-- 填充的颜色 -->
  6 + <solid android:color="@color/green1" />
  7 + <!-- 圆角的半径 -->
  8 + <corners android:radius="@dimen/px2dp_10" />
  9 +</shape>
... ...
C5/app/src/main/res/drawable/oppos_selector.xml
  View file @a5a485e
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 android:state_pressed="true" android:drawable="@drawable/btn_signin_d"/>
5   - <item android:state_focused="true" android:drawable="@drawable/btn_oppose"/>
  4 + <item android:state_pressed="true" android:drawable="@drawable/darkgrey_round_button"/>
  5 + <item android:state_focused="true" android:drawable="@drawable/red_round_button"/>
6 6  
7   - <item android:state_enabled="false" android:drawable="@drawable/btn_signin_d"/>
  7 + <item android:state_enabled="false" android:drawable="@drawable/darkgrey_round_button"/>
8 8 <!-- 默认 -->
9   - <item android:drawable="@drawable/btn_oppose"/>
  9 + <item android:drawable="@drawable/red_round_button"/>
10 10  
11 11 </selector>
... ...
C5/app/src/main/res/drawable/red_round_button.xml 0 → 100644
  View file @a5a485e
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<shape
  3 + xmlns:android="http://schemas.android.com/apk/res/android"
  4 + android:shape="rectangle">
  5 + <!-- 填充的颜色 -->
  6 + <solid android:color="@color/red1" />
  7 + <!-- 圆角的半径 -->
  8 + <corners android:radius="@dimen/px2dp_10" />
  9 +</shape>
... ...
C5/app/src/main/res/drawable/signin_selector.xml
  View file @a5a485e
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
3 3  
4   -
5 4 <!-- 点击后的颜色 -->
6 5 <item android:state_pressed="true" android:drawable="@drawable/btn_signin_disable"/>
7 6 <item android:state_focused="true" android:drawable="@drawable/btn_signin_enable"/>
... ... @@ -10,5 +9,4 @@
10 9 <!-- 默认 -->
11 10 <item android:drawable="@drawable/btn_signin_enable"/>
12 11  
13   -
14 12 </selector>
... ...
C5/app/src/main/res/drawable/yellow_round_button.xml 0 → 100644
  View file @a5a485e
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<shape
  3 + xmlns:android="http://schemas.android.com/apk/res/android"
  4 + android:shape="rectangle">
  5 + <!-- 填充的颜色 -->
  6 + <solid android:color="@color/yellow" />
  7 + <!-- 圆角的半径 -->
  8 + <corners android:radius="@dimen/px2dp_10" />
  9 +</shape>
... ...
C5/app/src/main/res/layout/fragment_election.xml
  View file @a5a485e
... ... @@ -37,12 +37,12 @@
37 37  
38 38 <Button
39 39 android:id="@+id/list_election_item_add_btn"
40   - android:layout_width="120dp"
41   - android:layout_height="50dp"
  40 + android:layout_width="@dimen/px2dp_320"
  41 + android:layout_height="@dimen/px2dp_90"
42 42 android:background="@drawable/agree_selector"
43 43 android:text="@string/select_other"
44 44 android:textColor="@color/white"
45   - android:layout_marginRight="20dp"
  45 + android:layout_marginRight="@dimen/px2dp_206"
46 46 android:textSize="@dimen/big_text_p5" />
47 47  
48 48 </LinearLayout>
... ... @@ -100,7 +100,7 @@
100 100 <RelativeLayout
101 101 android:id="@+id/election_pannal_bottom"
102 102 android:layout_width="match_parent"
103   - android:layout_height="@dimen/linear_heigh"
  103 + android:layout_height="@dimen/px2dp_138"
104 104 android:layout_alignParentBottom="true"
105 105 android:alpha="0.9"
106 106 android:background="@drawable/gray_alpha"
... ... @@ -108,26 +108,26 @@
108 108  
109 109 <Button
110 110 android:id="@+id/election_btn_confirm"
111   - android:layout_width="@dimen/button_width"
112   - android:layout_height="wrap_content"
  111 + android:layout_width="@dimen/px2dp_420"
  112 + android:layout_height="@dimen/px2dp_110"
113 113 android:layout_centerInParent="true"
114 114 android:layout_marginRight="@dimen/content_margin"
115 115 android:background="@drawable/oppos_selector"
116 116 android:text="@string/confirm_submit"
117 117 android:textColor="@color/white"
118   - android:textSize="@dimen/big_text_p5"
  118 + android:textSize="@dimen/px2sp_60"
119 119 android:textStyle="bold" />
120 120  
121 121 <Button
122 122 android:id="@+id/election_btn_modify"
123   - android:layout_width="@dimen/button_width"
124   - android:layout_height="wrap_content"
  123 + android:layout_width="@dimen/px2dp_420"
  124 + android:layout_height="@dimen/px2dp_110"
125 125 android:layout_centerInParent="true"
126 126 android:layout_marginRight="@dimen/content_margin"
127 127 android:background="@drawable/signin_selector"
128 128 android:text="@string/modify"
129 129 android:textColor="@color/white"
130   - android:textSize="@dimen/big_text_p5"
  130 + android:textSize="@dimen/px2sp_60"
131 131 android:textStyle="bold"
132 132 android:visibility="invisible" />
133 133 </RelativeLayout>
... ... @@ -220,7 +220,8 @@
220 220 android:layout_marginRight="20dp"
221 221 android:layout_marginTop="50dp"
222 222 android:background="@drawable/right_control"
223   - android:orientation="vertical">
  223 + android:orientation="vertical"
  224 + android:visibility="gone">
224 225  
225 226 <ImageView
226 227 android:id="@+id/election_pageup"
... ...
C5/app/src/main/res/values/color.xml
  View file @a5a485e
... ... @@ -164,4 +164,7 @@
164 164  
165 165 <color name="titile_background_1">#450603</color>
166 166  
  167 + <color name="green1">#00964d</color> <!--绿色 -->
  168 + <color name="red1">#d50c00</color> <!--红色 -->
  169 +
167 170 </resources>
168 171 \ No newline at end of file
... ...