diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 69e56fe..7859c16 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4443ac2..571de83 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,15 +9,10 @@
+
+
-
-
-
-
-
-
-
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c4c85b..299c5f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
+
+
tools:targetApi="31">
-
-
+
+
-
-
+
+
+
-
-
+
+
-
-
+
+
+ android:label="@string/title_activity_login">
+
android:name=".ChangePwActivity"
android:exported="true"
@@ -66,13 +71,11 @@
android:name=".MyPageActivity"
android:exported="true"
android:label="@string/title_activity_my_page">
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+ android:label="@string/title_activity_post">
+
+ android:label="@string/title_activity_shop">
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/Nemophila.java b/app/src/main/java/com/example/nemophila/Nemophila.java
index 70e79e0..1069e4e 100644
--- a/app/src/main/java/com/example/nemophila/Nemophila.java
+++ b/app/src/main/java/com/example/nemophila/Nemophila.java
@@ -2,9 +2,14 @@
import android.app.Application;
+import com.example.nemophila.entities.Shop;
+
public class Nemophila extends Application {
private String uid;
private String token;
+ private Shop currentShop;
+ private double currentLongitude;
+ private double currentLatitude;
//Getter
public String getUid() {
@@ -13,6 +18,15 @@
public String getToken() {
return token;
}
+ public Shop getCurrentShop() {
+ return currentShop;
+ }
+ public double getCurrentLongitude() {
+ return currentLongitude;
+ }
+ public double getCurrentLatitude() {
+ return currentLatitude;
+ }
//Setter
public void setUid(String uid) {
@@ -21,4 +35,13 @@
public void setToken(String token) {
this.token = token;
}
+ public void setCurrentShop(Shop currentShop) {
+ this.currentShop = currentShop;
+ }
+ public void setCurrentLongitude(double currentLongitude) {
+ this.currentLongitude = currentLongitude;
+ }
+ public void setCurrentLatitude(double currentLatitude) {
+ this.currentLatitude = currentLatitude;
+ }
}
diff --git a/app/src/main/java/com/example/nemophila/entities/Post.java b/app/src/main/java/com/example/nemophila/entities/Post.java
index b97d9be..5c65deb 100644
--- a/app/src/main/java/com/example/nemophila/entities/Post.java
+++ b/app/src/main/java/com/example/nemophila/entities/Post.java
@@ -55,8 +55,14 @@
this.comment = comment;
}
-// public Post(PostJson pj) {
-// this.pid = pj.getId();
-// this.uid = pj.getOwner()
-// }
+ //コンストラクタ（PostJsonからPostを作成)
+ public Post(PostJson pj) {
+ this.pid = pj.getId();
+ this.uid = pj.getOwner().getId();
+ this.name = pj.getOwner().getName();
+ this.genre = this.getGenre();
+ this.date = "2001/12/12"; //サンプル
+ this.rate = pj.getRate();
+ this.comment = pj.getComment();
+ }
}
diff --git a/app/src/main/java/com/example/nemophila/entities/PostJson.java b/app/src/main/java/com/example/nemophila/entities/PostJson.java
index 69fa816..11fea40 100644
--- a/app/src/main/java/com/example/nemophila/entities/PostJson.java
+++ b/app/src/main/java/com/example/nemophila/entities/PostJson.java
@@ -8,7 +8,7 @@
private String image3;
private int rate;
private String comment;
- private Account owner;
+ private AccountJson owner;
//Getter
public String getId() {
@@ -32,7 +32,7 @@
public String getComment() {
return comment;
}
- public Account getOwner() {
+ public AccountJson getOwner() {
return owner;
}
@@ -58,7 +58,7 @@
public void setComment(String comment) {
this.comment = comment;
}
- public void setOwner(Account owner) {
+ public void setOwner(AccountJson owner) {
this.owner = owner;
}
}
diff --git a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
index aa3a344..4614381 100644
--- a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
+++ b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
@@ -91,28 +91,36 @@
return pid;
}
+ //PostJsonからPostを作成し，それをLiveDataにセット
public void getShopPosts(String sid) {
ArrayList posts = new ArrayList<>();
getShopPostJson(sid);
for(PostJson pj: postJson) {
-
+ Post post = new Post(pj);
+ posts.add(post);
}
+ shopPostsLiveData.setValue(posts);
+ System.out.println("完了しました");
}
+ //PostJsonを取得
private void getShopPostJson(String sid) {
Call> call = postsRest.getShopPosts(sid);
call.enqueue(new Callback>() {
@Override
public void onResponse(Call> call, Response> response) {
if (response.isSuccessful()) {
+ System.out.println("responseGood");
postJson = response.body();
} else {
+ System.out.println("responseError");
//レスポンスエラー
}
}
@Override
public void onFailure(Call> call, Throwable t) {
+ System.out.println("networkError");
//通信エラー
}
});