diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8f9d4ab..a253c23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,13 +11,19 @@
+
+
-
+
+
+
+
+
diff --git a/app/src/main/java/com/example/nemophila/LoginActivity.java b/app/src/main/java/com/example/nemophila/LoginActivity.java
index 5dd4b79..c3bdf20 100644
--- a/app/src/main/java/com/example/nemophila/LoginActivity.java
+++ b/app/src/main/java/com/example/nemophila/LoginActivity.java
@@ -31,11 +31,13 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
+ //Nemophilaと連携
nemophila = (Nemophila) this.getApplication();
-// if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){
-// Intent intent = new Intent(LoginActivity.this,MainActivity.class);
-// startActivity(intent);
-// }
+ //Nemophilaにtokenとuidがある場合ログイン画面をスキップ
+ if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){
+ Intent intent = new Intent(LoginActivity.this,MainActivity.class);
+ startActivity(intent);
+ }
//通信の初期化
this.retrofit = new Retrofit.Builder()
@@ -44,10 +46,11 @@
.build();
this.AccountsRest = retrofit.create(AccountsRest.class);
-
+//Loginボタンを押したとき
findViewById(R.id.LoginButton).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ //IDとpwの入力
EditText edituid = (EditText) findViewById(R.id.editTextUserID);
String uid = edituid.getText().toString();
EditText editpw = (EditText) findViewById(R.id.editTextTextNewPassword);
@@ -86,6 +89,7 @@
});
}
});
+//SignUpボタンを押したとき
findViewById(R.id.SignUp).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -93,6 +97,7 @@
startActivity(intent);
}
});
+//ForgotPasswordボタンを押したとき(処理未記入)
findViewById(R.id.ForgotPW).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git a/app/src/main/java/com/example/nemophila/SignUpActivity.java b/app/src/main/java/com/example/nemophila/SignUpActivity.java
index 0b1aa70..07694b3 100644
--- a/app/src/main/java/com/example/nemophila/SignUpActivity.java
+++ b/app/src/main/java/com/example/nemophila/SignUpActivity.java
@@ -40,6 +40,7 @@
findViewById(R.id.SignUpButton).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ //Nameとpwを入力
EditText editname = (EditText) findViewById(R.id.editTextTextUserName);
String name = editname.getText().toString();
EditText editpw = (EditText) findViewById(R.id.editTextTextNewPassword);