diff --git a/app/src/main/java/com/example/nemophila/FriendActivity.java b/app/src/main/java/com/example/nemophila/FriendActivity.java index 8168255..ffb93c8 100644 --- a/app/src/main/java/com/example/nemophila/FriendActivity.java +++ b/app/src/main/java/com/example/nemophila/FriendActivity.java @@ -2,6 +2,7 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -15,6 +16,8 @@ import android.widget.ImageView; import android.widget.TextView; +import com.example.nemophila.viewmodels.FriendViewModel; + import java.util.ArrayList; import java.util.List; @@ -30,6 +33,9 @@ List friendsDataset = new ArrayList<>(); // 1行分の情報を持つDataModelを格納するリスト RecyclerView rv = findViewById(R.id.friendsList); // recyclerViewを取得 adapter = new FriendActivityAdapter(friendsDataset); // adapterを取得 + FriendViewModel friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class); // ViewModelを取得 + Nemophila nemophila = (Nemophila) this.getApplication(); + //一行ずつを縦に(LinearLayout)表示するLayoutManagerを宣言 LinearLayoutManager llm = new LinearLayoutManager(this); @@ -41,6 +47,10 @@ rv.setHasFixedSize(true); rv.setLayoutManager(llm); + String myUid = nemophila.getUid(); // 自身のidを取得 +// friendViewModel.getFriends(myUid); // 自身のフレンドの一覧を取得するメソッドを呼び出す + + // マイページ画面に画面遷移する Button backButton = findViewById(R.id.backMyPage); backButton.setOnClickListener(v -> { diff --git a/app/src/main/java/com/example/nemophila/FriendActivityAdapter.java b/app/src/main/java/com/example/nemophila/FriendActivityAdapter.java deleted file mode 100644 index f4490da..0000000 --- a/app/src/main/java/com/example/nemophila/FriendActivityAdapter.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.example.nemophila; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import java.util.List; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class FriendActivityAdapter extends RecyclerView.Adapter { - private List list; - - public FriendActivityAdapter(List list) { - this.list = list; - } - - public void setList(List list) { - this.list = list; - } - - @NonNull - @Override - public FriendsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int ViewType) { - View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_friends_activity, parent,false); - FriendsViewHolder vh = new FriendsViewHolder(inflate); - return vh; - } - - @Override - public void onBindViewHolder(@NonNull FriendsViewHolder holder, int position) { - // 後からアイコンの登録をできるようにする - holder.nameView.setText(list.get(position).getName()); - } - - @Override - public int getItemCount() { - return list.size(); - } -} diff --git a/app/src/main/java/com/example/nemophila/FriendDataModel.java b/app/src/main/java/com/example/nemophila/FriendDataModel.java deleted file mode 100644 index 1eaaefc..0000000 --- a/app/src/main/java/com/example/nemophila/FriendDataModel.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.nemophila; - -public class FriendDataModel { - private String name; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/app/src/main/java/com/example/nemophila/FriendsViewHolder.java b/app/src/main/java/com/example/nemophila/FriendsViewHolder.java deleted file mode 100644 index 393098a..0000000 --- a/app/src/main/java/com/example/nemophila/FriendsViewHolder.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.nemophila; - -import android.view.View; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class FriendsViewHolder extends RecyclerView.ViewHolder { - public ImageView iconView; - public TextView nameView; - public Button deleteButton; - - public FriendsViewHolder(@NonNull View itemView) { - super(itemView); - iconView = itemView.findViewById(R.id.friendIcon); - nameView = itemView.findViewById(R.id.friendName); - deleteButton = itemView.findViewById(R.id.friendDelete); - } -}