Merge remote-tracking branch 'origin/master' into addMutableLiveToken
|
---|
app/build.gradle.kts |
---|
app/src/main/java/com/example/tampopo_client/views/LoginActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/MainActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java |
---|
app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java |
---|
app/src/main/res/drawable/comment.png 0 → 100644 |
---|
|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/layout/fragment_friend_received.xml |
---|
app/src/main/res/layout/main_dialog.xml 0 → 100644 |
---|
app/src/main/res/values/themes.xml |
---|
gradle/libs.versions.toml |
---|