GitBucket
|
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
FriendReceivedFragment
Hiroki
Hiroki11111
LaunchActivity
LoginActivity4
add-scalar-converter-factory
addHTTPsupport
addMutableLiveToken
fix-activity-main
fix-friend-received-fragment
fix-friendrequest-viewmodel2
fix-view-binding
friend-received-fragment
friend-received-fragment2
friend-received-fragment4
friend-received-fragment5
friend-received-fragment6
friend-received-fragment7
implement-realtime-datafetch
master
update-friend-viewmodel5
|
|---|
|
|
| app/build.gradle.kts |
|---|
| app/src/main/AndroidManifest.xml |
|---|
| app/src/main/java/com/example/tampopo_client/views/FriendActivity.java 0 → 100644 |
|---|
| app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java 0 → 100644 |
|---|
| app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java 0 → 100644 |
|---|
| app/src/main/java/com/example/tampopo_client/views/LoginActivity.java 0 → 100644 |
|---|
| app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java 0 → 100644 |
|---|
| app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java 0 → 100644 |
|---|
| app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java 0 → 100644 |
|---|
| app/src/main/res/layout/activity_friend.xml 0 → 100644 |
|---|
| app/src/main/res/layout/activity_login.xml 0 → 100644 |
|---|
| app/src/main/res/layout/fragment_friend_list.xml 0 → 100644 |
|---|
| app/src/main/res/layout/fragment_friend_list_list.xml 0 → 100644 |
|---|
| app/src/main/res/layout/fragment_friend_received.xml 0 → 100644 |
|---|
| app/src/main/res/layout/fragment_friend_received_list.xml 0 → 100644 |
|---|
| app/src/main/res/values/dimens.xml 0 → 100644 |
|---|
| app/src/main/res/values/strings.xml |
|---|
| gradle/libs.versions.toml |
|---|