diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java index df57536..761f6c5 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java @@ -34,7 +34,7 @@ loginUseCases.inputData(userName.getText().toString(), passWord.getText().toString()); //通信 - LoginResponseControllerController userLoginResponseController = new LoginResponseControllerController(fragmentActivity, manager); + LoginResponseController userLoginResponseController = new LoginResponseController(fragmentActivity, manager); loginPresenter.setFollowingController(userLoginResponseController); loginUseCases.proc(); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseController.java new file mode 100644 index 0000000..1646f39 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseController.java @@ -0,0 +1,33 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller; + +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentManager; + +import net.arnx.jsonic.JSON; +import net.arnx.jsonic.TypeReference; + +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Cactus; +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.URIAddressedAccount; +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponseControllerBoundary; +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponseUseCase; + +public class LoginResponseController implements LoginResponseControllerBoundary { + private FragmentActivity fragmentActivity; + private FragmentManager manager; + + public LoginResponseController(FragmentActivity fragmentActivity, FragmentManager manager) { + this.fragmentActivity = fragmentActivity; + this.manager = manager; + } + + @Override + public void onResponse(String response) { + URIAddressedAccount lac = JSON.decode(response, new TypeReference() { + }); + System.out.println(response); + LoginResponsePresenter loginResponsePresenter = new LoginResponsePresenter(fragmentActivity, manager); + LoginResponseUseCase loginResponseUseCase = new LoginResponseUseCase((Cactus) (fragmentActivity.getApplication()), loginResponsePresenter); + loginResponseUseCase.inputData(lac); + loginResponseUseCase.proc(); + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseControllerController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseControllerController.java deleted file mode 100644 index cefef85..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseControllerController.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller; - -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; - -import net.arnx.jsonic.JSON; -import net.arnx.jsonic.TypeReference; - -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Cactus; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.URIAddressedAccount; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponseControllerBoundary; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponseUseCase; - -public class LoginResponseControllerController implements LoginResponseControllerBoundary { - private FragmentActivity fragmentActivity; - private FragmentManager manager; - - public LoginResponseControllerController(FragmentActivity fragmentActivity, FragmentManager manager) { - this.fragmentActivity = fragmentActivity; - this.manager = manager; - } - - @Override - public void onResponse(String response) { - URIAddressedAccount lac = JSON.decode(response, new TypeReference() {}); - System.out.println(response); - - LoginResponsePresenter loginResponsePresenter = new LoginResponsePresenter(fragmentActivity, manager); - LoginResponseUseCase loginResponseUseCase = new LoginResponseUseCase((Cactus) (fragmentActivity.getApplication()), loginResponsePresenter); - loginResponseUseCase.inputData(lac); - loginResponseUseCase.proc(); - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java index e402415..da3ed30 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java @@ -20,7 +20,6 @@ public void succeeded() { Toast.makeText(fragmentActivity, "ログインに成功しました。", Toast.LENGTH_SHORT).show(); - //画面遷移 FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.fragment_place, new InstancesFragment()); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Account.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Account.java index 7653584..c5a372a 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Account.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Account.java @@ -5,7 +5,8 @@ public class Account { private String id, name, token, pass, uniqueID; private boolean login = false; - private Account(){ + + private Account() { } public Account(String userID, String userName, String userPass, String uniqueID) { @@ -33,7 +34,7 @@ this.name = name; } - @JSONHint(ignore=true) + @JSONHint(ignore = true) public String getPass() { return pass; } @@ -50,7 +51,7 @@ this.login = login; } - public void setToken(String token){ + public void setToken(String token) { this.token = token; } @@ -64,7 +65,7 @@ return token; } - @JSONHint(ignore=true) + @JSONHint(ignore = true) public String getUniqueID() { return uniqueID; } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Cactus.java index 7da98dd..83d14a3 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Cactus.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Cactus.java @@ -8,46 +8,36 @@ public class Cactus extends Application { private Account myAccount = null; - private URIAddressedAccount addressedAccount; public Cactus() { - registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() { @Override public void onActivityCreated(Activity activity, Bundle savedInstanceState) { - } @Override public void onActivityStarted(Activity activity) { - - } @Override public void onActivityResumed(Activity activity) { - } @Override public void onActivityPaused(Activity activity) { - } @Override public void onActivityStopped(Activity activity) { - } @Override public void onActivitySaveInstanceState(Activity activity, Bundle outState) { - } @Override public void onActivityDestroyed(Activity activity) { - } }); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/RandomStringGenerator.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/RandomStringGenerator.java index 937a4bd..b20e259 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/RandomStringGenerator.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/RandomStringGenerator.java @@ -8,7 +8,6 @@ public static final String ALPHA_NUMERIC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; private RandomStringGenerator() { - } static public String generateRandomString(int num, String seed) { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java index 9acc0cb..7667f82 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java @@ -1,7 +1,7 @@ package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Cactus; import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Account; +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Cactus; import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.URIAddressedAccount; public class LoginResponseUseCase { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java index e9587ac..dda5ca3 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java @@ -28,7 +28,6 @@ @Override public void onStart() { super.onStart(); - Button button = view.findViewById(R.id.signUP1); button.setOnClickListener(new View.OnClickListener() { @Override @@ -42,6 +41,5 @@ }); Button loginButton = view.findViewById(R.id.login); loginButton.setOnClickListener(loginController); - } }