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 e04cc35d0c99cb6de95a515cd0e09c5bc4382253 2 parents 3db2202 + a1d3b9f k-kimoto authored on 20 Jul 2023

Showing 19 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/nemophila/MapsActivity.java
• app/src/main/java/com/example/nemophila/MapsFragment.java
• app/src/main/java/com/example/nemophila/Nemophila.java
• app/src/main/java/com/example/nemophila/RequestedActivity.java
• app/src/main/java/com/example/nemophila/RequestingActivity.java
• app/src/main/java/com/example/nemophila/RequestingDialogFragment.java
• app/src/main/java/com/example/nemophila/TestActivity.java
• app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
• app/src/main/res/layout/activity_maps.xml
• app/src/main/res/layout/activity_mypage.xml
• app/src/main/res/layout/filter_item.xml
• app/src/main/res/layout/filter_layout.xml
• app/src/main/res/layout/layout_friends_activity.xml
• app/src/main/res/layout/layout_requested_activity.xml
• app/src/main/res/values/strings.xml

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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

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/Nemophila.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/RequestingDialogFragment.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/res/layout/activity_maps.xml

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below