Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient Conflicts: .idea/deploymentTargetDropDown.xml FriendActivity_1017 changeicon filter_ic_seturl geticon icon layoutFix master
commit 96f9e90ff28685fb4f92c94bcfb583d1f843fe8f 2 parents aad2cd9 + 0c79d7e t-nagao authored on 12 Oct 2023

Showing 32 changed files

• .idea/deploymentTargetDropDown.xml
• app/src/main/ic_launcher-playstore.png
• app/src/main/java/com/example/nemophila/FriendActivity.java
• app/src/main/res/drawable-v24/nemophila_icon.jpg
• app/src/main/res/drawable/ic_launcher_background.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 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/res/drawable-v24/nemophila_icon.jpg 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/ic_launcher_background.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