diff --git a/app/build.gradle b/app/build.gradle index 9204a42..1fc7e27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,6 +29,7 @@ buildFeatures { viewBinding true } + namespace 'com.example.nemophila' } //repositories { diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java index ed666bd..ae30c66 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java @@ -8,7 +8,9 @@ import android.content.Intent; import android.os.Bundle; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; @@ -83,24 +85,24 @@ } }); - /* ここからよくわかっていない */ + /* ここからあんまわかっていない */ RecyclerView rv = (RecyclerView) findViewById(R.id.postsList); LinearLayoutManager llm = new LinearLayoutManager(this); - List postsDataset = new ArrayList<>(); - MyPageActivityAdapter adapter = new MyPageActivityAdapter(postsDataset); + List MyPageActDataset = new ArrayList<>(); + MyPageActAdapter adapter = new MyPageActAdapter(MyPageActDataset); rv.setHasFixedSize(true); rv.setLayoutManager(llm); rv.setAdapter(adapter); + accountViewModel.getAccountPosts(uid); accountViewModel.getAccountPostsLiveData().observe(this, new Observer >() { @Override public void onChanged(Collection Posts) { - //postsDatasetを一旦クリアし、LiveDataから受け取ったデータを一つずつセット(重複しないように) - postsDataset.clear(); + //MyPageActDatasetを一旦クリアし、LiveDataから受け取ったデータを一つずつセット + MyPageActDataset.clear(); for (Post post: Posts){ - PostDataModel data = new PostDataModel(); - data.setName(post.getName()); + MyPageActDataModel data = new MyPageActDataModel(); data.setDate(post.getDate()); //rateはintで受け取った評価に対応した星の数のStringに変換してセット int intRate = post.getRate(); @@ -115,25 +117,101 @@ data.setRate(strRate); data.setGenre(post.getGenre()); data.setComment(post.getComment()); - - postsDataset.add(data); + MyPageActDataset.add(data); } + //RecyclerViewをonChangedが呼ばれるたび表示(アダプターを更新してRecyclerViewにセット) - adapter.setList(postsDataset); + adapter.setList(MyPageActDataset); rv.setAdapter(adapter); } }); } -// protected void onResume(Bundle savedInstanceState) { -// super.onResume(savedInstanceState); -// -// Nemophila nemophila = (Nemophila) getApplication(); -// String uid = nemophila.getUid(); -// String name = nemophila.getName(); -// TextView myName = (TextView) findViewById(R.id.name); -// myName.setText(name); -// TextView id = (TextView) findViewById(R.id.id); -// id.setText(uid); -// } + /* ここからMyPageActivityの内部クラス */ + + // Adapter + public class MyPageActAdapter extends RecyclerView.Adapter { + + private List list; + + public void setList(List list) { + this.list = list; + } + + public MyPageActAdapter(List list) { + this.list = list; + } + + @Override + public MyPageActViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_my_page_activity_posts, parent,false); + MyPageActViewHolder vh = new MyPageActViewHolder(inflate); + return vh; + } + + @Override + public void onBindViewHolder(MyPageActViewHolder holder, int position) { + 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 list.size(); + } + } + + // ViewHolder + public class MyPageActViewHolder extends RecyclerView.ViewHolder { + public TextView dateView; + public TextView rateView; + public TextView genreView; + public TextView commentView; + + public MyPageActViewHolder(View itemView) { + super(itemView); + 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); + } + } + + // DataModel + public class MyPageActDataModel { + private String date; + private String rate; + private String genre; + private String comment; + + 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/MyPageActivityAdapter.java b/app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java index 6af5422..508658f 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java @@ -1,42 +1,42 @@ -package com.example.nemophila; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.recyclerview.widget.RecyclerView; - -import java.util.List; - -public class MyPageActivityAdapter extends RecyclerView.Adapter { - - private List list; - - public void setList(List list) { - this.list = list; - } - - public MyPageActivityAdapter(List list) { - this.list = list; - } - - @Override - public PostsViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_my_page_activity_posts, parent,false); - PostsViewHolder vh = new PostsViewHolder(inflate); - return vh; - } - - @Override - public void onBindViewHolder(PostsViewHolder holder, int position) { - 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 list.size(); - } -} +//package com.example.nemophila; +// +//import android.view.LayoutInflater; +//import android.view.View; +//import android.view.ViewGroup; +// +//import androidx.recyclerview.widget.RecyclerView; +// +//import java.util.List; +// +//public class MyPageActivityAdapter extends RecyclerView.Adapter { +// +// private List list; +// +// public void setList(List list) { +// this.list = list; +// } +// +// public MyPageActivityAdapter(List list) { +// this.list = list; +// } +// +// @Override +// public PostsViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { +// View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_my_page_activity_posts, parent,false); +// PostsViewHolder vh = new PostsViewHolder(inflate); +// return vh; +// } +// +// @Override +// public void onBindViewHolder(PostsViewHolder holder, int position) { +// 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 list.size(); +// } +//} diff --git a/app/src/main/java/com/example/nemophila/PostDataModel.java b/app/src/main/java/com/example/nemophila/PostDataModel.java index 0d9f577..f4c5bc0 100644 --- a/app/src/main/java/com/example/nemophila/PostDataModel.java +++ b/app/src/main/java/com/example/nemophila/PostDataModel.java @@ -1,43 +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; - } -} +//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/PostsViewHolder.java b/app/src/main/java/com/example/nemophila/PostsViewHolder.java index c1d19fd..1f618d3 100644 --- a/app/src/main/java/com/example/nemophila/PostsViewHolder.java +++ b/app/src/main/java/com/example/nemophila/PostsViewHolder.java @@ -1,24 +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); - } -} +//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/res/drawable/blue_circle_button.xml b/app/src/main/res/drawable/blue_circle_button.xml new file mode 100644 index 0000000..2e13f66 --- /dev/null +++ b/app/src/main/res/drawable/blue_circle_button.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_baseline_clear_24.xml b/app/src/main/res/drawable/ic_baseline_clear_24.xml new file mode 100644 index 0000000..844b6b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_clear_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/layout_my_page_activity_posts.xml b/app/src/main/res/layout/layout_my_page_activity_posts.xml index 1467c83..ac65699 100644 --- a/app/src/main/res/layout/layout_my_page_activity_posts.xml +++ b/app/src/main/res/layout/layout_my_page_activity_posts.xml @@ -1,5 +1,6 @@ - + android:layout_height="match_parent" + android:layout_weight="0.1" /> + android:textSize="16sp" /> + + + + + + diff --git a/build.gradle b/build.gradle index 3eb7c48..98b5d27 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.application' version '7.2.1' apply false id 'com.android.library' version '7.2.1' apply false - id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false + id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.0' apply false } task clean(type: Delete) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 870a1dc..eb62b05 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 30 13:58:12 JST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME