diff --git a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java index 261e17e..5c84a49 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java +++ b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java @@ -106,6 +106,7 @@ SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putInt("uid", preferenceUid); + this.preferenceUid = preferenceUid; editor.commit(); } @@ -113,6 +114,7 @@ SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putString("name", preferenceName); + this.preferenceName = preferenceName; editor.commit(); } @@ -120,6 +122,7 @@ SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putString("email", preferenceEmail); + this.preferenceEmail = preferenceEmail; editor.commit(); } @@ -127,6 +130,7 @@ SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putString("password", preferencePassword); + this.preferencePassword = preferencePassword; editor.commit(); } @@ -134,6 +138,7 @@ SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putString("token", preferenceToken); + this.preferenceToken = preferenceToken; editor.commit(); } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java index 250f5b3..3bad98b 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; +import android.widget.TextView; import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; @@ -44,6 +45,21 @@ setTheme(R.style.AppTheme_NoTitleBar);//タイトルバーを消す init(); } + //----------------------------------------------------------------- + @Override + protected void onResume() { + super.onResume(); + if (hasAccount()) { + Acanthus acanthus = (Acanthus) getApplication(); + TextView email = findViewById(R.id.editTextTextLoginEmail); + TextView password = findViewById(R.id.editTextTextLoginPassword); + + email.setText(acanthus.getPreferenceEmail()); + password.setText(acanthus.getPreferencePassword()); + } + // ダミー表示 + // else setDummyForm(); + } //----------------------------------------------------------------- //----------------------------------------------------------------- @@ -78,6 +94,24 @@ startActivity(intent); finish(); } - //----------------------------------------------------------------- + //----------------------------------------------------------------- + // 既にアカウントを持っている場合 + private boolean hasAccount() { + Acanthus acanthus = (Acanthus) getApplication(); + if (acanthus.getPreferenceEmail().equals("")) return false; + return !acanthus.getPreferencePassword().equals(""); + } + + //----------------------------------------------------------------- + // + private void setDummyForm(){ + Acanthus acanthus = (Acanthus) getApplication(); + TextView email = findViewById(R.id.editTextTextLoginEmail); + TextView password = findViewById(R.id.editTextTextLoginPassword); + + email.setText("d0@dummy.com"); + password.setText("nittalab"); + } + //----------------------------------------------------------------- } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java index cbef89d..586cce8 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java @@ -50,17 +50,22 @@ Acanthus acanthus = (Acanthus) getApplication(); // 各フォーム取得 - String name = binding.editTextTextSignUpPersonName.getText().toString(); - String emailAddress = binding.editTextTextSignUpEmailAddress.getText().toString(); - String password = binding.editTextTextSignUpPassword.getText().toString(); + TextView nameForm = findViewById(R.id.editTextTextSignUpPersonName); + TextView emailForm = findViewById(R.id.editTextTextSignUpEmailAddress); + TextView passwordForm = findViewById(R.id.editTextTextSignUpPassword); - Call call = accountsRest.createAccount(name, emailAddress, password); + String name = nameForm.getText().toString(); + String email = emailForm.getText().toString(); + String password = passwordForm.getText().toString(); + + Call call = accountsRest.createAccount(name, email, password); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()) { + acanthus.setPreferenceUid(response.body().getUid()); acanthus.setPreferenceName(name); - acanthus.setPreferenceEmail(emailAddress); + acanthus.setPreferenceEmail(email); acanthus.setPreferencePassword(password); transitionLoginActivity(); } else clearForm(); @@ -96,11 +101,22 @@ } //----------------------------------------------------------------- + // ダミーフォーム + private void dummyFormSetup(){ + binding.editTextTextSignUpPersonName.setText("name"); + binding.editTextTextSignUpEmailAddress.setText("dn@dummy.com"); + binding.editTextTextSignUpPassword.setText("nittalab"); + } + + + //----------------------------------------------------------------- //----------------------------------------------------------------- // 初期化 private void init() { setContentView(R.layout.activity_sign_up); binding = ActivitySignUpBinding.inflate(getLayoutInflater()); + + clearForm(); } //----------------------------------------------------------------- } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login_screen.xml b/app/src/main/res/layout/activity_login_screen.xml index 9ec0573..bf78966 100644 --- a/app/src/main/res/layout/activity_login_screen.xml +++ b/app/src/main/res/layout/activity_login_screen.xml @@ -42,17 +42,17 @@ android:textSize="18dp" android:textStyle="bold" android:textColor="@color/white" /> + + android:textColor="@color/black" /> @@ -74,17 +74,17 @@ android:textSize="18dp" android:textStyle="bold" android:textColor="@color/white" /> + + android:textColor="@color/black" /> diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index 3300896..53d6d4e 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -41,17 +41,17 @@ android:textSize="18dp" android:textStyle="bold" android:textColor="@color/white" /> + + android:textColor="@color/black" /> @@ -73,17 +73,17 @@ android:textSize="18dp" android:textStyle="bold" android:textColor="@color/white" /> + + android:textColor="@color/black" /> @@ -105,17 +105,17 @@ android:textSize="18dp" android:textStyle="bold" android:textColor="@color/white"/> + + android:textColor="@color/black" />