Browse code Merge branch 'master' into setting # Conflicts: # app/src/main/AndroidManifest.xml ChatActivity3 ChatActivity4 Hiroki1111 LaunchActivity Seting2 add-user-icon fix-friendlist-error implement-activity-viewmodel mainActivity_natty master
commit a3a84918b0c3e73fd3f415505032fc8d6f7b8ae5 2 parents 2f05481 + 296d658 y-ichii authored 6 days ago

Showing 29 changed files

• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/models/FriendRequest.java
• app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModelFactory.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.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/NotificationListener.java
• app/src/main/java/com/example/tampopo_client/viewmodels/RealTimeViewModel.java
• app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
• app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.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/TestFriendIconActivity.java
• app/src/main/res/drawable/chat_notification.png
• app/src/main/res/drawable/circle_button.xml
• app/src/main/res/drawable/friend02_icon.png
• app/src/main/res/drawable/friend_icon.png
• app/src/main/res/drawable/new_png.png
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_test_friend_icon.xml
• app/src/main/res/layout/sample_friend_icon_view.xml
• app/src/main/res/values-night/styles.xml
• app/src/main/res/values/attrs_friend_icon_view.xml
• app/src/main/res/values/colors.xml
• app/src/main/res/values/strings.xml
• app/src/main/res/values/styles.xml
• app/src/main/res/values/themes.xml

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/models/FriendRequest.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java

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

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.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/NotificationListener.java 0 → 100644

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

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

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/MainActivity.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/TestFriendIconActivity.java 0 → 100644

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

Ignore Space Show notes View app/src/main/res/drawable/circle_button.xml 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below