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 chatActivity8 chatActivity9 chatactivity7 fragment-friend-receiver friendList2 mainActivity_natty master
commit f3be082562eb36967df7ba3699019f752fbaf950 2 parents 8f3e907 + f43e41b n-morii authored 2 days ago

Patch

Unified Split

Showing 7 changed files

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/resources/ChatroomResource.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/MainActivity.java

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

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

Show line notes below