diff --git a/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java b/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java index cbc6603..e97be04 100644 --- a/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java @@ -5,17 +5,24 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.EditText; import android.widget.NumberPicker; import android.widget.Spinner; import com.example.citrusclient.Citrus; import com.example.citrusclient.R; +import com.example.citrusclient.viewmodels.BooksViewModel; +import com.example.citrusclient.viewmodels.ScheduleViewModel; +import com.example.citrusclient.viewmodels.TodosViewModel; + +import java.util.Calendar; /** * A simple {@link Fragment} subclass. @@ -24,7 +31,8 @@ */ public class CreateTodoFragment extends Fragment { - private Citrus citrus; + private TodosViewModel todosViewModel; + private BooksViewModel booksViewModel; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -35,9 +43,12 @@ private String mParam1; private String mParam2; + private Citrus citrus; private int year; private int month; private int day; + private String title; + private int selectBookNum; public CreateTodoFragment() { // Required empty public constructor @@ -69,7 +80,9 @@ mParam2 = getArguments().getString(ARG_PARAM2); } - + citrus = (Citrus)(getActivity().getApplication()); + todosViewModel = new ViewModelProvider(this).get(TodosViewModel.class); + booksViewModel = new ViewModelProvider(this).get(BooksViewModel.class); } @Override @@ -82,23 +95,27 @@ @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + selectBookNum = 0; + + EditText titleField = view.findViewById(R.id.todo_title_inputField); + title = titleField.getText().toString(); + NumberPicker numberPickerYear = view.findViewById(R.id.numberPickerYear); - numberPickerYear.setValue(citrus.getCurYear()); - numberPickerYear.setMinValue(2024); - numberPickerYear.setMaxValue(2054); - year = numberPickerYear.getValue();//設定年を取得 + numberPickerYear.setMinValue(citrus.getCurYear()); + numberPickerYear.setMaxValue(citrus.getCurYear() + 30); + numberPickerYear.setValue(citrus.getCurYear()); // 年の初期値を設定 NumberPicker numberPickerMonth = view.findViewById(R.id.numberPickerMonth); - numberPickerYear.setValue(citrus.getCurMonth()); numberPickerMonth.setMinValue(1); numberPickerMonth.setMaxValue(12); - month = numberPickerMonth.getValue();//設定月を取得 + numberPickerMonth.setValue(citrus.getCurMouth()); // 月の初期値を設定 + NumberPicker numberPickerDay = view.findViewById(R.id.numberPickerDay); - numberPickerYear.setValue(citrus.getCurDay()); numberPickerDay.setMinValue(1); numberPickerDay.setMaxValue(31); - day = numberPickerDay.getValue();//設定月を取得 + numberPickerDay.setValue(citrus.getCurDay()); // 日の初期値を設定 + Button cancelButton = view.findViewById(R.id.todo_cancel_button); cancelButton.setOnClickListener(v->{ @@ -106,7 +123,10 @@ }); Button createButton = view.findViewById(R.id.todo_create_button); - cancelButton.setOnClickListener(v->{ + createButton.setOnClickListener(v->{ + year = numberPickerYear.getValue(); // 設定年を取得 + month = numberPickerMonth.getValue(); // 設定月を取得 + day = numberPickerDay.getValue(); // 設定日を取得 createTodo(); ((MainActivity)getActivity()).backFragment(); }); @@ -122,7 +142,7 @@ //Todo追加時の処理 private void createTodo() { - + todosViewModel.createTodo(citrus.getAccountId(),selectBookNum,year,month,day,title,citrus.getToken()); } } \ No newline at end of file