diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 08aed1b..d3b9dcc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -110,6 +110,11 @@ android:name=".ShopActivity" android:exported="true" android:label="@string/title_activity_shop"> + + + + + diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java index a351c71..ed03880 100644 --- a/app/src/main/java/com/example/nemophila/ShopActivity.java +++ b/app/src/main/java/com/example/nemophila/ShopActivity.java @@ -3,6 +3,7 @@ import static android.app.PendingIntent.getActivity; import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; @@ -13,6 +14,7 @@ import android.view.View; import android.widget.Button; +import com.example.nemophila.entities.Post; import com.example.nemophila.viewmodels.PostsViewModel; import java.util.ArrayList; @@ -34,13 +36,15 @@ } }); + List postsDataset = new ArrayList<>(); + + //RecyclerView RecyclerView rv = (RecyclerView) findViewById(R.id.postsList); - ShopActivityAdapter adapter = new ShopActivityAdapter(this.createDataset()); + ShopActivityAdapter adapter = new ShopActivityAdapter(postsDataset); LinearLayoutManager llm = new LinearLayoutManager(this); - RecyclerView.ItemDecoration itemDecoration = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL); rv.addItemDecoration(itemDecoration); @@ -53,22 +57,55 @@ PostsViewModel postsViewModel = new ViewModelProvider(this).get(PostsViewModel.class); postsViewModel.getShopPostJson("151347fa-2c90-44d7-ba48-f23f475b910d"); + //LiveDataへの購読 + postsViewModel.getShopPostLiveData().observe(this, new Observer>() { + //private List members; + @Override + public void onChanged(List ShopPosts) { + postsDataset.clear(); + for (Post post: ShopPosts){ + PostDataModel data = new PostDataModel(); + data.setName(post.getName()); + data.setDate(post.getDate()); + int intRate = post.getRate(); + String strRate = ""; + for (int i = 0; i < 5; i++){ + if(intRate > i ){ + strRate += "★"; + }else{ + strRate += "☆"; + } + } + data.setRate(strRate); + data.setGenre(post.getGenre()); + data.setComment(post.getComment()); + + postsDataset.add(data); + System.out.println("hogehoge"); + } + } + + }); + + } - private List createDataset() { - //RecyclerViewの中身の仮データ - List dataset = new ArrayList<>(); - for (int i = 0; i < 50; i++) { - PostDataModel data = new PostDataModel(); - data.setName("ネモフィラ 太郎" + i + "号"); - data.setDate("yyyy/mm/dd"); - data.setRate("★★★★★"); - data.setGenre("ラーメン, 中華, おいしい, 安い"); - data.setComment("おいしかった。"); - dataset.add(data); - } - return dataset; - } +// private List postsDataset() { +// +// //RecyclerViewの中身の仮データ +// List dataset = new ArrayList<>(); +// for (int i = 0; i < 50; i++) { +// PostDataModel data = new PostDataModel(); +// data.setName("ネモフィラ 太郎" + i + "号"); +// data.setDate("yyyy/mm/dd"); +// data.setRate("★★★★★"); +// data.setGenre("ラーメン, 中華, おいしい, 安い"); +// data.setComment("おいしかった。"); +// +// dataset.add(data); +// } +// return dataset; +// } } \ No newline at end of file