Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into PostACT_DeletePic Conflicts: app/src/main/java/com/example/nemophila/PostActivity.java FriendActivity_1017 changeicon filter_ic_seturl geticon icon master
commit 9d5a494e58cb2cb36097b98da2b12668174752e3 2 parents db273e8 + 8384655 k-kimoto authored on 12 Oct 2023

Showing 49 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/ic_launcher-playstore.png
• app/src/main/java/com/example/nemophila/FriendActivity.java
• app/src/main/java/com/example/nemophila/LoginActivity.java
• app/src/main/java/com/example/nemophila/MapsFragment.java
• app/src/main/java/com/example/nemophila/MyPageActivity.java
• app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
• app/src/main/java/com/example/nemophila/PostActivity.java
• app/src/main/java/com/example/nemophila/RequestedActivity.java
• app/src/main/java/com/example/nemophila/ShopActivity.java
• app/src/main/java/com/example/nemophila/SignUpActivity.java
• app/src/main/java/com/example/nemophila/resources/AccountsRest.java
• app/src/main/java/com/example/nemophila/resources/FriendsRest.java
• app/src/main/java/com/example/nemophila/resources/ShopsRest.java
• app/src/main/res/drawable-v24/nemophila_icon.jpg
• app/src/main/res/drawable/ic_launcher_background.xml
• app/src/main/res/layout/activity_post.xml
• app/src/main/res/layout/layout_requested_activity.xml
• app/src/main/res/layout/layout_requesting_activity.xml
• app/src/main/res/layout/layout_shop_activity_posts.xml
• app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
• app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
• app/src/main/res/mipmap-hdpi/ic_launcher.png
• app/src/main/res/mipmap-hdpi/ic_launcher.webp
• app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
• app/src/main/res/mipmap-hdpi/ic_launcher_round.png
• app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
• app/src/main/res/mipmap-mdpi/ic_launcher.png
• app/src/main/res/mipmap-mdpi/ic_launcher.webp
• app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
• app/src/main/res/mipmap-mdpi/ic_launcher_round.png
• app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
• app/src/main/res/mipmap-xhdpi/ic_launcher.png
• app/src/main/res/mipmap-xhdpi/ic_launcher.webp
• app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
• app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
• app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
• app/src/main/res/mipmap-xxhdpi/ic_launcher.png
• app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
• app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
• app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
• app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
• app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
• app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
• app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
• app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
• app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

Ignore Space Show notes View .idea/misc.xml

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

Ignore Space Show notes View app/src/main/ic_launcher-playstore.png 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/FriendActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/LoginActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MapsFragment.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MyPageActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MyPageEditorActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/PostActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestedActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/ShopActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/SignUpActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/AccountsRest.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/FriendsRest.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/ShopsRest.java

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

Ignore Space Show notes View app/src/main/res/drawable/ic_launcher_background.xml

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

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

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

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

Show notes View app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml 100644 → 0

Show notes View app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-hdpi/ic_launcher.png 0 → 100644

Show notes View app/src/main/res/mipmap-hdpi/ic_launcher.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png 0 → 100644

Ignore Space Show notes View app/src/main/res/mipmap-hdpi/ic_launcher_round.png 0 → 100644

Show notes View app/src/main/res/mipmap-hdpi/ic_launcher_round.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-mdpi/ic_launcher.png 0 → 100644

Show notes View app/src/main/res/mipmap-mdpi/ic_launcher.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png 0 → 100644

Ignore Space Show notes View app/src/main/res/mipmap-mdpi/ic_launcher_round.png 0 → 100644

Show notes View app/src/main/res/mipmap-mdpi/ic_launcher_round.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-xhdpi/ic_launcher.png 0 → 100644

Show notes View app/src/main/res/mipmap-xhdpi/ic_launcher.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png 0 → 100644

Ignore Space Show notes View app/src/main/res/mipmap-xhdpi/ic_launcher_round.png 0 → 100644

Show notes View app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-xxhdpi/ic_launcher.png 0 → 100644

Show notes View app/src/main/res/mipmap-xxhdpi/ic_launcher.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png 0 → 100644

Ignore Space Show notes View app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png 0 → 100644

Show notes View app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-xxxhdpi/ic_launcher.png 0 → 100644

Show notes View app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp 100644 → 0

Ignore Space Show notes View app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png 0 → 100644

Ignore Space Show notes View app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png 0 → 100644

Show notes View app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp 100644 → 0

Show line notes below