diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b6091b9..7c79974 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,12 +75,12 @@ android:exported="true" android:label="@string/title_activity_login"> - - + + - - + + - - - - - + + + + RequestingDataList = new ArrayList<>(); + + //xmlからrvにRecyclerViewを取得、アダプターを宣言 + RecyclerView rv = (RecyclerView) findViewById(R.id.requestingList); + RequestingActivity.RequestingAdapter adapter = new RequestingActivity.RequestingAdapter(RequestingDataList); + + //一行ずつを縦に(LinearLayout)表示するLayoutManagerを宣言 + LinearLayoutManager llm = new LinearLayoutManager(this); + // + RecyclerView.ItemDecoration itemDecoration = + new DividerItemDecoration(this, DividerItemDecoration.VERTICAL); + rv.addItemDecoration(itemDecoration); + + rv.setHasFixedSize(true); + rv.setLayoutManager(llm); + } - //フレンド送信のダイアログを表示 - public void showDialog(View view) { - DialogFragment dialogFragment = new RequestingFragment(); - dialogFragment.show(getSupportFragmentManager(), "requesting_dialog"); - } + + //RecyclerViewのための内部クラス + //とりあえずnameのみで仮作成 - //フレンド申請のためのダイアログフラグメント - public class RequestingFragment extends DialogFragment { + //Adapter + public class RequestingAdapter extends RecyclerView.Adapter { + + private List list; + + public RequestingAdapter(List list) { + this.list =list; + } + + public void setList(List list) { + this.list = list; + } @NonNull @Override - public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + public RequestingActivity.RequestingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - builder.setTitle("フレンド申請") - .setMessage("(申請先のユーザー名)") - .setPositiveButton("フレンド申請", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - // このボタンを押した時の処理を書きます。 - } - }) - .setNegativeButton("キャンセル", null); - return builder.create(); + //ShopActivityのレイアウトのままなので、ここを作って反映させる + View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_shop_activity_posts, parent,false); + RequestingActivity.RequestingViewHolder vh = new RequestingActivity.RequestingViewHolder(inflate); + return vh; + } + + @Override + public void onBindViewHolder(@NonNull RequestingActivity.RequestingViewHolder holder, int position) { + holder.nameView.setText(list.get(position).getName()); + } + + @Override + public int getItemCount() { + return list.size(); } } + + //ViewHolder + public class RequestingViewHolder extends RecyclerView.ViewHolder { + public TextView nameView; + + public RequestingViewHolder(@NonNull View itemView) { + super(itemView); + nameView = (TextView) itemView.findViewById(R.id.userName); + } + } + + //DataModel + public static class RequestingDataModel { + private String name; + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + } + } \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/RequestingDialogFragment.java b/app/src/main/java/com/example/nemophila/RequestingDialogFragment.java new file mode 100644 index 0000000..03fa52f --- /dev/null +++ b/app/src/main/java/com/example/nemophila/RequestingDialogFragment.java @@ -0,0 +1,29 @@ +package com.example.nemophila; + +import android.app.Dialog; +import android.content.DialogInterface; +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; + +public class RequestingDialogFragment extends DialogFragment { + + @NonNull + @Override + public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setTitle("フレンド申請") + .setMessage("IDにあったユーザー") + .setPositiveButton("申請を送る", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // ボタンを押した時の処理 + } + }) + .setNegativeButton("キャンセル", null); + return builder.create(); + } + +} diff --git a/app/src/main/res/layout/activity_requesting.xml b/app/src/main/res/layout/activity_requesting.xml index 19a5763..e3b2df7 100644 --- a/app/src/main/res/layout/activity_requesting.xml +++ b/app/src/main/res/layout/activity_requesting.xml @@ -43,10 +43,10 @@ android:text="IDで検索してフレンド申請を送る" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.079" + app:layout_constraintHorizontal_bias="0.094" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.126" /> + app:layout_constraintVertical_bias="0.127" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.17" />