Skip to content

Commit 8c75f64

Browse files
AnkhwatcherAnkhwatcher
committed
Implement contributors list fragment.
Hide the voting guide information after 11pm on voting day.
1 parent 62c3d2c commit 8c75f64

File tree

8 files changed

+271
-30
lines changed

8 files changed

+271
-30
lines changed

‎mobile/src/main/java/ie/yesequality/yesequality/ContributorsFragment.java‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
package ie.yesequality.yesequality;
2+
3+
4+
import android.database.DataSetObserver;
5+
import android.os.Bundle;
6+
import android.support.v4.app.ListFragment;
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.view.ViewGroup;
10+
import android.widget.ListAdapter;
11+
import android.widget.ListView;
12+
import android.widget.TextView;
13+
14+
import butterknife.ButterKnife;
15+
import butterknife.InjectView;
16+
17+
public class ContributorsFragment extends ListFragment {
18+
19+
private static final String ARG_ABOVE_TEXT = "ABOVE_TEXT";
20+
private static final String ARG_COLOR_ID = "COLOR_ID";
21+
private static final String ARG_TEXT_COLOR_ID = "TEXT_COLOR_ID";
22+
private static final String ARG_CONTRIBUTORS = "CONTRIBUTORS";
23+
@InjectView(R.id.information_above_text)
24+
protected TextView information_above_text;
25+
@InjectView(android.R.id.list)
26+
protected ListView list;
27+
private int aboveTextId;
28+
private String[] mContributors;
29+
private int textColor;
30+
private int colorId;
31+
32+
/**
33+
* Mandatory empty constructor for the fragment manager to instantiate the
34+
* fragment (e.g. upon screen orientation changes).
35+
*/
36+
public ContributorsFragment() {
37+
}
38+
39+
public static ContributorsFragment newInstance(int aboveTextID, int colorID, int textColorID, int contributors) {
40+
ContributorsFragment fragment = new ContributorsFragment();
41+
Bundle args = new Bundle();
42+
args.putInt(ARG_ABOVE_TEXT, aboveTextID);
43+
args.putInt(ARG_COLOR_ID, colorID);
44+
args.putInt(ARG_TEXT_COLOR_ID, textColorID);
45+
args.putInt(ARG_CONTRIBUTORS, contributors);
46+
fragment.setArguments(args);
47+
48+
return fragment;
49+
}
50+
51+
@Override
52+
public void onCreate(Bundle savedInstanceState) {
53+
super.onCreate(savedInstanceState);
54+
55+
if (getArguments() != null) {
56+
aboveTextId = getArguments().getInt(ARG_ABOVE_TEXT);
57+
colorId = getArguments().getInt(ARG_COLOR_ID);
58+
textColor = getResources().getColor(getArguments().getInt(ARG_TEXT_COLOR_ID));
59+
mContributors = getResources().getStringArray(getArguments().getInt(ARG_CONTRIBUTORS));
60+
}
61+
62+
63+
}
64+
65+
@Override
66+
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
67+
View rootView = inflater.inflate(R.layout.fragment_contributors, container, false);
68+
rootView.setBackgroundResource(colorId);
69+
ButterKnife.inject(this, rootView);
70+
71+
information_above_text.setText(aboveTextId);
72+
information_above_text.setTextColor(textColor);
73+
74+
list.setAdapter(new ListAdapter() {
75+
@Override
76+
public boolean areAllItemsEnabled() {
77+
return false;
78+
}
79+
80+
@Override
81+
public boolean isEnabled(int position) {
82+
return false;
83+
}
84+
85+
@Override
86+
public void registerDataSetObserver(DataSetObserver observer) {
87+
88+
}
89+
90+
@Override
91+
public void unregisterDataSetObserver(DataSetObserver observer) {
92+
93+
}
94+
95+
@Override
96+
public int getCount() {
97+
return mContributors.length;
98+
}
99+
100+
@Override
101+
public String getItem(int position) {
102+
return mContributors[position];
103+
}
104+
105+
@Override
106+
public long getItemId(int position) {
107+
return position;
108+
}
109+
110+
@Override
111+
public boolean hasStableIds() {
112+
return true;
113+
}
114+
115+
@Override
116+
public View getView(int position, View convertView, ViewGroup parent) {
117+
TextView textView = (TextView) convertView;
118+
if (textView == null) {
119+
textView = (TextView) LayoutInflater.from(getActivity()).inflate(R.layout.simple_list_item, parent, false);
120+
textView.setTextColor(textColor);
121+
}
122+
textView.setText(getItem(position));
123+
124+
return textView;
125+
}
126+
127+
@Override
128+
public int getItemViewType(int position) {
129+
return 0;
130+
}
131+
132+
@Override
133+
public int getViewTypeCount() {
134+
return 1;
135+
}
136+
137+
@Override
138+
public boolean isEmpty() {
139+
return mContributors.length != 0;
140+
}
141+
});
142+
return rootView;
143+
}
144+
145+
146+
}

‎mobile/src/main/java/ie/yesequality/yesequality/InformationPagesFragment.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ public class InformationPagesFragment extends Fragment {
1818

1919
public static final InformationPagesFragment newInstance(int pictureID, int aboveTextID,
2020
int belowTextID, int colorID,
21-
String link, int textColor) {
21+
String link, int textColorID) {
2222

2323
InformationPagesFragment fragment = new InformationPagesFragment();
2424

25-
Bundle bundle = new Bundle(4);
25+
Bundle bundle = new Bundle(6);
2626
bundle.putInt("PICTURE_ID", pictureID);
2727
bundle.putInt("BELOW_TEXT", belowTextID);
2828
bundle.putInt("ABOVE_TEXT", aboveTextID);
2929
bundle.putInt("COLOR_ID", colorID);
3030
bundle.putString("LINK", link);
31-
bundle.putInt("TEXT_COLOR", textColor);
31+
bundle.putInt("TEXT_COLOR_ID", textColorID);
3232

3333
fragment.setArguments(bundle);
3434

@@ -52,8 +52,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
5252

5353
aboveTextView.setText(aboveText);
5454
belowTextView.setText(belowText);
55-
aboveTextView.setTextColor(getResources().getColor(getArguments().getInt("TEXT_COLOR")));
56-
belowTextView.setTextColor(getResources().getColor(getArguments().getInt("TEXT_COLOR")));
55+
aboveTextView.setTextColor(getResources().getColor(getArguments().getInt("TEXT_COLOR_ID")));
56+
belowTextView.setTextColor(getResources().getColor(getArguments().getInt("TEXT_COLOR_ID")));
5757

5858
imageView.setImageResource(imageID);
5959
final String link = getArguments().getString("LINK", "");

‎mobile/src/main/java/ie/yesequality/yesequality/MainActivity.java‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -69,31 +69,34 @@ private List<Fragment> getFragmentList() {
6969
R.color.dark_green, "", R.color.white));
7070
}
7171

72-
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon1,
73-
R.string.information_page_string_two, R.string.information_page_string_three,
74-
R.color.lilac, "", R.color.white));
75-
76-
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon2,
77-
R.string.information_page_string_two, R.string.information_page_string_four,
78-
R.color.dark_cyan, "", R.color.white));
79-
80-
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon3,
81-
R.string.information_page_string_two, R.string.information_page_string_five,
82-
R.color.navy, "", R.color.white));
83-
84-
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon4,
85-
R.string.information_page_string_two, R.string.information_page_string_six,
86-
R.color.dark_lilac, "", R.color.white));
87-
88-
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon5,
89-
R.string.information_page_string_seven, R.string.information_page_string_eight,
90-
R.color.dark_navy, "http://www.checktheregister.ie", R.color.white));
91-
92-
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon9,
93-
R.string.information_page_string_thirteen, R.string.information_page_string_fourteen,
94-
R.color.green, "", R.color.white));
72+
if (!((YesEqualityApplication) getApplication()).isVotingEnded()) {
73+
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon1,
74+
R.string.information_page_string_two, R.string.information_page_string_three,
75+
R.color.lilac, "", R.color.white));
76+
77+
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon2,
78+
R.string.information_page_string_two, R.string.information_page_string_four,
79+
R.color.dark_cyan, "", R.color.white));
80+
81+
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon3,
82+
R.string.information_page_string_two, R.string.information_page_string_five,
83+
R.color.navy, "", R.color.white));
84+
85+
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon4,
86+
R.string.information_page_string_two, R.string.information_page_string_six,
87+
R.color.dark_lilac, "", R.color.white));
88+
89+
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon5,
90+
R.string.information_page_string_seven, R.string.information_page_string_eight,
91+
R.color.dark_navy, "http://www.checktheregister.ie", R.color.white));
92+
93+
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon9,
94+
R.string.information_page_string_thirteen, R.string.information_page_string_fourteen,
95+
R.color.green, "", R.color.white));
96+
}
9597

9698
if (((YesEqualityApplication) getApplication()).isVotingStarted()) {
99+
fragments.add(ContributorsFragment.newInstance(R.string.contributor_text, R.color.dark_red, R.color.white, R.array.contributors_list));
97100
fragments.add(InformationPagesFragment.newInstance(R.drawable.infoicon13,
98101
R.string.information_page_github_top, R.string.information_page_github_bottom,
99102
R.color.github_grey, "https://github.com/HackForEquality/android-app", R.color.white));

‎mobile/src/main/java/ie/yesequality/yesequality/YesEqualityApplication.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@
1313
* Created by rory on 16/05/15.
1414
*/
1515
public class YesEqualityApplication extends Application {
16-
private static final String VOTE_START = "2015-05-22T06:55:00";
16+
private static final String VOTE_START = "2015-05-22T00:00:00";
1717
//private static final String VOTE_START = "2015-05-17T00:08:00";
1818

19+
private static final String VOTE_END = "2015-05-22T23:00:00";
20+
1921
private static final String TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
2022
private static final String DUBLIN_TIMEZONE_NAME = "Europe/Dublin";
2123
public static Date sVoteStartDate = new Date();
24+
public static Date sVoteEndDate = new Date();
2225

2326
@Override
2427
public void onCreate() {
@@ -29,8 +32,10 @@ public void onCreate() {
2932
Log.d(this.getClass().getSimpleName(), sVoteStartDate.toLocaleString());
3033
try {
3134
sVoteStartDate = isoFormat.parse(VOTE_START);
35+
sVoteEndDate = isoFormat.parse(VOTE_END);
3236
} catch (ParseException e) {
33-
sVoteStartDate.setTime(1432274100000l);
37+
sVoteStartDate.setTime(1432249200000l);
38+
sVoteEndDate.setTime(1432335600000l);
3439
}
3540
Log.d(this.getClass().getSimpleName(), sVoteStartDate.toLocaleString());
3641
}
@@ -41,4 +46,10 @@ public boolean isVotingStarted() {
4146

4247
return sVoteStartDate.before(currentTime);
4348
}
49+
50+
public boolean isVotingEnded() {
51+
Date currentTime = new Date();
52+
53+
return sVoteEndDate.before(currentTime);
54+
}
4455
}

‎mobile/src/main/res/drawable/custom_scroll_thumb.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3+
<solid android:color="@color/transparent_white" />
4+
<corners android:radius="2dp" />
5+
<size android:width="2dp" />
6+
7+
8+
</shape>

‎mobile/src/main/res/layout/fragment_contributors.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:gravity="center"
6+
android:orientation="vertical">
7+
8+
<TextView
9+
android:id="@+id/information_above_text"
10+
android:layout_width="wrap_content"
11+
android:layout_height="wrap_content"
12+
android:gravity="center"
13+
android:paddingBottom="30dp"
14+
android:paddingLeft="@dimen/activity_horizontal_margin"
15+
android:paddingRight="@dimen/activity_horizontal_margin"
16+
android:textColor="#fff"
17+
android:textSize="32sp" />
18+
19+
<ListView
20+
android:id="@android:id/list"
21+
android:layout_width="match_parent"
22+
android:layout_height="0dp"
23+
android:layout_marginBottom="?actionBarSize"
24+
android:layout_weight="1"
25+
android:fadeScrollbars="false"
26+
android:scrollbarStyle="insideOverlay"
27+
android:scrollbarThumbVertical="@drawable/custom_scroll_thumb" />
28+
</LinearLayout>

‎mobile/src/main/res/layout/simple_list_item.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2006 The Android Open Source Project
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
14+
-->
15+
16+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
17+
xmlns:tools="http://schemas.android.com/tools"
18+
android:id="@android:id/text1"
19+
android:layout_width="match_parent"
20+
android:layout_height="wrap_content"
21+
android:gravity="center"
22+
android:paddingLeft="@dimen/activity_horizontal_margin"
23+
android:paddingRight="@dimen/activity_horizontal_margin"
24+
android:paddingTop="8dp"
25+
android:textAppearance="?android:attr/textAppearanceListItemSmall"
26+
tools:text="Alan Cowap" />

‎mobile/src/main/res/values/strings.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,23 @@
6767
<string name="alarmCancelDay">Reminder cancelled for voting day</string>
6868
<string name="alarmCancelDayBefore">Reminder cancelled for day before voting day</string>
6969
<string name="error_taking_picture">Unable to take a picture because the camera is not connected. :(</string>
70+
71+
<string name="contributor_text">This application was built through the volunteer effort of:</string>
72+
<string-array name="contributors_list">
73+
<item>Alan Cowap</item>
74+
<item>Chris Clancy</item>
75+
<item>Colm Doyle</item>
76+
<item>Dean Harrison</item>
77+
<item>Fergal Carroll</item>
78+
<item>Jacqueline Russell</item>
79+
<item>Jessy Conroy</item>
80+
<item>Jose Dominguez</item>
81+
<item>Laura Uzcategui</item>
82+
<item>Rayco Batista Diaz</item>
83+
<item>Ricardo La Rosa</item>
84+
<item>Rory Glynn</item>
85+
<item>Sona Harrison</item>
86+
<item>Vlado Atanasov</item>
87+
<item>Yunjun Wang</item>
88+
</string-array>
7089
</resources>

0 commit comments

Comments
 (0)