Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty

Fork: 0

nitta-lab-2025 / tampopo-client

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 ChatActivity4 Hiroki1111 LaunchActivity Seting2 add-user-icon fix-friendlist-error implement-activity-viewmodel mainActivity_natty master
commit 266b633ee1ccdb4833782d9058c00ee4963cc633 2 parents c392829 + 327e677 n-morii authored 18 days ago

Patch

Unified Split

Showing 11 changed files

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