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 9db3ad5..8ba2505 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 @@ -30,8 +30,8 @@ private TextView mFriendNickname; private ImageView mFriendChatNotification; private boolean chatNotification = false; - private String friendActivity; private String friendUserId; + private String friendUserNickName; private ChatViewModel chatViewModel; // TODO: CHANGE @@ -41,8 +41,7 @@ public void onChanged(List activityList) { if (activityList != null && !activityList.isEmpty()) { Activity act = activityList.get(0); - friendActivity = act.getText(); - setComment(act.getUserId()); + setComment(act.getText()); } } }; @@ -69,9 +68,10 @@ return chatObserver; } - public FriendIconView(Context context, String friendUserId, ChatViewModel chatViewModel) { + public FriendIconView(Context context, String friendUserId,String friendUserNickName, ChatViewModel chatViewModel) { this(context); this.friendUserId = friendUserId; + this.friendUserNickName = friendUserNickName; this.chatViewModel = chatViewModel; init(null, 0); } @@ -116,17 +116,17 @@ public void onClick(View v) { //通話に出る場合 if (chatNotification) { - answeringCallDialog(getContext(), FriendIconView.this.friendUserId); + answeringCallDialog(getContext(), FriendIconView.this.friendUserNickName); } // 通話をかける場合 else if(!chatNotification){ - showCallRequestDialog(getContext(), FriendIconView.this.friendUserId); + showCallRequestDialog(getContext(), FriendIconView.this.friendUserNickName); } } }); } //通話に出る際のダイアログの表示 - public void answeringCallDialog(Context context, String fromUserName){ + public void answeringCallDialog(Context context, String fromUserNickName){ Dialog fromDialog = new Dialog(context); fromDialog.setContentView(R.layout.dialog_chat_receved); fromDialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent); @@ -134,7 +134,7 @@ // メッセージテキスト TextView tvMessage = fromDialog.findViewById(R.id.tv_message); - tvMessage.setText(fromUserName + " さんから通話リクエストが届いています。\n通話を開始しますか?"); + tvMessage.setText(fromUserNickName + " さんから通話リクエストが届いています。\n通話を開始しますか?"); // 開始ボタン Button btnStart = fromDialog.findViewById(R.id.btn_start); @@ -164,7 +164,7 @@ } //通話をかける際のダイアログの表示 - public void showCallRequestDialog(Context context, String toUserName) { + public void showCallRequestDialog(Context context, String toUserNickName) { Dialog toDialog = new Dialog(context); toDialog.setContentView(R.layout.dialog_chat_receved); toDialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent); @@ -172,7 +172,7 @@ // メッセージテキスト TextView tvMessage = toDialog.findViewById(R.id.tv_message); - tvMessage.setText(toUserName + " さんと通話を開始しますか?"); + tvMessage.setText(toUserNickName + " さんと通話を開始しますか?"); // 開始ボタン Button btnStart = toDialog.findViewById(R.id.btn_start);