Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into LoginActivity # Conflicts: # app/src/main/AndroidManifest.xml Hiroki LaunchActivity LoginActivity2 add-activity-viewmodel master
commit e89668e4c2a201538137ec71191573a592f2ec09 2 parents dcee63a + e345419 amika11071107 authored 4 days ago

Showing 11 changed files

• app/build.gradle.kts
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/views/FriendActivity.java
• app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
• app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java
• app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java
• app/src/main/res/layout/activity_friend.xml
• app/src/main/res/layout/fragment_friend_received.xml
• app/src/main/res/layout/fragment_friend_received_list.xml
• app/src/main/res/values/dimens.xml
• gradle/libs.versions.toml

Ignore Space Show notes View app/build.gradle.kts

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/FriendActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_friend.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_friend_received.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_friend_received_list.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/dimens.xml 0 → 100644

Ignore Space Show notes View gradle/libs.versions.toml

Show line notes below