Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

name copy update #236

Merged
merged 1 commit into from
Apr 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/assets/json/server-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
"many": "minutes"
},
"minutes_plural": "minutes",
"Name": "Name",
"New_pledge_activity": "New pledge activity",
"No_comments_yet": "No comments yet.",
"No_messages": "No messages",
Expand Down Expand Up @@ -2149,6 +2150,7 @@
"many": "Min"
},
"minutes_plural": "Min",
"Name": "Name",
"New_pledge_activity": "Neue Finanzierungsbeiträge",
"No_comments_yet": "Bisher noch keine Kommentare.",
"No_messages": "Keine Nachrichten",
Expand Down Expand Up @@ -4088,6 +4090,7 @@
"many": "minutos"
},
"minutes_plural": "minutos",
"Name": "Name",
"New_pledge_activity": "Nueva actividad de contribución",
"No_comments_yet": "No hay comentarios todavia.",
"No_messages": "No hay mensajes",
Expand Down Expand Up @@ -6027,6 +6030,7 @@
"many": "minutes"
},
"minutes_plural": "minutes",
"Name": "Name",
"New_pledge_activity": "Nouveaux engagements",
"No_comments_yet": "Pas de commentaires.",
"No_messages": "Pas de messages",
Expand Down Expand Up @@ -7966,6 +7970,7 @@
"many": "分"
},
"minutes_plural": "分",
"Name": "Name",
"New_pledge_activity": "新しいプレッジ",
"No_comments_yet": "まだコメントはありません。",
"No_messages": "メッセージがありません。",
Expand Down Expand Up @@ -9894,6 +9899,7 @@
"show_refreshed_thanks_page": "control",
"project_cards_description": "control",
"default_rec_projects": "control",
"stripe_elements": "experimental",
"sticky_global_header": "control"
},
"stripe": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

@RequiresActivityViewModel(SignupViewModel.ViewModel.class)
public final class SignupActivity extends BaseActivity<SignupViewModel.ViewModel> {
@Bind(R.id.full_name) EditText nameEditText;
@Bind(R.id.name) EditText nameEditText;
@Bind(R.id.email) EditText emailEditText;
@Bind(R.id.help_button) TextView helpButton;
@Bind(R.id.login_toolbar) LoginToolbar loginToolbar;
Expand Down Expand Up @@ -86,9 +86,9 @@ public void disclaimerClick() {
new LoginPopupMenu(this, this.helpButton).show();
}

@OnTextChanged(R.id.full_name)
void onNameTextChanged(final @NonNull CharSequence fullName) {
this.viewModel.inputs.fullName(fullName.toString());
@OnTextChanged(R.id.name)
void onNameTextChanged(final @NonNull CharSequence name) {
this.viewModel.inputs.name(name.toString());
}

@OnTextChanged(R.id.email)
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/java/com/kickstarter/viewmodels/SignupViewModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ interface Inputs {
void email(String email);

/** Call when the name field changes. */
void fullName(String fullName);
void name(String name);

/** Call when the password field changes. */
void password(String password);
Expand Down Expand Up @@ -69,7 +69,7 @@ public ViewModel(final @NonNull Environment environment) {
this.currentUser = environment.currentUser();

final Observable<SignupData> signupData = Observable.combineLatest(
this.fullName, this.email, this.password, this.sendNewslettersIsChecked, SignupData::new
this.name, this.email, this.password, this.sendNewslettersIsChecked, SignupData::new
);

this.sendNewslettersClick
Expand Down Expand Up @@ -116,7 +116,7 @@ public ViewModel(final @NonNull Environment environment) {
}

private Observable<AccessTokenEnvelope> submit(final @NonNull SignupData data) {
return this.client.signup(data.fullName, data.email, data.password, data.password, data.sendNewsletters)
return this.client.signup(data.name, data.email, data.password, data.password, data.sendNewsletters)
.compose(Transformers.pipeApiErrorsTo(this.signupError))
.compose(Transformers.neverError())
.doOnSubscribe(() -> this.formSubmitting.onNext(true))
Expand All @@ -128,8 +128,8 @@ private void success(final @NonNull AccessTokenEnvelope envelope) {
this.signupSuccess.onNext(null);
}

private final PublishSubject<String> fullName = PublishSubject.create();
private final PublishSubject<String> email = PublishSubject.create();
private final PublishSubject<String> name = PublishSubject.create();
private final PublishSubject<String> password = PublishSubject.create();
private final PublishSubject<Boolean> sendNewslettersClick = PublishSubject.create();
private final PublishSubject<Void> signupClick = PublishSubject.create();
Expand All @@ -148,8 +148,8 @@ private void success(final @NonNull AccessTokenEnvelope envelope) {
@Override public void email(final String email) {
this.email.onNext(email);
}
@Override public void fullName(final String fullName) {
this.fullName.onNext(fullName);
@Override public void name(final String name) {
this.name.onNext(name);
}
@Override public void password(final String password) {
this.password.onNext(password);
Expand Down Expand Up @@ -179,21 +179,21 @@ private void success(final @NonNull AccessTokenEnvelope envelope) {
}

final static class SignupData {
final @NonNull String fullName;
final @NonNull String email;
final @NonNull String name;
final @NonNull String password;
final boolean sendNewsletters;

SignupData(final @NonNull String fullName, final @NonNull String email, final @NonNull String password,
SignupData(final @NonNull String name, final @NonNull String email, final @NonNull String password,
final boolean sendNewsletters) {
this.fullName = fullName;
this.name = name;
this.email = email;
this.password = password;
this.sendNewsletters = sendNewsletters;
}

boolean isValid() {
return this.fullName.length() > 0 && StringUtils.isEmail(this.email) && this.password.length() >= 6;
return this.name.length() > 0 && StringUtils.isEmail(this.email) && this.password.length() >= 6;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/signup_form_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
android:layout_marginTop="@dimen/grid_2">

<EditText
android:id="@+id/full_name"
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName|textCapWords"
android:maxLines="1"
style="@style/CalloutPrimary"
android:hint="@string/signup_input_fields_full_name" />
android:hint="@string/Name" />

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

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings_i18n.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ Unterstützer</string>
<string name="Message_backer" formatted="false">Nachricht an Unterstützer senden</string>
<string name="Message_creator" formatted="false">Nachricht an Projektgründer senden</string>
<string name="Message_user_name" formatted="false">Nachricht senden an %{user_name}…</string>
<string name="Name" formatted="false">Name</string>
<string name="New_pledge_activity" formatted="false">Neue Finanzierungsbeiträge</string>
<string name="No_Results" formatted="false">Keine Ergebnisse</string>
<string name="No_comments_yet" formatted="false">Bisher noch keine Kommentare.</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-es/strings_i18n.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ patrocinadores</string>
<string name="Message_backer" formatted="false">Enviar mensaje a patrocinador</string>
<string name="Message_creator" formatted="false">Enviar mensaje al creador</string>
<string name="Message_user_name" formatted="false">Mensaje a %{user_name}…</string>
<string name="Name" formatted="false">Name</string>
<string name="New_pledge_activity" formatted="false">Nueva actividad de contribución</string>
<string name="No_Results" formatted="false">Sin resultados</string>
<string name="No_comments_yet" formatted="false">No hay comentarios todavia.</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-fr/strings_i18n.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ contributeurs</string>
<string name="Message_backer" formatted="false">Envoyer un message au contributeur</string>
<string name="Message_creator" formatted="false">Envoyer un message au créateur</string>
<string name="Message_user_name" formatted="false">Envoyer un message à %{user_name}</string>
<string name="Name" formatted="false">Name</string>
<string name="New_pledge_activity" formatted="false">Nouveaux engagements</string>
<string name="No_Results" formatted="false">Pas de résultats</string>
<string name="No_comments_yet" formatted="false">Pas de commentaires.</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ja/strings_i18n.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
<string name="Message_backer" formatted="false">バッカーにメッセージする</string>
<string name="Message_creator" formatted="false">クリエーターにメッセージする</string>
<string name="Message_user_name" formatted="false">%{user_name} にメッセージ</string>
<string name="Name" formatted="false">Name</string>
<string name="New_pledge_activity" formatted="false">新しいプレッジ</string>
<string name="No_Results" formatted="false">該当結果なし</string>
<string name="No_comments_yet" formatted="false">まだコメントはありません。</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings_i18n.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ with friends.</string>
<string name="Message_backer" formatted="false">Message backer</string>
<string name="Message_creator" formatted="false">Message creator</string>
<string name="Message_user_name" formatted="false">Message %{user_name}…</string>
<string name="Name" formatted="false">Name</string>
<string name="New_pledge_activity" formatted="false">New pledge activity</string>
<string name="No_Results" formatted="false">No Results</string>
<string name="No_comments_yet" formatted="false">No comments yet.</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void testSignupViewModel_FormValidation() {
final TestSubscriber<Boolean> formIsValidTest = new TestSubscriber<>();
vm.outputs.formIsValid().subscribe(formIsValidTest);

vm.inputs.fullName("brandon");
vm.inputs.name("brandon");
formIsValidTest.assertNoValues();

vm.inputs.email("incorrect@kickstarter");
Expand All @@ -50,7 +50,7 @@ public void testSignupViewModel_SuccessfulSignup() {
final TestSubscriber<Boolean> formSubmittingTest = new TestSubscriber<>();
vm.outputs.formSubmitting().subscribe(formSubmittingTest);

vm.inputs.fullName("brandon");
vm.inputs.name("brandon");
vm.inputs.email("hello@kickstarter.com");
vm.inputs.email("incorrect@kickstarter");
vm.inputs.password("danisawesome");
Expand Down Expand Up @@ -87,7 +87,7 @@ public void testSignupViewModel_ApiValidationError() {
final TestSubscriber<Boolean> formSubmittingTest = new TestSubscriber<>();
vm.outputs.formSubmitting().subscribe(formSubmittingTest);

vm.inputs.fullName("brandon");
vm.inputs.name("brandon");
vm.inputs.email("hello@kickstarter.com");
vm.inputs.email("incorrect@kickstarter");
vm.inputs.password("danisawesome");
Expand Down Expand Up @@ -123,7 +123,7 @@ public void testSignupViewModel_ApiError() {
final TestSubscriber<Boolean> formSubmittingTest = new TestSubscriber<>();
vm.outputs.formSubmitting().subscribe(formSubmittingTest);

vm.inputs.fullName("brandon");
vm.inputs.name("brandon");
vm.inputs.email("hello@kickstarter.com");
vm.inputs.email("incorrect@kickstarter");
vm.inputs.password("danisawesome");
Expand Down