Browse code Merge branch 'master' into Hiroki11 ChatActivity3 ChatActivity4 Hiroki11 Hiroki1111 LaunchActivity Seting2 add-user-icon fix-friendlist-error implement-activity-viewmodel mainActivity_natty master
commit 709511ec8ab91f3f8d2eaf3b16f38ac48bffe584 2 parents f644e18 + 7a71d01 HataiShunsuke authored 11 days ago

Showing 17 changed files

• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
• app/src/main/java/com/example/tampopo_client/views/MainActivity.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_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/views/FriendIconView.java 0 → 100644

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/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_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