Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty # Conflicts: # app/src/main/java/com/example/tampopo_client/views/MainActivity.java ChatActivity3 ChatRooms Chatroom FriendIconView4 FriendIconView5 FriendIconView7 Hiroki0 Hiroki0111 Hiroki1111 Hiroki12 Hiroki77 LaunchActivity Seting2 Setting2 Setting3 UserInfoActivity2 add-friend-icon-views add-pending1 add-pending2 add-pending3 add-user-icon bug2 bug2-gemini-p1 bug2-gemini-p1-NoHint bug2-gpt-p1 bug2-gpt-p1-NoHint bug2-p1 bug2-p1-cloude-NoHint bug3-p1 bug3-p1-claude-NoHint bug3-p1-gemini-NoHint bug3-p1-gpt-NoHint bug4 bug4-p1 bug4-p1-claude-NoHint bug4-p1-gemini-NoHint bug4-p1-gpt-NoHint bug4-p2-gemini-NoHint bug5-p1 bug5-p1-claude-NoHint bug5-p1-gpt-NoHint chat-room-delete chat-rooms chat-rooms2 chat-rooms3 chat-rooms4 chatActivity8 chatActivity9 chatactivity7 fix-chatroom-model fix-friend-icon-view-placement fix-friendlist-error fragment-friend-receiver friendList2 mainActivity_natty master show-chat-activity1 show-chat-activity2 show-chat-activity3 show-chat-realtime1 show-chat-realtime2 show-chat-realtime3 show-friend-nickname1 show-friend-nicknname2 show-friend-nicknname3

commit 266b633ee1ccdb4833782d9058c00ee4963cc633 2 parents c392829 + 327e677 n-morii authored on 2 Oct

Showing 11 changed files

• app/src/main/java/com/example/tampopo_client/models/FriendRequest.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModelFactory.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/NotificationListener.java
• app/src/main/java/com/example/tampopo_client/viewmodels/RealTimeViewModel.java
• app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
• app/src/main/java/com/example/tampopo_client/views/MainActivity.java
• app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/models/FriendRequest.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModelFactory.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/NotificationListener.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/RealTimeViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/MainActivity.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java

Show line notes below