diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java b/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java index abe19ae..e50df29 100644 --- a/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java +++ b/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java @@ -56,6 +56,10 @@ Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_friend_received_list, container, false); + // Add some sample items. + for (int i = 1; i <= 30; i++) + FriendRequestContent.addItem(new FriendRequestContent.FriendRequestItem(Integer.toString(i), "ユーザ" + i)); + // Set the adapter if (view instanceof RecyclerView) { Context context = view.getContext(); diff --git a/app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java b/app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java index 9640389..7df07fc 100644 --- a/app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java +++ b/app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.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/FriendRequestContent.java b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java index cd141e8..7882221 100644 --- a/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java +++ b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java @@ -13,26 +13,26 @@ //各アイテムにアクセスするためのID付きマップ*/ public static final Map ITEM_MAP = new HashMap(); - private static final int COUNT = 30; //データ30個作成 + public static final int COUNT = 30; //データ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(FriendRequestItem item) { + public static void addItem(FriendRequestItem item) { ITEMS.add(item); ITEM_MAP.put(item.id, item); } //位置(1,2,...)に応じたFriendRequestItem を生成するメソッド - private static FriendRequestItem createPlaceholderItem(int position) { - return new FriendRequestItem(String.valueOf(position), "ユーザー名 ", makeDetails(position)); - } +// public static FriendRequestItem createPlaceholderItem(int position) { +// return new FriendRequestItem(String.valueOf(position), "ユーザー名 ", makeDetails(position)); +// } //詳細説明用の文字列を作るメソッド。position に応じて「詳細情報」がたくさん増える private static String makeDetails(int position) { @@ -47,18 +47,18 @@ //FriendRequestを表す1件のデータ public static class FriendRequestItem { public final String id; //アイテムのID - public final String content; //表示される名前 - public final String details; //詳細説明 + public final String name; //表示される名前 + //public final String details; //詳細説明 - public FriendRequestItem(String id, String content, String details) { + public FriendRequestItem(String id, String name) { this.id = id; - this.content = content; - this.details = details; + this.name = name; + //this.details = details; } @Override public String toString() { - return content; + return name + " " + id; } } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_friend_received.xml b/app/src/main/res/layout/fragment_friend_received.xml index fa26f01..953cbb9 100644 --- a/app/src/main/res/layout/fragment_friend_received.xml +++ b/app/src/main/res/layout/fragment_friend_received.xml @@ -19,22 +19,22 @@ android:layout_margin="@dimen/text_margin" android:textAppearance="?attr/textAppearanceListItem" /> -