diff --git a/.idea/misc.xml b/.idea/misc.xml index 571de83..ce729fb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,7 +9,6 @@ - @@ -18,6 +17,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6dddb84..299c5f8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,6 +22,9 @@ tools:targetApi="31"> + @@ -104,11 +107,13 @@ + 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/PostsViewHolder.java b/app/src/main/java/com/example/nemophila/PostsViewHolder.java new file mode 100644 index 0000000..c1d19fd --- /dev/null +++ b/app/src/main/java/com/example/nemophila/PostsViewHolder.java @@ -0,0 +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 PostsViewHolder extends RecyclerView.ViewHolder { + public TextView nameView; + public TextView dateView; + public TextView rateView; + public TextView genreView; + public TextView commentView; + + public PostsViewHolder(@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/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java index a34caa7..b1d0143 100644 --- a/app/src/main/java/com/example/nemophila/ShopActivity.java +++ b/app/src/main/java/com/example/nemophila/ShopActivity.java @@ -1,6 +1,9 @@ package com.example.nemophila; +import static android.app.PendingIntent.getActivity; + import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -28,21 +31,28 @@ } }); - //RecycleView + //RecyclerView RecyclerView rv = (RecyclerView) findViewById(R.id.postsList); ShopActivityAdapter adapter = new ShopActivityAdapter(this.createDataset()); LinearLayoutManager llm = new LinearLayoutManager(this); + + RecyclerView.ItemDecoration itemDecoration = + new DividerItemDecoration(this, DividerItemDecoration.VERTICAL); + rv.addItemDecoration(itemDecoration); + rv.setHasFixedSize(true); rv.setLayoutManager(llm); rv.setAdapter(adapter); + + } private List createDataset() { - + //RecyclerViewの中身の仮データ List dataset = new ArrayList<>(); for (int i = 0; i < 50; i++) { PostDataModel data = new PostDataModel(); @@ -50,7 +60,7 @@ data.setDate("yyyy/mm/dd"); data.setRate("★★★★★"); data.setGenre("ラーメン, 中華, おいしい, 安い"); - data.setComment("おいしかった。\n\n"); + data.setComment("おいしかった。"); dataset.add(data); } diff --git a/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java b/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java index 94613af..8c3b5ce 100644 --- a/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java +++ b/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java @@ -9,7 +9,7 @@ import java.util.List; -public class ShopActivityAdapter extends RecyclerView.Adapter { +public class ShopActivityAdapter extends RecyclerView.Adapter { public List list; @@ -19,15 +19,15 @@ @NonNull @Override - public ShopActivityViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + public PostsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_shop_activity_posts, parent,false); - ShopActivityViewHolder vh = new ShopActivityViewHolder(inflate); + PostsViewHolder vh = new PostsViewHolder(inflate); return vh; } @Override - public void onBindViewHolder(@NonNull ShopActivityViewHolder holder, int position) { + public void onBindViewHolder(@NonNull PostsViewHolder holder, int position) { holder.nameView.setText(list.get(position).getName()); holder.dateView.setText(list.get(position).getDate()); holder.rateView.setText(list.get(position).getRate()); diff --git a/app/src/main/java/com/example/nemophila/ShopActivityViewHolder.java b/app/src/main/java/com/example/nemophila/ShopActivityViewHolder.java deleted file mode 100644 index ac06f6f..0000000 --- a/app/src/main/java/com/example/nemophila/ShopActivityViewHolder.java +++ /dev/null @@ -1,24 +0,0 @@ -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/java/com/example/nemophila/ShopCreateActivity.java b/app/src/main/java/com/example/nemophila/ShopCreateActivity.java new file mode 100644 index 0000000..811ddd9 --- /dev/null +++ b/app/src/main/java/com/example/nemophila/ShopCreateActivity.java @@ -0,0 +1,14 @@ +package com.example.nemophila; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class ShopCreateActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_shop_create); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml index e0a6398..397f53f 100644 --- a/app/src/main/res/layout/activity_shop.xml +++ b/app/src/main/res/layout/activity_shop.xml @@ -35,13 +35,13 @@ + app:layout_constraintVertical_bias="0.582" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_shop_create.xml b/app/src/main/res/layout/activity_shop_create.xml new file mode 100644 index 0000000..6480277 --- /dev/null +++ b/app/src/main/res/layout/activity_shop_create.xml @@ -0,0 +1,9 @@ + + + + \ 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 441c9ca..1e9ae11 100644 --- a/app/src/main/res/layout/layout_shop_activity_posts.xml +++ b/app/src/main/res/layout/layout_shop_activity_posts.xml @@ -4,6 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" android:orientation="vertical"> @@ -57,5 +59,11 @@ android:layout_weight="1" android:text="コメント" /> + + + + + + \ No newline at end of file