responseの変数名の変更 #39

Merged a-hongo merged 6 commits into nitta-lab-2019:master from nitta-lab-2019:CreateGroup on 18 Jul 2019

Patch

Unified Split

Showing 5 changed files

                Ignore Space
               Show notes
              View
            
          
          15 ■■■■■
          app/src/main/java/com/example/cosmosclient/app/Cosmos.java
 import com.example.cosmosclient.entities.Group;
 
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){
        this.token = token;
        return token;
    }
 
    //Group処理
    public void setCurrentGroup(Group g){
    public void setCurrentGroup(String g){
        curGroup = g;
    }
    public Group getCurentGroup(){
    public String getCurentGroup(){
        return curGroup;
    }
 
    //uId処理
    }
    public String getuId(){
        return uId;
    }
 
    //gId処理
    public void setgId(String gId){
        this.gId = gId;
    }
    public String getgId(){
        return gId;
    }
}
 import com.example.cosmosclient.entities.Group;
 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){
         this.token = token;
         return token;
     }
     //Group処理
+    public void setCurrentGroup(Group g){
+    public void setCurrentGroup(String g){
         curGroup = g;
     }
+    public Group getCurentGroup(){
+    public String getCurentGroup(){
         return curGroup;
     }
     //uId処理
     }
     public String getuId(){
         return uId;
     }
+    //gId処理
+    public void setgId(String gId){
+        this.gId = gId;
+    }
+    public String getgId(){
+        return gId;
+    }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java
     public String gId;
    public String uri;
    public String name;
    public ArrayList<User> members= new ArrayList<>();
    public ArrayList<Request> request = new ArrayList<>();
    public ArrayList<Request> requests = new ArrayList<>();
}
     public String gId;
     public String uri;
     public String name;
     public ArrayList<User> members= new ArrayList<>();
+    public ArrayList<Request> request = new ArrayList<>();
+    public ArrayList<Request> requests = new ArrayList<>();
 }

                Ignore Space
               Show notes
              View
            
          
          19 ■■■■■
          app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
+            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;
import android.text.Editable;
import android.text.TextWatcher;
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;
import retrofit2.Callback;
import retrofit2.Retrofit;
import retrofit2.converter.jackson.JacksonConverterFactory;
 
public class CreateGroupActivity extends AppCompatActivity {
    Button createGroupButton;
    private Button createGroupButton;
 
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
 
        //グループ作成に必要な情報の取得
        Cosmos app = (Cosmos) getApplication();
        uId = app.getuId();
        ////サインアップでトークンが返ってきてないため一時コメントアウト
        token = app.getToken();
        //token="abcdef";
 
        //retrofitの処理
        final Retrofit retrofit = new Retrofit.Builder()
                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/")
                    public void onResponse(Call<CreateGroupResponse> call, Response<CreateGroupResponse> response) {
                        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();
                            finish();
 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;
 import android.text.Editable;
 import android.text.TextWatcher;
 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;
 import retrofit2.Callback;
 import retrofit2.Retrofit;
 import retrofit2.converter.jackson.JacksonConverterFactory;
 public class CreateGroupActivity extends AppCompatActivity {
+    Button createGroupButton;
+    private Button createGroupButton;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         //グループ作成に必要な情報の取得
         Cosmos app = (Cosmos) getApplication();
         uId = app.getuId();
-        ////サインアップでトークンが返ってきてないため一時コメントアウト
         token = app.getToken();
-        //token="abcdef";
         //retrofitの処理
         final Retrofit retrofit = new Retrofit.Builder()
                 .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/")
                     public void onResponse(Call<CreateGroupResponse> call, Response<CreateGroupResponse> response) {
                         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();
                             finish();

                Ignore Space
               Show notes
              View
            
          
          35 ■■■■■
          app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
             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;
import android.text.Editable;
 
public class SigninActivity extends AppCompatActivity {
    private boolean uIdEnable;
    private boolean pwEnable;
    Button SigninButton;
    private Button SigninButton;
 
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        final EditText UserIdText = findViewById(R.id.UserIdText);
        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()
                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/")
            this.view = view;
        }
 
        @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){/*記述不要*/};
 
        @Override
        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;
                    }
 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;
 import android.text.Editable;
 public class SigninActivity extends AppCompatActivity {
     private boolean uIdEnable;
     private boolean pwEnable;
+    Button SigninButton;
+    private Button SigninButton;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final EditText UserIdText = findViewById(R.id.UserIdText);
         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()
                 .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/")
             this.view = view;
         }
         @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){/*記述不要*/};
         @Override
         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;
                     }

                Ignore Space
               Show notes
              View
            
          
          22 ■■■■■
          app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
             package com.example.cosmosclient.views;
 
 
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;
import android.widget.ImageView;
import com.example.cosmosclient.entities.SignupResponse;
import com.example.cosmosclient.resources.UsersRest;
import com.theartofdev.edmodo.cropper.CropImage;
import com.theartofdev.edmodo.cropper.CropImageView;
 
 
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
                            Cosmos app = (Cosmos) getApplication();
                            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();
                            finish();
 package com.example.cosmosclient.views;
 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;
 import android.widget.ImageView;
 import com.example.cosmosclient.entities.SignupResponse;
 import com.example.cosmosclient.resources.UsersRest;
 import com.theartofdev.edmodo.cropper.CropImage;
 import com.theartofdev.edmodo.cropper.CropImageView;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
                             Cosmos app = (Cosmos) getApplication();
                             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();
                             finish();