Merge remote-tracking branch 'origin/master' into createUserViewModels2
|
---|
app/build.gradle.kts |
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/com/example/tampopo_client/resources/FriendRequestResource.java 100644 → 0 |
---|
app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/ui/dashboard/DashboardFragment.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/ui/dashboard/DashboardViewModel.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/ui/home/HomeFragment.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/ui/home/HomeViewModel.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java 0 → 100644 |
---|
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/MainActivity.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 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/views/placeholder/PlaceholderContent.java 100644 → 0 |
---|
app/src/main/res/drawable/friend.png 0 → 100644 |
---|
|
app/src/main/res/drawable/icon_cat.jpg 0 → 100644 |
---|
|
app/src/main/res/drawable/notification.png 0 → 100644 |
---|
|
app/src/main/res/drawable/setting.png 0 → 100644 |
---|
|
app/src/main/res/layout/activity_friend.xml |
---|
app/src/main/res/layout/activity_launch.xml |
---|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/layout/activity_register.xml |
---|
app/src/main/res/layout/fragment_dashboard.xml 0 → 100644 |
---|
app/src/main/res/layout/fragment_home.xml 0 → 100644 |
---|
app/src/main/res/layout/fragment_notifications.xml 0 → 100644 |
---|
app/src/main/res/menu/bottom_nav_menu.xml 0 → 100644 |
---|
app/src/main/res/navigation/mobile_navigation.xml 0 → 100644 |
---|
app/src/main/res/values/strings.xml |
---|
gradle/libs.versions.toml |
---|