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 5838808..70fcf3b 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 @@ -58,6 +58,11 @@ Button followUserButton = findViewById(R.id.followUserButton); + //閲覧しているユーザーページが自分のページならフォローボタンを非表示する + if (uid == uid2) { + followUserButton.setVisibility(View.INVISIBLE); + } + //ログインしているユーザーがフォローしているかの有無で画面表示時のボタンの文字を変更する userPageViewModel.getFollows(uid); userPageViewModel.getFollowUidJson().observe(this, new Observer() { @@ -96,7 +101,7 @@ @Override public void onClick(View v) { Intent intent = new Intent(getApplication(), FollowListActivity.class); - intent.putExtra("uid", uid2); + intent.putExtra("UID", uid2); startActivity(intent); } }); @@ -107,7 +112,7 @@ @Override public void onClick(View v) { Intent intent = new Intent(getApplication(), FollowerListActivity.class); - intent.putExtra("uid", uid2); + intent.putExtra("UID", uid2); startActivity(intent); } }); @@ -118,7 +123,7 @@ @Override public void onClick(View v) { Intent intent = new Intent(getApplication(), WorkListActivity.class); - intent.putExtra("uid", uid2); + intent.putExtra("UID", uid2); 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 b271941..8d3568e 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 @@ -1,5 +1,6 @@ package org.ntlab.acanthus_client.views.userpage.followList; +import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -20,6 +21,8 @@ setContentView(R.layout.activity_follow_list); userPageViewModel = new ViewModelProvider(this).get(UserPageViewModel.class); + Intent intent = getIntent(); //UserPageActivityからuidをもらう + Integer uid = intent.getIntExtra("UID", 0); Button returnButton = findViewById(R.id.returnFollowButton); 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 1627710..caffbad 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 @@ -1,5 +1,6 @@ package org.ntlab.acanthus_client.views.userpage.followerList; +import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -21,6 +22,8 @@ setContentView(R.layout.activity_follower_list); userPageViewModel = new ViewModelProvider(this).get(UserPageViewModel.class); + Intent intent = getIntent(); //UserPageActivityからuidをもらう + Integer uid = intent.getIntExtra("UID", 0); Button returnButton = findViewById(R.id.returnFollowerButton); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java index 9a543e7..9656aa4 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java @@ -1,5 +1,6 @@ package org.ntlab.acanthus_client.views.userpage.workList; +import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -18,6 +19,9 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_work_list); + Intent intent = getIntent(); //UserPageActivityからuidをもらう + Integer uid = intent.getIntExtra("UID", 0); + Button returnButton = findViewById(R.id.returnWorkButton); //前の画面に戻る処理