diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserListViewAdapter.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserListViewAdapter.java index 0f50618..6f8ce34 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserListViewAdapter.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserListViewAdapter.java @@ -19,14 +19,14 @@ //参照保存データ static class ViewHolder { - TextView textViewUid; + TextView textViewName; } - public UserListViewAdapter(Context context, int layoutId, ArrayList name) { + public UserListViewAdapter(Context context, int layoutId, ArrayList names) { super(); this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); this.layoutId = layoutId; - this.nameList = name; + this.nameList = names; } @Override @@ -38,15 +38,15 @@ convertView = inflater.inflate(layoutId, parent, false); //ViewHolderの生成とレイアウト内テキストのセット viewHolder = new UserListViewAdapter.ViewHolder(); - viewHolder.textViewUid = convertView.findViewById(R.id.followOrFollowerUid); + viewHolder.textViewName = convertView.findViewById(R.id.followOrFollowerName); convertView.setTag(viewHolder); } else { //既に初期セットの処理がされている場合、再利用する viewHolder = (UserListViewAdapter.ViewHolder) convertView.getTag(); } - //ViewHolder内のtextViewName,Dateに各ポジションのデータをセット - if (nameList != null) viewHolder.textViewUid.setText(nameList.get(position)); + //ViewHolder内のtextViewNameに各ポジションのデータをセット + if (nameList != null) viewHolder.textViewName.setText(nameList.get(position)); return convertView; } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java index 3081e4f..e0bba96 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java @@ -35,16 +35,17 @@ userPageViewModel = new ViewModelProvider(this).get(UserPageViewModel.class); acanthus = (Acanthus) getApplication(); - Integer uid = 1; -// Integer uid = acanthus.getPreferenceUid(); - String token = "abc0"; -// String token = acanthus.getPreferenceToken(); -// Intent intent = getIntent(); //FollowListActivity,FollowerListActivityからそれぞれuidをもらう -// Integer uid2 = intent.getIntExtra("UID", 0); - Integer uid2 = 2; + Integer loginUid = 1; +// Integer loginUid = acanthus.getPreferenceUid(); + String loginToken = "abc0"; +// String loginToken = acanthus.getPreferenceToken(); + Intent intent = getIntent(); //FollowListActivity,FollowerListActivityからそれぞれuidをもらう +// Integer uid = intent.getIntExtra("UID", 0); + Integer uid = 2; + String uname = intent.getStringExtra("NAME"); TextView userNameText = findViewById(R.id.userNameText); -// userNameText.setText(); + userNameText.setText(uname); TextView profileText = findViewById(R.id.profileText); @@ -61,18 +62,18 @@ Button followUserButton = findViewById(R.id.followUserButton); //閲覧しているユーザーページが自分のページならフォローボタンを非表示する - if (uid == uid2) { + if (loginUid == uid) { followUserButton.setVisibility(View.INVISIBLE); } //ログインしているユーザーがフォローしているかの有無で画面表示時のボタンの文字を変更する - userPageViewModel.getFollows(uid); + userPageViewModel.getFollows(loginUid); userPageViewModel.getFollowJson().observe(this, new Observer() { @Override public void onChanged(@Nullable FollowJson followJson) { followsUidList = followJson.getFollowUids(); - if (followsUidList.contains(uid2)) { + if (followsUidList.contains(uid)) { followUserButton.setText("フォロー解除"); }else{ followUserButton.setText("フォローする"); @@ -85,13 +86,13 @@ followUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (!followsUidList.contains(uid2)) { - userPageViewModel.addFollow(uid, token, uid2); - followsUidList.add(uid2); + if (!followsUidList.contains(uid)) { + userPageViewModel.addFollow(loginUid, loginToken, uid); + followsUidList.add(uid); followUserButton.setText("フォロー解除"); }else{ - userPageViewModel.releaseFollow(uid, token, uid2); - followsUidList.remove(uid2); + userPageViewModel.releaseFollow(loginUid, loginToken, uid); + followsUidList.remove(uid); followUserButton.setText("フォローする"); } } @@ -103,7 +104,7 @@ @Override public void onClick(View v) { Intent intent = new Intent(getApplication(), FollowListActivity.class); - intent.putExtra("UID", uid2); + intent.putExtra("UID", uid); startActivity(intent); } }); @@ -114,7 +115,7 @@ @Override public void onClick(View v) { Intent intent = new Intent(getApplication(), FollowerListActivity.class); - intent.putExtra("UID", uid2); + intent.putExtra("UID", uid); startActivity(intent); } }); @@ -125,7 +126,7 @@ @Override public void onClick(View v) { Intent intent = new Intent(getApplication(), WorkListActivity.class); - intent.putExtra("UID", uid2); + intent.putExtra("UID", uid); startActivity(intent); } }); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java index e3a7348..9d86815 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java @@ -60,6 +60,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { Intent intent = new Intent(getApplication(), UserPageActivity.class); intent.putExtra("UID", followUidList.get(position)); + intent.putExtra("NAME", followNameList.get(position)); startActivity(intent); } }); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java index e001d96..22aad87 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java @@ -62,6 +62,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { Intent intent = new Intent(getApplication(), UserPageActivity.class); intent.putExtra("UID", followerUidList.get(position)); + intent.putExtra("NAME", followerNameList.get(position)); startActivity(intent); } }); diff --git a/app/src/main/res/layout/follow_or_follower_list.xml b/app/src/main/res/layout/follow_or_follower_list.xml index 878d951..c9a7cfa 100644 --- a/app/src/main/res/layout/follow_or_follower_list.xml +++ b/app/src/main/res/layout/follow_or_follower_list.xml @@ -7,7 +7,7 @@ android:orientation="vertical" >