Merge remote-tracking branch 'origin/master' into LaunchActivity

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge remote-tracking branch 'origin/master' into LaunchActivity AcceptFriend ChatActivity3 ChatRooms Chatroom FriendIconView4 FriendIconView5 FriendIconView7 FriendReceivedFragment Hiroki Hiroki0 Hiroki0111 Hiroki11 Hiroki1111 Hiroki11111 Hiroki12 Hiroki77 LaunchActivity LoginActivity4 Seting2 Setting2 Setting3 UserInfoActivity2 add-friend-icon-views add-pending1 add-pending2 add-pending3 add-scalar-converter-factory add-user-icon addHTTPsupport addMutableLiveToken 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 bug6-chatgpt-p1(re) bug6-chatgpt-p2(re) chat-room-delete chat-rooms chat-rooms2 chat-rooms3 chat-rooms4 chatActivity8 chatActivity9 chatactivity7 detached fix-activity-main fix-chatroom-model fix-friend-icon-view-placement fix-friend-received-fragment fix-friendlist-error fix-friendrequest-viewmodel2 fragment-friend-receiver friend-received-fragment friend-received-fragment2 friend-received-fragment4 friend-received-fragment5 friend-received-fragment6 friend-received-fragment7 friendList2 implement-realtime-datafetch mainActivity_natty master rana 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 update-friend-viewmodel5
commit b1addd6768dda9ef8d90208a674f9bd6223ef9d4 2 parents f4df8b5 + ae285d5 Yuzuki　Yoshimura authored on 8 Jul

Browse code

AcceptFriend ChatActivity3 ChatRooms Chatroom FriendIconView4 FriendIconView5 FriendIconView7 FriendReceivedFragment Hiroki Hiroki0 Hiroki0111 Hiroki11 Hiroki1111 Hiroki11111 Hiroki12 Hiroki77 LaunchActivity LoginActivity4 Seting2 Setting2 Setting3 UserInfoActivity2 add-friend-icon-views add-pending1 add-pending2 add-pending3 add-scalar-converter-factory add-user-icon addHTTPsupport addMutableLiveToken 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 bug6-chatgpt-p1(re) bug6-chatgpt-p2(re) chat-room-delete chat-rooms chat-rooms2 chat-rooms3 chat-rooms4 chatActivity8 chatActivity9 chatactivity7 detached fix-activity-main fix-chatroom-model fix-friend-icon-view-placement fix-friend-received-fragment fix-friendlist-error fix-friendrequest-viewmodel2 fragment-friend-receiver friend-received-fragment friend-received-fragment2 friend-received-fragment4 friend-received-fragment5 friend-received-fragment6 friend-received-fragment7 friendList2 implement-realtime-datafetch mainActivity_natty master rana 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 update-friend-viewmodel5

commit b1addd6768dda9ef8d90208a674f9bd6223ef9d4

2 parents f4df8b5 + ae285d5

Yuzuki　Yoshimura authored on 8 Jul

Patch

Unified Split

Showing 4 changed files

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

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/resources/FriendsResource.java

Ignore Space Show notes View app/src/main/res/layout/activity_register.xml

Show line notes below