diff --git a/app/src/main/java/com/example/cosmosclient/entities/GroupListResponse.java b/app/src/main/java/com/example/cosmosclient/entities/GroupListResponse.java index 68c1998..9af528b 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/GroupListResponse.java +++ b/app/src/main/java/com/example/cosmosclient/entities/GroupListResponse.java @@ -1,34 +1,35 @@ package com.example.cosmosclient.entities; +import com.example.cosmosclient.entities.jsons.GroupJson; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; -@JsonIgnoreProperties(ignoreUnknown = true) +//@JsonIgnoreProperties(ignoreUnknown = true) public class GroupListResponse { - private List groups; + private List groups; public GroupListResponse() { } - public GroupListResponse(List groups) { + public GroupListResponse(List groups) { this.groups = groups; } - public List getGroup() { + public List getGroups() { return groups; } - public void setGroup(List groups) { + public void setGroups(List groups) { this.groups = groups; } - public void addGroup(Group g) { + public void addGroup(GroupJson g) { groups.add(g); } - public Group getGroup(int index) { + public GroupJson getGroup(int index) { return groups.get(index); } diff --git a/app/src/main/java/com/example/cosmosclient/entities/jsons/GroupJson.java b/app/src/main/java/com/example/cosmosclient/entities/jsons/GroupJson.java new file mode 100644 index 0000000..9264728 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/entities/jsons/GroupJson.java @@ -0,0 +1,35 @@ +package com.example.cosmosclient.entities.jsons; + +public class GroupJson { + private String name; + private String gId; + private String uri; + + public String getgId() { + return gId; + } + + public void setgId(String gId) { + this.gId = gId; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri){ + this.uri = uri; + } + + public void setName(String name){ + this.name = name; + } + + public String getName(){ + return name; + } + + public String toString() { + return name; + } +} diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java index eec96e9..16bd164 100644 --- a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java @@ -48,6 +48,7 @@ private static final String TAG = GroupListActivity.class.getName(); private DynamicGridView gridView; + GroupListResponse result; @Override @@ -71,7 +72,7 @@ TextView userIDTextView = navView.getHeaderView(0).findViewById(R.id.userID); userNameTextView.setText("ユーザ名:"+uName); userIDTextView.setText("ユーザID:"+uId); - + final ArrayList groupList = new ArrayList<>(); //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() @@ -90,9 +91,18 @@ @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()) { - GroupListResponse result = response.body(); + GroupListResponse result2 = response.body(); + result = result2; // Iterator it = result.member.iterator(); // int i = 0; + for (int i = 0; i < result.getGroupCount(); i++) { + groupList.add(result.getGroup(i).getName()); + } + + // グループ名一覧の表示 + gridView.setAdapter((ListAdapter) new CheeseDynamicAdapter(GroupListActivity.this, + result.getGroups(), + getResources().getInteger(R.integer.column_count))); //画像をBase64に変換 Bitmap icon = BitmapFactory.decodeResource(getResources(),R.drawable.default_icon_image); @@ -138,15 +148,12 @@ } }); - //String[] list = {"ファミリー\n 紙コップ\n 延長ケーブル", "Group2\n からし", "Group3\n ケーキ\n something"}; - +// ArrayList GroupList = new ArrayList<>(); +// for (int i = 0; i < result.getGroupCount(); i++) { +// GroupList.add(result.getGroup(i).getName()); +// } gridView = (DynamicGridView) findViewById(R.id.dynamic_grid); - // グループ名一覧の表示 - gridView.setAdapter((ListAdapter) new CheeseDynamicAdapter(this, - new ArrayList(Arrays.asList(Cheeses.sCheeseStrings)), - getResources().getInteger(R.integer.column_count))); - gridView.setOnDragListener(new DynamicGridView.OnDragListener() { @Override public void onDragStarted(int position) {