diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 1adb1c2..66f7271 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index a187139..54ed16b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -31,6 +31,8 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a40b3e2..cddffac 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"> - - + + - - + + - - - - + android:label="@string/title_activity_requesting" + android:windowSoftInputMode="adjustPan"> + + + + - - + + - - + + diff --git a/app/src/main/java/com/example/nemophila/RequestingActivity.java b/app/src/main/java/com/example/nemophila/RequestingActivity.java index 8d4dfb9..6adf436 100644 --- a/app/src/main/java/com/example/nemophila/RequestingActivity.java +++ b/app/src/main/java/com/example/nemophila/RequestingActivity.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.EditText; import android.widget.TextView; +import com.example.nemophila.viewmodels.PostsViewModel; + import java.util.ArrayList; import java.util.List; @@ -24,6 +27,10 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_requesting); + //Nemophilaから自分のuidとtokenを取得 + String uid = ((Nemophila)getApplication()).getUid(); + String token = ((Nemophila)getApplication()).getToken(); + String requestingId; //左上のボタンでマイページへ遷移 Button returnButton = (Button)findViewById(R.id.requestingAcReturnButton); @@ -42,15 +49,17 @@ //入力されたIDを取得 EditText editSearchId = (EditText) findViewById(R.id.inputRequestingId); String searchingId = editSearchId.getText().toString(); - //取得したIDのユーザー名を受け取る + //取得したIDのユーザー名を受け取り、OKならreqyestingIdに入れる String requestingName; //申請を送るダイアログを表示 RequestingDialogFragment dialog = new RequestingDialogFragment(); dialog.show(getSupportFragmentManager(), "Requesting_dialog"); + //OK押したら申請するメソッドにuid、requestingId、tokenを渡す } }); //RecyclerView(表示の設定、直接表示するところはLivedataを購読しているonChanged内にしたい) + List requestingDataSet = new ArrayList<>(); List RequestingDataList = new ArrayList<>(); //xmlからrvにRecyclerViewを取得、アダプターを宣言 @@ -67,11 +76,25 @@ rv.setHasFixedSize(true); rv.setLayoutManager(llm); + + //表示テスト用に仮データ + List testDataSet = new ArrayList<>(); + for (int i = 0; i < 15; i++) { + RequestingDataModel data = new RequestingDataModel(); + data.setName("ネモフィラ太郎"+ i + "号(テスト)"); + + testDataSet.add(data); + } + //onChange内に書くべき表示部分 + adapter.setList(testDataSet); + rv.setAdapter(adapter); + } + //RecyclerViewのための内部クラス - //とりあえずnameのみで仮作成 + //とりあえずnameのみで作成 //Adapter public class RequestingAdapter extends RecyclerView.Adapter { @@ -90,8 +113,7 @@ @Override public RequestingActivity.RequestingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - //ShopActivityのレイアウトのままなので、ここを作って反映させる - View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_shop_activity_posts, parent,false); + View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_requesting_activity, parent,false); RequestingActivity.RequestingViewHolder vh = new RequestingActivity.RequestingViewHolder(inflate); return vh; } @@ -113,7 +135,7 @@ public RequestingViewHolder(@NonNull View itemView) { super(itemView); - nameView = (TextView) itemView.findViewById(R.id.userName); + nameView = (TextView) itemView.findViewById(R.id.requestingName); } } diff --git a/app/src/main/res/layout/activity_requesting.xml b/app/src/main/res/layout/activity_requesting.xml index e3b2df7..6dc38db 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.094" + app:layout_constraintHorizontal_bias="0.124" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.127" /> + app:layout_constraintVertical_bias="0.123" /> + app:layout_constraintTop_toBottomOf="@+id/titleRequestingList" + app:layout_constraintVertical_bias="0.428" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_requesting_activity.xml b/app/src/main/res/layout/layout_requesting_activity.xml new file mode 100644 index 0000000..dcfe6bf --- /dev/null +++ b/app/src/main/res/layout/layout_requesting_activity.xml @@ -0,0 +1,31 @@ + + + + + + + + +