diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java b/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java index 203ab3b..1d68ef5 100644 --- a/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java +++ b/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java @@ -4,6 +4,7 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -13,8 +14,12 @@ import android.view.ViewGroup; import com.example.tampopo_client.R; +import com.example.tampopo_client.viewmodels.FriendViewModel; import com.example.tampopo_client.views.placeholder.FriendContent; +import java.util.List; +import androidx.lifecycle.Observer; + /** * A fragment representing a list of Items. */ @@ -56,6 +61,11 @@ Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_friend_list_list, container, false); + // Add some sample items. + //for (int i = 1; i <= 30; i++) { + // FriendContent.addItem(new FriendContent.FriendItem(Integer.toString(i), "ユーザ" + i)); + //} + // Set the adapter if (view instanceof RecyclerView) { Context context = view.getContext(); @@ -69,4 +79,21 @@ } return view; } + + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + FriendViewModel friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class); + + friendViewModel.getFriendIdsLiveData().observe(getViewLifecycleOwner(), new Observer>() { + + @Override + public void onChanged(List friendIds) { + for (String i : friendIds) { + FriendContent.addItem(new FriendContent.FriendItem(i, "")); + } + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java b/app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java index 1bdcbeb..22ef86b 100644 --- a/app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java +++ b/app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java @@ -34,7 +34,7 @@ public void onBindViewHolder(final ViewHolder holder, int position) { holder.mItem = mValues.get(position); //holder.mIdView.setText(mValues.get(position).id); - holder.mContentView.setText(mValues.get(position).content); + holder.mContentView.setText(mValues.get(position).name); } @Override diff --git a/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java index 4521cdc..3c48f8e 100644 --- a/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java +++ b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java @@ -26,25 +26,25 @@ private static final int COUNT = 30; - static { - // Add some sample items. - for (int i = 1; i <= COUNT; i++) { - addItem(createPlaceholderItem(i)); - } - } + //static { + // // Add some sample items. + // for (int i = 1; i <= COUNT; i++) { + // addItem(createPlaceholderItem(i)); + // } + //} - private static void addItem(FriendItem item) { + public static void addItem(FriendItem item) { ITEMS.add(item); ITEM_MAP.put(item.id, item); } - private static FriendItem createPlaceholderItem(int position) { - return new FriendItem(String.valueOf(position), "ユーザー名 " , makeDetails(position)); + //private static FriendItem createPlaceholderItem(int position) { + // return new FriendItem(String.valueOf(position), "ユーザー名 " , makeDetails(position)); - } + //} private static String makeDetails(int position) { StringBuilder builder = new StringBuilder(); @@ -62,20 +62,19 @@ public static class FriendItem { public final String id; - public final String content; - public final String details; + public final String name; - public FriendItem(String id, String content, String details) { + + public FriendItem(String id, String name) { this.id = id; - this.content = content; - this.details = details; + this.name = name; } @Override public String toString() { - return content; + return name; } } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_friend_list.xml b/app/src/main/res/layout/fragment_friend_list.xml index e408406..c0a60be 100644 --- a/app/src/main/res/layout/fragment_friend_list.xml +++ b/app/src/main/res/layout/fragment_friend_list.xml @@ -14,9 +14,28 @@ + + + + \ No newline at end of file