diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5021834..3caa385 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,10 +32,6 @@ - - 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 a8247cb..6c696b0 100644 --- a/app/src/main/java/com/example/citrusclient/views/MainActivity.java +++ b/app/src/main/java/com/example/citrusclient/views/MainActivity.java @@ -28,11 +28,13 @@ return insets; }); + showFragment(new MyBookshelfFragment()); + setNavViewEvent(); } - private void showFragment(Fragment fragment){ + public void showFragment(Fragment fragment){ getSupportFragmentManager().beginTransaction() .replace(R.id.fragment_container, fragment) .addToBackStack(null) diff --git a/app/src/main/java/com/example/citrusclient/views/MyBookshelfAdapter.java b/app/src/main/java/com/example/citrusclient/views/MyBookshelfAdapter.java deleted file mode 100644 index 145a274..0000000 --- a/app/src/main/java/com/example/citrusclient/views/MyBookshelfAdapter.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.example.citrusclient.views; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.example.citrusclient.R; - -import java.util.List; - -public class MyBookshelfAdapter extends RecyclerView.Adapter{ - - private List bookList; - - MyBookshelfAdapter(List book){ - this.bookList = book; - } - - @NonNull - @Override - public MyBookViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.a_book, parent, false); - return new MyBookViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull MyBookViewHolder holder, int position) { - MyBookshelfFragment.RowBook bookData = this.bookList.get(position); - holder.bookButton.setText(bookData.hogeTitle); - holder.bookButton.setBackgroundColor(bookData.color); - } - - @Override - public int getItemCount() { - return bookList.size(); - } - - static class MyBookViewHolder extends RecyclerView.ViewHolder{ - Button bookButton; - public MyBookViewHolder(@NonNull View itemView) { - super(itemView); - bookButton = itemView.findViewById(R.id.book_button); - } - } - -} 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 1875d4c..51865a1 100644 --- a/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java @@ -15,9 +15,12 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.GridLayout; +import com.example.citrusclient.Citrus; import com.example.citrusclient.R; +import com.example.citrusclient.viewmodels.BooksViewModel; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; @@ -89,6 +92,13 @@ bookList = createBooks(); + Citrus citrus = (Citrus)(getActivity().getApplication()); + String token = citrus.getToken(); + String accountId = citrus.getAccountId(); + + BooksViewModel booksViewModel = new BooksViewModel(); + + RecyclerView recyclerView = view.findViewById(R.id.my_books_list); recyclerView.setHasFixedSize(true); RecyclerView.LayoutManager layoutManager = new GridLayoutManager(view.getContext(), 2); @@ -123,4 +133,41 @@ int color; } -} \ No newline at end of file +} + +class MyBookshelfAdapter extends RecyclerView.Adapter{ + + private List bookList; + + MyBookshelfAdapter(List book){ + this.bookList = book; + } + + @NonNull + @Override + public MyBookViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.a_book, parent, false); + return new MyBookViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull MyBookViewHolder holder, int position) { + MyBookshelfFragment.RowBook bookData = this.bookList.get(position); + holder.bookButton.setText(bookData.hogeTitle); + holder.bookButton.setBackgroundColor(bookData.color); + } + + @Override + public int getItemCount() { + return bookList.size(); + } + + static class MyBookViewHolder extends RecyclerView.ViewHolder{ + Button bookButton; + public MyBookViewHolder(@NonNull View itemView) { + super(itemView); + bookButton = itemView.findViewById(R.id.book_button); + } + } + +} diff --git a/app/src/main/res/layout/a_book.xml b/app/src/main/res/layout/a_book.xml index b0f7823..5bd8707 100644 --- a/app/src/main/res/layout/a_book.xml +++ b/app/src/main/res/layout/a_book.xml @@ -14,5 +14,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" + app:cornerRadius="25dp" app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file