Commit 66da514d707bdbd3fc3c0014985eec8141f8ca3a
1 parent
84a1644e
图片移动到统一文件夹
Showing
54 changed files
with
49 additions
and
4 deletions
.gitignore
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
@@ -541,7 +541,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa | @@ -541,7 +541,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa | ||
541 | singlevoteTvTipsLayout.setVisibility(View.VISIBLE); | 541 | singlevoteTvTipsLayout.setVisibility(View.VISIBLE); |
542 | // tvTips.setText(getString(R.string.submited)); | 542 | // tvTips.setText(getString(R.string.submited)); |
543 | tvTips.setText(""); | 543 | tvTips.setText(""); |
544 | - tvTips.setBackgroundResource(R.drawable.submitted); | ||
545 | } else { | 544 | } else { |
546 | disableVote(); | 545 | disableVote(); |
547 | singlevoteTvTipsLayout.setVisibility(View.VISIBLE); | 546 | singlevoteTvTipsLayout.setVisibility(View.VISIBLE); |
C5/app/src/main/res/drawable/abstain.png
0 → 100644
13.4 KB
C5/app/src/main/res/drawable/abstain_small.png
0 → 100644
6.88 KB
C5/app/src/main/res/drawable/agree.png
0 → 100644
14 KB
C5/app/src/main/res/drawable/agree_small.png
0 → 100644
7.06 KB
C5/app/src/main/res/drawable/bigger.png
0 → 100644
1.69 KB
C5/app/src/main/res/drawable/black_alpha.png
0 → 100644
1.05 KB
C5/app/src/main/res/drawable/btn_abstain.png
0 → 100644
1.38 KB
C5/app/src/main/res/drawable/btn_abstain_s.png
0 → 100644
1.39 KB
C5/app/src/main/res/drawable/btn_agree.png
0 → 100644
1.25 KB
C5/app/src/main/res/drawable/btn_agree_s.png
0 → 100644
1.25 KB
C5/app/src/main/res/drawable/btn_back.png
0 → 100644
15.7 KB
C5/app/src/main/res/drawable/btn_back_s.png
0 → 100644
15.3 KB
C5/app/src/main/res/drawable/btn_back_white.png
0 → 100644
16 KB
C5/app/src/main/res/drawable/btn_election_abstain.png
0 → 100644
2.82 KB
C5/app/src/main/res/drawable/btn_election_abstain_s.png
0 → 100644
2.82 KB
C5/app/src/main/res/drawable/btn_modify.png
0 → 100644
1.43 KB
C5/app/src/main/res/drawable/btn_modify_s.png
0 → 100644
1.47 KB
C5/app/src/main/res/drawable/btn_oo.png
0 → 100644
1.69 KB
C5/app/src/main/res/drawable/btn_oo_s.png
0 → 100644
1.88 KB
C5/app/src/main/res/drawable/btn_oppos_s.png
0 → 100644
1.39 KB
C5/app/src/main/res/drawable/btn_oppose.png
0 → 100644
1.38 KB
C5/app/src/main/res/drawable/btn_other.png
0 → 100644
1.42 KB
C5/app/src/main/res/drawable/btn_other_s.png
0 → 100644
1.45 KB
C5/app/src/main/res/drawable/btn_page.png
0 → 100644
1.42 KB
C5/app/src/main/res/drawable/btn_page_d.png
0 → 100644
1.28 KB
C5/app/src/main/res/drawable/btn_page_h.png
0 → 100644
1.42 KB
C5/app/src/main/res/drawable/btn_setisfy.png
0 → 100644
1.38 KB
C5/app/src/main/res/drawable/btn_setisfy_s.png
0 → 100644
1.39 KB
C5/app/src/main/res/drawable/btn_signin.png
0 → 100644
1.38 KB
C5/app/src/main/res/drawable/btn_signin_d.png
0 → 100644
1.38 KB
C5/app/src/main/res/drawable/btn_signin_s.png
0 → 100644
1.39 KB
C5/app/src/main/res/drawable/btn_submit.png
0 → 100644
1.25 KB
C5/app/src/main/res/drawable/btn_submit_s.png
0 → 100644
1.25 KB
C5/app/src/main/res/drawable/btn_xx.png
0 → 100644
1.35 KB
C5/app/src/main/res/drawable/btn_xx_s.png
0 → 100644
1.39 KB
C5/app/src/main/res/drawable/delete.png
0 → 100644
1.46 KB
C5/app/src/main/res/drawable/detail_icon.png
0 → 100644
1.26 KB
C5/app/src/main/res/drawable/gray_alpha.png
0 → 100644
2.3 KB
C5/app/src/main/res/drawable/ic_clear.png
0 → 100644
746 Bytes
C5/app/src/main/res/drawable/map.bmp
0 → 100644
No preview for this file type
C5/app/src/main/res/drawable/meeting_bg.jpg
0 → 100644
163 KB
C5/app/src/main/res/drawable/ok.png
0 → 100644
9.53 KB
C5/app/src/main/res/drawable/ok_small.png
0 → 100644
6.86 KB
C5/app/src/main/res/drawable/oppos.png
0 → 100644
13.8 KB
C5/app/src/main/res/drawable/oppos_small.png
0 → 100644
6.78 KB
C5/app/src/main/res/drawable/red_bg.bmp
0 → 100644
No preview for this file type
C5/app/src/main/res/drawable/rendavote.xml
0 → 100644
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:shape="rectangle" > | ||
4 | + <corners | ||
5 | + android:radius="10dp" /> | ||
6 | + <padding | ||
7 | + android:bottom="5dp" | ||
8 | + android:left="5dp" | ||
9 | + android:right="5dp" | ||
10 | + android:top="5dp" /> | ||
11 | + <solid android:color="@color/white" /> | ||
12 | +</shape> | ||
0 | \ No newline at end of file | 13 | \ No newline at end of file |
C5/app/src/main/res/drawable/smaller.png
0 → 100644
1.69 KB
C5/app/src/main/res/drawable/submitted.png renamed to C5/app/src/main/res/drawable/voted.png
159 KB
C5/app/src/main/res/drawable/voted_empty.png
0 → 100644
51.3 KB
C5/app/src/main/res/layout/fragment_singlevote.xml
@@ -148,7 +148,7 @@ | @@ -148,7 +148,7 @@ | ||
148 | 148 | ||
149 | <TextView | 149 | <TextView |
150 | android:id="@+id/singlevote_tv_tips" | 150 | android:id="@+id/singlevote_tv_tips" |
151 | - android:layout_width="250dp" | 151 | + android:layout_width="200dp" |
152 | android:layout_height="80dp" | 152 | android:layout_height="80dp" |
153 | android:layout_centerHorizontal="true" | 153 | android:layout_centerHorizontal="true" |
154 | android:gravity="center" | 154 | android:gravity="center" |
@@ -159,8 +159,8 @@ | @@ -159,8 +159,8 @@ | ||
159 | 159 | ||
160 | <TextView | 160 | <TextView |
161 | android:id="@+id/singlevote_tv_result" | 161 | android:id="@+id/singlevote_tv_result" |
162 | - android:layout_width="wrap_content" | ||
163 | - android:layout_height="wrap_content" | 162 | + android:layout_width="200dp" |
163 | + android:layout_height="80dp" | ||
164 | android:layout_centerHorizontal="true" | 164 | android:layout_centerHorizontal="true" |
165 | android:gravity="center" | 165 | android:gravity="center" |
166 | android:textColor="#4b3b93" | 166 | android:textColor="#4b3b93" |
C5/app/src/main/res/values/dimens.xml
@@ -24,4 +24,37 @@ | @@ -24,4 +24,37 @@ | ||
24 | <dimen name="big_text_p7">15sp</dimen> | 24 | <dimen name="big_text_p7">15sp</dimen> |
25 | <dimen name="big_text_p8">10sp</dimen> | 25 | <dimen name="big_text_p8">10sp</dimen> |
26 | 26 | ||
27 | + | ||
28 | + | ||
29 | + | ||
30 | + | ||
31 | + | ||
32 | + | ||
33 | + | ||
34 | + | ||
35 | + | ||
36 | + | ||
37 | + | ||
38 | + | ||
39 | + | ||
40 | + | ||
41 | + | ||
42 | + | ||
43 | + | ||
44 | + | ||
45 | + | ||
46 | + | ||
47 | + | ||
48 | + | ||
49 | + | ||
50 | + | ||
51 | + | ||
52 | + | ||
53 | + | ||
54 | + | ||
55 | + | ||
56 | + | ||
57 | + | ||
58 | + | ||
59 | + | ||
27 | </resources> | 60 | </resources> |