Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty
commit 7429dab41314c3d8fb3678b2ac5c851a916c6ff2
2 parents 35f6a71 + 72f3717
n-morii authored 11 hours ago
Showing 7 changed files
View
app/src/main/AndroidManifest.xml
View
app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
View
app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
View
app/src/main/java/com/example/tampopo_client/views/UserInfoActivity.java 0 → 100644
View
app/src/main/res/drawable/tampopo.png 0 → 100644
View
app/src/main/res/layout/activity_chat.xml
View
app/src/main/res/layout/activity_user_info.xml 0 → 100644