diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 88f3f83..4c3cd5d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,21 +10,17 @@
 
     <application
         android:name=".app.Cosmos"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".views.DisplayGroupIDActivity"
-            android:label="IDを表示"
-            ></activity>
-        <activity
             android:name=".views.CreateGroupActivity"
-            android:label="グループ作成" />
+            android:label="グループ作成"></activity>
         <activity
             android:name=".views.JoinGroupByIDActivity"
             android:label="IDでグループに入る" />
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
new file mode 100644
index 0000000..3f34654
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java
@@ -0,0 +1,11 @@
+package com.example.cosmosclient.entities;
+
+import java.util.ArrayList;
+
+public class CreateGroupResponse {
+    public String gId;
+    public String uri;
+    public String name;
+    public ArrayList<User> members= new ArrayList<>();
+    public ArrayList<Request> requests = new ArrayList<>();
+}
diff --git a/app/src/main/java/com/example/cosmosclient/entities/Request.java b/app/src/main/java/com/example/cosmosclient/entities/Request.java
index 619f097..8524945 100644
--- a/app/src/main/java/com/example/cosmosclient/entities/Request.java
+++ b/app/src/main/java/com/example/cosmosclient/entities/Request.java
@@ -10,7 +10,7 @@
     private String IssuerUid;
     private String product;
     private Date deadline;
-//    private String location;
+    //    private String location;
     private int location;
     private String name; //消
     private boolean done = false;
@@ -61,4 +61,5 @@
     public void setName(String name) {
         this.name = name;
     }
-}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
index 712e2fd..ca8e0db 100644
--- a/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
+++ b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
@@ -1,5 +1,7 @@
 package com.example.cosmosclient.entities;
 
+import java.util.ArrayList;
+
 public class SignupResponse {
     public String uId;
     public String name;
@@ -7,6 +9,7 @@
     public String token;
     public String iconUri;
     public boolean login;
+    public ArrayList<Group> groups;
 
 
 }
diff --git a/app/src/main/java/com/example/cosmosclient/entities/User.java b/app/src/main/java/com/example/cosmosclient/entities/User.java
new file mode 100644
index 0000000..7d07fa4
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/entities/User.java
@@ -0,0 +1,118 @@
+package com.example.cosmosclient.entities;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class User {
+    /**
+     * USER用のクラス
+     *
+     * @param uId string //LONGに変更
+     * @param uri String
+     * @param name String
+     * @param iconUri String iconの保存先
+     * @param login Boolean トークンが存在するか否か
+     * @param groups Set<Group> 所属するグループ
+     * @param tokens String userが持トークン一覧
+     *
+     * TODO: Tokenのデータベース接続
+     * TODO: tokenの持ち方要検討
+     */
+
+    public String uId, uri, name, iconUri;
+    public boolean login = true;
+    public Set<Group> groups = new HashSet<>();//HashSetでいいのかな？
+    //仕様ではStringを返すため
+    //public Set<Token> tokens = new HashSet<>();
+    //public Set<String> tokens = new HashSet<>();
+    public String token;
+    private String dummyToken = "a9965652-c2ec-4a0d-a78a-b457e8b2deca";
+
+    public User() {
+
+    }
+    public User(String name, String uId, String uri, String iconUri) {
+        setuId(uId);
+        setUri(uri);
+        setName(name);
+        setIconUri(iconUri);
+        setToken(this.dummyToken);
+        //addToken(this.dummyToken);
+        this.login = true;
+    }
+
+    public String getuId() {
+        return uId;
+    }
+
+    public void setuId(String uId) {
+        this.uId = uId;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIconUri() {
+        return iconUri;
+    }
+
+    public void setIconUri(String iconUri) {
+        this.iconUri = iconUri;
+    }
+
+    public boolean getLogin() {
+        return login;
+    }
+
+    public void setLogin(boolean login) {
+        this.login = login;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    /*
+     * //仕様ではStringで返すため
+     * public Set<String> getTokens(){
+     *     return tokens;
+     * }
+     * public void setTokens(Set<String> tokens){
+     *     this.tokens=tokens;
+     * }
+     * public void addToken (String token){
+     *     tokens.add(token);
+     * }
+     */
+
+    public Set<Group> getGroups() {
+        return groups;
+    }
+
+    public void setGroups(Set<Group> groups) {
+        this.groups = groups;
+    }
+
+    public void addGroups(Group group){
+        //テスト用
+        //Group group = Groups.getInstance().getGroupByGid(gId);
+        groups.add(group);
+    }
+}
diff --git a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
index a102c92..d364c4e 100644
--- a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
+++ b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
@@ -1,5 +1,6 @@
 package com.example.cosmosclient.resources;
 
+import com.example.cosmosclient.entities.CreateGroupResponse;
 import com.example.cosmosclient.entities.Group;
 import com.example.cosmosclient.entities.Request;
 
@@ -16,7 +17,7 @@
 public interface GroupsRest {
     @POST("groups")
     @FormUrlEncoded
-    Call<Group> createGroup(@Field("name") String name,@Field("uId") String uId,@Field("token") String token);
+    Call<CreateGroupResponse> createGroup(@Field("name") String name, @Field("uId") String uId, @Field("token") String token);
 
 //    @GET("/{gId}/requests")
 //    Call<ArrayList<Request>> getRequestsListByGid(@Path("gid") String gid, @Query("token") String token);
diff --git a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
index 174c8e7..5ef1453 100644
--- a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
@@ -19,8 +19,8 @@
 public class AddMemberActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
 
         private static final String[] scenes = {
-                "QRコードで招待",
-                "IDで招待",
+                "QRコードで追加",
+                "IDで追加",
                 "LINEで招待"
         };
 
@@ -64,10 +64,11 @@
             if(selectedText.contains("QR")==true){
                 intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class);
             }else if(selectedText.contains("ID")==true){
-                intent = new Intent(this.getApplicationContext(), DisplayGroupIDActivity.class);
-            }else  if(selectedText.contains("LINE")==true){
+                intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class);
+            }else{
 //                intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class);
-                intent = new Intent(Intent.ACTION_VIEW, Uri.parse("line://msg/text/?GroupID"));
+                Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("line://msg/text/?GroupID"));
+                startActivity(i);
             }
 
 //            Intent intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class);
diff --git a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
index 5987657..5a1622f 100644
--- a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
@@ -63,36 +63,36 @@
         addButton = findViewById(R.id.buttonAdd);
 
         calenderButton.setOnClickListener(new View.OnClickListener() {
-             @Override
-             public void onClick(View v) {
-                 //キーボードを閉じる
-                 inputMethodManager.hideSoftInputFromWindow(editTextProduct.getWindowToken(), InputMethodManager.RESULT_UNCHANGED_SHOWN);
+            @Override
+            public void onClick(View v) {
+                //キーボードを閉じる
+                inputMethodManager.hideSoftInputFromWindow(editTextProduct.getWindowToken(), InputMethodManager.RESULT_UNCHANGED_SHOWN);
 
-                 //Calendarインスタンスを取得
-                 final Calendar calender = Calendar.getInstance();
+                //Calendarインスタンスを取得
+                final Calendar calender = Calendar.getInstance();
 
-                 //DatePickerDialogインスタンスを取得
-                 DatePickerDialog datePickerDialog = new DatePickerDialog(AddRequestActivity.this, new DatePickerDialog.OnDateSetListener() {
+                //DatePickerDialogインスタンスを取得
+                DatePickerDialog datePickerDialog = new DatePickerDialog(AddRequestActivity.this, new DatePickerDialog.OnDateSetListener() {
 
-                     @Override
-                             public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
-                                 curYear = year;
-                                 curMonth = month;
-                                 curDayOfMonth = dayOfMonth;
+                    @Override
+                    public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
+                        curYear = year;
+                        curMonth = month;
+                        curDayOfMonth = dayOfMonth;
 
-                                 //setした日付を取得して表示
-                                 editTextDeadline.setText(String.format("%d / %02d / %02d", year, month+1, dayOfMonth));
-                             }
-                         },
-                         calender.get(Calendar.YEAR),
-                         calender.get(Calendar.MONTH),
-                         calender.get(Calendar.DATE)
-                 );
+                        //setした日付を取得して表示
+                        editTextDeadline.setText(String.format("%d / %02d / %02d", year, month+1, dayOfMonth));
+                    }
+                },
+                        calender.get(Calendar.YEAR),
+                        calender.get(Calendar.MONTH),
+                        calender.get(Calendar.DATE)
+                );
 
-                 //dialogを表示
-                 datePickerDialog.show();
-             }
-         });
+                //dialogを表示
+                datePickerDialog.show();
+            }
+        });
 
         //editTextDeadlineにリスナーをセット
         editTextDeadline.setOnKeyListener(new View.OnKeyListener() {
@@ -111,9 +111,9 @@
         });
 
         // 追加ボタン
-         addButton.setOnClickListener(new View.OnClickListener() {
-             @Override
-             public void onClick(View v) {
+        addButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
 //        //retrofitの処理
 //        final Retrofit retrofit = new Retrofit.Builder()
 //                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/")
@@ -150,14 +150,14 @@
 //             }
 //         });
 
-                 // エディットテキストのテキストを取得
-                 String inputProduct = editTextProduct.getText().toString();
+                // エディットテキストのテキストを取得
+                String inputProduct = editTextProduct.getText().toString();
 
-                 // 取得したテキストを TextView に張り付ける
-                 RequestListActivity.requestlist.add(0, (new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), Yolp.getInstance().getCodeBySubcategory(selectedSubCategory), "a-hongo")));
-                 finish();
-             }
-         });
+                // 取得したテキストを TextView に張り付ける
+                RequestListActivity.requestlist.add(0, (new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), Yolp.getInstance().getCodeBySubcategory(selectedSubCategory), "a-hongo")));
+                finish();
+            }
+        });
 
         // リスナーを登録
         category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -208,4 +208,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java b/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java
index 210fbd8..b2e17db 100644
--- a/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java
+++ b/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java
@@ -73,13 +73,12 @@
             items.add("からし");
             items.add("わさび");
             items.add("砂糖");
-
+ 
             ArrayAdapter<String> adapter = new ArrayAdapter<String>(getContext(), R.layout.item_list, items);
             //itemList.setAdapter(adapter);
         }
 
 
-
         void build(String title) {
             titleText.setText(title);
 
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 49e3d17..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,6 +1,6 @@
 package com.example.cosmosclient.views;
 
-import android.media.Image;
+import android.content.Intent;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -9,12 +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.Group;
+import com.example.cosmosclient.entities.CreateGroupResponse;
 import com.example.cosmosclient.resources.GroupsRest;
 
 import retrofit2.Call;
@@ -24,7 +23,7 @@
 import retrofit2.converter.jackson.JacksonConverterFactory;
 
 public class CreateGroupActivity extends AppCompatActivity {
-    Button createGroupButton;
+    private Button createGroupButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,9 +43,7 @@
         //グループ作成に必要な情報の取得
         Cosmos app = (Cosmos) getApplication();
         uId = app.getuId();
-        ////サインアップでトークンが返ってきてないため一時コメントアウト
-        //token = app.getToken();
-        token="abcdef";
+        token = app.getToken();
 
         //retrofitの処理
         final Retrofit retrofit = new Retrofit.Builder()
@@ -70,21 +67,20 @@
                     }
                 }, 1000L);
 
-                Call<Group> createGroup = createGroupService.createGroup(groupNameText.getText().toString(), uId, token);
+                Call<CreateGroupResponse> createGroup = createGroupService.createGroup(groupNameText.getText().toString(), uId, token);
 
-                createGroup.enqueue(new Callback<Group>() {
+                createGroup.enqueue(new Callback<CreateGroupResponse>() {
                     @Override
-                    public void onResponse(Call<Group> call, Response<Group> response) {
+                    public void onResponse(Call<CreateGroupResponse> call, Response<CreateGroupResponse> response) {
                         if (response.isSuccessful()) {
                             //成功時
-                            Group result = response.body();
+                            CreateGroupResponse result = response.body();
+                            //app/CosmosにgIdを保存
+                            Cosmos app = (Cosmos)getApplication();
+                            app.setgId(result.gId);
 
-//                                //確認用
-//                                System.out.println(result.getgId());
-//                                System.out.println(result.getName());
-//                                System.out.println(result.getRequests());
-//                                System.out.println(result.getUri());
-
+                            Intent intent = new Intent(getApplication(), RequestListActivity.class);
+                            startActivity(intent);
                             Toast.makeText(CreateGroupActivity.this,
                                     "グループを作成しました", Toast.LENGTH_SHORT).show();
                             finish();
@@ -97,7 +93,7 @@
                     }
 
                     @Override
-                    public void onFailure(Call<Group> call, Throwable t) {
+                    public void onFailure(Call<CreateGroupResponse> call, Throwable t) {
                         //失敗時
                         t.printStackTrace();
                         Toast.makeText(CreateGroupActivity.this,
diff --git a/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java b/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java
deleted file mode 100644
index f3b1841..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.example.cosmosclient.views;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.os.Build;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.example.cosmosclient.R;
-import com.example.cosmosclient.app.Cosmos;
-import com.example.cosmosclient.entities.Group;
-
-public class DisplayGroupIDActivity extends AppCompatActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_display_group_id);
-
-        EditText groupID = (EditText)findViewById(R.id.groupID);
-        // ボタンを設定
-        Button copyButton = findViewById(R.id.copy_Button);
-        //読み取り専用にする設定
-        groupID.setEnabled(false);
-//        //現在のグループ情報を格納しているものからgIdを取得
-//        Cosmos app = (Cosmos) getApplication();
-//        Group curentGroup = app.getCurentGroup();
-//        //元となるgIdを取得完了
-//        String gId = curentGroup.getgId();
-        final String gId = "vrehngortis";
-        groupID.setText(gId);
-
-        copyButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                ClipboardManager clipboard
-                        = (ClipboardManager) getSystemService(
-                        Context.CLIPBOARD_SERVICE);
-                clipboard.setPrimaryClip(ClipData.newPlainText("", gId));
-            }
-        });
-
-    }
-
-}
diff --git a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
index 58421c5..4e4afcd 100644
--- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
@@ -49,6 +49,8 @@
 
     Toast toast; //動作テスト用
 
+
+
     //Request List
     public static ArrayList<Request> requestlist = new ArrayList<>();
 
@@ -351,7 +353,7 @@
         //LEFT hamburger button
         DrawerLayout requestlistDrawer = (DrawerLayout) findViewById(R.id.request_list_drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                        this, requestlistDrawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+                this, requestlistDrawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
         requestlistDrawer.addDrawerListener(toggle);
         toggle.syncState();
 
@@ -508,8 +510,4 @@
         Collections.sort(namesortRequestlist, nameSortComparator);
         return namesortRequestlist;
     }
-}
-
-
-
-
+}
\ No newline at end of file
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 da8b756..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;
@@ -56,14 +57,14 @@
         final EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText);
         iconChoice = findViewById(R.id.choiceImage);
 
-//
-//        //入力欄監視
-//        NameText.addTextChangedListener(new GenericTextWatcher(NameText));
-//        PasswordText.addTextChangedListener(new GenericTextWatcher(PasswordText));
-//        ConfirmPasswordText.addTextChangedListener(new GenericTextWatcher(ConfirmPasswordText));
-//
-//        //アカウント登録ボタン無効化
-//        MakeAccountButton.setEnabled(false);
+
+        //入力欄監視
+        NameText.addTextChangedListener(new GenericTextWatcher(NameText));
+        PasswordText.addTextChangedListener(new GenericTextWatcher(PasswordText));
+        ConfirmPasswordText.addTextChangedListener(new GenericTextWatcher(ConfirmPasswordText));
+
+        //アカウント登録ボタン無効化
+        MakeAccountButton.setEnabled(false);
 
         //Make Accountボタンの処理
         MakeAccountButton.setOnClickListener(new View.OnClickListener() {
@@ -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();
diff --git a/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java b/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java
index 87e1a8a..f317028 100644
--- a/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java
+++ b/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java
@@ -95,4 +95,4 @@
 //        Yolp yolp = (Yolp) o;
 //        return codeToSubcategory.equals(yolp.codeToSubcategory) || nameToCategory.equals(yolp.nameToCategory);
 //    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_member.xml b/app/src/main/res/layout/activity_add_member.xml
index 242f8aa..7274a61 100644
--- a/app/src/main/res/layout/activity_add_member.xml
+++ b/app/src/main/res/layout/activity_add_member.xml
@@ -18,8 +18,8 @@
         tools:layout_editor_absoluteX="0dp" />
 
     <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="416dp"
+        android:layout_height="500dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:orientation="vertical"
diff --git a/app/src/main/res/layout/activity_display_group_id.xml b/app/src/main/res/layout/activity_display_group_id.xml
deleted file mode 100644
index e0bf2c3..0000000
--- a/app/src/main/res/layout/activity_display_group_id.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".views.DisplayGroupIDActivity">
-
-    <TextView
-        android:id="@+id/groupName"
-        android:layout_width="match_parent"
-        android:layout_height="75dp"
-        android:background="#e6eae3"
-        android:gravity="center"
-        android:text="家族用　グループ"
-        android:textSize="24sp"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:layout_editor_absoluteX="16dp" />
-
-    <EditText
-        android:id="@+id/groupID"
-        android:layout_width="207dp"
-        android:layout_height="45dp"
-        android:layout_marginStart="76dp"
-        android:layout_marginLeft="76dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:ems="10"
-        android:gravity="center"
-        android:inputType="textPersonName"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/copy_Button"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/groupName"
-        app:layout_constraintVertical_bias="0.436" />
-
-    <Button
-        android:id="@+id/copy_Button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:text="コピー"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/groupID"
-        app:layout_constraintTop_toTopOf="@+id/groupID" />
-
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_join_group_actions.xml b/app/src/main/res/layout/activity_join_group_actions.xml
index 2fbf70f..1fb2b70 100644
--- a/app/src/main/res/layout/activity_join_group_actions.xml
+++ b/app/src/main/res/layout/activity_join_group_actions.xml
@@ -9,8 +9,11 @@
 
     <ListView
         android:id="@+id/list_view_join"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="395dp"
+        android:layout_height="640dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_join_group_by_id.xml b/app/src/main/res/layout/activity_join_group_by_id.xml
index 1a45ac7..0ec48a6 100644
--- a/app/src/main/res/layout/activity_join_group_by_id.xml
+++ b/app/src/main/res/layout/activity_join_group_by_id.xml
@@ -19,10 +19,10 @@
         android:inputType="textEmailAddress"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/button"
-        app:layout_constraintHorizontal_bias="0.765"
+        app:layout_constraintHorizontal_bias="0.785"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView7"
-        app:layout_constraintVertical_bias="0.441" />
+        app:layout_constraintVertical_bias="0.27" />
 
     <TextView
         android:id="@+id/textView7"
@@ -39,8 +39,8 @@
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
         android:text="検索"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/inputGroupID" />
diff --git a/app/src/main/res/layout/activity_make_group.xml b/app/src/main/res/layout/activity_make_group.xml
index 0762055..724ef38 100644
--- a/app/src/main/res/layout/activity_make_group.xml
+++ b/app/src/main/res/layout/activity_make_group.xml
@@ -27,6 +27,7 @@
         android:layout_marginLeft="8dp"
         android:layout_marginEnd="36dp"
         android:layout_marginRight="36dp"
+        android:inputType="text"
         android:hint="20文字以内"
         android:maxLength="20"
         android:textSize="18sp"
diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml
index 6b37c3c..831e7ad 100644
--- a/app/src/main/res/layout/activity_signin.xml
+++ b/app/src/main/res/layout/activity_signin.xml
@@ -36,6 +36,7 @@
         android:ems="10"
         android:hint="@string/password"
         android:inputType="textPassword"
+        android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index bf45ed6..c0b617e 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -100,6 +100,7 @@
         android:hint="@string/confirm_password"
         android:inputType="textPassword"
         android:textSize="18sp"
+        android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
@@ -118,6 +119,7 @@
         android:hint="@string/password"
         android:inputType="textPassword"
         android:textSize="18sp"
+        android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
@@ -163,7 +165,11 @@
         android:layout_height="100dp"
         android:layout_marginStart="152dp"
         android:layout_marginLeft="152dp"
-        android:layout_marginTop="44dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView6"
         app:srcCompat="@drawable/ic_menu_gallery" />
diff --git a/app/src/main/res/layout/content_request_list.xml b/app/src/main/res/layout/content_request_list.xml
index c894494..7699cd2 100644
--- a/app/src/main/res/layout/content_request_list.xml
+++ b/app/src/main/res/layout/content_request_list.xml
@@ -66,6 +66,7 @@
                     android:layout_weight="1"
                     android:orientation="horizontal">
 
+
                     <TextView
                         android:id="@+id/textProduct"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index aa882a0..829341c 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -29,5 +29,5 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         />
-
+ 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 1b0e575..21d5116 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -8,5 +8,5 @@
     android:paddingLeft="40dp"
     android:paddingRight="5dp"
     >
-
+ 
 </TextView>
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar b/dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar
new file mode 100644
index 0000000..8040ff7
--- /dev/null
+++ b/dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar
Binary files differ
diff --git a/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state b/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state
index 4577682..1b7a50f 100644
--- a/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state
+++ b/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state
Binary files differ