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 353d6b8..8cd28e4 100644 --- a/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/CreateBookFragment.java @@ -1,5 +1,6 @@ package com.example.citrusclient.views; +import android.annotation.SuppressLint; import android.content.Intent; import android.content.DialogInterface; //import android.support.v4.app.DialogFragment; @@ -13,6 +14,7 @@ import androidx.lifecycle.ViewModelProvider; import android.text.Editable; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -26,9 +28,11 @@ import android.graphics.Color;//ボタンの色変更 import android.os.Bundle; import android.widget.Button; +import android.widget.CompoundButton; import android.widget.EditText; import android.widget.RadioButton; import android.widget.RadioGroup; +import android.widget.Switch; import android.widget.TextView; import org.w3c.dom.Text; @@ -80,7 +84,6 @@ mParam1 = getArguments().getString(ARG_PARAM1); mParam2 = getArguments().getString(ARG_PARAM2); } - booksViewModel = new ViewModelProvider(this).get(BooksViewModel.class); } @@ -93,13 +96,17 @@ } - private String color; + private String color; //色 + //private Switch mSwitch = null;//本の公開状況の切り替えボタン + private boolean publicity; + @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); //親クラスである Fragment の onViewCreated() メソッドを呼び出す Citrus citrus = (Citrus)(getActivity().getApplication()); String token = citrus.getToken(); String accountId = citrus.getAccountId(); + //ここから書く // MainActivityにこのフラグメントを設定するした二つのどっちか //((MainActivity) getContext()).setCreateBookFragment(this);//フラグメントとアクティビティ間での情報のやり取りがあるとき @@ -110,10 +117,11 @@ @Override public void onClick(View view2) { EditText editname = (EditText) view.findViewById(R.id.book_name); //本の名前を入力する - Editable bookeditable = editname.getText(); TextView textbookname = (TextView) view.findViewById(R.id.set_book_name); //本の名前が無かったら入力してと表示する +// boolean isChecked = mSwitch.isChecked(); //本の公開状況 +// publicity = isChecked; if (bookeditable == null) { //本の名前がなかったら System.out.println("本の名前を入力してください"); @@ -136,16 +144,18 @@ } } 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(); if(color == null){ color = "#D5D5D5"; //色が選択されてなかったらグレー } - booksViewModel.createBook(accountId, bookname, color, true, token); //BooksViewModelを呼び出して本を作る + + booksViewModel.createBook(accountId, bookname, color, publicity, token); //BooksViewModelを呼び出して本を作る //画面が本棚に戻る + ((MainActivity) getActivity()).showFragment(new MyBookshelfFragment()); //本棚に戻る } } @@ -171,8 +181,35 @@ } }); + + //View view = getView(); + Switch sw = view.findViewById(R.id.switch1); + sw.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (isChecked) { + publicity = true; + } else { + publicity = false; + } + } + }); } +// public void returnPublicity(String pub) { +// View view = getView(); +// Switch sw = view.findViewById(R.id.switch1); +// sw.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { +// public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { +// if (isChecked) { +// publicity = true; +// } else { +// publicity = false; +// } +// } +// }); +// } + public void returnValue(String colorIn){ color = colorIn;//createBookの変数colorに入る