diff --git a/.gitignore b/.gitignore index c030963..e1403c0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /C5/build /C5/evaluation/build *.iml +*.class diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java index 06de4af..114799f 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java @@ -541,7 +541,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa singlevoteTvTipsLayout.setVisibility(View.VISIBLE); // tvTips.setText(getString(R.string.submited)); tvTips.setText(""); - tvTips.setBackgroundResource(R.drawable.submitted); } else { disableVote(); singlevoteTvTipsLayout.setVisibility(View.VISIBLE); diff --git a/C5/app/src/main/res/drawable/abstain.png b/C5/app/src/main/res/drawable/abstain.png new file mode 100644 index 0000000..f5fa3af --- /dev/null +++ b/C5/app/src/main/res/drawable/abstain.png diff --git a/C5/app/src/main/res/drawable/abstain_small.png b/C5/app/src/main/res/drawable/abstain_small.png new file mode 100644 index 0000000..9a4ee2c --- /dev/null +++ b/C5/app/src/main/res/drawable/abstain_small.png diff --git a/C5/app/src/main/res/drawable/agree.png b/C5/app/src/main/res/drawable/agree.png new file mode 100644 index 0000000..305b547 --- /dev/null +++ b/C5/app/src/main/res/drawable/agree.png diff --git a/C5/app/src/main/res/drawable/agree_small.png b/C5/app/src/main/res/drawable/agree_small.png new file mode 100644 index 0000000..bdbad3d --- /dev/null +++ b/C5/app/src/main/res/drawable/agree_small.png diff --git a/C5/app/src/main/res/drawable/bigger.png b/C5/app/src/main/res/drawable/bigger.png new file mode 100644 index 0000000..bae08a3 --- /dev/null +++ b/C5/app/src/main/res/drawable/bigger.png diff --git a/C5/app/src/main/res/drawable/black_alpha.png b/C5/app/src/main/res/drawable/black_alpha.png new file mode 100644 index 0000000..eeff94c --- /dev/null +++ b/C5/app/src/main/res/drawable/black_alpha.png diff --git a/C5/app/src/main/res/drawable/btn_abstain.png b/C5/app/src/main/res/drawable/btn_abstain.png new file mode 100644 index 0000000..a149e6d --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_abstain.png diff --git a/C5/app/src/main/res/drawable/btn_abstain_s.png b/C5/app/src/main/res/drawable/btn_abstain_s.png new file mode 100644 index 0000000..78a45cb --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_abstain_s.png diff --git a/C5/app/src/main/res/drawable/btn_agree.png b/C5/app/src/main/res/drawable/btn_agree.png new file mode 100644 index 0000000..c565998 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_agree.png diff --git a/C5/app/src/main/res/drawable/btn_agree_s.png b/C5/app/src/main/res/drawable/btn_agree_s.png new file mode 100644 index 0000000..684f9aa --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_agree_s.png diff --git a/C5/app/src/main/res/drawable/btn_back.png b/C5/app/src/main/res/drawable/btn_back.png new file mode 100644 index 0000000..f313c89 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_back.png diff --git a/C5/app/src/main/res/drawable/btn_back_s.png b/C5/app/src/main/res/drawable/btn_back_s.png new file mode 100644 index 0000000..96d0ea0 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_back_s.png diff --git a/C5/app/src/main/res/drawable/btn_back_white.png b/C5/app/src/main/res/drawable/btn_back_white.png new file mode 100644 index 0000000..23c9368 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_back_white.png diff --git a/C5/app/src/main/res/drawable/btn_election_abstain.png b/C5/app/src/main/res/drawable/btn_election_abstain.png new file mode 100644 index 0000000..18325f2 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_election_abstain.png diff --git a/C5/app/src/main/res/drawable/btn_election_abstain_s.png b/C5/app/src/main/res/drawable/btn_election_abstain_s.png new file mode 100644 index 0000000..950d877 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_election_abstain_s.png diff --git a/C5/app/src/main/res/drawable/btn_modify.png b/C5/app/src/main/res/drawable/btn_modify.png new file mode 100644 index 0000000..2e1c76b --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_modify.png diff --git a/C5/app/src/main/res/drawable/btn_modify_s.png b/C5/app/src/main/res/drawable/btn_modify_s.png new file mode 100644 index 0000000..535b525 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_modify_s.png diff --git a/C5/app/src/main/res/drawable/btn_oo.png b/C5/app/src/main/res/drawable/btn_oo.png new file mode 100644 index 0000000..001338c --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_oo.png diff --git a/C5/app/src/main/res/drawable/btn_oo_s.png b/C5/app/src/main/res/drawable/btn_oo_s.png new file mode 100644 index 0000000..9e8ed74 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_oo_s.png diff --git a/C5/app/src/main/res/drawable/btn_oppos_s.png b/C5/app/src/main/res/drawable/btn_oppos_s.png new file mode 100644 index 0000000..cf6dc81 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_oppos_s.png diff --git a/C5/app/src/main/res/drawable/btn_oppose.png b/C5/app/src/main/res/drawable/btn_oppose.png new file mode 100644 index 0000000..f266f5b --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_oppose.png diff --git a/C5/app/src/main/res/drawable/btn_other.png b/C5/app/src/main/res/drawable/btn_other.png new file mode 100644 index 0000000..6c80fca --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_other.png diff --git a/C5/app/src/main/res/drawable/btn_other_s.png b/C5/app/src/main/res/drawable/btn_other_s.png new file mode 100644 index 0000000..4e9f3ab --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_other_s.png diff --git a/C5/app/src/main/res/drawable/btn_page.png b/C5/app/src/main/res/drawable/btn_page.png new file mode 100644 index 0000000..ee1d980 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_page.png diff --git a/C5/app/src/main/res/drawable/btn_page_d.png b/C5/app/src/main/res/drawable/btn_page_d.png new file mode 100644 index 0000000..a063282 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_page_d.png diff --git a/C5/app/src/main/res/drawable/btn_page_h.png b/C5/app/src/main/res/drawable/btn_page_h.png new file mode 100644 index 0000000..606e4db --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_page_h.png diff --git a/C5/app/src/main/res/drawable/btn_setisfy.png b/C5/app/src/main/res/drawable/btn_setisfy.png new file mode 100644 index 0000000..cf5f41e --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_setisfy.png diff --git a/C5/app/src/main/res/drawable/btn_setisfy_s.png b/C5/app/src/main/res/drawable/btn_setisfy_s.png new file mode 100644 index 0000000..d569e7f --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_setisfy_s.png diff --git a/C5/app/src/main/res/drawable/btn_signin.png b/C5/app/src/main/res/drawable/btn_signin.png new file mode 100644 index 0000000..0f83554 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_signin.png diff --git a/C5/app/src/main/res/drawable/btn_signin_d.png b/C5/app/src/main/res/drawable/btn_signin_d.png new file mode 100644 index 0000000..de4959b --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_signin_d.png diff --git a/C5/app/src/main/res/drawable/btn_signin_s.png b/C5/app/src/main/res/drawable/btn_signin_s.png new file mode 100644 index 0000000..9898caf --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_signin_s.png diff --git a/C5/app/src/main/res/drawable/btn_submit.png b/C5/app/src/main/res/drawable/btn_submit.png new file mode 100644 index 0000000..c565998 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_submit.png diff --git a/C5/app/src/main/res/drawable/btn_submit_s.png b/C5/app/src/main/res/drawable/btn_submit_s.png new file mode 100644 index 0000000..684f9aa --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_submit_s.png diff --git a/C5/app/src/main/res/drawable/btn_xx.png b/C5/app/src/main/res/drawable/btn_xx.png new file mode 100644 index 0000000..32b1aae --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_xx.png diff --git a/C5/app/src/main/res/drawable/btn_xx_s.png b/C5/app/src/main/res/drawable/btn_xx_s.png new file mode 100644 index 0000000..d534ac1 --- /dev/null +++ b/C5/app/src/main/res/drawable/btn_xx_s.png diff --git a/C5/app/src/main/res/drawable/delete.png b/C5/app/src/main/res/drawable/delete.png new file mode 100644 index 0000000..2ca50d0 --- /dev/null +++ b/C5/app/src/main/res/drawable/delete.png diff --git a/C5/app/src/main/res/drawable/detail_icon.png b/C5/app/src/main/res/drawable/detail_icon.png new file mode 100644 index 0000000..c2e7c1e --- /dev/null +++ b/C5/app/src/main/res/drawable/detail_icon.png diff --git a/C5/app/src/main/res/drawable/gray_alpha.png b/C5/app/src/main/res/drawable/gray_alpha.png new file mode 100644 index 0000000..f593cfe --- /dev/null +++ b/C5/app/src/main/res/drawable/gray_alpha.png diff --git a/C5/app/src/main/res/drawable/ic_clear.png b/C5/app/src/main/res/drawable/ic_clear.png new file mode 100644 index 0000000..d8b9be0 --- /dev/null +++ b/C5/app/src/main/res/drawable/ic_clear.png diff --git a/C5/app/src/main/res/drawable/map.bmp b/C5/app/src/main/res/drawable/map.bmp new file mode 100644 index 0000000..3e1df33 --- /dev/null +++ b/C5/app/src/main/res/drawable/map.bmp diff --git a/C5/app/src/main/res/drawable/meeting_bg.jpg b/C5/app/src/main/res/drawable/meeting_bg.jpg new file mode 100644 index 0000000..4a27004 --- /dev/null +++ b/C5/app/src/main/res/drawable/meeting_bg.jpg diff --git a/C5/app/src/main/res/drawable/ok.png b/C5/app/src/main/res/drawable/ok.png new file mode 100644 index 0000000..339e26b --- /dev/null +++ b/C5/app/src/main/res/drawable/ok.png diff --git a/C5/app/src/main/res/drawable/ok_small.png b/C5/app/src/main/res/drawable/ok_small.png new file mode 100644 index 0000000..5992707 --- /dev/null +++ b/C5/app/src/main/res/drawable/ok_small.png diff --git a/C5/app/src/main/res/drawable/oppos.png b/C5/app/src/main/res/drawable/oppos.png new file mode 100644 index 0000000..e0ec892 --- /dev/null +++ b/C5/app/src/main/res/drawable/oppos.png diff --git a/C5/app/src/main/res/drawable/oppos_small.png b/C5/app/src/main/res/drawable/oppos_small.png new file mode 100644 index 0000000..07c489d --- /dev/null +++ b/C5/app/src/main/res/drawable/oppos_small.png diff --git a/C5/app/src/main/res/drawable/red_bg.bmp b/C5/app/src/main/res/drawable/red_bg.bmp new file mode 100644 index 0000000..e7dc2b0 --- /dev/null +++ b/C5/app/src/main/res/drawable/red_bg.bmp diff --git a/C5/app/src/main/res/drawable/rendavote.xml b/C5/app/src/main/res/drawable/rendavote.xml new file mode 100644 index 0000000..8bb16f4 --- /dev/null +++ b/C5/app/src/main/res/drawable/rendavote.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/C5/app/src/main/res/drawable/smaller.png b/C5/app/src/main/res/drawable/smaller.png new file mode 100644 index 0000000..dff6245 --- /dev/null +++ b/C5/app/src/main/res/drawable/smaller.png diff --git a/C5/app/src/main/res/drawable/submitted.png b/C5/app/src/main/res/drawable/voted.png index 94c85bb..94c85bb 100644 --- a/C5/app/src/main/res/drawable/submitted.png +++ b/C5/app/src/main/res/drawable/voted.png diff --git a/C5/app/src/main/res/drawable/voted_empty.png b/C5/app/src/main/res/drawable/voted_empty.png new file mode 100644 index 0000000..7024ba7 --- /dev/null +++ b/C5/app/src/main/res/drawable/voted_empty.png diff --git a/C5/app/src/main/res/layout/fragment_singlevote.xml b/C5/app/src/main/res/layout/fragment_singlevote.xml index 57369e1..4c2da25 100644 --- a/C5/app/src/main/res/layout/fragment_singlevote.xml +++ b/C5/app/src/main/res/layout/fragment_singlevote.xml @@ -148,7 +148,7 @@ 15sp 10sp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +