diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 7866781..69e56fe 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/PostDataModel.java b/app/src/main/java/com/example/nemophila/PostDataModel.java new file mode 100644 index 0000000..0d9f577 --- /dev/null +++ b/app/src/main/java/com/example/nemophila/PostDataModel.java @@ -0,0 +1,43 @@ +package com.example.nemophila; + +public class PostDataModel { + private String name; + private String date; + private String rate; + private String genre; + private String comment; + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getDate() { + return date;} + public void setDate(String date) { + this.date = date; + } + + public String getRate() { + return rate; + } + public void setRate(String rate) { + this.rate = rate; + } + + public String getGenre() { + return genre; + } + public void setGenre(String genre) { + this.genre = genre; + } + + public String getComment() { + return comment; + } + public void setComment(String comment) { + this.comment = comment; + } +} diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java index fe69e34..a34caa7 100644 --- a/app/src/main/java/com/example/nemophila/ShopActivity.java +++ b/app/src/main/java/com/example/nemophila/ShopActivity.java @@ -1,12 +1,17 @@ package com.example.nemophila; import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; +import java.util.ArrayList; +import java.util.List; + public class ShopActivity extends AppCompatActivity { @Override @@ -23,8 +28,32 @@ } }); - ////RecycleView - //super.onCreate(savedInstanceState); + //RecycleView + RecyclerView rv = (RecyclerView) findViewById(R.id.postsList); + ShopActivityAdapter adapter = new ShopActivityAdapter(this.createDataset()); + LinearLayoutManager llm = new LinearLayoutManager(this); + + rv.setHasFixedSize(true); + rv.setLayoutManager(llm); + rv.setAdapter(adapter); + + } + + private List createDataset() { + + + 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("おいしかった。\n\n"); + + dataset.add(data); + } + return dataset; } } \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java b/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java index 47b2da1..94613af 100644 --- a/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java +++ b/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java @@ -1,26 +1,42 @@ package com.example.nemophila; +import android.view.LayoutInflater; +import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import java.util.List; + public class ShopActivityAdapter extends RecyclerView.Adapter { + public List list; + + public ShopActivityAdapter(List list) { + this.list =list; + } @NonNull @Override public ShopActivityViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return null; + + View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_shop_activity_posts, parent,false); + ShopActivityViewHolder vh = new ShopActivityViewHolder(inflate); + return vh; } @Override public void onBindViewHolder(@NonNull ShopActivityViewHolder holder, int position) { - + holder.nameView.setText(list.get(position).getName()); + holder.dateView.setText(list.get(position).getDate()); + holder.rateView.setText(list.get(position).getRate()); + holder.genreView.setText(list.get(position).getGenre()); + holder.commentView.setText(list.get(position).getComment()); } @Override public int getItemCount() { - return 0; + return list.size(); } } diff --git a/app/src/main/java/com/example/nemophila/ShopActivityViewHolder.java b/app/src/main/java/com/example/nemophila/ShopActivityViewHolder.java index 5ca11ed..ac06f6f 100644 --- a/app/src/main/java/com/example/nemophila/ShopActivityViewHolder.java +++ b/app/src/main/java/com/example/nemophila/ShopActivityViewHolder.java @@ -1,13 +1,24 @@ package com.example.nemophila; import android.view.View; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; public class ShopActivityViewHolder extends RecyclerView.ViewHolder { + public TextView nameView; + public TextView dateView; + public TextView rateView; + public TextView genreView; + public TextView commentView; public ShopActivityViewHolder(@NonNull View itemView) { super(itemView); + nameView = (TextView) itemView.findViewById(R.id.userName); + dateView = (TextView) itemView.findViewById(R.id.date); + rateView = (TextView) itemView.findViewById(R.id.rate); + genreView = (TextView) itemView.findViewById(R.id.genre); + commentView = (TextView) itemView.findViewById(R.id.comment); } } diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml index ae997d6..e0a6398 100644 --- a/app/src/main/res/layout/activity_shop.xml +++ b/app/src/main/res/layout/activity_shop.xml @@ -36,11 +36,12 @@ + app:layout_constraintTop_toBottomOf="@+id/shopName" + app:layout_constraintVertical_bias="1.0" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_shop_activity_posts.xml b/app/src/main/res/layout/layout_shop_activity_posts.xml index 121d565..441c9ca 100644 --- a/app/src/main/res/layout/layout_shop_activity_posts.xml +++ b/app/src/main/res/layout/layout_shop_activity_posts.xml @@ -9,29 +9,29 @@ + android:text="yyyy/mm/dd" /> @@ -46,14 +46,14 @@