Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into LoginActivity4 AcceptFriend ChatActivity3 ChatRooms Chatroom FriendIconView4 FriendIconView5 FriendIconView7 FriendReceivedFragment Hiroki0 Hiroki0111 Hiroki11 Hiroki1111 Hiroki12 Hiroki77 LaunchActivity LoginActivity4 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 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-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

commit cc82292a5fa8ebbceeb782c0a343a71bc2c306f3 2 parents 1f90272 + a71cc03 amika11071107 authored on 17 Jul

Showing 32 changed files

• app/build.gradle.kts
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/models/User.java
• app/src/main/java/com/example/tampopo_client/resources/UserResource.java
• app/src/main/java/com/example/tampopo_client/ui/notifications/NotificationsFragment.java
• app/src/main/java/com/example/tampopo_client/ui/notifications/NotificationsViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.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/FriendViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
• app/src/main/java/com/example/tampopo_client/views/FriendActivity.java
• app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
• app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java
• app/src/main/java/com/example/tampopo_client/views/MainActivity.java
• app/src/main/java/com/example/tampopo_client/views/MyFragmentAdapter.java
• app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java
• app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
• app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java
• app/src/main/res/drawable/comment.png
• app/src/main/res/layout/activity_friend.xml
• app/src/main/res/layout/activity_launch.xml
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_register.xml
• app/src/main/res/layout/dialog_add_friend.xml
• app/src/main/res/layout/fragment_friend_received.xml
• app/src/main/res/layout/main_dialog.xml
• app/src/main/res/menu/bottom_nav_menu.xml
• app/src/main/res/navigation/mobile_navigation.xml
• app/src/main/res/values/strings.xml
• app/src/main/res/values/themes.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/models/User.java

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/ui/notifications/NotificationsFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/ui/notifications/NotificationsViewModel.java 0 → 100644

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/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/FriendViewModel.java

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

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

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/LaunchActivity.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/MyFragmentAdapter.java 0 → 100644

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/comment.png 0 → 100644

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/menu/bottom_nav_menu.xml

Show notes View app/src/main/res/navigation/mobile_navigation.xml 100644 → 0

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

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

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

Show line notes below