Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into Hiroki0111
commit 0004cc60ab112ab277b5a2ec600ee017fa72cc25
2 parents ea343c5 + f43e41b
h-yamamoto authored 16 hours ago
Showing 6 changed files
View
app/src/main/java/com/example/tampopo_client/Tampopo.java
View
app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
View
app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
View
app/src/main/java/com/example/tampopo_client/views/MainActivity.java
View
app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java
View
app/src/main/res/layout/sample_friend_icon_view.xml