diff --git a/app/src/main/java/com/example/citrusclient/views/AccountColorDialogFragment.java b/app/src/main/java/com/example/citrusclient/views/AccountColorDialogFragment.java new file mode 100644 index 0000000..51451ca --- /dev/null +++ b/app/src/main/java/com/example/citrusclient/views/AccountColorDialogFragment.java @@ -0,0 +1,69 @@ +package com.example.citrusclient.views; + +import android.app.Dialog; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.os.Bundle; +import android.widget.RadioButton; +import android.widget.RadioGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import com.example.citrusclient.Citrus; +import com.example.citrusclient.R; +import android.widget.RadioButton; +import android.widget.RadioGroup; + + +public class AccountColorDialogFragment extends DialogFragment { + private Citrus citrus; + + SettingsFragment target; //なにこれ + + AccountColorDialogFragment(SettingsFragment st) {target=st;} + @NonNull //なにこれ + @Override + public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + // ダイアログを生成 + Dialog dialog = new Dialog(requireContext()); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + dialog.setContentView(R.layout.fragment_account_color_dialog); + + RadioGroup rg = dialog.findViewById(R.id.radioGroupColors); + // ラジオグループのチェック状態変更リスナーを設定 + rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + // チェックされたラジオボタンのIDを取得 + RadioButton radioButton = group.findViewById(checkedId); + if (radioButton != null) { + int selectedId = radioButton.getId(); + // ここで選択されたラジオボタンのID（selectedId）を使用して処理を行う + if (selectedId == R.id.radioButtonShadow) { + target.returnAcountColor("#D5D5D5"); + } else if (selectedId == R.id.radioButtonSprout) { + target.returnAcountColor("#BEECAE"); + } else if (selectedId == R.id.radioButtonAqua) { + target.returnAcountColor("#BEF7FF"); + } else if (selectedId == R.id.radioButtonLavender) { + target.returnAcountColor("#D297FC"); + } else if (selectedId == R.id.radioButtonJasmine) { + target.returnAcountColor("#FFFFFF"); + } else if (selectedId == R.id.radioButtonCitrus) { + target.returnAcountColor("#FFFF99"); + } else if (selectedId == R.id.radioButtonSakura) { + target.returnAcountColor("#FFECEF"); + } + + } + dismiss(); + } + }); + + return dialog; + } + } \ No newline at end of file diff --git a/app/src/main/java/com/example/citrusclient/views/HomeFragment.java b/app/src/main/java/com/example/citrusclient/views/HomeFragment.java index 2d37c7a..1e709ad 100644 --- a/app/src/main/java/com/example/citrusclient/views/HomeFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/HomeFragment.java @@ -142,7 +142,7 @@ Citrus citrus = (Citrus)(getActivity().getApplication()); String token = citrus.getToken(); String accountId = citrus.getAccountId(); - + System.out.println(token); curDate = LocalDate.of(year, month, day); todoList = new ArrayList<>(); @@ -178,7 +178,7 @@ FloatingActionButton scheduleAddButton = view.findViewById(R.id.schedule_add_button); scheduleAddButton.setOnClickListener(v -> { - ((MainActivity) getActivity()).showFragment(new CreateScheduleFragment()); + ((MainActivity) getActivity()).showFragment(new CreateScheduleFragment(year, month ,day)); }); ImageButton prevBotton = view.findViewById(R.id.prev_day_botton); @@ -443,7 +443,7 @@ holder.scheduleButton.setTextColor(Color.rgb(255 - red, 255 - green, 255 - blue)); holder.scheduleButton.setOnClickListener(v -> { - ((MainActivity) activity).showFragment(new CreateScheduleFragment()); + ((MainActivity) activity).showFragment(new CreateScheduleFragment(scheduleData, book)); }); } @@ -490,22 +490,23 @@ int year = curDate.getYear(); int month = curDate.getMonthValue(); int day = curDate.getDayOfMonth(); - long yearMonth = year * 10000 + month * 100 + day; - long scheduleYearMonth = convertTimeInteger(scheduleTime) / 1000000; - + long yearMonthDay = year * 10000 + month * 100 + day; + long scheduleYMD = convertTimeInteger(scheduleTime) / 10000; // long scheduleYearMonth = extractUpperDigits(convertTimeInteger(scheduleTime), 8); - System.out.println(yearMonth); - System.out.println(scheduleYearMonth); - return scheduleTime.substring(scheduleTime.length() - 5); + if(yearMonthDay > scheduleYMD) { + return "00:00"; + } else if(yearMonthDay < scheduleYMD) { + return "23:59"; + } else { + return scheduleTime.substring(scheduleTime.length() - 5); + } } - public static long extractUpperDigits(long number, int digitCount) { - // 10の累乗を計算 - long divisor = (long) Math.pow(10, String.valueOf(number).length() - digitCount); -// System.out.println(divisor); -// System.out.println(number / divisor); - return number / divisor; // 上位の桁を抽出 - } +// public static long extractUpperDigits(long number, int digitCount) { +// // 10の累乗を計算 +// long divisor = (long) Math.pow(10, String.valueOf(number).length() - digitCount); +// return number / divisor; // 上位の桁を抽出 +// } @Override public int getItemCount() { diff --git a/app/src/main/res/layout/fragment_account_color_dialog.xml b/app/src/main/res/layout/fragment_account_color_dialog.xml new file mode 100644 index 0000000..c797edb --- /dev/null +++ b/app/src/main/res/layout/fragment_account_color_dialog.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file