diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 483db85..b25b3a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,7 +36,7 @@ android:name=".MapsActivity" android:label="@string/title_activity_maps"> - + diff --git a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java new file mode 100644 index 0000000..5f8b03e --- /dev/null +++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java @@ -0,0 +1,74 @@ +package org.ntlab.amaryllis.client; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; + +import org.ntlab.amaryllis.client.resources.AccountsRest; + +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; + +public class SignUpActivity extends AppCompatActivity implements TextWatcher { + TextView emailTextView; + EditText emailEditText; + TextView passWordTextView; + EditText passWordEditText; + TextView nameTextView; + EditText nameEditText; + Button signUpButton; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_signup); + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/rest/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + final AccountsRest signUpService = retrofit.create(AccountsRest.class); + emailEditText = (EditText) findViewById(R.id.editTextTextEmailAddress); + passWordEditText = (EditText) findViewById(R.id.editTextTextPassword); + nameEditText = (EditText) findViewById(R.id.editTextTextPersonName); + emailEditText.addTextChangedListener(this); + emailTextView = findViewById(R.id.editTextTextEmailAddress); + passWordEditText.addTextChangedListener(this); + passWordTextView = findViewById(R.id.editTextTextPassword); + nameEditText.addTextChangedListener(this); + nameTextView = findViewById(R.id.editTextTextPersonName); + signUpButton = (Button)findViewById(R.id.button); + signUpButton.setEnabled(false); + signUpButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(SignUpActivity.this,MapsActivity.class); + startActivity(intent); + } + }); + + } + + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + if(emailTextView.length()>0 && passWordTextView.length()>7 && nameTextView.length()>0 ){ + signUpButton.setEnabled(true); + } else{ + signUpButton.setEnabled(false); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/amaryllis/client/SignupActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/SignupActivity.java deleted file mode 100644 index 4cd17d0..0000000 --- a/app/src/main/java/org/ntlab/amaryllis/client/SignupActivity.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ntlab.amaryllis.client; - -import androidx.appcompat.app.AppCompatActivity; - -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; - -public class SignupActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_signup); - Button signupButton = (Button)findViewById(R.id.button); - signupButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - Intent intent = new Intent(SignupActivity.this,MapsActivity.class); - startActivity(intent); - } - }); - - } -} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java index 38d538e..4a0f4d0 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java @@ -1,19 +1,5 @@ package org.ntlab.amaryllis.client.resources; -import org.ntlab.amaryllis.client.SignupActivity; - -import java.util.List; - -import retrofit2.Call; -import retrofit2.http.DELETE; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.GET; -import retrofit2.http.POST; -import retrofit2.http.PUT; -import retrofit2.http.Path; -import retrofit2.http.Query; - public interface AccountsRest { //追記 diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml index d985cd1..58a6966 100644 --- a/app/src/main/res/layout/activity_signup.xml +++ b/app/src/main/res/layout/activity_signup.xml @@ -4,10 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".SignupActivity"> + tools:context=".SignUpActivity">