diff --git a/app/src/main/java/com/example/citrusclient/views/MyAdapter.java b/app/src/main/java/com/example/citrusclient/views/MyAdapter.java
index 26dee74..6c00b37 100644
--- a/app/src/main/java/com/example/citrusclient/views/MyAdapter.java
+++ b/app/src/main/java/com/example/citrusclient/views/MyAdapter.java
@@ -83,6 +83,9 @@
 
 package com.example.citrusclient.views;
 
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -91,16 +94,22 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.example.citrusclient.Citrus;
 import com.example.citrusclient.R;
 import com.example.citrusclient.models.Book;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 public class MyAdapter extends RecyclerView.Adapter<MyAdapter.ViewHolder> {
     private List<Book> originalList; // 元のデータリスト
     private List<Book> filteredList; // フィルタリングされたリスト
 
+//    private List<Book> publicList;
+//    private List accountIdList;
+//    private Context context;
+
     public MyAdapter(List<Book> originalList) {
         this.originalList = originalList;
         this.filteredList = new ArrayList<>(originalList);
@@ -117,6 +126,39 @@
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         Book currentBook = filteredList.get(position);
         holder.bind(currentBook);
+
+        holder.authorTextView.setText(filteredList.get(position).getAccountId());
+        holder.authorTextView.setHeight(30);
+        holder.authorTextView.setWidth(100);
+
+        Book publicData = this.filteredList.get(position);
+        holder.titleTextView.setText(publicData.getTitle());
+
+        int red, green, blue;
+        if (publicData.getColor() == null || publicData.getColor().length() < 7) {
+            red = 255;
+            green = 255;
+            blue = 255;
+        } else {
+            red = Integer.parseInt(publicData.getColor().substring(1, 3), 16);
+            green = Integer.parseInt(publicData.getColor().substring(3, 5), 16);
+            blue = Integer.parseInt(publicData.getColor().substring(5, 7), 16);
+            System.out.println("redColor is "+red);
+        }
+
+        holder.titleTextView.setBackgroundColor(Color.rgb(red, green, blue));
+
+        holder.titleTextView.setTextColor(Color.rgb(255 - red, 255 - green, 255 - blue));
+//        holder.titleTextView.setOnClickListener(v -> {
+//            Calendar c = Calendar.getInstance();
+//            Activity activity = (Activity) context;
+//            Citrus citrus = (Citrus) activity.getApplication();
+//            citrus.setCurYear(c.get(Calendar.YEAR));
+//            citrus.setCurMonth(c.get(Calendar.MONTH) + 1);
+//            citrus.setCurDay(c.get(Calendar.DATE));
+//            citrus.setCurBookId(publicData.getBookId());
+//            ((MainActivity) activity).showFragment(new HomeFragment());
+//        });
     }
 
     @Override
diff --git a/app/src/main/java/com/example/citrusclient/views/SearchFragment.java b/app/src/main/java/com/example/citrusclient/views/SearchFragment.java
index 4747d5b..a6e5e07 100644
--- a/app/src/main/java/com/example/citrusclient/views/SearchFragment.java
+++ b/app/src/main/java/com/example/citrusclient/views/SearchFragment.java
@@ -62,7 +62,7 @@
     private SearchView searchView;
     private String searchWord;
 
-    private int sortBy = 0;
+    private Integer sortBy = 0;
 
     EditText editText;
 
@@ -189,7 +189,7 @@
             public boolean onQueryTextChange(String newText) {
                 //adapter.filter(newText); // フィルタリングを実行
                 loadSearchResults(newText);
-                System.out.println("aho");
+                System.out.println("ahe");
                 return true;
             }
         });
@@ -204,14 +204,19 @@
         //if(sortBy != null) sortBy = sort;//ソートはまだ
         Log.d(TAG, "Search query: " + title + accountId);
 
-        if(title != null){
-            if(accountId != null){
+        if(title != null) {
+            if (accountId != null) {
                 publicBooksViewModel.loadSearchBooks(title, accountId, sortBy);//title,accountidでの検索
-            }else publicBooksViewModel.loadSearchTitleBooks(title, sortBy);//titleのみの検索
-            if(accountId != null){
+            }/* else {
+                publicBooksViewModel.loadSearchTitleBooks(title, sortBy);//titleのみの検索
+            }
+            if (accountId != null) {
                 publicBooksViewModel.loadSearchAccountIdBooks(accountId, sortBy);//accountidでの検索
-            }else publicBooksViewModel.loadAllBooks();
+            } */else {
+                publicBooksViewModel.loadAllBooks();
+            }
             // titleとaccountIdを使って検索
+        }
     }
 }
 
@@ -246,14 +251,9 @@
             holder.idText.setWidth(100);
             Book publicData = this.publicList.get(position);
             holder.publicButton.setText(publicData.getTitle());
-            int red;
-            int green;
-            int blue;
-            if (publicData.getColor() == null) {
-                red = 255;
-                green = 255;
-                blue = 255;
-            } else if (publicData.getColor().length() < 7) {
+
+            int red, green, blue;
+            if (publicData.getColor() == null || publicData.getColor().length() < 7) {
                 red = 255;
                 green = 255;
                 blue = 255;
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 755584c..a636b07 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -24,6 +24,37 @@
         android:layout_height="80dp"
         android:layout_marginTop="60dp" />
 
+    <RadioGroup
+        android:id="@+id/SelectButton"
+        android:layout_width="wrap_content"
+        android:layout_height="80dp"
+        android:layout_marginLeft="300dp"
+        android:layout_marginTop="60dp"
+        android:orientation="vertical">
+
+        <RadioButton
+            android:id="@+id/rbTodo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="todo" />
+
+        <RadioButton
+            android:id="@+id/rbSchedule"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:checked="true"
+            android:text="schedule" />
+
+        <RadioButton
+            android:id="@+id/rbBoth"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="todoANDschedule" />
+    </RadioGroup>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/public_list"
         android:layout_width="match_parent"