diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java index 0ed8392..17e895c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java @@ -1,16 +1,16 @@ package org.ntlab.acanthus_client.entities; -import java.util.HashMap; +import java.util.ArrayList; public class FollowJson { - private HashMap follows = new HashMap<>(); + private ArrayList followUids; + private ArrayList followNames; - public HashMap getFollows() { - return follows; + public ArrayList getFollowUids(){ + return followUids; } - public void setFollows(HashMap follows) { - this.follows = follows; + public ArrayList getFollowNames(){ + return followNames; } - } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java index bfbcf0b..ff71c31 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java @@ -1,16 +1,16 @@ package org.ntlab.acanthus_client.entities; -import java.util.HashMap; +import java.util.ArrayList; public class FollowerJson { - private HashMap followers = new HashMap<>(); + private ArrayList followerUids; + private ArrayList followerNames; - public HashMap getFollowers() { - return followers; + public ArrayList getFollowerUids(){ + return followerUids; } - public void setFollowers(HashMap followers) { - this.followers = followers; + public ArrayList getFollowerNames(){ + return followerNames; } - } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java index d25add8..3081e4f 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java @@ -26,7 +26,7 @@ private UserPageViewModel userPageViewModel; private Acanthus acanthus; - private Collection followsList = new ArrayList<>(); + private Collection followsUidList = new ArrayList<>(); @Override protected void onCreate(Bundle savedInstanceState){ @@ -70,9 +70,9 @@ userPageViewModel.getFollowJson().observe(this, new Observer() { @Override public void onChanged(@Nullable FollowJson followJson) { - followsList = followJson.getFollows().keySet(); + followsUidList = followJson.getFollowUids(); - if (followsList.contains(uid2)) { + if (followsUidList.contains(uid2)) { followUserButton.setText("フォロー解除"); }else{ followUserButton.setText("フォローする"); @@ -85,13 +85,13 @@ followUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (!followsList.contains(uid2)) { + if (!followsUidList.contains(uid2)) { userPageViewModel.addFollow(uid, token, uid2); - followsList.add(uid2); + followsUidList.add(uid2); followUserButton.setText("フォロー解除"); }else{ userPageViewModel.releaseFollow(uid, token, uid2); - followsList.remove(uid2); + followsUidList.remove(uid2); followUserButton.setText("フォローする"); } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java index 358a85b..e3a7348 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java @@ -49,8 +49,8 @@ userPageViewModel.getFollowJson().observe(this, new Observer() { @Override public void onChanged(FollowJson followJson) { - ArrayList followUidList = (ArrayList) followJson.getFollows().keySet(); - ArrayList followNameList = (ArrayList) followJson.getFollows().values(); + ArrayList followUidList = followJson.getFollowUids(); + ArrayList followNameList = followJson.getFollowNames(); BaseAdapter adapter = new UserListViewAdapter(getApplication(), R.layout.follow_or_follower_list, followNameList); listView.setAdapter(adapter); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java index 9bf7595..e001d96 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java @@ -51,8 +51,8 @@ userPageViewModel.getFollowerJson().observe(this, new Observer() { @Override public void onChanged(@Nullable FollowerJson followerJson) { - ArrayList followerUidList = (ArrayList) followerJson.getFollowers().keySet(); - ArrayList followerNameList = (ArrayList) followerJson.getFollowers().values(); + ArrayList followerUidList = followerJson.getFollowerUids(); + ArrayList followerNameList = followerJson.getFollowerNames(); BaseAdapter adapter = new UserListViewAdapter(getApplication(), R.layout.follow_or_follower_list, followerNameList); listView.setAdapter(adapter); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java index 59a7182..26ed5ca 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java @@ -71,7 +71,7 @@ Collections.sort(listEntries, new Comparator>() { @Override public int compare(Map.Entry o1, Map.Entry o2) { - return o1.getKey().compareTo(o2.getKey()); + return o2.getKey().compareTo(o1.getKey()); } }); for (Map.Entry entry : listEntries){