コンフリクトを修正
1 parent 9049304 commit 75528833462a29ce958e87d154eaab98f3f5267f
d-matsuura authored on 4 Nov 2021
Showing 5 changed files
View
14
app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
userNameText.setText(uname);
 
TextView profileText = findViewById(R.id.profileText);
 
Button returnButton = findViewById(R.id.returnButton);
 
//前の画面に戻る処理
returnButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
 
Button followUserButton = findViewById(R.id.followUserButton);
 
//閲覧しているユーザーページが自分のページならフォローボタンを非表示する
if (loginUid == uid) {
followUserButton.setVisibility(View.INVISIBLE);
}
 
//ログインしているユーザーがフォローしているかの有無で画面表示時のボタンの文字を変更する
userPageViewModel.getFollows(loginUid);
userPageViewModel.getFollowJson().observe(this, new Observer<FollowJson>() {
userPageViewModel.getMyFollows(loginUid);
userPageViewModel.getMyFollowJson().observe(this, new Observer<FollowJson>() {
@Override
public void onChanged(@Nullable FollowJson followJson) {
followsUidList = followJson.getFollowUids();
 
View
6
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java
package org.ntlab.acanthus_client.views.userpage.followList;
package org.ntlab.acanthus_client.views.userpage.followFollower.followList;
 
import android.content.Intent;
import android.os.Bundle;
 
Integer uid = intent.getIntExtra("UID", 0);
ListView listView = getActivity().findViewById(R.id.followListView);
 
//フォロー一覧の取得と表示
userPageViewModel.getFollows(uid);
userPageViewModel.getFollowJson().observe(getViewLifecycleOwner(), new Observer<FollowJson>() {
userPageViewModel.getMyFollows(uid);
userPageViewModel.getMyFollowJson().observe(getViewLifecycleOwner(), new Observer<FollowJson>() {
@Override
public void onChanged(FollowJson followJson) {
ArrayList<Integer> followUidList = followJson.getFollowUids();
ArrayList<String> followNameList = followJson.getFollowNames();
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java
View
app/src/main/res/layout/activity_follow_list.xml 100644 → 0
View
app/src/main/res/layout/activity_follower_list.xml 100644 → 0