From f61b2bc089a66c3a35a347fb8cdfe38be82936d8 Mon Sep 17 00:00:00 2001 From: geraugu Date: Mon, 17 Aug 2015 23:13:16 -0300 Subject: [PATCH] refactoring --- app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/ActionsCreator.java | 26 ++++++++++++++++++++++++++ app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/UserActions.java | 3 +++ app/src/main/java/com/monitorabrasil/monitoralegislativo/stores/UserStore.java | 24 ++++++++++++++++++++++-- app/src/main/java/com/monitorabrasil/monitoralegislativo/view/Login2Activity.java | 34 ++++++++++++++-------------------- 4 files changed, 65 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/ActionsCreator.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/ActionsCreator.java index 897879e..43364ed 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/ActionsCreator.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/ActionsCreator.java @@ -4,6 +4,7 @@ import com.monitorabrasil.monitoralegislativo.dispatcher.Dispatcher; import com.parse.LogInCallback; import com.parse.LogOutCallback; import com.parse.ParseUser; +import com.parse.SignUpCallback; /** * Created by 89741803168 on 13/08/2015. @@ -70,6 +71,31 @@ public class ActionsCreator { } + public void cadastrar(String nome, String password, String email) { + ParseUser user = new ParseUser(); + user.setUsername(email); + user.setPassword(password); + user.setEmail(email); + user.put("nome", nome); + user.signUpInBackground(new SignUpCallback() { + @Override + public void done(com.parse.ParseException e) { + if (e == null) { + dispatcher.dispatch( + UserActions.USER_CADASTRO, + UserActions.KEY_TEXT, "sucesso" + ); + } else { + dispatcher.dispatch( + UserActions.USER_CADASTRO, + UserActions.KEY_TEXT, "erro" + ); + } + } + + + }); + } } diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/UserActions.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/UserActions.java index 40aa9a8..f855288 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/UserActions.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/actions/UserActions.java @@ -6,7 +6,10 @@ package com.monitorabrasil.monitoralegislativo.actions; public interface UserActions { String USER_LOGAR = "user-logar"; String USER_LOGOUT = "user-logout"; + String USER_CADASTRO = "user_cadastro"; String KEY_TEXT = "key-text"; String KEY_ID = "key-id"; + + } diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/stores/UserStore.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/stores/UserStore.java index 4ad062d..8628800 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/stores/UserStore.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/stores/UserStore.java @@ -12,6 +12,11 @@ public class UserStore extends Store{ private static UserStore instance; private String status; + private String evento; + + + + protected UserStore(Dispatcher dispatcher) { super(dispatcher); @@ -29,14 +34,19 @@ public class UserStore extends Store{ @Subscribe public void onAction(Action action) { status = "erro"; + this.evento = action.getType(); + this.status = ((String) action.getData().get(UserActions.KEY_TEXT)); + switch (action.getType()) { case UserActions.USER_LOGAR: - status = ((String) action.getData().get(UserActions.KEY_TEXT)); emitStoreChange(); break; case UserActions.USER_LOGOUT: emitStoreChange(); break; + case UserActions.USER_CADASTRO: + emitStoreChange(); + break; } } @@ -44,10 +54,20 @@ public class UserStore extends Store{ StoreChangeEvent changeEvent() { UserStoreChangeEvent mUserStoreChangeEvent = new UserStoreChangeEvent(); mUserStoreChangeEvent.status = this.status; + mUserStoreChangeEvent.evento = this.evento; return mUserStoreChangeEvent; } public class UserStoreChangeEvent implements StoreChangeEvent { - String status; + private String status; + private String evento; + + public String getEvento() { + return evento; + } + + public String getStatus() { + return status; + } } } diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/view/Login2Activity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/view/Login2Activity.java index 39f1185..529f8e9 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/view/Login2Activity.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/view/Login2Activity.java @@ -24,6 +24,7 @@ import android.widget.TextView; import com.monitorabrasil.monitoralegislativo.R; import com.monitorabrasil.monitoralegislativo.actions.ActionsCreator; +import com.monitorabrasil.monitoralegislativo.actions.UserActions; import com.monitorabrasil.monitoralegislativo.application.MyApp; import com.monitorabrasil.monitoralegislativo.dispatcher.Dispatcher; import com.monitorabrasil.monitoralegislativo.stores.UserStore; @@ -255,6 +256,15 @@ public class Login2Activity extends AppCompatActivity { @Subscribe public void onTodoStoreChange(UserStore.UserStoreChangeEvent event) { + switch (event.getEvento()){ + case UserActions.USER_CADASTRO: + if(event.getStatus().equals("erro")){ + showProgress(false, mLoginFormView); + Snackbar.make(mLoginFormView, "Houve um erro ao fazer seu cadastro ", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + break; + } updateUI(); } @@ -362,29 +372,13 @@ public class Login2Activity extends AppCompatActivity { } else { // Show a progress spinner, and kick off a background task to // perform the user login attempt. - showProgress(true,null); + showProgress(true, null); + + + actionsCreator.cadastrar(nome, password, email); - ParseUser user = new ParseUser(); - user.setUsername(email); - user.setPassword(password); - user.setEmail(email); - user.put("nome", mNome.getText().toString()); - - - user.signUpInBackground(new SignUpCallback() { - @Override - public void done(com.parse.ParseException e) { - if (e == null) { - montaFormLogout(); - } else { - showProgress(false, mLoginFormView); - Snackbar.make(mLoginFormView, "Houve um erro ao fazer seu cadastro ", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - } - }); } } -- libgit2 0.21.2