diff --git a/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java b/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java new file mode 100644 index 0000000..269b78a --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java @@ -0,0 +1,7 @@ +package com.example.cosmosclient.entities; + +import java.util.List; + +public class SigninResponse { + public List token; +} diff --git a/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java new file mode 100644 index 0000000..4a52150 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java @@ -0,0 +1,15 @@ +package com.example.cosmosclient.entities; + +import java.util.List; + +public class SignupResponse { + public String uId; + public String name; + public String pw; + public String uri; + public List token; + public String iconUri; + public boolean login; + + +} diff --git a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java index 2b40d63..d4ddb3e 100644 --- a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java +++ b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java @@ -1,7 +1,7 @@ package com.example.cosmosclient.resources; -import com.example.cosmosclient.views.SigninResponse; -import com.example.cosmosclient.views.SignupResponse; +import com.example.cosmosclient.entities.SigninResponse; +import com.example.cosmosclient.entities.SignupResponse; import retrofit2.Call; import retrofit2.http.Field; diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java index 91b5e0f..05bfc17 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -12,6 +12,7 @@ import com.example.cosmosclient.R; import com.example.cosmosclient.app.Cosmos; +import com.example.cosmosclient.entities.SigninResponse; import com.example.cosmosclient.resources.UsersRest; import retrofit2.Call; @@ -38,11 +39,11 @@ Button ForgotPasswordButton = findViewById(R.id.ForgotPasswordButton); //ボタン無効化 - SigninButton.setEnabled(false); - - //TextWatcherで入力監視 - UserIdText.addTextChangedListener(new SigninActivity.GenericTextWatcher(UserIdText)); - PasswordText.addTextChangedListener(new SigninActivity.GenericTextWatcher(PasswordText)); +// SigninButton.setEnabled(false); +// +// //TextWatcherで入力監視 +// UserIdText.addTextChangedListener(new SigninActivity.GenericTextWatcher(UserIdText)); +// PasswordText.addTextChangedListener(new SigninActivity.GenericTextWatcher(PasswordText)); //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java b/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java deleted file mode 100644 index 7d6482b..0000000 --- a/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.cosmosclient.views; - -import java.util.List; - -public class SigninResponse { - public List token; -} diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java index 7fb3572..ec129b1 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -12,6 +12,7 @@ import com.example.cosmosclient.R; import com.example.cosmosclient.app.Cosmos; +import com.example.cosmosclient.entities.SignupResponse; import com.example.cosmosclient.resources.UsersRest; @@ -46,14 +47,14 @@ final EditText NameText = findViewById(R.id.NameText); final EditText PasswordText = findViewById(R.id.PasswordText); final EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText); - - //入力欄監視 - NameText.addTextChangedListener(new GenericTextWatcher(NameText)); - PasswordText.addTextChangedListener(new GenericTextWatcher(PasswordText)); - ConfirmPasswordText.addTextChangedListener(new GenericTextWatcher(ConfirmPasswordText)); - - //アカウント登録ボタン無効化 - MakeAccountButton.setEnabled(false); +// +// //入力欄監視 +// NameText.addTextChangedListener(new GenericTextWatcher(NameText)); +// PasswordText.addTextChangedListener(new GenericTextWatcher(PasswordText)); +// ConfirmPasswordText.addTextChangedListener(new GenericTextWatcher(ConfirmPasswordText)); +// +// //アカウント登録ボタン無効化 +// MakeAccountButton.setEnabled(false); //Make Accountボタンの処理 MakeAccountButton.setOnClickListener(new View.OnClickListener(){ diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java b/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java deleted file mode 100644 index 963dfce..0000000 --- a/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.cosmosclient.views; - -import java.util.List; - -public class SignupResponse { - public String uId; - public String name; - public String pw; - public String uri; - public List token; - public String iconUri; - public boolean login; - - -}