Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivityIcon # Conflicts: # app/build.gradle.kts LaunchActivity add-scalar-converter-factory addHTTPsupport addMutableLiveToken friend-received-fragment4 master update-friend-viewmodel5
commit 0f799a92569192c522581e1587d9234020c18e86 2 parents 176be86 + fbc00a3 g-shimokawa authored 7 days ago

Showing 30 changed files

• app/build.gradle.kts
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/models/User.java
• app/src/main/java/com/example/tampopo_client/resources/FriendRequestResource.java
• app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java
• app/src/main/java/com/example/tampopo_client/resources/UserResource.java
• app/src/main/java/com/example/tampopo_client/ui/dashboard/DashboardFragment.java
• app/src/main/java/com/example/tampopo_client/ui/dashboard/DashboardViewModel.java
• app/src/main/java/com/example/tampopo_client/ui/home/HomeFragment.java
• app/src/main/java/com/example/tampopo_client/ui/home/HomeViewModel.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/UserViewModel.java
• 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/LaunchActivity.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/FriendRequestContent.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/activity_launch.xml
• app/src/main/res/layout/activity_register.xml
• app/src/main/res/layout/fragment_dashboard.xml
• app/src/main/res/layout/fragment_home.xml
• app/src/main/res/layout/fragment_notifications.xml
• app/src/main/res/menu/bottom_nav_menu.xml
• app/src/main/res/navigation/mobile_navigation.xml
• app/src/main/res/values/strings.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/models/User.java 0 → 100644

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.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/ui/dashboard/DashboardFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/ui/dashboard/DashboardViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/ui/home/HomeFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/ui/home/HomeViewModel.java 0 → 100644

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

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

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/FriendActivity.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/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/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/layout/activity_friend.xml

Ignore Space Show notes View app/src/main/res/layout/activity_launch.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_dashboard.xml 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/menu/bottom_nav_menu.xml 0 → 100644

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

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

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

Show line notes below