diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index f274772..8666e4b 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,17 +1,17 @@ - + - + - + - - + + \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java index 747be89..2bd208b 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java @@ -30,7 +30,16 @@ Nemophila nemophila = (Nemophila) getApplication(); -//ボタンを押した場合の画面遷移 + // 「閉じる」ボタンを押したときにメイン画面へ遷移する + Button cancelButton = (Button) findViewById(R.id.cancel); + cancelButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(MyPageActivity.this, MainActivity.class); + startActivity(intent); + } + }); + + //「フレンドリスト」ボタンを押したときにフレンドリスト画面へ遷移する Button friendButton = (Button) findViewById(R.id.friend); friendButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { @@ -39,6 +48,17 @@ } }); + + // 「フレンド追加」ボタンを押したときにフレンド追加画面へ遷移する + Button RequestedButton = (Button) findViewById(R.id.requested); + RequestedButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(MyPageActivity.this, RequestedActivity.class); + startActivity(intent); + } + }); + + //　「マイページ編集」ボタンを押したときにマイページ編集画面へ遷移する Button changeMyPageButton = (Button) findViewById(R.id.changeMyPage); changeMyPageButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { @@ -48,21 +68,7 @@ }); - Button cancelButton = (Button) findViewById(R.id.cancel); - cancelButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - Intent intent = new Intent(MyPageActivity.this, MainActivity.class); - startActivity(intent); - } - }); - Button RequestedButton = (Button) findViewById(R.id.requested); - RequestedButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - Intent intent = new Intent(MyPageActivity.this, RequestedActivity.class); - startActivity(intent); - } - }); -//AccountViewModelとの通信とテキストの表示 + //AccountViewModelとの通信とテキストの表示 AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class); accountViewModel.getNameLiveData().observe(this, new Observer () { @Override @@ -71,7 +77,6 @@ myName.setText(name); nemophila.setName(name); } - }); String uid = nemophila.getUid(); String name = nemophila.getName(); diff --git a/app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java b/app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java new file mode 100644 index 0000000..b8651d1 --- /dev/null +++ b/app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java @@ -0,0 +1,38 @@ +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 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/entities/Post.java b/app/src/main/java/com/example/nemophila/entities/Post.java index 5c65deb..9a55b5a 100644 --- a/app/src/main/java/com/example/nemophila/entities/Post.java +++ b/app/src/main/java/com/example/nemophila/entities/Post.java @@ -60,8 +60,8 @@ this.pid = pj.getId(); this.uid = pj.getOwner().getId(); this.name = pj.getOwner().getName(); - this.genre = this.getGenre(); - this.date = "2001/12/12"; //サンプル + this.genre = pj.getGenre(); + this.date = pj.getDate(); this.rate = pj.getRate(); this.comment = pj.getComment(); } diff --git a/app/src/main/java/com/example/nemophila/entities/PostJson.java b/app/src/main/java/com/example/nemophila/entities/PostJson.java index 11fea40..81073c7 100644 --- a/app/src/main/java/com/example/nemophila/entities/PostJson.java +++ b/app/src/main/java/com/example/nemophila/entities/PostJson.java @@ -3,6 +3,7 @@ public class PostJson { private String id; private String genre; + private String date; private String image1; private String image2; private String image3; @@ -17,6 +18,9 @@ public String getGenre() { return genre; } + public String getDate() { + return date; + } public String getImage1() { return image1; } @@ -43,6 +47,9 @@ public void setGenre(String genre) { this.genre = genre; } + public void setDate(String date) { + this.date = date; + } public void setImage1(String image1) { this.image1 = image1; } diff --git a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java index 20af87c..e8b46a1 100644 --- a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java +++ b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java @@ -36,7 +36,8 @@ @DELETE("accounts/{uid}") Call deleteAccount( - @Path("uid") String uid + @Path("uid") String uid, + @Field("token") String token ); @FormUrlEncoded diff --git a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java index d71c92f..d28414b 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java @@ -50,8 +50,8 @@ public MutableLiveData> getAccountPostsLiveData() { return accountPostsLiveData; } // 対象のアカウント情報の削除 - public void deleteAccount(String uid) { - Call call = accountsRest.deleteAccount(uid); + public void deleteAccount(String uid, String token) { + Call call = accountsRest.deleteAccount(uid, token); call.enqueue(new Callback() { @Override diff --git a/app/src/main/res/layout/activity_mypage.xml b/app/src/main/res/layout/activity_mypage.xml index 7fd6be6..e6764dd 100644 --- a/app/src/main/res/layout/activity_mypage.xml +++ b/app/src/main/res/layout/activity_mypage.xml @@ -6,112 +6,127 @@ android:layout_height="match_parent" tools:context=".MyPageActivity"> - - + + + app:layout_constraintEnd_toStartOf="@+id/cancel" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/icon" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0" />