Merge branch 'master' into setting

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge branch 'master' into setting # Conflicts: # app/src/main/java/com/example/tampopo_client/Tampopo.java ChatActivity3 ChatActivity4 Hiroki1111 LaunchActivity Seting2 add-user-icon fix-friendlist-error implement-activity-viewmodel mainActivity_natty master
commit 6fa777dc0464d3fd81c0e8ff1694a8d495c88c00 2 parents a3a8491 + 50030af y-ichii authored 6 days ago

Patch

Unified Split

Showing 15 changed files

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