Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into PostAct

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into PostAct Cahnge_ FriendActivity FriendActivity_1017 MypageEditor_icon PostAct Sample accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit 62f64e7b12505166bb4646213a78ebe0469e8398 2 parents 4830983 + ca6927b k-kimoto authored on 25 Jul 2023

Patch

Unified Split

Showing 13 changed files

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/java/com/example/nemophila/FriendActivity.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/RequestingActivity.java

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/ic_baseline_replay_24.xml 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/layout/friend_list_item.xml 0 → 100644

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

Show line notes below