diff --git a/.idea/misc.xml b/.idea/misc.xml index 3ccd03d..867daff 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,53 +3,23 @@ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3dc7176..5bfc0fe 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,8 +41,6 @@ - - tab.setText(tabText[position]) + ).attach(); } public void onClickNext(View view) { diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListActivity.java deleted file mode 100644 index 012fa73..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListActivity.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.ntlab.acanthus_client.views.userpage.followFollower.followList; - -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.AdapterView; -import android.widget.BaseAdapter; -import android.widget.Button; -import android.widget.ListView; - -import org.ntlab.acanthus_client.R; -import org.ntlab.acanthus_client.entities.FollowJson; -import org.ntlab.acanthus_client.views.userpage.followFollower.UserListViewAdapter; -import org.ntlab.acanthus_client.views.userpage.UserPageActivity; -import org.ntlab.acanthus_client.views.userpage.followFollower.UserPageViewModel; - -import java.util.ArrayList; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -public class FollowListActivity extends AppCompatActivity { - - private UserPageViewModel userPageViewModel; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_follow_list); - - userPageViewModel = new ViewModelProvider(this).get(UserPageViewModel.class); - Intent intent = getIntent(); //UserPageActivityからuidをもらう - Integer uid = intent.getIntExtra("UID", 0); - ListView listView = findViewById(R.id.followListView); - - Button returnButton = findViewById(R.id.returnFollowButton); - - //前の画面に戻る処理 - returnButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - - //フォロー一覧の取得と表示 - userPageViewModel.getFollows(uid); - userPageViewModel.getFollowJson().observe(this, new Observer() { - @Override - public void onChanged(FollowJson followJson) { - ArrayList followUidList = followJson.getFollowUids(); - ArrayList followNameList = followJson.getFollowNames(); - BaseAdapter adapter = new UserListViewAdapter(getApplication(), R.layout.follow_or_follower_list, followNameList); - - listView.setAdapter(adapter); - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - //フォローのユーザーページへの遷移 - @Override - 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/followFollower/followList/FollowListFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java index 1d3bf37..5481f3c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java @@ -4,9 +4,11 @@ import android.os.Bundle; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import androidx.viewpager2.widget.ViewPager2; import android.view.LayoutInflater; import android.view.View; @@ -16,11 +18,15 @@ import android.widget.Button; import android.widget.ListView; +import com.google.android.material.tabs.TabLayout; +import com.google.android.material.tabs.TabLayoutMediator; + import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.FragmentEditBinding; import org.ntlab.acanthus_client.databinding.FragmentFollowListBinding; import org.ntlab.acanthus_client.entities.FollowJson; +import org.ntlab.acanthus_client.views.userpage.followFollower.FollowFollowerAdapter; import org.ntlab.acanthus_client.views.userpage.followFollower.UserListViewAdapter; import org.ntlab.acanthus_client.views.userpage.UserPageActivity; import org.ntlab.acanthus_client.views.userpage.followFollower.UserPageViewModel; @@ -30,57 +36,36 @@ public class FollowListFragment extends Fragment { private UserPageViewModel userPageViewModel; - private FragmentFollowListBinding binding; - private ArrayList followUidList; - private ArrayList followNameList; - private BaseAdapter adapter; - private Acanthus acanthus; @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - userPageViewModel = new ViewModelProvider(this).get(UserPageViewModel.class); - - binding = FragmentFollowListBinding.inflate(inflater, container, false); - View root = binding.getRoot(); - - return root; + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_follow_list, container, false); } @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - acanthus = (Acanthus) getActivity().getApplication(); + userPageViewModel = new ViewModelProvider(this).get(UserPageViewModel.class); Intent intent = getActivity().getIntent(); //UserPageActivityからuidをもらう Integer uid = intent.getIntExtra("UID", 0); - ListView listView = (ListView) getActivity().findViewById(R.id.followListView); - -// Button returnButton = getActivity().findViewById(R.id.returnFollowButton); - - //前の画面に戻る処理 -// returnButton.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// -// } -// }); + ListView listView = getActivity().findViewById(R.id.followListView); //フォロー一覧の取得と表示 userPageViewModel.getFollows(uid); userPageViewModel.getFollowJson().observe(getViewLifecycleOwner(), new Observer() { @Override public void onChanged(FollowJson followJson) { - followUidList = userPageViewModel.getFollowJson().getValue().getFollowUids(); - followNameList = userPageViewModel.getFollowJson().getValue().getFollowNames(); - adapter = new UserListViewAdapter(getActivity(), R.layout.follow_or_follower_list, followNameList); + ArrayList followUidList = followJson.getFollowUids(); + ArrayList followNameList = followJson.getFollowNames(); + BaseAdapter adapter = new UserListViewAdapter(getActivity().getApplication(), R.layout.follow_or_follower_list, followNameList); listView.setAdapter(adapter); listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { //フォローのユーザーページへの遷移 @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - Intent intent = new Intent(acanthus, UserPageActivity.class); + Intent intent = new Intent(getActivity().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/followFollower/followerList/FollowerListActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListActivity.java deleted file mode 100644 index 4344b54..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListActivity.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.ntlab.acanthus_client.views.userpage.followFollower.followerList; - -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.AdapterView; -import android.widget.BaseAdapter; -import android.widget.Button; -import android.widget.ListView; - -import org.jetbrains.annotations.Nullable; -import org.ntlab.acanthus_client.R; -import org.ntlab.acanthus_client.entities.FollowerJson; -import org.ntlab.acanthus_client.views.userpage.followFollower.UserListViewAdapter; -import org.ntlab.acanthus_client.views.userpage.UserPageActivity; -import org.ntlab.acanthus_client.views.userpage.followFollower.UserPageViewModel; - -import java.util.ArrayList; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - - -public class FollowerListActivity extends AppCompatActivity { - - private UserPageViewModel userPageViewModel; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_follower_list); - - userPageViewModel = new ViewModelProvider(this).get(UserPageViewModel.class); - Intent intent = getIntent(); //UserPageActivityからuidをもらう - Integer uid = intent.getIntExtra("UID", 0); - ListView listView = findViewById(R.id.followerListView); - - Button returnButton = findViewById(R.id.returnFollowerButton); - - //前の画面に戻る処理 - returnButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - - //フォロワー一覧の取得と表示 - userPageViewModel.getFollowers(uid); - userPageViewModel.getFollowerJson().observe(this, new Observer() { - @Override - public void onChanged(@Nullable FollowerJson followerJson) { - ArrayList followerUidList = followerJson.getFollowerUids(); - ArrayList followerNameList = followerJson.getFollowerNames(); - BaseAdapter adapter = new UserListViewAdapter(getApplication(), R.layout.follow_or_follower_list, followerNameList); - - listView.setAdapter(adapter); - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - //フォロワーのユーザーページへの遷移 - @Override - 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/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java index 598f1fa..8870d21 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java @@ -47,16 +47,6 @@ Integer uid = intent.getIntExtra("UID", 0); ListView listView = (ListView) getActivity().findViewById(R.id.followerListView); - Button returnButton = (Button) getActivity().findViewById(R.id.returnFollowerButton); - - //前の画面に戻る処理 - returnButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - } - }); - //フォロワー一覧の取得と表示 userPageViewModel.getFollowers(uid); userPageViewModel.getFollowerJson().observe(getViewLifecycleOwner(), new Observer() { diff --git a/app/src/main/res/layout/activity_follow_follower.xml b/app/src/main/res/layout/activity_follow_follower.xml index a4c7fab..05da267 100644 --- a/app/src/main/res/layout/activity_follow_follower.xml +++ b/app/src/main/res/layout/activity_follow_follower.xml @@ -6,21 +6,11 @@ android:orientation="vertical" tools:context=".views.userpage.followFollower.FollowFollowerActivity"> - -