diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bdd5b80..5c4c85b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
-
-
+ android:usesCleartextTraffic="true"
tools:targetApi="31">
+
-
-
+
+
-
-
+
+
-
-
-
+
+
-
-
+
+
-
+ android:label="@string/title_activity_login">
android:name=".ChangePwActivity"
android:exported="true"
@@ -68,11 +66,13 @@
android:name=".MyPageActivity"
android:exported="true"
android:label="@string/title_activity_my_page">
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
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