diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 1adb1c2..6e5fc32 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/FriendActivity.java b/app/src/main/java/com/example/nemophila/FriendActivity.java
index ffb93c8..02785cb 100644
--- a/app/src/main/java/com/example/nemophila/FriendActivity.java
+++ b/app/src/main/java/com/example/nemophila/FriendActivity.java
@@ -2,6 +2,7 @@
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -16,9 +17,11 @@
import android.widget.ImageView;
import android.widget.TextView;
+import com.example.nemophila.entities.AccountNameJson;
import com.example.nemophila.viewmodels.FriendViewModel;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
public class FriendActivity extends AppCompatActivity {
@@ -48,8 +51,25 @@
rv.setLayoutManager(llm);
String myUid = nemophila.getUid(); // 自身のidを取得
-// friendViewModel.getFriends(myUid); // 自身のフレンドの一覧を取得するメソッドを呼び出す
-
+ friendViewModel.getFriends(myUid); // 自身のフレンドの一覧を取得するメソッドを呼び出す
+
+ friendViewModel.getFriendsLiveData().observe(this, new Observer>() {
+ @Override
+ public void onChanged(Collection friends) {
+ // 以前のデータが残っていると不都合なので、空にしておく
+ friendsDataset.clear();
+
+ for (AccountNameJson friend : friends) {
+ FriendDataModel data = new FriendDataModel();
+ data.setName(friend.getName());
+ friendsDataset.add(data);
+
+ //RecyclerViewをonChangedが呼ばれるたび表示(アダプターを更新してRecyclerViewにセット)
+ adapter.setList(friendsDataset);
+ rv.setAdapter(adapter);
+ }
+ }
+ });
// マイページ画面に画面遷移する
Button backButton = findViewById(R.id.backMyPage);
diff --git a/app/src/main/java/com/example/nemophila/entities/AccountNameJson.java b/app/src/main/java/com/example/nemophila/entities/AccountNameJson.java
index d865620..2df8fc1 100644
--- a/app/src/main/java/com/example/nemophila/entities/AccountNameJson.java
+++ b/app/src/main/java/com/example/nemophila/entities/AccountNameJson.java
@@ -1,6 +1,22 @@
package com.example.nemophila.entities;
public class AccountNameJson {
+ private String uid;
private String name;
- private String id;
+
+ // Getter
+ public String getName() {
+ return name;
+ }
+ public String getUid() {
+ return uid;
+ }
+
+ // Setter
+ public void setName(String name) {
+ this.name = name;
+ }
+ public void setUid(String uid) {
+ this.uid = uid;
+ }
}