diff --git a/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java b/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java index 8cc26d7..62e173b 100644 --- a/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java @@ -11,7 +11,8 @@ import com.example.cosmosclient.R; -public class ForgotPasswordActivity extends AppCompatActivity{ +public class ForgotPasswordActivity extends AppCompatActivity { + //public class ForgotPasswordActivity extends AppCompatActivity implements TextWatcher{ String EMailPattern = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$"; @@ -23,6 +24,9 @@ //idの取得 final EditText EmailAddressText = findViewById(R.id.EMailAddressText); Button SendButton = findViewById(R.id.SendButton); + + //EmailAddressText.addTextChangedListener(this); + //送信ボタン処理 SendButton.setOnClickListener(new View.OnClickListener() { @Override @@ -35,5 +39,21 @@ finish(); } }); - } + } //@Override +// public void beforeTextChanged(CharSequence s, int start, int count,int after) { +// //ignore +// } +// +// @Override +// public void onTextChanged(CharSequence s, int start, int before, int count) { +// //ignore +// } +// +// @Override +// public void afterTextChanged(Editable s) { +//    //操作後のEtidTextの状態を取得する +// String inputStr = s.toString(); +// +// } + } 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 3c0257d..ea7be6d 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -9,6 +9,9 @@ import com.example.cosmosclient.R; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; + public class SigninActivity extends AppCompatActivity { @Override @@ -23,6 +26,14 @@ final EditText PasswordText = findViewById(R.id.PasswordText); Button ForgotPasswordButton = findViewById(R.id.ForgotPasswordButton); + //retrofitの処理 + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("nitta-lab-www.is.konan-u.ac.jp") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + //interfaceから実装を取得 + Signin signin = retrofit.create(Signin.class); + //Sign inボタンの処理 SigninButton.setOnClickListener(new View.OnClickListener() { @Override 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 0d46890..8f21d0c 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -27,9 +27,10 @@ //retrofitの処理 Retrofit retrofit = new Retrofit.Builder() - .baseUrl("/cosmos") + .baseUrl("nitta-lab-www.is.konan-u.ac.jp") .addConverterFactory(JacksonConverterFactory.create()) .build(); + //interfaceから実装を取得 Signup signup = retrofit.create(Signup.class); @@ -40,6 +41,7 @@ final EditText PasswordText = findViewById(R.id.PasswordText); final EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText); + //finalつけないとエラー出る final Call call = signup.listUser(EmailAddressText.getText().toString(),PasswordText.getText().toString(),"3"); diff --git a/app/src/main/res/drawable/white.png b/app/src/main/res/drawable/white.png deleted file mode 100644 index 15f8d06..0000000 --- a/app/src/main/res/drawable/white.png +++ /dev/null Binary files differ