diff --git a/app/src/main/java/com/example/citrusclient/views/MainActivity.java b/app/src/main/java/com/example/citrusclient/views/MainActivity.java index 6c696b0..02b7179 100644 --- a/app/src/main/java/com/example/citrusclient/views/MainActivity.java +++ b/app/src/main/java/com/example/citrusclient/views/MainActivity.java @@ -50,9 +50,9 @@ if(itemId == R.id.book){// 本棚 showFragment(new MyBookshelfFragment()); } else if(itemId == R.id.search){//検索 - showFragment(new CreateBookFragment()); - } else if(itemId == R.id.home){//ホーム + } else if(itemId == R.id.home){//ホーム + showFragment(new HomeFragment()); }else if(itemId == R.id.calendar){ //カレンダ }else if(itemId == R.id.face){//マイページ diff --git a/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java b/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java index 5bbb9ca..3ebfb26 100644 --- a/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java @@ -1,5 +1,7 @@ package com.example.citrusclient.views; +import android.app.Activity; +import android.content.Context; import android.graphics.Color; import android.media.Image; import android.os.Bundle; @@ -28,6 +30,7 @@ import com.google.android.material.snackbar.Snackbar; import java.util.ArrayList; +import java.util.Calendar; import java.util.HashMap; import java.util.List; @@ -114,7 +117,7 @@ RecyclerView.LayoutManager layoutManager = new GridLayoutManager(view.getContext(), 2); //new LinearLayoutManager(view.getContext()); recyclerView.setLayoutManager(layoutManager); - MyBookshelfAdapter bookAdapter = new MyBookshelfAdapter(bookList); + MyBookshelfAdapter bookAdapter = new MyBookshelfAdapter(bookList, getActivity()); recyclerView.setAdapter(bookAdapter); FloatingActionButton addButton = view.findViewById(R.id.book_add_button); @@ -140,9 +143,11 @@ class MyBookshelfAdapter extends RecyclerView.Adapter{ private List bookList; + private Context context; - MyBookshelfAdapter(List book){ + MyBookshelfAdapter(List book, Context context){ this.bookList = book; + this.context = context; } public void setBooks(List books){ @@ -166,6 +171,16 @@ int blue = Integer.parseInt(bookData.getColor().substring(5, 7), 16); holder.bookButton.setBackgroundColor(Color.rgb(red, green, blue)); holder.bookButton.setTextColor(Color.rgb(255 - red, 255 - green, 255 - blue)); + holder.bookButton.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)); + ((MainActivity) activity).showFragment(new HomeFragment()); + + }); } @Override