diff --git a/app/src/main/java/com/example/citrusclient/Citrus.java b/app/src/main/java/com/example/citrusclient/Citrus.java
index e5b600f..07637ce 100644
--- a/app/src/main/java/com/example/citrusclient/Citrus.java
+++ b/app/src/main/java/com/example/citrusclient/Citrus.java
@@ -11,6 +11,8 @@
     private Integer curYear;
     private Integer curMonth;
     private Integer curDay;
+    private String curLookingAccountId;
+    private Integer curLookingBookId;
     //getter
     public String getToken(){
         return token;
@@ -22,6 +24,8 @@
     public Integer getCurYear() {return curYear;}
     public Integer getCurMonth(){return curMonth;}
     public Integer getCurDay(){return curDay;}
+    public String getCurLookingAccountId(){return curLookingAccountId;}
+    public Integer getCurLookingBookId(){return curLookingBookId;}
 
     //setter
     public void setToken(String token){
@@ -34,4 +38,6 @@
     public void setCurYear(Integer curYear){this.curYear = curYear;}
     public void setCurMonth(Integer curMonth){this.curMonth = curMonth;}
     public void setCurDay(Integer curDay){this.curDay = curDay;}
+    public void setCurLookingAccountId(String curLookingAccountId){this.curLookingAccountId = curLookingAccountId;}
+    public void setCurLookingBookId(Integer curLookingBookId){this.curLookingBookId = curLookingBookId;}
 }
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 7ce0a8c..11adefe 100644
--- a/app/src/main/java/com/example/citrusclient/views/HomeFragment.java
+++ b/app/src/main/java/com/example/citrusclient/views/HomeFragment.java
@@ -346,7 +346,9 @@
 
         holder.todoButton.setOnClickListener(v -> {
             Activity activity = (Activity) context;
-            ((MainActivity) activity).showFragment(new CreateTodoFragment(todoData));
+            ((MainActivity) activity).showFragment(new CreateTodoFragment(todoData, book));
+            notifyDataSetChanged();
+
         });
 
         holder.todoCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
@@ -430,7 +432,6 @@
         Schedule scheduleData = this.scheduleList.get(position);
         holder.scheduleButton.setText(scheduleData.getTitle());
 //        holder.scheduleButton.setText(scheduleData.getTitle() + extractionTime(scheduleData.getStartTime()) + " ~ "  + extractionTime(scheduleData.getEndTime()));
-        System.out.println(scheduleData.getEndTime());
         Book book = idBookHashMap.get(scheduleData.getBookId());
         if(book != null) {
             red = Integer.parseInt(book.getColor().substring(1, 3), 16);
@@ -459,6 +460,7 @@
 
             // StringをLocalDateTimeに変換
             LocalDateTime dateTime = LocalDateTime.parse(scheduleTime, formatter);
+            System.out.println(dateTime);
 
             // 年、月、日、時、分を抽出
             int year = dateTime.getYear();
@@ -466,9 +468,9 @@
             int day = dateTime.getDayOfMonth();
             int hour = dateTime.getHour();
             int minute = dateTime.getMinute();
-
             // 必要に応じて整数を組み合わせる（例: YYYYMMDDHHMM）
-            int result = year * 1000000 + month * 10000 + day * 100 + hour * 10 + minute;
+            int result = year * 100000 + month * 1000000 + day * 10000 + hour * 100 + minute;
+            System.out.println(result);
 
             return result;
         } catch (DateTimeParseException e) {
@@ -481,6 +483,7 @@
         int time = convertTimeInteger(scheduleTime);
         int result = time % 10000;
         return result;
+
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 8bf0f35..0ce6a50 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,14 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/アイコンの色の設定"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   tools:context=".views.SettingsFragment">
 
   <!-- TODO: Update blank fragment layout -->
-  <TextView
+  <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:text="@string/hello_blank_fragment" />
+    android:layout_height="match_parent">
+    <TextView
+      android:id="@+id/IconColor"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="アイコンの色の選択"
+      android:textColor="@color/black"
+      tools:layout_editor_absoluteX="142dp"
+      tools:layout_editor_absoluteY="202dp" />
+    <TextView
+      android:id="@+id/IdChange"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="ユーザーネーム変更"
+      android:textColor="@color/black"
+      tools:layout_editor_absoluteX="142dp"
+      tools:layout_editor_absoluteY="311dp" />
+    <TextView
+      android:id="@+id/NowPassword1"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="現在のパスワード"
+      android:textColor="@color/black"
+      tools:layout_editor_absoluteX="43dp"
+      tools:layout_editor_absoluteY="355dp" />
+    <EditText
+      android:id="@+id/EnterNowPassword"
+      android:layout_width="130dp"
+      android:layout_height="38dp"
+      android:ems="10"
+      android:inputType="text"
+      android:text="nowpassword"
+      android:textColor="#80000000"
+      android:textSize="15sp"
+      tools:layout_editor_absoluteX="196dp"
+      tools:layout_editor_absoluteY="346dp" />
+    <TextView
+      android:id="@+id/NewUsername"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="新しいユーザーネーム"
+      android:textColor="@color/black"
+      tools:layout_editor_absoluteX="43dp"
+      tools:layout_editor_absoluteY="386dp" />
+    <EditText
+      android:id="@+id/EnterNewUsename"
+      android:layout_width="130dp"
+      android:layout_height="41dp"
+      android:ems="10"
+      android:inputType="text"
+      android:text="newusername"
+      android:textColor="#80000000"
+      android:textSize="15sp"
+      tools:layout_editor_absoluteX="196dp"
+      tools:layout_editor_absoluteY="376dp" />
+    <TextView
+      android:id="@+id/PasswordChange"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="パスワード変更"
+      android:textColor="@color/black"
+      tools:layout_editor_absoluteX="156dp"
+      tools:layout_editor_absoluteY="434dp" />
+    <TextView
+      android:id="@+id/NowPassword2"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="現在のパスワード"
+      android:textColor="@color/black"
+      tools:layout_editor_absoluteX="43dp"
+      tools:layout_editor_absoluteY="470dp" />
+    <TextView
+      android:id="@+id/NewPassword"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="新しいパスワード"
+      android:textColor="@color/black"
+      tools:layout_editor_absoluteX="43dp"
+      tools:layout_editor_absoluteY="500dp" />
+    <EditText
+      android:id="@+id/EnterNowPassword2"
+      android:layout_width="130dp"
+      android:layout_height="wrap_content"
+      android:ems="10"
+      android:inputType="text"
+      android:text="nowpassword"
+      android:textColor="#80000000"
+      android:textSize="15sp"
+      tools:layout_editor_absoluteX="196dp"
+      tools:layout_editor_absoluteY="455dp" />
+    <EditText
+      android:id="@+id/EnterNewPassword"
+      android:layout_width="130dp"
+      android:layout_height="wrap_content"
+      android:ems="10"
+      android:inputType="text"
+      android:text="newpassword"
+      android:textColor="#80000000"
+      android:textSize="15sp"
+      tools:layout_editor_absoluteX="196dp"
+      tools:layout_editor_absoluteY="491dp" />
+    <TextView
+      android:id="@+id/FavoritePosts"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="いいねした投稿"
+      android:textColor="@color/black"
+      tools:layout_editor_absoluteX="156dp"
+      tools:layout_editor_absoluteY="550dp" />
+    <Button
+      android:id="@+id/button"
+      android:layout_width="50dp"
+      android:layout_height="35dp"
+      android:backgroundTint="#D8DADA"
+      android:text="更新"
+      android:textColor="@color/black"
+      android:textSize="8sp"
+      tools:layout_editor_absoluteX="334dp"
+      tools:layout_editor_absoluteY="372dp" />
+    <Button
+      android:id="@+id/button2"
+      android:layout_width="50dp"
+      android:layout_height="35dp"
+      android:backgroundTint="#D8DADA"
+      android:text="更新"
+      android:textColor="@color/black"
+      android:textSize="8sp"
+      tools:layout_editor_absoluteX="334dp"
+      tools:layout_editor_absoluteY="486dp" />
+    <TextView
+      android:id="@+id/Like"
+      android:layout_width="50dp"
+      android:layout_height="50dp"
+      android:text="💗"
+      android:textSize="40sp"
+      tools:layout_editor_absoluteX="142dp"
+      tools:layout_editor_absoluteY="239dp" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
 
 </FrameLayout>
\ No newline at end of file