Merge branch 'master' into LaunchActivity
|
---|
app/build.gradle.kts |
---|
app/src/main/java/com/example/tampopo_client/Tampopo.java |
---|
app/src/main/java/com/example/tampopo_client/models/ChatMessage.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/models/Chatroom.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/models/FriendPair.java |
---|
app/src/main/java/com/example/tampopo_client/resources/ChatroomResource.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/resources/FriendsResource.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/ChatroomViewModel.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/views/ChatActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/FriendIconView.java |
---|
app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java |
---|
app/src/main/java/com/example/tampopo_client/views/MainActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/MyFragmentAdapter.java |
---|
app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java |
---|
app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java |
---|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/layout/activity_test_friend_icon.xml |
---|
app/src/main/res/layout/sample_friend_icon_view.xml |
---|