diff --git a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java index 632820b..367fb6e 100644 --- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java +++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java @@ -6,8 +6,9 @@ public class Cosmos extends Application { private String token=null; - private Group curGroup=null; + private String curGroup=null; private String uId=null; + private String gId=null; //token処理 public void setToken(String token){ @@ -18,10 +19,10 @@ } //Group処理 - public void setCurrentGroup(Group g){ + public void setCurrentGroup(String g){ curGroup = g; } - public Group getCurentGroup(){ + public String getCurentGroup(){ return curGroup; } @@ -32,4 +33,12 @@ public String getuId(){ return uId; } + + //gId処理 + public void setgId(String gId){ + this.gId = gId; + } + public String getgId(){ + return gId; + } } diff --git a/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java index 2cf3fec..3f34654 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java +++ b/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java @@ -7,5 +7,5 @@ public String uri; public String name; public ArrayList members= new ArrayList<>(); - public ArrayList request = new ArrayList<>(); + public ArrayList requests = new ArrayList<>(); } diff --git a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java index 6aee5c9..c0cd0b6 100644 --- a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java @@ -1,7 +1,6 @@ package com.example.cosmosclient.views; import android.content.Intent; -import android.media.Image; import android.os.Handler; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; @@ -10,13 +9,11 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.widget.ImageButton; import android.widget.Toast; import com.example.cosmosclient.R; import com.example.cosmosclient.app.Cosmos; import com.example.cosmosclient.entities.CreateGroupResponse; -import com.example.cosmosclient.entities.Group; import com.example.cosmosclient.resources.GroupsRest; import retrofit2.Call; @@ -26,7 +23,7 @@ import retrofit2.converter.jackson.JacksonConverterFactory; public class CreateGroupActivity extends AppCompatActivity { - Button createGroupButton; + private Button createGroupButton; @Override protected void onCreate(Bundle savedInstanceState) { @@ -46,9 +43,7 @@ //グループ作成に必要な情報の取得 Cosmos app = (Cosmos) getApplication(); uId = app.getuId(); - ////サインアップでトークンが返ってきてないため一時コメントアウト token = app.getToken(); - //token="abcdef"; //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() @@ -80,15 +75,11 @@ if (response.isSuccessful()) { //成功時 CreateGroupResponse result = response.body(); + //app/CosmosにgIdを保存 + Cosmos app = (Cosmos)getApplication(); + app.setgId(result.gId); + Intent intent = new Intent(getApplication(), RequestListActivity.class); - - -// //確認用 -// System.out.println(result.getgId()); -// System.out.println(result.getName()); -// System.out.println(result.getRequests()); -// System.out.println(result.getUri()); - startActivity(intent); Toast.makeText(CreateGroupActivity.this, "グループを作成しました", Toast.LENGTH_SHORT).show(); 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 799fec0..dbfd08e 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -1,6 +1,7 @@ package com.example.cosmosclient.views; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Handler; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; @@ -25,7 +26,7 @@ public class SigninActivity extends AppCompatActivity { private boolean uIdEnable; private boolean pwEnable; - Button SigninButton; + private Button SigninButton; @Override protected void onCreate(Bundle savedInstanceState) { @@ -39,12 +40,25 @@ final EditText PasswordText = findViewById(R.id.PasswordText); Button ForgotPasswordButton = findViewById(R.id.ForgotPasswordButton); + // 「pref_data」という設定データファイルを読み込み + SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE); + String account = prefData.getString("account", ""); + + // 空チェック + if (account != null && account.length() > 0) { + // 保存済の情報をログインID欄に設定 + UserIdText.setText(account); + uIdEnable=true; + //UserIdText.setEnabled(false); + } + //ボタン無効化 -// SigninButton.setEnabled(false); -// -// //TextWatcherで入力監視 -// UserIdText.addTextChangedListener(new SigninActivity.GenericTextWatcher(UserIdText)); -// PasswordText.addTextChangedListener(new SigninActivity.GenericTextWatcher(PasswordText)); + SigninButton.setEnabled(false); + + //TextWatcherで入力監視 + UserIdText.addTextChangedListener(new SigninActivity.GenericTextWatcher(UserIdText)); + PasswordText.addTextChangedListener(new SigninActivity.GenericTextWatcher(PasswordText)); + //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() @@ -136,7 +150,9 @@ } @Override - public void beforeTextChanged(CharSequence s, int start, int count,int after){/*記述不要*/}; + public void beforeTextChanged(CharSequence s, int start, int count,int after){ + /*記述不要*/ + }; @Override public void onTextChanged(CharSequence s, int start, int before, int count){/*記述不要*/}; @@ -144,7 +160,7 @@ public void afterTextChanged(Editable s){ switch(view.getId()) { case R.id.UserIdText: - if (s.length() > 0) { + if (s.length()>0) { uIdEnable = true; } else { uIdEnable = false; 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 c2b9ae9..8e5f0b5 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -2,12 +2,14 @@ import android.content.Intent; +import android.content.SharedPreferences; import android.net.Uri; import android.os.Handler; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; +import android.util.Base64; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -21,7 +23,6 @@ import com.theartofdev.edmodo.cropper.CropImage; import com.theartofdev.edmodo.cropper.CropImageView; - import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -105,16 +106,17 @@ app.setToken(result.token); app.setuId(result.uId); + // 「pref_data」という設定データファイルを読み込み + SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE); + SharedPreferences.Editor editor = prefData.edit(); + + // 入力されたログインIDとログインパスワード + editor.putString("account", result.uId); + + // 保存 + editor.commit(); + Intent intent = new Intent(getApplication(), GroupListActivity.class); - - //test -// System.out.println(result.uId); -// System.out.println(result.name); -// System.out.println(result.uri); -// System.out.println(result.token); -// System.out.println(result.iconUri); -// System.out.println(result.pw); - startActivity(intent); Toast.makeText(SignupActivity.this, "アカウントを作成しました", Toast.LENGTH_SHORT).show();