Skip to content

Commit bc42e85

Browse files
huttneabhuttneab
authored
Merge pull request #79 from huttneab/little_changes
update opt-ins to be partner opt-ins.
2 parents a173650 + 9bad819 commit bc42e85

14 files changed

Lines changed: 100 additions & 57 deletions

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Manifest version information!
22
def versionMajor = 1
33
def versionMinor = 0
4-
def versionPatch = 5
4+
def versionPatch = 6
55
def versionBuild = 0 // bump for dogfood builds, public betas, etc.
66

77
apply plugin: 'com.android.application'

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private void doWorkIfNeeded() {
132132
PackageManager pm = context.getPackageManager();
133133

134134
pm.setComponentEnabledSetting(receiver,
135-
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
135+
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
136136

137137
stopSelf();
138138
}
@@ -156,6 +156,7 @@ private void doWork(final RockyRequest rockyRequest) {
156156
RockyRequest.Status status =
157157
!regResponse.isError() && regResponse.response().isSuccessful()
158158
? REGISTER_SUCCESS : REGISTER_SERVER_FAILURE;
159+
159160

160161
UploadNotification.notify(getApplicationContext(), status);
161162

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ static Builder builder() {
7171
.optInEmail(false)
7272
.optInSms(false)
7373
.optInVolunteer(false)
74-
.partnerOptInEmail(false)
75-
.partnerOptInSms(false)
7674
.partnerOptInVolunteer(false)
7775
.finishWithState(true)
7876
.createdViaApi(true);
@@ -123,8 +121,8 @@ public static ApiRockyRequest fromDb(RockyRequest rockyRequest,
123121
return builder()
124122
.phoneType(rockyRequest.phoneType().toString())
125123
.partnerId(rockyRequest.partnerId())
126-
.optInEmail(rockyRequest.optInEmail())
127-
.optInSms(rockyRequest.optInSMS())
124+
.partnerOptInEmail(rockyRequest.partnerOptInEmail())
125+
.partnerOptInSms(rockyRequest.partnerOptInSMS())
128126
.optInVolunteer(rockyRequest.optInVolunteer())
129127
.sourceTrackingId(rockyRequest.sourceTrackingId())
130128
.partnerTrackingId(rockyRequest.partnerTrackingId())

‎app/src/main/java/com/rockthevote/grommet/data/db/DbOpenHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class DbOpenHelper extends SQLiteOpenHelper {
3131
+ RockyRequest.OPT_IN_SMS + " INTEGER DEFAULT " + Db.BOOLEAN_FALSE + ","
3232
+ RockyRequest.OPT_IN_VOLUNTEER + " INTEGER DEFAULT " + Db.BOOLEAN_FALSE + ","
3333
+ RockyRequest.PARTNER_OPT_IN_SMS + " INTEGER DEFAULT " + Db.BOOLEAN_FALSE + ","
34-
+ RockyRequest.PARTNER_OPT_IN_EMAIL + " INTEGER DEFAULT " + Db.BOOLEAN_FALSE + ","
34+
+ RockyRequest.PARTNER_OPT_IN_EMAIL + " INTEGER DEFAULT " + Db.BOOLEAN_TRUE + ","
3535
+ RockyRequest.SOURCE_TRACKING_ID + " TEXT,"
3636
+ RockyRequest.PARTNER_TRACKING_ID + " TEXT,"
3737
+ RockyRequest.OPEN_TRACKING_ID + " TEXT,"

‎app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,9 @@ public static Race fromString(String race) {
309309
}
310310

311311
public enum Party {
312-
OTHER("Other"),
313312
DEMOCRATIC("Democratic"),
314-
GREEN("Green"),
315-
INDEPENDENT("Independent"),
316-
LIBERTARIAN("Libertarian"),
317313
REPUBLICAN("Republican"),
318-
NONE("None");
314+
OTHER("Other");
319315

320316
private final String party;
321317

‎app/src/main/java/com/rockthevote/grommet/ui/misc/ObservableValidator.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public ObservableValidator(Object controller, Context context) {
2525
public void onAllRulesPassed(View view) {
2626
if (view instanceof TextInputLayout) {
2727
((TextInputLayout) view).setError(null);
28+
((TextInputLayout) view).setErrorEnabled(false);
2829
} else if (view instanceof CheckBox) {
2930
((CheckBox) view).setError(null);
3031
}

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
154154
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
155155
super.onActivityCreated(savedInstanceState);
156156
phoneOptIn.setText(getString(R.string.label_receive_text, partnerNamePref.get()));
157+
emailOptIn.setText(getString(R.string.label_receive_email, partnerNamePref.get()));
157158
}
158159

159160
@Override
@@ -243,7 +244,7 @@ public void onResume() {
243244
db.update(
244245
RockyRequest.TABLE,
245246
new RockyRequest.Builder()
246-
.optInEmail(checked)
247+
.partnerOptInEmail(checked)
247248
.build(),
248249
RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
249250
}));
@@ -280,7 +281,7 @@ public void onResume() {
280281
db.update(
281282
RockyRequest.TABLE,
282283
new RockyRequest.Builder()
283-
.optInSMS(checked)
284+
.partnerOptInSMS(checked)
284285
.build(),
285286
RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
286287
}));
@@ -304,7 +305,9 @@ public void onDriversLicenseChecked(boolean checked) {
304305

305306
// disabling it prevents Saripaar from trying to validate it
306307
pennDOTTIL.setEnabled(!checked);
307-
pennDOTTIL.setErrorEnabled(!checked);
308+
if (checked) {
309+
pennDOTTIL.setErrorEnabled(false);
310+
}
308311
doesNotHavePennDOT.onNext(checked);
309312
}
310313

@@ -314,7 +317,9 @@ public void onSSNChecked(boolean checked) {
314317

315318
// disabling it prevents Saripaar from trying to validate it
316319
ssnTIL.setEnabled(!checked);
317-
ssnTIL.setErrorEnabled(!checked);
320+
if (checked) {
321+
ssnTIL.setErrorEnabled(false);
322+
}
318323
doesNotHaveSSN.onNext(checked);
319324
}
320325

‎app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ protected void onAttachedToWindow() {
185185
RxTextView.afterTextChangeEvents(cityEditText),
186186
RxTextView.afterTextChangeEvents(stateSpinner.getEditText()),
187187
RxTextView.afterTextChangeEvents(zipEditText),
188-
RxTextView.afterTextChangeEvents(stateSpinner.getEditText()),
188+
RxTextView.afterTextChangeEvents(countySpinner.getEditText()),
189189
(street, unit, city, state, zip, county) -> new Address.Builder()
190190
.streetName(street.editable().toString())
191191
.subAddress(unit.editable().toString())

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

Lines changed: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<GridLayout
55
xmlns:android="http://schemas.android.com/apk/res/android"
66
xmlns:app="http://schemas.android.com/apk/res-auto"
7+
xmlns:tools="http://schemas.android.com/tools"
78
android:layout_width="match_parent"
89
android:layout_height="wrap_content"
910
android:animateLayoutChanges="true"
@@ -30,7 +31,7 @@
3031
android:layout_marginStart="@dimen/content_margin"
3132
android:paddingBottom="@dimen/content_area_padding"
3233
android:paddingTop="@dimen/content_area_padding"
33-
app:errorEnabled="true"
34+
app:errorEnabled="false"
3435
>
3536

3637
<android.support.design.widget.TextInputEditText
@@ -39,7 +40,8 @@
3940
android:layout_height="wrap_content"
4041
android:hint="@string/preferred_language_label"
4142
android:inputType="text"
42-
android:maxLines="1"/>
43+
android:maxLines="1"
44+
android:text="@string/preferred_language_default"/>
4345

4446
</android.support.design.widget.TextInputLayout>
4547

@@ -51,7 +53,7 @@
5153
android:layout_marginEnd="@dimen/content_margin"
5254
android:layout_marginStart="@dimen/content_margin"
5355
android:hint="@string/section_label_race"
54-
app:errorEnabled="true"/>
56+
app:errorEnabled="false"/>
5557

5658
<com.rockthevote.grommet.ui.misc.BetterSpinner
5759
android:id="@+id/spinner_party"
@@ -61,8 +63,18 @@
6163
android:layout_marginEnd="@dimen/content_margin"
6264
android:layout_marginStart="@dimen/content_margin"
6365
android:hint="@string/section_label_party"
64-
app:errorEnabled="true"/>
66+
android:paddingBottom="@dimen/content_area_padding"
67+
app:errorEnabled="false"/>
6568

69+
<TextView
70+
android:layout_width="0dp"
71+
android:layout_height="wrap_content"
72+
android:layout_columnSpan="2"
73+
android:layout_gravity="fill_horizontal"
74+
android:layout_marginEnd="@dimen/content_margin"
75+
android:layout_marginStart="@dimen/content_margin"
76+
android:paddingTop="@dimen/content_area_padding"
77+
android:text="@string/penn_dot_enforcer_text"/>
6678

6779
<android.support.design.widget.TextInputLayout
6880
android:id="@+id/til_penn_dot"
@@ -71,15 +83,15 @@
7183
android:layout_gravity="fill_horizontal"
7284
android:layout_marginEnd="@dimen/content_margin"
7385
android:layout_marginStart="@dimen/content_margin"
74-
app:errorEnabled="true"
86+
app:errorEnabled="false"
7587
>
7688

7789
<android.support.design.widget.TextInputEditText
7890
android:id="@+id/penn_dot_edit_text"
7991
android:layout_width="match_parent"
8092
android:layout_height="wrap_content"
81-
android:hint="@string/label_drivers_license_id"
8293
android:digits="0123456789"
94+
android:hint="@string/label_drivers_license_id"
8395
android:inputType="number"
8496
android:maxLength="8"
8597
android:maxLines="1"/>
@@ -91,18 +103,29 @@
91103
android:layout_width="wrap_content"
92104
android:layout_columnSpan="2"
93105
android:layout_marginStart="@dimen/content_margin"
106+
android:gravity="bottom"
94107
android:paddingBottom="@dimen/content_area_padding"
95-
android:paddingTop="@dimen/content_area_padding"
96108
android:text="@string/label_does_not_have_penn_dot"/>
97109

110+
111+
<TextView
112+
android:layout_width="0dp"
113+
android:layout_height="wrap_content"
114+
android:layout_columnSpan="2"
115+
android:layout_gravity="fill_horizontal"
116+
android:layout_marginEnd="@dimen/content_margin"
117+
android:layout_marginStart="@dimen/content_margin"
118+
android:paddingTop="@dimen/content_area_padding"
119+
android:text="@string/ssn_enforcer_text"/>
120+
98121
<android.support.design.widget.TextInputLayout
99122
android:id="@+id/til_ssn_last_four"
100123
android:layout_width="0dip"
101124
android:layout_columnSpan="2"
102125
android:layout_gravity="fill_horizontal"
103126
android:layout_marginEnd="@dimen/content_margin"
104127
android:layout_marginStart="@dimen/content_margin"
105-
app:errorEnabled="true"
128+
app:errorEnabled="false"
106129
>
107130

108131
<android.support.design.widget.TextInputEditText
@@ -121,8 +144,8 @@
121144
android:layout_width="wrap_content"
122145
android:layout_columnSpan="2"
123146
android:layout_marginStart="@dimen/content_margin"
147+
android:gravity="bottom"
124148
android:paddingBottom="@dimen/content_area_padding"
125-
android:paddingTop="@dimen/content_area_padding"
126149
android:text="@string/label_does_not_have_ssn"/>
127150

128151
<View
@@ -144,6 +167,15 @@
144167
android:text="@string/section_label_contact_info"
145168
android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
146169

170+
<TextView
171+
android:layout_width="0dp"
172+
android:layout_height="wrap_content"
173+
android:layout_columnSpan="2"
174+
android:layout_gravity="fill_horizontal"
175+
android:layout_marginEnd="@dimen/content_margin"
176+
android:layout_marginStart="@dimen/content_margin"
177+
android:text="@string/label_email_confirmation"/>
178+
147179
<android.support.design.widget.TextInputLayout
148180
android:id="@+id/til_email"
149181
android:layout_width="0dp"
@@ -152,12 +184,12 @@
152184
android:layout_gravity="fill_horizontal"
153185
android:layout_marginEnd="@dimen/content_margin"
154186
android:layout_marginStart="@dimen/content_margin"
155-
app:errorEnabled="true">
187+
app:errorEnabled="false">
156188

157189
<android.support.design.widget.TextInputEditText
158190
android:id="@+id/email_edit_text"
159191
android:layout_width="match_parent"
160-
android:layout_height="@dimen/list_item_height"
192+
android:layout_height="wrap_content"
161193
android:layout_marginBottom="@dimen/content_area_padding"
162194
android:hint="@string/label_email"
163195
android:inputType="textEmailAddress"
@@ -172,9 +204,10 @@
172204
android:layout_columnSpan="2"
173205
android:layout_marginEnd="@dimen/content_margin"
174206
android:layout_marginStart="@dimen/content_margin"
207+
android:checked="true"
175208
android:paddingBottom="@dimen/content_area_padding"
176209
android:paddingTop="@dimen/content_area_padding"
177-
android:text="@string/label_receive_email"/>
210+
tools:text="@string/label_receive_email"/>
178211

179212
<android.support.design.widget.TextInputLayout
180213
android:id="@+id/til_phone_number"
@@ -183,7 +216,7 @@
183216
android:layout_columnWeight=".7"
184217
android:layout_gravity="fill_horizontal"
185218
android:layout_marginStart="@dimen/content_margin"
186-
app:errorEnabled="true">
219+
app:errorEnabled="false">
187220

188221
<android.support.design.widget.TextInputEditText
189222
android:id="@+id/phone"
@@ -202,7 +235,7 @@
202235
android:layout_gravity="fill_horizontal"
203236
android:layout_marginEnd="@dimen/content_margin"
204237
android:hint="@string/label_phone_type"
205-
app:errorEnabled="true"/>
238+
app:errorEnabled="false"/>
206239

207240
<CheckBox
208241
android:id="@+id/checkbox_can_receive_text"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
android:layout_gravity="fill_horizontal"
112112
android:layout_marginEnd="@dimen/content_margin"
113113
android:layout_marginStart="@dimen/content_margin"
114-
app:errorEnabled="true">
114+
app:errorEnabled="false">
115115

116116
<android.support.design.widget.TextInputEditText
117117
android:id="@+id/assistant_phone"
@@ -130,7 +130,6 @@
130130
android:paddingTop="@dimen/content_area_padding"
131131
android:layout_marginStart="@dimen/content_margin"
132132
android:layout_marginEnd="@dimen/content_margin"
133-
android:textStyle="bold"
134133
android:text="@string/label_assistant_declaration"/>
135134

136135
<CheckBox

0 commit comments

Comments
 (0)