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

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 Conflicts: .idea/deploymentTargetDropDown.xml app/src/main/java/com/example/nemophila/RequestingActivity.java Cahnge_ FriendActivity FriendActivity_1017 MypageEditor_icon Sample accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit bf2fec04cabaf44467107c16dcf998d627557d79 2 parents 05799de + d51e1b1 t-nagao authored on 28 Sep 2023

Browse code

Conflicts:
	.idea/deploymentTargetDropDown.xml
	app/src/main/java/com/example/nemophila/RequestingActivity.java

Cahnge_ FriendActivity FriendActivity_1017 MypageEditor_icon Sample accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre

commit bf2fec04cabaf44467107c16dcf998d627557d79

2 parents 05799de + d51e1b1

t-nagao authored on 28 Sep 2023

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/TestActivity.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/PostsViewModel.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/layout/activity_post.xml

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

Show line notes below