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 7a995de..454a53f 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 @@ -66,7 +66,7 @@ View view = inflater.inflate(R.layout.fragment_friend_received_list, container, false); FriendViewModel friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class); - FriendReceivedRequestViewModel friendReceivedRequestViewModel = new ViewModelProvider(this).get(FriendReceivedRequestViewModel.class); + Tampopo tampopo = (Tampopo) this.getView().getApplicationWindowToken(); String receiverId = tampopo.getUserId(); String token = tampopo.getToken(); @@ -84,7 +84,7 @@ } else { recyclerView.setLayoutManager(new GridLayoutManager(context, mColumnCount)); } - recyclerView.setAdapter(new MyFriendRequestRecyclerViewAdapter(FriendRequestContent.ITEMS, friendReceivedRequestViewModel, receiverId, token)); + recyclerView.setAdapter(new MyFriendRequestRecyclerViewAdapter(FriendRequestContent.ITEMS, friendViewModel, receiverId, token)); } return view; } diff --git a/app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java b/app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java index d04e9d9..4b7c836 100644 --- a/app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java +++ b/app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java @@ -21,12 +21,18 @@ // 表示するFriendRequestItemのリスト(アダプターのデータ) private final List mValues; + + private FriendViewModel friendViewModel; private String receiverId; private String token; // コンストラクタ:アダプターを初期化し、表示データのリストを受け取る - public MyFriendRequestRecyclerViewAdapter(List items, FriendReceivedRequestViewModel friendReceivedRequestViewModel, String receiverId, String token) { + public MyFriendRequestRecyclerViewAdapter(List items, FriendViewModel friendViewModel, String receiverId, String token) { mValues = items; + this.friendViewModel = friendViewModel; + this.receiverId = receiverId; + this.token = token; + } // ビュー(行)を新しく作成するときに呼ばれる(レイアウトのXMLを元に1行分のViewを作成) @@ -51,7 +57,7 @@ String senderId = holder.mItem.id; // または holder.mItem.senderId // 例:ViewModelにフレンド登録処理を依頼する - FriendViewModel.createFriend(senderId, receiverId, token); + friendViewModel.createFriend(token, senderId, receiverId); Toast.makeText(v.getContext(), "フレンド申請を許可しました", Toast.LENGTH_SHORT).show(); });