Merge branch 'activity'

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'activity' # Conflicts: # .idea/deploymentTargetDropDown.xml Cahnge_ FriendActivity FriendActivity_1017 MypageEditor_icon Sample accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit c82ed3542e7a954ca4a7c6315c7c80aa3548a5d6 2 parents 5685580 + 9c781a1 t-nagao authored on 21 Sep 2023

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

Ignore Space Show notes View .idea/misc.xml

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/RequestingActivity.java

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

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

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

Show notes View app/src/main/res/layout/layout_friend_dialog.xml 100644 → 0

Show line notes below