Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into add-dependencies # Conflicts: # gradle/libs.versions.toml 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 f367af38d65d271478e181054d4e1978acf67cd4 2 parents 1633f9e + e0c43e9 s-yamagiwa authored on 1 Jul

Showing 18 changed files

• app/build.gradle.kts
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/views/FriendActivity.java
• app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java
• app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
• app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
• app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java
• app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java
• app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java
• app/src/main/res/layout/activity_friend.xml
• app/src/main/res/layout/activity_login.xml
• app/src/main/res/layout/fragment_friend_list.xml
• app/src/main/res/layout/fragment_friend_list_list.xml
• app/src/main/res/layout/fragment_friend_received.xml
• app/src/main/res/layout/fragment_friend_received_list.xml
• app/src/main/res/values/dimens.xml
• app/src/main/res/values/strings.xml
• gradle/libs.versions.toml

Ignore Space Show notes View app/build.gradle.kts

Ignore Space Show notes View app/src/main/AndroidManifest.xml

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_friend.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_login.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_friend_list.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_friend_list_list.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_friend_received.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_friend_received_list.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/dimens.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/strings.xml

Ignore Space Show notes View gradle/libs.versions.toml

Show line notes below