Commit ef5342708b113458d6f721c5ea07d9a873cad046
1 parent
83b71cdb
修改提交中颜色
Showing
2 changed files
with
5 additions
and
3 deletions
C5/app/src/main/res/layout/fragment_custom_election.xml
@@ -301,7 +301,7 @@ | @@ -301,7 +301,7 @@ | ||
301 | android:layout_height="wrap_content" | 301 | android:layout_height="wrap_content" |
302 | android:layout_marginTop="@dimen/px100dp" | 302 | android:layout_marginTop="@dimen/px100dp" |
303 | android:layout_gravity="center" | 303 | android:layout_gravity="center" |
304 | - android:textColor="@color/red" | 304 | + android:textColor="@color/red2" |
305 | android:text="@string/submiting" | 305 | android:text="@string/submiting" |
306 | android:textSize="@dimen/px140dp" | 306 | android:textSize="@dimen/px140dp" |
307 | android:visibility="gone" | 307 | android:visibility="gone" |
C5/app/src/main/res/layout/fragment_election.xml
@@ -269,7 +269,6 @@ | @@ -269,7 +269,6 @@ | ||
269 | android:layout_width="match_parent" | 269 | android:layout_width="match_parent" |
270 | android:layout_height="match_parent" | 270 | android:layout_height="match_parent" |
271 | android:layout_below="@id/line_panel" | 271 | android:layout_below="@id/line_panel" |
272 | - android:visibility="gone" | ||
273 | android:background="#E5E5E5"> | 272 | android:background="#E5E5E5"> |
274 | 273 | ||
275 | <LinearLayout | 274 | <LinearLayout |
@@ -299,6 +298,9 @@ | @@ -299,6 +298,9 @@ | ||
299 | android:background="@color/white" | 298 | android:background="@color/white" |
300 | android:imeOptions="flagNoExtractUi" | 299 | android:imeOptions="flagNoExtractUi" |
301 | android:lines="1" | 300 | android:lines="1" |
301 | + android:maxLines="1" | ||
302 | + android:inputType="text" | ||
303 | + android:singleLine="true" | ||
302 | android:textSize="@dimen/big_text_p4" /> | 304 | android:textSize="@dimen/big_text_p4" /> |
303 | </LinearLayout> | 305 | </LinearLayout> |
304 | 306 | ||
@@ -455,7 +457,7 @@ | @@ -455,7 +457,7 @@ | ||
455 | android:layout_height="wrap_content" | 457 | android:layout_height="wrap_content" |
456 | android:layout_marginTop="@dimen/px100dp" | 458 | android:layout_marginTop="@dimen/px100dp" |
457 | android:layout_gravity="center" | 459 | android:layout_gravity="center" |
458 | - android:textColor="@color/red" | 460 | + android:textColor="@color/red2" |
459 | android:text="@string/submiting" | 461 | android:text="@string/submiting" |
460 | android:textSize="@dimen/px140dp" | 462 | android:textSize="@dimen/px140dp" |
461 | android:visibility="gone" | 463 | android:visibility="gone" |