Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into Setting2 # Conflicts: # app/src/main/java/com/example/tampopo_client/Tampopo.java # app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java # app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java Setting2 master
commit 6bd20f4989617cd3d2907bac8ba17b4a668faed1 2 parents 11d5093 + 61a59a9 y-ichii authored 19 hours ago

Showing 30 changed files

• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/Tampopo.java
• app/src/main/java/com/example/tampopo_client/models/Activity.java
• app/src/main/java/com/example/tampopo_client/models/Chatroom.java
• app/src/main/java/com/example/tampopo_client/models/FriendPair.java
• app/src/main/java/com/example/tampopo_client/resources/ActivitiesResource.java
• app/src/main/java/com/example/tampopo_client/resources/ChatroomResource.java
• app/src/main/java/com/example/tampopo_client/resources/FriendsResource.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ActivitiesFetchCallback.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModelFactory.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ChatroomViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/UserActivityStatusChangeListener.java
• app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
• app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
• app/src/main/java/com/example/tampopo_client/views/FriendIconView.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/MainActivity.java
• app/src/main/java/com/example/tampopo_client/views/MyFragmentAdapter.java
• app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java
• app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java
• app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java
• app/src/main/res/layout/activity_chat.xml
• app/src/main/res/layout/activity_launch.xml
• app/src/main/res/layout/activity_register.xml
• app/src/main/res/layout/activity_test_friend_icon.xml

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/ActivitiesFetchCallback.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/ChatViewModel.java

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/FriendListFragment.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/MainActivity.java

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

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

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

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

Ignore Space Show notes View app/src/main/res/layout/activity_chat.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_register.xml

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

Show line notes below