diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java index 61ad06e..696407e 100644 --- a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java +++ b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java @@ -16,7 +16,9 @@ import com.bumptech.glide.Glide; import com.example.tampopo_client.R; +import com.example.tampopo_client.Tampopo; import com.example.tampopo_client.models.Activity; +import com.example.tampopo_client.viewmodels.ChatViewModel; import com.google.android.material.imageview.ShapeableImageView; import java.util.List; @@ -29,8 +31,8 @@ private ImageView mFriendChatNotification; private boolean chatNotification = false; private String friendActivity; - private String userId; - private String chatroomId = null; + private String friendUserId; + private ChatViewModel chatViewModel; // TODO: CHANGE //ActivityLiveData @@ -67,27 +69,28 @@ return chatObserver; } - public FriendIconView(Context context, String userId) { + public FriendIconView(Context context, String friendUserId, ChatViewModel chatViewModel) { this(context); - this.userId = userId; + this.friendUserId = friendUserId; + this.chatViewModel = chatViewModel; init(null, 0); } public FriendIconView(Context context) { super(context); - this.userId = null; + this.friendUserId = null; init(null, 0); } public FriendIconView(Context context, AttributeSet attrs) { super(context, attrs); - this.userId = null; + this.friendUserId = null; init(attrs, 0); } public FriendIconView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - this.userId = null; + this.friendUserId = null; init(attrs, defStyle); } @@ -118,7 +121,7 @@ mFriendChatNotification.setVisibility(View.GONE); } else { // 通話をかける場合 - showCallRequestDialog(getContext(), FriendIconView.this.userId); + showCallRequestDialog(getContext(), FriendIconView.this.friendUserId); } } }); @@ -140,11 +143,15 @@ Toast.makeText(context, "通話を開始しました", Toast.LENGTH_SHORT).show(); dialog.dismiss(); + // 通話を開始する + Tampopo tampopo = (Tampopo) ((MainActivity) getContext()).getApplication(); +// String chatroomId = chatViewModel.enterChatroom(tampopo.getUserId(), friendUserId, tampopo.getToken()); + // ChatActivityに画面遷移する Context ctx = getContext(); Intent intent = new Intent(ctx, ChatActivity.class); - intent.putExtra("friendId", userId); - intent.putExtra("chatroomId", chatroomId); + intent.putExtra("friendId", friendUserId); +// intent.putExtra("chatroomId", chatroomId); ctx.startActivity(intent); }); @@ -162,10 +169,6 @@ } } - public void setChatroomId(String chatroomId) { - this.chatroomId = chatroomId; - } - public void setImageResource(int resId) { if (mFriendIcon != null) { mFriendIcon.setImageResource(resId);