diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 0ad711e..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 8584373..bbe0982 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,8 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 369e08f..160fc79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,11 +30,11 @@ android:exported="true" android:label="@string/title_activity_login"> - - + + - - + + call = AccountsRest.getAccounts(); - // 通信 - Call call = AccountsRest.getAccounts(); - - call.enqueue (new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.isSuccessful()) { - //System.out.println("通信成功:changeBelongsAndMaster"); - } else { - //System.out.println("通信可能：changeBelongsAndMaster: " + response.code()); + call.enqueue (new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) { + System.out.println("通信成功:changeBelongsAndMaster"); + Intent intent = new Intent(LoginActivity.this,MainActivity.class); + startActivity(intent); + } else { + System.out.println("通信可能：changeBelongsAndMaster: " + response.code()); + } } - } - @Override - public void onFailure(Call call, Throwable t) { - //System.out.println("通信失敗:changeBelongsAndMaster"); - } - }); - } + @Override + public void onFailure(Call call, Throwable t) { + System.out.println("通信失敗:changeBelongsAndMaster"); + } + }); + } + }); + findViewById(R.id.SignUp).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(LoginActivity.this,SignUpActivity.class); + startActivity(intent); + } + }); } } diff --git a/app/src/main/java/com/example/nemophila/SignUpActivity.java b/app/src/main/java/com/example/nemophila/SignUpActivity.java index 8ac26b4..e91e33f 100644 --- a/app/src/main/java/com/example/nemophila/SignUpActivity.java +++ b/app/src/main/java/com/example/nemophila/SignUpActivity.java @@ -3,12 +3,63 @@ import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; +import android.view.View; +import android.widget.EditText; -public class SignUpActivity extends AppCompatActivity { +import com.example.nemophila.entities.Account; +import com.example.nemophila.resources.AccountsRest; + +import java.util.HashMap; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; + +public class SignUpActivity extends AppCompatActivity{ + + private Retrofit retrofit; + private AccountsRest AccountsRest; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sign_up); + //通信の初期化 + this.retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/nemophila/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + this.AccountsRest = retrofit.create(AccountsRest.class); + + findViewById(R.id.SignUpButton).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + EditText editname = (EditText) findViewById(R.id.editTextTextUserName); + String name = editname.getText().toString(); + EditText editpw = (EditText) findViewById(R.id.editTextTextNewPassword); + String pw = editpw.getText().toString(); + + // 通信 + Call call = AccountsRest.createAccounts(name,pw); + + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) { + System.out.println("通信成功:changeBelongsAndMaster"); + } else { + System.out.println("通信可能：changeBelongsAndMaster: " + response.code()); + } + } + + @Override + public void onFailure(Call call, Throwable t) { + System.out.println("通信失敗:changeBelongsAndMaster"); + } + }); + } + }); } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3370f83..d12efd2 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -15,33 +15,42 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" /> + app:layout_constraintTop_toBottomOf="@+id/editTextTextNewPassword" /> + +