Browse code Merge branch 'master' into setting # Conflicts: # app/src/main/java/com/example/tampopo_client/Tampopo.java ChatActivity3 ChatRooms Chatroom FriendIconView4 FriendIconView5 FriendIconView7 Hiroki0 Hiroki0111 Hiroki1111 Hiroki12 Hiroki77 LaunchActivity Seting2 Setting2 Setting3 UserInfoActivity2 add-friend-icon-views add-pending1 add-pending2 add-pending3 add-pending3-2 add-user-icon bug1'-p1 bug1'-p1-claude-NoHint bug1'-p1-claude-NoHint(d) bug1'-p1-gemini-NoHint bug1'-p1-gemini-NoHint(d) bug1'-p1-gpt-NoHint bug1'-p1-gpt-NoHint(d) bug1'-p1-gpt-mine-pre1 bug1'-p1-mine-pre2 bug1'-p1-mine-pre4 bug1'-p1-mine-pre5 bug1'-p2-claude-NoHint bug1'-p2-claude-NoHint(d) bug1'-p2-gemini-NoHint bug1'-p2-gemini-NoHint(d) bug1'-p2-gpt-NoHint bug1'-p2-gpt-NoHint(d) bug1'-p2-gpt-NoHint(d)-2 bug1'-p2-mine-pre4 bug1'-p2-mine-pre5 bug1'-p3-claude-NoHint bug1'-p3-claude-NoHint(d) bug1'-p3-gemini-NoHint bug1'-p3-gemini-NoHint(d) bug1'-p3-gpt-NoHint bug1'-p3-gpt-NoHint(d)-2 bug1'-p3-mine-pre4 bug1'-p3-mine-pre5 bug1'-p4-mine-pre4 bug1'-p5-mine-pre4 bug1-p1-claude-NoHint bug1-p1-gemini-NoHint bug1-p1-gpt-NoHint bug1-p2-claude-NoHint bug1-p2-gemini-NoHint bug1-p2-gpt-NoHint bug1-p3-gemini-NoHint bug1-p3-gpt-NoHint bug2 bug2-gemini-p1 bug2-gemini-p1-NoHint bug2-gpt-p1 bug2-gpt-p1-NoHint bug2-p1 bug2-p1-cloude-NoHint bug3-p1 bug3-p1-claude-NoHint bug3-p1-gemini-NoHint bug3-p1-gpt-NoHint bug4 bug4-p1 bug4-p1-claude-NoHint bug4-p1-gemini-NoHint bug4-p1-gemini-NoHint(d) bug4-p1-gemini-NoHint(d)-2 bug4-p1-gpt-NoHint bug4-p2-gemini-NoHint bug4-p2-gemini-NoHint(d)-2 bug5-p1 bug5-p1-NoHint(d)-2 bug5-p1-claude-NoHint bug5-p1-gemini-NoHint bug5-p1-gpt-NoHint bug5-p2-NoHint(d)-2 bug5-p2-gemini-NoHint bug5-p3-NoHint(d)-2 chat-room-delete chat-rooms chat-rooms2 chat-rooms3 chat-rooms4 chatActivity8 chatActivity9 chatactivity7 fix-chatroom-model fix-friend-icon-view-placement fix-friendlist-error fragment-friend-receiver friendList2 mainActivity_natty master show-chat-activity1 show-chat-activity2 show-chat-activity3 show-chat-activity3-2 show-chat-realtime1 show-chat-realtime1-2 show-chat-realtime2 show-chat-realtime2-2 show-chat-realtime3 show-chat-realtime3-2 show-friend-nickname1 show-friend-nicknname2 show-friend-nicknname3

commit 6fa777dc0464d3fd81c0e8ff1694a8d495c88c00 2 parents a3a8491 + 50030af y-ichii authored on 14 Oct

Showing 15 changed files

• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/tampopo_client/Tampopo.java
• app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
• app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
• app/src/main/java/com/example/tampopo_client/views/MainActivity.java
• app/src/main/res/drawable/default_icon.jpg
• app/src/main/res/drawable/friend02_icon.jpg
• app/src/main/res/drawable/friend02_icon.png
• app/src/main/res/drawable/friend03_icon.jpg
• app/src/main/res/drawable/friend04_icon.png
• app/src/main/res/drawable/phone.png
• app/src/main/res/layout/activity_chat.xml
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/dialog_chat_receved.xml
• app/src/main/res/values/colors.xml

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

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/ChatActivity.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/res/drawable/default_icon.jpg 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/drawable/friend03_icon.jpg 0 → 100644

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

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

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

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

Show line notes below