diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java index b177235..fec40ed 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java @@ -33,12 +33,12 @@ //ユーザーのフォローを解除するメソッド - @FormUrlEncoded + @DELETE("accounts/{uid}/follows") - Call releaseFollows( + Call releaseFollows( @Path("uid") Integer uid, - @Field("token") String token, - @Field("followUid") Integer followUid + @Query("token") String token, + @Query("followUid") Integer followUid ); } 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 85b07e6..0b64c81 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 @@ -15,6 +15,9 @@ import org.ntlab.acanthus_client.views.userpage.workList.WorkListActivity; +import java.util.ArrayList; +import java.util.Collection; + import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -23,6 +26,7 @@ private UserPageViewModel userPageViewModel; private Acanthus acanthus; + private Collection followsList = new ArrayList<>(); @Override protected void onCreate(Bundle savedInstanceState){ @@ -33,6 +37,7 @@ acanthus = (Acanthus) getApplication(); Integer uid = 1; String token = "abc0"; + Integer uid2 = 2; TextView userNameText = findViewById(R.id.userNameText); // userNameText.setText(); @@ -55,28 +60,34 @@ userPageViewModel.getFollowUidJson().observe(this, new Observer() { @Override public void onChanged(@Nullable FollowUidJson followUidJson) { + followsList = followUidJson.getFollowsUid(); + if (followsList.contains(uid2)) { + followUserButton.setText("フォロー解除"); + }else{ + followUserButton.setText("フォローする"); + } } }); -// if () { -// followUserButton.setText("フォロー解除"); -// }else{ -// followUserButton.setText("フォローする"); -// } + if (followsList.contains(uid2)) { + followUserButton.setText("フォロー解除"); + }else{ + followUserButton.setText("フォローする"); + } //ユーザーのフォロー及びフォロー解除の処理 followUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { -// if () { -// userPageViewModel.addFollow(uid, token, 2); -// followUserButton.setText("フォロー解除"); -// }else{ -// userPageViewModel.releaseFollow(uid, token, 2); -// followUserButton.setText("フォローする"); -// } + if (!followsList.contains(uid2)) { + userPageViewModel.addFollow(uid, token, uid2); + followUserButton.setText("フォロー解除"); + }else{ + userPageViewModel.releaseFollow(uid, token, uid2); + followUserButton.setText("フォローする"); + } } }); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java index c4db76d..1ddc2b6 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java @@ -57,7 +57,7 @@ @Override public void onFailure(Call call, Throwable t) { - Log.d("tag", "onFailure: "); + } });