diff --git a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java index ed79e2f..14bf304 100644 --- a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java @@ -29,6 +29,7 @@ import com.example.tampopo_client.viewmodels.UserViewModel; import java.util.List; +import java.util.Map; public class MainActivity extends AppCompatActivity { @@ -36,6 +37,7 @@ private ImageButton sendButton; private GridView wordGroup; private LinearLayout messageList; + //private List friendIds = List.of(); //アクティビティの選択肢 private String[] words = {"ひまnow", "あそぼ!", "そろそろ会いたない〜?", "勉強なう", "電話しよ~", "お風呂入ってくる~", "今暇だよー!", "いそがしい~!!"}; private Button openDialogButton; @@ -69,11 +71,23 @@ //tampopoを宣言する tampopo = (Tampopo) getApplication(); - MutableLiveData> activitiesLiveData = activityViewModel.getActivitiesLiveData(); - activitiesLiveData.observe(this, new Observer>() { - @Override - public void onChanged(List activities) { +// MutableLiveData>friendUserIdsLiveDate = activityViewModel.getFriendUserIdsLiveData(); +// friendUserIdsLiveDate.observe(this, new Observer>() { +// @Override +// public void onChanged(List friendLive) { +// if(friendLive != null){ +// friendIds = friendLive; +// updateActivityView(activityViewModel.getActivitiesLiveData().getValue()); +// } +// } +// }); + + MutableLiveData> activitiesLiveData = activityViewModel.getActivitiesLiveData(); + activitiesLiveData.observe(this, new Observer>() { + @Override + public void onChanged(Map activities) { + updateActivityView(activities); } }); @@ -157,4 +171,27 @@ dialog.show(); } + private void updateActivityView(Map activities) { + TextView comment = this.findViewById(R.id.friend01_comment); + for (Activity ac: activities.values()) { + comment.setText(ac.getText()); + } + +// if (activities == null || friendIds == null) return; +// +// messageList.removeAllViews(); // 表示をリセット +// +// for (String userId : friendIds) { +// Activity activity = activities.get(userId); +// if (activity != null) { +// TextView textView = new TextView(this); +// textView.setText(activity.getText()); +// textView.setTextSize(16); +// textView.setPadding(16, 16, 16, 16); +// // 必要に応じてユーザー名なども表示できる +// messageList.addView(textView); +// } +// } + } + } \ No newline at end of file