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

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 MPA Cahnge_ ErrorType FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon Sample accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit 84a317343d85a291228c23a624e51746f83972df 2 parents d28126a + abfe5e6 d-matsuura authored on 25 Jul 2023

Patch

Unified Split

Showing 11 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.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/MapsDialogFragment.java 0 → 100644

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/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/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_my_page_editor.xml

Show line notes below