Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into FriendActivity-1 # Conflicts: # app/src/main/res/layout/activity_friend.xml # app/src/main/res/menu/bottom_nav_menu.xml # app/src/main/res/values/strings.xml LaunchActivity add-scalar-converter-factory friend-received-fragment4 master update-friend-viewmodel5
commit 9031c36d136c5522cad78dcd84614ddda4720e06 2 parents 67eedd1 + 4a8e78d t-watanabe authored 9 hours ago

Showing 36 changed files

• app/build.gradle.kts
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/Tampopo.java
• app/src/main/java/com/example/tampopo_client/models/Activity.java
• app/src/main/java/com/example/tampopo_client/models/User.java
• app/src/main/java/com/example/tampopo_client/resources/ActivitiesResource.java
• app/src/main/java/com/example/tampopo_client/resources/UserResource.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java
• 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/FriendListFragment.java
• app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
• app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java
• 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/MyFriendRecyclerViewAdapter.java
• app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java
• app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
• app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java
• app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java
• app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java
• app/src/main/res/drawable/comment.png
• app/src/main/res/drawable/eye.png
• app/src/main/res/layout/activity_launch.xml
• app/src/main/res/layout/activity_login.xml
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_register.xml
• app/src/main/res/layout/fragment_friend_list.xml
• app/src/main/res/layout/fragment_friend_received.xml
• app/src/main/res/layout/main_dialog.xml
• app/src/main/res/navigation/mobile_navigation.xml
• app/src/main/res/values-night/themes.xml
• app/src/main/res/values/themes.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/Tampopo.java 0 → 100644

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

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

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/LoginActivity.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/MainActivity.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/comment.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/eye.png 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_launch.xml

Ignore Space Show notes View app/src/main/res/layout/activity_login.xml

Ignore Space Show notes View app/src/main/res/layout/activity_main.xml

Ignore Space Show notes View app/src/main/res/layout/activity_register.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_friend_list.xml

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

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

Ignore Space Show notes View app/src/main/res/navigation/mobile_navigation.xml

Ignore Space Show notes View app/src/main/res/values-night/themes.xml

Ignore Space Show notes View app/src/main/res/values/themes.xml

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

Show line notes below