diff --git a/app/src/main/java/com/example/tampopo_client/models/FriendRequest.java b/app/src/main/java/com/example/tampopo_client/models/FriendRequest.java index af9c8ff..939f0b7 100644 --- a/app/src/main/java/com/example/tampopo_client/models/FriendRequest.java +++ b/app/src/main/java/com/example/tampopo_client/models/FriendRequest.java @@ -1,4 +1,4 @@ -package org.ntlab.tampoposerver.models; +package com.example.tampopo_client.models; public class FriendRequest { private Integer id; diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java b/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java index a836ccc..72f9525 100644 --- a/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java +++ b/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java @@ -4,6 +4,8 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -13,7 +15,11 @@ import android.view.ViewGroup; import com.example.tampopo_client.R; +import com.example.tampopo_client.models.FriendRequest; import com.example.tampopo_client.views.placeholder.FriendRequestContent; +import com.example.tampopo_client.viewmodels.FriendReceivedRequestViewModel; + +import java.util.List; /** * A fragment representing a list of Items. @@ -57,8 +63,8 @@ View view = inflater.inflate(R.layout.fragment_friend_received_list, container, false); // Add some sample items. - for (int i = 1; i <= 30; i++) - FriendRequestContent.addItem(new FriendRequestContent.FriendRequestItem(Integer.toString(i), "ユーザ名" + i)); +// for (int i = 1; i <= 30; i++) +// FriendRequestContent.addItem(new FriendRequestContent.FriendRequestItem(Integer.toString(i), "ユーザ名" + i)); // Set the adapter if (view instanceof RecyclerView) { @@ -73,4 +79,20 @@ } return view; } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + FriendReceivedRequestViewModel friendReceivedRequestViewModel = new ViewModelProvider(this).get(FriendReceivedRequestViewModel.class); + friendReceivedRequestViewModel.getReceivedRequestsLiveData().observe(getViewLifecycleOwner(), new Observer>() { + + // LiveData に変更があったとき(新しい友達リクエストのリストが届いたとき)に呼ばれるメソッド + @Override + public void onChanged(List friendRequests) { + for (FriendRequest f: friendRequests) { + FriendRequestContent.addItem(new FriendRequestContent.FriendRequestItem(f.getSenderId(), "ユーザー名")); + } + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java index 7882221..a52b3af 100644 --- a/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java +++ b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java @@ -60,5 +60,6 @@ public String toString() { return name + " " + id; } + } } \ No newline at end of file