Merge branch 'develop' into component/viewer/1

This commit is contained in:
r-ca committed 2024-01-21 15:04:37 +09:00
commit 0accd4fa79
11 files changed
+455 -327

No files matched your search

@@ -57,7 +57,8 @@ public class DebugMenuLibraryItemListPageFragment extends Fragment {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false);
ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(10);
// ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(10);
ArrayList<ListItem> listItems = new ArrayList<>();
for (ListItem listItem : listItems) {
System.out.println(listItem.getTitle());
}
@@ -23,6 +23,7 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
@@ -67,18 +68,6 @@ public class HomeTopFragment extends Fragment {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_home_top, container, false);
ArrayList<ListItem> recentDocument = lacertaLibrary.getRecentDocument(10);
Log.d("docs", Integer.toString(recentDocument.size()));
RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
ListItemAdapter listItemAdapter = new ListItemAdapter(recentDocument);
recyclerView.setAdapter(listItemAdapter);
return view;
}
@@ -86,6 +75,20 @@ public class HomeTopFragment extends Fragment {
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
ListItemAdapter listItemAdapter = new ListItemAdapter();
recyclerView.setAdapter(listItemAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
listItemAdapter.setListItems(listItems);
getActivity().runOnUiThread(() -> {
listItemAdapter.notifyItemRangeInserted(0, listItems.size());
});
});
CollapsingToolbarLayout collapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar);
Toolbar toolbar = view.findViewById(R.id.toolbar);
@@ -23,6 +23,14 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
this.listItems = listItems;
}
public ListItemAdapter() {
this.listItems = new ArrayList<>();
}
public void setListItems(ArrayList<ListItem> listItems) {
this.listItems = listItems;
}
@NonNull
@Override
public ListItemAdapter.ListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {