Browse code Merge branch 'master' into mypage3 # Conflicts: # .idea/misc.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit 153763e038661c9875c2ad2935bbed7860407be7 2 parents dea779a + 9bc4eb7 k-suzuki authored on 15 Jun 2023

Showing 34 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/nemophila/ChangePwActivity.java
• app/src/main/java/com/example/nemophila/LoginActivity.java
• app/src/main/java/com/example/nemophila/MainActivity.java
• app/src/main/java/com/example/nemophila/Nemophila.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/ShopActivity.java
• app/src/main/java/com/example/nemophila/ShopActivityAdapter.java
• app/src/main/java/com/example/nemophila/ShopCreateActivity.java
• app/src/main/java/com/example/nemophila/SignUpActivity.java
• app/src/main/java/com/example/nemophila/TestActivity.java
• app/src/main/java/com/example/nemophila/entities/Account.java
• app/src/main/java/com/example/nemophila/entities/AccountJson.java
• app/src/main/java/com/example/nemophila/entities/Post.java
• app/src/main/java/com/example/nemophila/entities/PostJson.java
• app/src/main/java/com/example/nemophila/resources/AccountsRest.java
• app/src/main/java/com/example/nemophila/resources/PostsRest.java
• app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/TimerViewModel.java
• app/src/main/res/drawable/icon.jpg
• app/src/main/res/drawable/icon_current.jpg
• app/src/main/res/layout/activity_change_pw.xml
• app/src/main/res/layout/activity_login.xml
• app/src/main/res/layout/activity_shop.xml
• app/src/main/res/layout/activity_shop_create.xml
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/layout/layout_shop_activity_posts.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/build.gradle

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/example/nemophila/ChangePwActivity.java 0 → 100644

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MainActivity.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/PostDataModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/PostsViewHolder.java 0 → 100644

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/ShopActivityAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/ShopCreateActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/SignUpActivity.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/entities/Account.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/entities/AccountJson.java 0 → 100644

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/PostsRest.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/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/java/com/example/nemophila/viewmodels/TimerViewModel.java 0 → 100644

Show notes View app/src/main/res/drawable/icon.jpg 100644 → 0

Ignore Space Show notes View app/src/main/res/drawable/icon_current.jpg 0 → 100644

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

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

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

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

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

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

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

Show line notes below