diff --git a/app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java b/app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java index 77c9cda..fe52065 100644 --- a/app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java @@ -50,11 +50,11 @@ int selectedId = radioButton.getId(); // ここで選択されたラジオボタンのID(selectedId)を使用して処理を行う if (selectedId == R.id.radioButtonShadow) { - target.returnValue("#A5A5A5"); + target.returnValue("#D5D5D5"); } else if (selectedId == R.id.radioButtonSprout) { - target.returnValue("#A2FA83"); + target.returnValue("#BEECAE"); } else if (selectedId == R.id.radioButtonAqua) { - target.returnValue("#A3F4FF"); + target.returnValue("#BEF7FF"); } else if (selectedId == R.id.radioButtonLavender) { target.returnValue("#B994FF"); } else if (selectedId == R.id.radioButtonJasmine) { @@ -62,7 +62,7 @@ } else if (selectedId == R.id.radioButtonCitrus) { target.returnValue("#F6C755"); } else if (selectedId == R.id.radioButtonSakura) { - target.returnValue("#F6C755"); + target.returnValue("#FFCBFA"); } } diff --git a/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java b/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java index 6f7f10e..2b72cfe 100644 --- a/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java @@ -3,6 +3,7 @@ import android.content.Intent; import android.content.DialogInterface; //import android.support.v4.app.DialogFragment; +import android.content.res.ColorStateList; import android.os.Bundle; import androidx.annotation.NonNull; @@ -135,20 +136,13 @@ } } else { System.out.println(bookname); -// String textbook = textbookname.getText().toString().trim(); - //本を保存するコードを書く? - + // String textbook = textbookname.getText().toString().trim(); String accountId = ((Citrus) getActivity().getApplication()).getAccountId(); String token = ((Citrus) getActivity().getApplication()).getToken(); - - booksViewModel.createBook(accountId, bookname, color, true, token); //BooksViewModelを呼び出して本を作る //画面が本棚に戻る - - - ((MainActivity) getActivity()).showFragment(new MyBookshelfFragment()); //本棚に戻る } } @@ -168,6 +162,7 @@ @Override public void onClick(View view2) { // ((MainActivity) getActivity()).showFragment(new BookColorDialogFragment()); + //CreatebookFragmentにBookColordialogFragmentの情報を渡した状態のコンストラクタをつくる BookColorDialogFragment bookColorDialogFragment = new BookColorDialogFragment(CreateBookFragment.this); bookColorDialogFragment.show(getActivity().getSupportFragmentManager(), "simple"); @@ -176,7 +171,14 @@ } public void returnValue(String colorIn){ - color = colorIn; - } + color = colorIn;//createBookの変数colorに入る + View view = getView(); // FragmentのView + + if (view != null) { + Button colorButton = view.findViewById(R.id.color_button); + int parsedColor = Color.parseColor(color); + colorButton.setBackgroundTintList(ColorStateList.valueOf(parsedColor)); + } + } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_book_color_dialog.xml b/app/src/main/res/layout/fragment_book_color_dialog.xml index 89ab6ac..7f7c250 100644 --- a/app/src/main/res/layout/fragment_book_color_dialog.xml +++ b/app/src/main/res/layout/fragment_book_color_dialog.xml @@ -8,7 +8,7 @@ tools:context=".views.BookColorDialogFragment"> @@ -25,7 +25,7 @@ android:layout_width="280dp" android:layout_height="wrap_content" android:layout_gravity="center" - android:buttonTint="#A5A5A5" + android:buttonTint="#D5D5D5" android:text="Shadow" /> + android:layout_height="match_parent" + android:background="#FFFFFF">