diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/InputUserController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/InputUserController.java deleted file mode 100644 index 147aeca..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/InputUserController.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller; - -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.view.View; -import android.widget.EditText; -import android.widget.Toast; - -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginBoundary; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginUseCases; -import org.ntlab.radishforandroidstudio.R; - -/** - * 入力したデータをString型に変換し、入力判定を行うクラス - * - * @author n-konishi - */ - -public class InputUserController implements View.OnClickListener { - private FragmentActivity fragmentActivity; - private FragmentManager manager; - - public InputUserController(FragmentActivity fragmentActivity, FragmentManager manager) { - this.fragmentActivity = fragmentActivity; - this.manager = manager; - } - - @Override - public void onClick(View view) { - EditText userName = fragmentActivity.findViewById(R.id.inputUserName); - EditText passWord = fragmentActivity.findViewById(R.id.checkPassword); - - //動作 - UserLoginPresenter userLoginPresenter = new UserLoginPresenter(); - UserLoginUseCases userLoginUseCases = new UserLoginUseCases(userLoginPresenter); - userLoginUseCases.inputData(userName.getText().toString(), passWord.getText().toString()); - - //通信 - UserLoginResponseController userLoginResponseController = new UserLoginResponseController(fragmentActivity, manager); - userLoginPresenter.setFollowingController(userLoginResponseController); - userLoginUseCases.proc(); - } -} 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 new file mode 100644 index 0000000..945db6f --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java @@ -0,0 +1,41 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller; + +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentManager; +import android.view.View; +import android.widget.EditText; + +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginUseCases; +import org.ntlab.radishforandroidstudio.R; + +/** + * 入力したデータをString型に変換し、入力判定を行うクラス + * + * @author n-konishi + */ + +public class LoginController implements View.OnClickListener { + private FragmentActivity fragmentActivity; + private FragmentManager manager; + + public LoginController(FragmentActivity fragmentActivity, FragmentManager manager) { + this.fragmentActivity = fragmentActivity; + this.manager = manager; + } + + @Override + public void onClick(View view) { + EditText userName = fragmentActivity.findViewById(R.id.inputUserName); + EditText passWord = fragmentActivity.findViewById(R.id.checkPassword); + + //動作 + LoginPresenter loginPresenter = new LoginPresenter(); + LoginUseCases loginUseCases = new LoginUseCases(loginPresenter); + loginUseCases.inputData(userName.getText().toString(), passWord.getText().toString()); + + //通信 + LoginResponseControllerController userLoginResponseController = new LoginResponseControllerController(fragmentActivity, manager); + loginPresenter.setFollowingController(userLoginResponseController); + loginUseCases.proc(); + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginPresenter.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginPresenter.java new file mode 100644 index 0000000..0336a1d --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginPresenter.java @@ -0,0 +1,49 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller; + +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginPresenterBoundary; +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponseControllerBoundary; +import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; + +/** + * Webサーバと通信を行いデータのやりとりをするクラス + * + * @author n-konishi + */ + +public class LoginPresenter implements LoginPresenterBoundary { +// private FragmentManager manager; + +// private CactusConnection loginConnection; + private LoginFragmentConnection loginConnection; +// private FragmentActivity fragmentActivity; + + public LoginPresenter() { +// this.fragmentActivity = fragmentActivity; +// this.manager = fragmentManager; + +// LoginControllerBoundary userLoginBoundary = null; +// LoginUseCases loginUseCases = new LoginUseCases(userLoginBoundary); +// String login_URL = loginUseCases.userLoginURL(); +// loginConnection = new CactusConnection(login_URL); + loginConnection = new LoginFragmentConnection(); + } + + public void send(String userID, String userPass) { + loginConnection.addFormParam("userID", userID); + loginConnection.addFormParam("userPass", userPass); + loginConnection.doPut(); + } + + public void setFollowingController(LoginResponseControllerBoundary followingController) { + loginConnection.setCallBack(followingController); + } +} + + + + + + + + + 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 new file mode 100644 index 0000000..a5bfe86 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseControllerController.java @@ -0,0 +1,32 @@ +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.UseCases.LoginResponseControllerBoundary; +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponseUseCase; +import org.ntlab.radishforandroidstudio.cactusClient.Cactus; +import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount; + +public class LoginResponseControllerController implements LoginResponseControllerBoundary { + private final FragmentActivity fragmentActivity; + private final 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(); + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..bfd800a --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java @@ -0,0 +1,33 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller; + +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.widget.Toast; + +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponsePresenterBoundary; +import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.views.InstancesFragment; + +public class LoginResponsePresenter implements LoginResponsePresenterBoundary { + private final FragmentActivity fragmentActivity; + private final FragmentManager manager; + + public LoginResponsePresenter(FragmentActivity fragmentActivity, FragmentManager manager) { + this.fragmentActivity = fragmentActivity; + this.manager = manager; + } + + public void successed() { + Toast.makeText(fragmentActivity, "ログインに成功しました。", Toast.LENGTH_SHORT).show(); + + //画面遷移 + FragmentTransaction transaction = manager.beginTransaction(); + transaction.replace(R.id.fragment_place, new InstancesFragment()); + transaction.commit(); + } + + public void failed() { + Toast.makeText(fragmentActivity, "ログインに失敗しました。", Toast.LENGTH_SHORT).show(); + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginPresenter.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginPresenter.java deleted file mode 100644 index 08f16b9..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginPresenter.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller; - -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.widget.Toast; - -import net.arnx.jsonic.JSON; -import net.arnx.jsonic.TypeReference; - -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.CactusConnection; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginBoundary; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginPresenterBoundary; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginResponseBoundary; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginUseCases; -import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.cactusClient.Cactus; -import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; -import org.ntlab.radishforandroidstudio.cactusClient.models.account.Account; -import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount; -import org.ntlab.radishforandroidstudio.cactusClient.views.InstancesFragment; -import org.ntlab.radishforandroidstudio.framework.network.CallBack; - -/** - * Webサーバと通信を行いデータのやりとりをするクラス - * - * @author n-konishi - */ - -public class UserLoginPresenter implements UserLoginPresenterBoundary { -// private FragmentManager manager; - -// private CactusConnection loginConnection; - private LoginFragmentConnection loginConnection; -// private FragmentActivity fragmentActivity; - - public UserLoginPresenter() { -// this.fragmentActivity = fragmentActivity; -// this.manager = fragmentManager; - -// UserLoginBoundary userLoginBoundary = null; -// UserLoginUseCases loginUseCases = new UserLoginUseCases(userLoginBoundary); -// String login_URL = loginUseCases.userLoginURL(); -// loginConnection = new CactusConnection(login_URL); - loginConnection = new LoginFragmentConnection(); - } - - public void send(String userID, String userPass) { - loginConnection.addFormParam("userID", userID); - loginConnection.addFormParam("userPass", userPass); - loginConnection.doPut(); - } - - public void setFollowingController(UserLoginResponseBoundary followingController) { - loginConnection.setCallBack(followingController); - } -} - - - - - - - - - diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginResponseController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginResponseController.java deleted file mode 100644 index 158ce7d..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginResponseController.java +++ /dev/null @@ -1,32 +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.UseCases.UserLoginResponseBoundary; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginResponseUseCase; -import org.ntlab.radishforandroidstudio.cactusClient.Cactus; -import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount; - -public class UserLoginResponseController implements UserLoginResponseBoundary { - private final FragmentActivity fragmentActivity; - private final FragmentManager manager; - - public UserLoginResponseController(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); - UserLoginResponsePresenter userLoginResponsePresenter = new UserLoginResponsePresenter(fragmentActivity, manager); - UserLoginResponseUseCase userLoginResponseUseCase = new UserLoginResponseUseCase((Cactus) (fragmentActivity.getApplication()), userLoginResponsePresenter); - userLoginResponseUseCase.inputData(lac); - userLoginResponseUseCase.proc(); - } -} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginResponsePresenter.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginResponsePresenter.java deleted file mode 100644 index 3699de1..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/UserLoginResponsePresenter.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 android.support.v4.app.FragmentTransaction; -import android.widget.Toast; - -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginResponsePresenterBoundary; -import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.cactusClient.views.InstancesFragment; - -public class UserLoginResponsePresenter implements UserLoginResponsePresenterBoundary { - private final FragmentActivity fragmentActivity; - private final FragmentManager manager; - - public UserLoginResponsePresenter(FragmentActivity fragmentActivity, FragmentManager manager) { - this.fragmentActivity = fragmentActivity; - this.manager = manager; - } - - public void successed() { - Toast.makeText(fragmentActivity, "ログインに成功しました。", Toast.LENGTH_SHORT).show(); - - //画面遷移 - FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new InstancesFragment()); - transaction.commit(); - } - - public void failed() { - Toast.makeText(fragmentActivity, "ログインに失敗しました。", Toast.LENGTH_SHORT).show(); - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginControllerBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginControllerBoundary.java new file mode 100644 index 0000000..a23b5c2 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginControllerBoundary.java @@ -0,0 +1,16 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; + +/** + * 入力情報をInputUserPresenterからUserLoginUserCaseに + * 情報を渡すためのInterfaceクラス + * + * @author n-konishi + */ + +public interface LoginControllerBoundary { + + String getUserId(); + + String getUserPass(); + +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginPresenterBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginPresenterBoundary.java new file mode 100644 index 0000000..9d9624f --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginPresenterBoundary.java @@ -0,0 +1,12 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; + +/** + * UserLoginUseCaseからUserLoginControllerに + * 情報を渡すためのInterfaceクラス + * + * @author n-konishi + */ + +public interface LoginPresenterBoundary { + void send(String id, String pass); +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseControllerBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseControllerBoundary.java new file mode 100644 index 0000000..c742848 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseControllerBoundary.java @@ -0,0 +1,6 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; + +import org.ntlab.radishforandroidstudio.framework.network.CallBack; + +public interface LoginResponseControllerBoundary extends CallBack { +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponsePresenterBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponsePresenterBoundary.java new file mode 100644 index 0000000..df05b65 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponsePresenterBoundary.java @@ -0,0 +1,6 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; + +public interface LoginResponsePresenterBoundary { + public void successed(); + public void failed(); +} 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 new file mode 100644 index 0000000..52142f7 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java @@ -0,0 +1,34 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; + +import org.ntlab.radishforandroidstudio.cactusClient.Cactus; +import org.ntlab.radishforandroidstudio.cactusClient.models.account.Account; +import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount; + +public class LoginResponseUseCase { + private Cactus cactus; + private LoginResponsePresenterBoundary userLoginResponsePresenter; + private URIAddressedAccount lac; + + public LoginResponseUseCase(Cactus cactus, LoginResponsePresenterBoundary userLoginResponsePresenter) { + this.cactus = cactus; + this.userLoginResponsePresenter = userLoginResponsePresenter; + } + + public void inputData(URIAddressedAccount lac) { + this.lac = lac; + } + + public void proc() { + Account user = lac.getAccount(); + if (user.isLogin()) { + System.out.println("成功"); + // エンティティの更新 + cactus.setMyAccount(user); + cactus.setAddressedAccount(lac); + + userLoginResponsePresenter.successed(); + } else { + userLoginResponsePresenter.failed(); + } + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginUseCases.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginUseCases.java new file mode 100644 index 0000000..e6d0d74 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginUseCases.java @@ -0,0 +1,59 @@ +package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; + +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.CactusConnectionEntity; +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.CactusUserEntity; + +/** + * Userのログイン情報のデータの流れを調整するクラス + */ + +public class LoginUseCases { + + private String LOGIN_URL; + private CactusConnectionEntity cactusConnectionEntity; +// private LoginControllerBoundary userLoginBoundary; + + private String userID; + private String userPass; + private LoginPresenterBoundary userLoginPresenter; + private CactusUserEntity cactusUserEntity; + + public LoginUseCases(LoginPresenterBoundary userLoginPresenter) { +// this.userLoginBoundary = userLoginBound; + //Entityに情報をセットする + this.userLoginPresenter = userLoginPresenter; +// cactusUserEntity = new CactusUserEntity(); + } + + public void inputData(String userID, String userPass) { + this.userID = userID; + this.userPass = userPass; + } + + public void proc() { + userLoginPresenter.send(userID, userPass); + } + +// public String userLoginURL() { +// cactusConnectionEntity = new CactusConnectionEntity(); +// LOGIN_URL = cactusConnectionEntity.getLOGIN_URL(); +// return LOGIN_URL; +// } +// +// +// @Override +// public String getUserID() { +//// userID = userLoginBoundary.getUserId(); +// cactusUserEntity.setUserId(userID); +// return userID; +// } +// +// @Override +// public String getUserPass() { +//// userPass = userLoginBoundary.getUserPass(); +// cactusUserEntity.setUserPass(userPass); +// return userPass; +// } + + +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginBoundary.java deleted file mode 100644 index 858156a..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginBoundary.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; - -/** - * 入力情報をInputUserPresenterからUserLoginUserCaseに - * 情報を渡すためのInterfaceクラス - * - * @author n-konishi - */ - -public interface UserLoginBoundary { - - String getUserId(); - - String getUserPass(); - -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginPresenterBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginPresenterBoundary.java deleted file mode 100644 index ac9a671..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginPresenterBoundary.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; - -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller.UserLoginResponseController; - -/** - * UserLoginUseCaseからUserLoginControllerに - * 情報を渡すためのInterfaceクラス - * - * @author n-konishi - */ - -public interface UserLoginPresenterBoundary { - void send(String id, String pass); -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponseBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponseBoundary.java deleted file mode 100644 index 75fc84c..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponseBoundary.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; - -import org.ntlab.radishforandroidstudio.framework.network.CallBack; - -public interface UserLoginResponseBoundary extends CallBack { -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponsePresenterBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponsePresenterBoundary.java deleted file mode 100644 index 472ec83..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponsePresenterBoundary.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; - -public interface UserLoginResponsePresenterBoundary { - public void successed(); - public void failed(); -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponseUseCase.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponseUseCase.java deleted file mode 100644 index 8279830..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginResponseUseCase.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; - -import android.support.v4.app.FragmentTransaction; -import android.widget.Toast; - -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller.UserLoginResponsePresenter; -import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.cactusClient.Cactus; -import org.ntlab.radishforandroidstudio.cactusClient.models.account.Account; -import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount; -import org.ntlab.radishforandroidstudio.cactusClient.views.InstancesFragment; - -public class UserLoginResponseUseCase { - private Cactus cactus; - private UserLoginResponsePresenterBoundary userLoginResponsePresenter; - private URIAddressedAccount lac; - - public UserLoginResponseUseCase(Cactus cactus, UserLoginResponsePresenterBoundary userLoginResponsePresenter) { - this.cactus = cactus; - this.userLoginResponsePresenter = userLoginResponsePresenter; - } - - public void inputData(URIAddressedAccount lac) { - this.lac = lac; - } - - public void proc() { - Account user = lac.getAccount(); - if (user.isLogin()) { - System.out.println("成功"); - // エンティティの更新 - cactus.setMyAccount(user); - cactus.setAddressedAccount(lac); - - userLoginResponsePresenter.successed(); - } else { - userLoginResponsePresenter.failed(); - } - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginUseCases.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginUseCases.java deleted file mode 100644 index 9088ae5..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/UserLoginUseCases.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases; - -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.CactusConnectionEntity; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.CactusUserEntity; - -/** - * Userのログイン情報のデータの流れを調整するクラス - */ - -public class UserLoginUseCases { - - private String LOGIN_URL; - private CactusConnectionEntity cactusConnectionEntity; -// private UserLoginBoundary userLoginBoundary; - - private String userID; - private String userPass; - private UserLoginPresenterBoundary userLoginPresenter; - private CactusUserEntity cactusUserEntity; - - public UserLoginUseCases(UserLoginPresenterBoundary userLoginPresenter) { -// this.userLoginBoundary = userLoginBound; - //Entityに情報をセットする - this.userLoginPresenter = userLoginPresenter; -// cactusUserEntity = new CactusUserEntity(); - } - - public void inputData(String userID, String userPass) { - this.userID = userID; - this.userPass = userPass; - } - - public void proc() { - userLoginPresenter.send(userID, userPass); - } - -// public String userLoginURL() { -// cactusConnectionEntity = new CactusConnectionEntity(); -// LOGIN_URL = cactusConnectionEntity.getLOGIN_URL(); -// return LOGIN_URL; -// } -// -// -// @Override -// public String getUserID() { -//// userID = userLoginBoundary.getUserId(); -// cactusUserEntity.setUserId(userID); -// return userID; -// } -// -// @Override -// public String getUserPass() { -//// userPass = userLoginBoundary.getUserPass(); -// cactusUserEntity.setUserPass(userPass); -// return userPass; -// } - - -} 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 e5ddf65..31d3a2e 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 @@ -9,24 +9,20 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import android.widget.EditText; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller.UserLoginResponseController; +import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller.LoginController; import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.UserLoginUseCases; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller.InputUserController; -import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Controller.UserLoginPresenter; import org.ntlab.radishforandroidstudio.cactusClient.views.SignUpFragment; public class LoginFragment extends Fragment { - InputUserController inputUserController; + LoginController loginController; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment FragmentActivity fragmentActivity = getActivity(); - inputUserController = new InputUserController(getActivity(), getFragmentManager()); + loginController = new LoginController(getActivity(), getFragmentManager()); return inflater.inflate(R.layout.login_fragment, container, false); } @@ -46,7 +42,7 @@ } }); Button loginButton = (Button) getActivity().findViewById(R.id.login); - loginButton.setOnClickListener(inputUserController); + loginButton.setOnClickListener(loginController); // loginButton.setOnClickListener(new View.OnClickListener() { // @Override // public void onClick(View view) { @@ -56,13 +52,13 @@ // FragmentManager manager = getFragmentManager(); // // //動作 -//// inputUserController.inputData(userName.getText().toString(), passWord.getText().toString()); -// UserLoginPresenter userLoginPresenter = new UserLoginPresenter(); -// UserLoginUseCases userLoginUseCases = new UserLoginUseCases(userLoginPresenter); +//// loginController.inputData(userName.getText().toString(), passWord.getText().toString()); +// LoginPresenter userLoginPresenter = new LoginPresenter(); +// LoginUseCases userLoginUseCases = new LoginUseCases(userLoginPresenter); // userLoginUseCases.inputData(userName.getText().toString(), passWord.getText().toString()); // // //通信 -// UserLoginResponseController userLoginResponseController = new UserLoginResponseController(fragmentActivity, manager); +// LoginResponseControllerController userLoginResponseController = new LoginResponseControllerController(fragmentActivity, manager); // userLoginPresenter.setFollowingController(userLoginResponseController); // userLoginUseCases.proc(); // }