Merge branch 'master' into ViewPager2
# Conflicts:
#	app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java
#	app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
#	app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java
#	app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java
#	app/src/main/res/layout/activity_follow_list.xml
#	app/src/main/res/layout/activity_follower_list.xml
commit 9049304e7507efc0c8b21d8bde31eb0b64095de4
2 parents e8338d9 + d5280b7
d-matsuura authored on 4 Nov 2021
Showing 11 changed files
View
3
■■
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java
import org.ntlab.acanthus_client.Acanthus;
import org.ntlab.acanthus_client.R;
import org.ntlab.acanthus_client.databinding.FragmentMypageBinding;
import org.ntlab.acanthus_client.views.animation.AnimationActivity;
import org.ntlab.acanthus_client.views.main_menu_ui.mypage.help.HowToUseActivity;
import org.ntlab.acanthus_client.views.main_menu_ui.mypage.help.InquiryActivity;
import org.ntlab.acanthus_client.views.main_menu_ui.mypage.others.AppInformationActivity;
import org.ntlab.acanthus_client.views.main_menu_ui.mypage.logout.LogoutActivity;
import org.ntlab.acanthus_client.views.main_menu_ui.mypage.others.PrivacyPolicyActivity;
//-----------------------------------------------------------------
//
private void transitionHowToUseActivity() {
Acanthus acanthus = (Acanthus) getActivity().getApplication();
Intent intent = new Intent(acanthus, FollowFollowerActivity.class);
Intent intent = new Intent(acanthus, HowToUseActivity.class);
startActivity(intent);
}
 
//-----------------------------------------------------------------
View
78
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java
 
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
import retrofit2.Retrofit;
import retrofit2.converter.jackson.JacksonConverterFactory;
 
import org.ntlab.acanthus_client.Acanthus;
import org.ntlab.acanthus_client.entities.FollowJson;
import org.ntlab.acanthus_client.entities.FollowerJson;
import org.ntlab.acanthus_client.resources.accounts.FollowersRest;
import org.ntlab.acanthus_client.resources.accounts.FollowsRest;
 
 
//-----------------------------------------------------------------
// マイページロジックの仲介者
public class MyPageViewModel extends ViewModel {
private MyPageModelContainer myPageModelContainer;
private MutableLiveData<Boolean> mIsInvited = new MutableLiveData<>();
private MutableLiveData<String> mUidText = new MutableLiveData<>();
private MutableLiveData<FollowJson> myFollowJsonMutableLiveData;
private MutableLiveData<FollowerJson> myFollowerJsonMutableLiveData;
 
//-----------------------------------------------------------------
// getter
public LiveData<Boolean> getImmutableIsInvited() {
public LiveData<String> getImmutableUidText() {
return mUidText;
}
 
public LiveData<FollowJson> getMyFollowJson() {
return myFollowJsonMutableLiveData;
}
 
public LiveData<FollowerJson> getMyFollowerJson() {
return myFollowerJsonMutableLiveData;
}
 
//-----------------------------------------------------------------
//-----------------------------------------------------------------
// init
public void init(Acanthus acanthus) {
myPageModelContainer = new MyPageModelContainer(acanthus);
this.myFollowJsonMutableLiveData = new MutableLiveData<>();
this.myFollowerJsonMutableLiveData = new MutableLiveData<>();
}
 
//-----------------------------------------------------------------
// 招待されているかを確認する通信リクエスト
// 招待を承諾するリクエスト
public void acceptInviteRequest(){
myPageModelContainer.getInvitedConnectionModel().acceptInvite();
}
 
//-----------------------------------------------------------------
//ログイン中のユーザーのフォローリストを取得する
public void getMyFollows(Integer uid) {
Retrofit retrofit = new Retrofit.Builder()
.baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/")
.addConverterFactory(JacksonConverterFactory.create())
.build();
final FollowsRest followsRest = retrofit.create(FollowsRest.class);
 
//フォローリストの取得
Call<FollowJson> call = followsRest.getFollows(uid);
call.enqueue(new Callback<FollowJson>() {
@Override
public void onResponse(Call<FollowJson> call, Response<FollowJson> response) {
if (response.isSuccessful()) {
if (response.body() != null) {
myFollowJsonMutableLiveData.setValue(response.body());
}
}
}
 
@Override
public void onFailure(Call<FollowJson> call, Throwable t) {
 
}
});
}
 
//-----------------------------------------------------------------
//ユーザーのフォロワーリストを取得する
public void getMyFollowers(Integer uid){
Retrofit retrofit = new Retrofit.Builder()
.baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/")
.addConverterFactory(JacksonConverterFactory.create())
.build();
final FollowersRest followersRest = retrofit.create(FollowersRest.class);
 
//フォロワーリストの取得
Call<FollowerJson> call = followersRest.getFollowers(uid);
call.enqueue(new Callback<FollowerJson>() {
@Override
public void onResponse(Call<FollowerJson> call, Response<FollowerJson> response) {
if (response.isSuccessful()) {
if (response.body() != null) {
myFollowerJsonMutableLiveData.setValue(response.body());
}
}
}
 
@Override
public void onFailure(Call<FollowerJson> call, Throwable t) {
 
}
});
 
}
 
}
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/UserPageViewModel.java
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java
View
app/src/main/res/layout/activity_follow_list.xml 0 → 100644
View
app/src/main/res/layout/activity_follower_list.xml 0 → 100644
View
app/src/main/res/layout/activity_userpage.xml
View
app/src/main/res/layout/activity_work_list.xml
View
app/src/main/res/layout/fragment_mypage.xml