Skip to content

Commit 8e0cb90

Browse files
huttneabhuttneab
authored
Merge pull request #45 from huttneab/voter_declaration
Add voter declaration for issue #41.
2 parents 357d1c6 + 99b06f0 commit 8e0cb90

7 files changed

Lines changed: 89 additions & 64 deletions

File tree

‎app/src/internalDebug/java/com/rockthevote/grommet/data/ApiEndpoints.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public enum ApiEndpoints {
66
PRODUCTION("Production", ApiModule.PRODUCTION_API_URL.toString()),
7-
STAGING("Staging","https://staging.rocky.rockthevote.com"),
7+
STAGING("Staging","https://staging.rocky.rockthevote.com/v3"),
88
MOCK_MODE("Mock Mode", "http://localhost/mock/");
99
public final String name;
1010
public final String url;

‎app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
library = true
1919
)
2020
public final class ApiModule {
21-
public static final HttpUrl PRODUCTION_API_URL = HttpUrl.parse("https://api.rocky.gov/");
21+
public static final HttpUrl PRODUCTION_API_URL = HttpUrl.parse("http://register.rockthevote.org/v3");
2222

2323
@Provides @Singleton HttpUrl provideBaseUrl() {
2424
return PRODUCTION_API_URL;

‎app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationCompleteDialogFragment.java‎

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.rockthevote.grommet.ui.registration;
22

3-
import android.app.Dialog;
43
import android.os.Bundle;
54
import android.support.annotation.Nullable;
65
import android.support.v4.app.DialogFragment;
@@ -10,52 +9,22 @@
109

1110
import com.rockthevote.grommet.R;
1211

13-
import java.util.Timer;
14-
import java.util.TimerTask;
12+
import butterknife.ButterKnife;
13+
import butterknife.OnClick;
1514

1615
public class RegistrationCompleteDialogFragment extends DialogFragment {
1716

18-
private long delay = 3500;
19-
20-
private Timer timer;
21-
private TimerTask task;
22-
23-
@Override
24-
public void onStart() {
25-
super.onStart();
26-
Dialog dialog = getDialog();
27-
if(null != dialog){
28-
int width = ViewGroup.LayoutParams.MATCH_PARENT;
29-
int height = ViewGroup.LayoutParams.MATCH_PARENT;
30-
dialog.getWindow().setLayout(width, height);
31-
}
32-
}
33-
3417
@Nullable
3518
@Override
3619
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
3720
setCancelable(false);
38-
39-
return inflater.inflate(R.layout.dialog_registration_complete, container);
21+
View v = inflater.inflate(R.layout.dialog_registration_complete, container);
22+
ButterKnife.bind(this, v);
23+
return v;
4024
}
4125

42-
@Override
43-
public void onResume() {
44-
super.onResume();
45-
timer = new Timer();
46-
task = new TimerTask() {
47-
@Override
48-
public void run() {
49-
getActivity().finish();
50-
}
51-
};
52-
timer.schedule(task, delay);
53-
54-
}
55-
56-
@Override
57-
public void onPause() {
58-
super.onPause();
59-
task.cancel();
26+
@OnClick(R.id.drc_ok_button)
27+
public void onOKClick(View v) {
28+
getActivity().finish();
6029
}
6130
}

‎app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public void onStartSigning() {
175175
@Override
176176
public void onSigned() {
177177
ByteArrayOutputStream baos = new ByteArrayOutputStream();
178-
signaturePad.getSignatureBitmap().compress(Bitmap.CompressFormat.JPEG, 100, baos);
178+
signaturePad.getSignatureBitmap().compress(Bitmap.CompressFormat.PNG, 100, baos);
179179
db.update(RockyRequest.TABLE,
180180
new RockyRequest.Builder()
181181
.signature(baos.toByteArray())
@@ -213,7 +213,9 @@ public void onRegisterClick(View v) {
213213
int totalApp = appRegTotal.get();
214214
appRegTotal.set(++totalApp);
215215

216-
new RegistrationCompleteDialogFragment().show(getFragmentManager(), "complete_dialog");
216+
RegistrationCompleteDialogFragment dialog = new RegistrationCompleteDialogFragment();
217+
dialog.setCancelable(false);
218+
dialog.show(getFragmentManager(), "complete_dialog");
217219
} else {
218220
signaturePadError.setVisibility(View.VISIBLE);
219221
}

‎app/src/main/res/layout/dialog_registration_complete.xml‎

Lines changed: 55 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,64 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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"
3+
android:layout_width="wrap_content"
4+
android:layout_height="wrap_content"
65
android:orientation="vertical"
7-
android:padding="@dimen/content_area_padding">
6+
android:paddingEnd="24dp"
7+
android:paddingStart="24dp"
8+
android:paddingTop="24dp">
9+
10+
<LinearLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="wrap_content"
13+
android:orientation="horizontal">
14+
15+
<ImageView
16+
android:layout_width="0dp"
17+
android:layout_height="match_parent"
18+
android:layout_gravity="fill_horizontal|center_vertical"
19+
android:layout_weight=".1"
20+
android:paddingEnd="@dimen/content_area_padding"
21+
android:scaleType="fitCenter"
22+
android:src="@drawable/ic_done_black_24dp"
23+
android:tint="@color/colorAccent"
24+
/>
25+
26+
<TextView
27+
android:layout_width="0dp"
28+
android:layout_height="match_parent"
29+
android:layout_gravity="fill_horizontal"
30+
android:layout_weight="1"
31+
android:gravity="center_vertical"
32+
android:paddingEnd="@dimen/content_area_padding"
33+
android:paddingStart="@dimen/content_area_padding"
34+
android:text="@string/registration_complete"
35+
android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle"/>
36+
37+
</LinearLayout>
838

9-
<ImageView
10-
android:layout_width="100dp"
11-
android:layout_height="100dp"
12-
android:paddingBottom="@dimen/content_area_padding"
13-
android:paddingTop="@dimen/content_area_padding"
14-
android:backgroundTint="@color/colorAccent"
15-
android:background="@drawable/ic_done_black_24dp"/>
1639

1740
<TextView
18-
android:layout_width="wrap_content"
41+
android:id="@+id/drc_text_view"
42+
android:layout_width="match_parent"
43+
android:layout_height="wrap_content"
44+
android:paddingBottom="24dp"
45+
android:paddingTop="8dp"
46+
android:text="@string/registration_complete_dialog_text"/>
47+
48+
<LinearLayout
49+
android:layout_width="match_parent"
1950
android:layout_height="wrap_content"
20-
android:paddingBottom="@dimen/content_area_padding"
21-
android:paddingTop="@dimen/content_area_padding"
22-
android:text="Registration Complete"
23-
android:textAppearance="@android:style/TextAppearance.Material.Display1"/>
51+
android:gravity="end"
52+
android:orientation="horizontal"
53+
android:paddingBottom="8dp">
54+
55+
<Button
56+
android:id="@+id/drc_ok_button"
57+
style="@android:style/Widget.Material.Button.Borderless.Colored"
58+
android:layout_width="wrap_content"
59+
android:layout_height="wrap_content"
60+
android:text="@string/action_ok"
61+
/>
62+
</LinearLayout>
2463

2564
</LinearLayout>

‎app/src/main/res/layout/fragment_review_and_confirm.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
android:paddingTop="@dimen/content_area_padding"
4040
android:text="@string/section_label_personal_info"
4141
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
42-
android:textColor="@color/colorAccent"
42+
android:textColor="@color/colorPrimary"
4343
android:textStyle="bold"
4444
/>
4545

@@ -120,7 +120,7 @@
120120
android:paddingTop="@dimen/content_area_padding"
121121
android:text="@string/section_label_registration_address"
122122
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
123-
android:textColor="@color/colorAccent"
123+
android:textColor="@color/colorPrimary"
124124
android:textStyle="bold"
125125
/>
126126

@@ -152,7 +152,7 @@
152152
android:paddingTop="@dimen/content_area_padding"
153153
android:text="@string/section_label_mailing_address"
154154
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
155-
android:textColor="@color/colorAccent"
155+
android:textColor="@color/colorPrimary"
156156
android:textStyle="bold"
157157
android:visibility="gone"
158158
tools:visibility="visible"
@@ -183,7 +183,7 @@
183183
android:paddingTop="@dimen/content_area_padding"
184184
android:text="@string/fragment_title_additional_info"
185185
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
186-
android:textColor="@color/colorAccent"
186+
android:textColor="@color/colorPrimary"
187187
android:textStyle="bold"
188188
android:visibility="gone"
189189
tools:visibility="visible"
@@ -232,7 +232,7 @@
232232
android:paddingTop="@dimen/content_area_padding"
233233
android:text="@string/section_label_signature"
234234
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
235-
android:textColor="@color/colorAccent"
235+
android:textColor="@color/colorPrimary"
236236
android:textStyle="bold"
237237
android:visibility="gone"
238238
tools:visibility="visible"

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,20 @@
108108
<string name="signature_instructions">Please use stylus for signature capture</string>
109109
<string name="signature_pad_error">Signature is required</string>
110110
<string name="action_cancel_reg">Cancel Registration</string>
111+
<string name="registration_complete">Registration Complete</string>
112+
<string name="registration_complete_dialog_text">
113+
\n
114+
\u2022 Your application has been sent to your county voter registration office.
115+
\n
116+
\n
117+
\u2022 Registration is not complete until processed and accepted.
118+
\n
119+
\n
120+
\u2022 If accepted, you will receive a Voter Registration Card by mail.
121+
\n
122+
\n
123+
\u2022 If you do not receive your Voter Registration Card within 14 days, contact your county voter registration office.
124+
</string>
111125

112126
<!-- Preference Strings -->
113127
<string name="pref_key_partner_id">partner_id</string>
@@ -126,6 +140,7 @@
126140
<string name="action_cancel">Cancel</string>
127141
<string name="action_save">Save</string>
128142
<string name="action_edit">Edit</string>
143+
<string name="action_ok">OK</string>
129144

130145
<string name="upload_notification_title_template">Processing PA OVRRegistrations</string>
131146

0 commit comments

Comments
 (0)