Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient Conflicts: .idea/misc.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre sighlogact

commit c21cf83b5afe1c44cf37f8ac1c9591395df8a4cf 2 parents cdc996d + 61ea0e0 m-mifune authored on 11 Jul 2023

Showing 17 changed files

• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/nemophila/FriendActivity.java
• app/src/main/java/com/example/nemophila/MyPageActivity.java
• app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java
• app/src/main/java/com/example/nemophila/PostDataModel.java
• app/src/main/java/com/example/nemophila/PostsViewHolder.java
• app/src/main/java/com/example/nemophila/RequestingActivity.java
• app/src/main/java/com/example/nemophila/entities/AccountNameJson.java
• app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
• app/src/main/res/drawable/blue_circle_button.xml
• app/src/main/res/drawable/ic_baseline_clear_24.xml
• app/src/main/res/layout/activity_requesting.xml
• app/src/main/res/layout/layout_my_page_activity_posts.xml
• app/src/main/res/layout/layout_requesting_activity.xml
• build.gradle
• gradle/wrapper/gradle-wrapper.properties

Ignore Space Show notes View app/build.gradle

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

Show notes View app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java 100644 → 0

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/PostsViewHolder.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/entities/AccountNameJson.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/drawable/blue_circle_button.xml 0 → 100644

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

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

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

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

Ignore Space Show notes View build.gradle

Ignore Space Show notes View gradle/wrapper/gradle-wrapper.properties

Show line notes below