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 6b72b78..ae0198f 100644
--- a/app/src/main/java/com/example/citrusclient/views/MyAdapter.java
+++ b/app/src/main/java/com/example/citrusclient/views/MyAdapter.java
@@ -17,6 +17,9 @@
 import com.example.citrusclient.viewmodels.FavoritesViewModel;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 
 import androidx.annotation.NonNull;
@@ -27,6 +30,7 @@
 public class MyAdapter extends RecyclerView.Adapter<MyAdapter.ViewHolder> {
     private List<Book> originalList; // 元のデータリスト
     private List<Book> filteredList; // フィルタリングされたリスト
+    private HashMap<String, HashSet<Integer>> favoritesMap = new HashMap<>();
 
 
     public MyAdapter(List<Book> originalList) {
@@ -46,6 +50,9 @@
         Book currentBook = filteredList.get(position);
         holder.bind(currentBook); // bindメソッドで設定
         Context context = holder.itemView.getContext();
+        Activity activity = (Activity) context;
+        Citrus citrus = (Citrus) activity.getApplication();
+        FavoritesViewModel favoritesViewModel = new ViewModelProvider((FragmentActivity)context).get(FavoritesViewModel.class);
 
         // 背景色の設定
         int red, green, blue;
@@ -59,16 +66,28 @@
         holder.titleTextView.setBackgroundColor(Color.rgb(red, green, blue));
         holder.titleTextView.setTextColor(Color.rgb(255 - red, 255 - green, 255 - blue));
         holder.titleTextView.setOnClickListener(v -> {
-            Activity activity = (Activity) context;
-            Citrus citrus = (Citrus) activity.getApplication();
             citrus.setCurLookingAccountId(currentBook.getAccountId());
             citrus.setCurLookingBookId(currentBook.getBookId());
+            Calendar calendar = Calendar.getInstance();
+            citrus.setCurYear(calendar.get(Calendar.YEAR));
+            citrus.setCurMonth(calendar.get(Calendar.MONTH) + 1);
+            citrus.setCurDay(calendar.get(Calendar.DATE));
             ((MainActivity) activity).showFragment(new OtherHomeFragment());
         });
+//        if (favoritesMap != null && favoritesMap.containsKey(currentBook.getAccountId())) {
+//            if (favoritesMap.get(currentBook.getAccountId()).contains(currentBook.getBookId())) {
+//                holder.LikeTextView.setImageResource(R.drawable.baseline_favorite_24);
+//                holder.LikeTextView.setTag("liked");
+//            } else {
+//                holder.LikeTextView.setImageResource(R.drawable.baseline_favorite_border_24);
+//                holder.LikeTextView.setTag("unliked");
+//            }
+//        } else {
+//            holder.LikeTextView.setImageResource(R.drawable.baseline_favorite_border_24);
+//            holder.LikeTextView.setTag("unliked");
+//        }
+
         holder.LikeTextView.setOnClickListener(view -> {
-            Activity activity = (Activity) context;
-            Citrus citrus = (Citrus) activity.getApplication();
-            FavoritesViewModel favoritesViewModel = new ViewModelProvider((FragmentActivity)context).get(FavoritesViewModel.class);
             System.out.println(holder.LikeTextView.getTag());
             if(holder.LikeTextView.getTag().equals("unliked")){
                 System.out.println(citrus.getAccountId()+"が"+currentBook.getAccountId()+"の"+currentBook.getBookId()+"を登録しました");
@@ -115,6 +134,10 @@
         }
         notifyDataSetChanged();
     }
+    public void updateFavorites(HashMap<String, HashSet<Integer>> newFavorites){
+        this.favoritesMap = newFavorites;
+        notifyDataSetChanged();
+    }
 
     static class ViewHolder extends RecyclerView.ViewHolder {
         TextView titleTextView;
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 556f4c7..35095a3 100644
--- a/app/src/main/java/com/example/citrusclient/views/SearchFragment.java
+++ b/app/src/main/java/com/example/citrusclient/views/SearchFragment.java
@@ -1,11 +1,13 @@
 package com.example.citrusclient.views;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -20,13 +22,15 @@
 import android.widget.SearchView;
 import android.widget.Spinner;
 
+import com.example.citrusclient.Citrus;
 import com.example.citrusclient.R;
+import com.example.citrusclient.models.Book;
 import com.example.citrusclient.viewmodels.PublicBooksViewModel;
 import com.example.citrusclient.viewmodels.FavoritesViewModel;
 
 import java.util.ArrayList;
-
-
+import java.util.HashMap;
+import java.util.HashSet;
 
 
 /**
@@ -111,6 +115,7 @@
     @SuppressLint("WrongViewCast")
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         adapter = new MyAdapter(new ArrayList<>());
+        Citrus citrus = (Citrus)(getActivity().getApplication());
         RecyclerView recyclerView = view.findViewById(R.id.public_list);
         recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
         recyclerView.setAdapter(adapter);
@@ -147,9 +152,20 @@
                 adapter.setBooks(new ArrayList<>(books)); // アダプターに新しいリストを渡す
             }
         });
+//        favoritesViewModel.getFavoritesBooksLiveData().observe(getViewLifecycleOwner(), new Observer<HashMap<String, HashSet<Integer>>>() {
+//            @Override
+//            public void onChanged(HashMap<String, HashSet<Integer>> stringHashSetHashMap) {
+//                if (stringHashSetHashMap != null) {
+//                    adapter.updateFavorites(stringHashSetHashMap);
+//                } else {
+//                    adapter.updateFavorites(new HashMap<>());
+//                }
+//            }
+//        });
 
         // Booksを読み込む
         publicBooksViewModel.loadAllBooks();
+//        favoritesViewModel.loadFavoritesBooks(citrus.getAccountId(), citrus.getToken());
 
         // SearchViewの設定
         SearchView searchView = view.findViewById(R.id.search_word);
@@ -181,7 +197,7 @@
             title = parts.length > 0 ? parts[0] : ""; // 最初の部分をtitleに
             accountId = parts.length > 1 ? parts[1] : ""; // 2番目の部分をaccountIdに
         }
-        if(sortBy != null) sortBy = sort;//ソートはまだ
+        if(sort != null) sortBy = sort;//ソートはまだ
         Log.d(TAG, "Search query: " + title + accountId);
 
         if(title != ""|| accountId != ""){