Download as
Browse Code »

Commit 3971c770c8b88504b8a7e628e71f67978a80c8c8

Authored by geraldo morais
2 parents 5199c660 f61b2bc0
Exists in master

Merge remote-tracking branch 'origin/master' 

Conflicts:
	app/src/main/java/com/monitorabrasil/participacidadao/view/Login2Activity.java
Showing 4 changed files with 74 additions and 27 deletions   Show diff stats
app/src/main/java/com/monitorabrasil/participacidadao/actions/ActionsCreator.java
  Diff comments   View file @3971c77
... ... @@ -4,6 +4,7 @@ import com.monitorabrasil.participacidadao.dispatcher.Dispatcher;
4 4 import com.parse.LogInCallback;
5 5 import com.parse.LogOutCallback;
6 6 import com.parse.ParseUser;
  7 +import com.parse.SignUpCallback;
7 8  
8 9 /**
9 10 * Created by 89741803168 on 13/08/2015.
... ... @@ -70,6 +71,31 @@ public class ActionsCreator {
70 71 }
71 72  
72 73  
  74 + public void cadastrar(String nome, String password, String email) {
  75 + ParseUser user = new ParseUser();
  76 + user.setUsername(email);
  77 + user.setPassword(password);
  78 + user.setEmail(email);
  79 + user.put("nome", nome);
73 80  
74 81  
  82 + user.signUpInBackground(new SignUpCallback() {
  83 + @Override
  84 + public void done(com.parse.ParseException e) {
  85 + if (e == null) {
  86 + dispatcher.dispatch(
  87 + UserActions.USER_CADASTRO,
  88 + UserActions.KEY_TEXT, "sucesso"
  89 + );
  90 + } else {
  91 + dispatcher.dispatch(
  92 + UserActions.USER_CADASTRO,
  93 + UserActions.KEY_TEXT, "erro"
  94 + );
  95 + }
  96 + }
  97 +
  98 +
  99 + });
  100 + }
75 101 }
... ...
app/src/main/java/com/monitorabrasil/participacidadao/actions/UserActions.java
  Diff comments   View file @3971c77
... ... @@ -6,7 +6,10 @@ package com.monitorabrasil.participacidadao.actions;
6 6 public interface UserActions {
7 7 String USER_LOGAR = "user-logar";
8 8 String USER_LOGOUT = "user-logout";
  9 + String USER_CADASTRO = "user_cadastro";
9 10  
10 11 String KEY_TEXT = "key-text";
11 12 String KEY_ID = "key-id";
  13 +
  14 +
12 15 }
... ...
app/src/main/java/com/monitorabrasil/participacidadao/stores/UserStore.java
  Diff comments   View file @3971c77
... ... @@ -12,6 +12,11 @@ public class UserStore extends Store{
12 12  
13 13 private static UserStore instance;
14 14 private String status;
  15 + private String evento;
  16 +
  17 +
  18 +
  19 +
15 20  
16 21 protected UserStore(Dispatcher dispatcher) {
17 22 super(dispatcher);
... ... @@ -29,14 +34,19 @@ public class UserStore extends Store{
29 34 @Subscribe
30 35 public void onAction(Action action) {
31 36 status = "erro";
  37 + this.evento = action.getType();
  38 + this.status = ((String) action.getData().get(UserActions.KEY_TEXT));
  39 +
32 40 switch (action.getType()) {
33 41 case UserActions.USER_LOGAR:
34   - status = ((String) action.getData().get(UserActions.KEY_TEXT));
35 42 emitStoreChange();
36 43 break;
37 44 case UserActions.USER_LOGOUT:
38 45 emitStoreChange();
39 46 break;
  47 + case UserActions.USER_CADASTRO:
  48 + emitStoreChange();
  49 + break;
40 50 }
41 51 }
42 52  
... ... @@ -44,10 +54,20 @@ public class UserStore extends Store{
44 54 StoreChangeEvent changeEvent() {
45 55 UserStoreChangeEvent mUserStoreChangeEvent = new UserStoreChangeEvent();
46 56 mUserStoreChangeEvent.status = this.status;
  57 + mUserStoreChangeEvent.evento = this.evento;
47 58 return mUserStoreChangeEvent;
48 59 }
49 60  
50 61 public class UserStoreChangeEvent implements StoreChangeEvent {
51   - String status;
  62 + private String status;
  63 + private String evento;
  64 +
  65 + public String getEvento() {
  66 + return evento;
  67 + }
  68 +
  69 + public String getStatus() {
  70 + return status;
  71 + }
52 72 }
53 73 }
... ...
app/src/main/java/com/monitorabrasil/participacidadao/view/Login2Activity.java
  Diff comments   View file @3971c77
1   -package com.monitorabrasil.participacidadao.view;
  1 +package com.monitorabrasil.monitoralegislativo.view;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
... ... @@ -22,11 +22,16 @@ import android.widget.ImageButton;
22 22 import android.widget.ImageView;
23 23 import android.widget.TextView;
24 24  
25   -import com.monitorabrasil.participacidadao.R;
26   -import com.monitorabrasil.participacidadao.actions.ActionsCreator;
27   -import com.monitorabrasil.participacidadao.dispatcher.Dispatcher;
28   -import com.monitorabrasil.participacidadao.stores.UserStore;
  25 +import com.monitorabrasil.monitoralegislativo.R;
  26 +import com.monitorabrasil.monitoralegislativo.actions.ActionsCreator;
  27 +import com.monitorabrasil.monitoralegislativo.actions.UserActions;
  28 +import com.monitorabrasil.monitoralegislativo.application.MyApp;
  29 +import com.monitorabrasil.monitoralegislativo.dispatcher.Dispatcher;
  30 +import com.monitorabrasil.monitoralegislativo.stores.UserStore;
  31 +import com.nostra13.universalimageloader.core.assist.FailReason;
  32 +import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
29 33 import com.parse.LogInCallback;
  34 +import com.parse.LogOutCallback;
30 35 import com.parse.ParseTwitterUtils;
31 36 import com.parse.ParseUser;
32 37 import com.parse.SignUpCallback;
... ... @@ -251,6 +256,15 @@ public class Login2Activity extends AppCompatActivity {
251 256  
252 257 @Subscribe
253 258 public void onTodoStoreChange(UserStore.UserStoreChangeEvent event) {
  259 + switch (event.getEvento()){
  260 + case UserActions.USER_CADASTRO:
  261 + if(event.getStatus().equals("erro")){
  262 + showProgress(false, mLoginFormView);
  263 + Snackbar.make(mLoginFormView, "Houve um erro ao fazer seu cadastro ", Snackbar.LENGTH_LONG)
  264 + .setAction("Action", null).show();
  265 + }
  266 + break;
  267 + }
254 268 updateUI();
255 269 }
256 270  
... ... @@ -358,29 +372,13 @@ public class Login2Activity extends AppCompatActivity {
358 372 } else {
359 373 // Show a progress spinner, and kick off a background task to
360 374 // perform the user login attempt.
361   - showProgress(true,null);
  375 + showProgress(true, null);
  376 +
  377 +
  378 + actionsCreator.cadastrar(nome, password, email);
362 379  
363   - ParseUser user = new ParseUser();
364   - user.setUsername(email);
365   - user.setPassword(password);
366   - user.setEmail(email);
367   - user.put("nome", mNome.getText().toString());
368   -
369   -
370   - user.signUpInBackground(new SignUpCallback() {
371   - @Override
372   - public void done(com.parse.ParseException e) {
373   - if (e == null) {
374   - montaFormLogout();
375   - } else {
376   - showProgress(false, mLoginFormView);
377   - Snackbar.make(mLoginFormView, "Houve um erro ao fazer seu cadastro ", Snackbar.LENGTH_LONG)
378   - .setAction("Action", null).show();
379   - }
380   - }
381 380  
382 381  
383   - });
384 382  
385 383 }
386 384 }
... ...