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

commit 26407193b64e0610c5818d32ec9eb3618c1fee6d 2 parents f13403a + da77099 k-suzuki authored on 6 Jun 2023

Showing 25 changed files

• .gitignore
• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/build.gradle
• app/src/main/AndroidManifest.xml
• 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/ShopActivity.java
• app/src/main/java/com/example/nemophila/SignUpActivity.java
• app/src/main/java/com/example/nemophila/entities/Account.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/entities/Shop.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/resources/ShopsRest.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/res/layout/activity_login.xml
• app/src/main/res/layout/activity_shop.xml
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/values/strings.xml
• local.properties

Ignore Space Show notes View .gitignore

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml 0 → 100644

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/LoginActivity.java 0 → 100644

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 0 → 100644

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

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

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

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

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

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

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/resources/ShopsRest.java

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

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

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

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

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

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

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

Ignore Space Show notes View local.properties 0 → 100644

Show line notes below