Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into add-dependencies
# Conflicts:
#	gradle/libs.versions.toml
commit f367af38d65d271478e181054d4e1978acf67cd4
2 parents 1633f9e + e0c43e9
s-yamagiwa authored 4 days ago
Showing 18 changed files
View
app/build.gradle.kts
View
app/src/main/AndroidManifest.xml
View
app/src/main/java/com/example/tampopo_client/views/FriendActivity.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/views/LoginActivity.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java 0 → 100644
View
app/src/main/res/layout/activity_friend.xml 0 → 100644
View
app/src/main/res/layout/activity_login.xml 0 → 100644
View
app/src/main/res/layout/fragment_friend_list.xml 0 → 100644
View
app/src/main/res/layout/fragment_friend_list_list.xml 0 → 100644
View
app/src/main/res/layout/fragment_friend_received.xml 0 → 100644
View
app/src/main/res/layout/fragment_friend_received_list.xml 0 → 100644
View
app/src/main/res/values/dimens.xml 0 → 100644
View
app/src/main/res/values/strings.xml
View
gradle/libs.versions.toml