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

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 Hiroki77 ChatRooms Chatroom FriendIconView4 FriendIconView5 Hiroki0 Hiroki77 Setting2 add-friend-icon-views chat-rooms chat-rooms2 fix-chatroom-model mainActivity_natty master
commit 176b56405a09c82dd3885cc216d6e3ce8d65e13d 2 parents c871507 + cbc4a37 h-yamamoto authored 7 hours ago

Patch

Unified Split

Showing 4 changed files

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

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

Show line notes below