From 23668c50e6b0fc54f2c0e323907bfcaa59438504 Mon Sep 17 00:00:00 2001 From: nero Date: Tue, 16 Jan 2024 11:10:35 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E6=9B=B8?= =?UTF-8?q?=E3=81=8D=E6=8F=9B=E3=81=88=E3=81=8C=E3=81=AA=E3=81=8B=E3=81=AA?= =?UTF-8?q?=E3=81=8B=E3=81=86=E3=81=BE=E3=81=8F=E3=81=84=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../library/LibraryFolderFragment.java | 14 +++--- .../feature/library/LibraryTopFragment.java | 44 +++++++++++++------ .../lacerta/feature/library/LibraryUtils.java | 2 +- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryFolderFragment.java b/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryFolderFragment.java index 731dcfe3..0cad384f 100644 --- a/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryFolderFragment.java +++ b/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryFolderFragment.java @@ -7,28 +7,32 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import one.nem.lacerta.model.document.DocumentMeta; +import one.nem.lacerta.model.ListItem; //フォルダ管理機能 public class LibraryFolderFragment extends Fragment { - private Map> folderMap; + private Map> folderMap; public LibraryFolderFragment() { folderMap = new HashMap<>(); } - public void addDocumentToFolder(String folderName, DocumentMeta documentMeta) { + public void addDocumentToFolder(String folderName, ListItem documentMeta) { if (!folderMap.containsKey(folderName)) { folderMap.put(folderName, new ArrayList<>()); } - List documents = folderMap.get(folderName); + List documents = folderMap.get(folderName); documents.add(documentMeta); } //フォルダに関連するドキュメントを取得するためのメソッド - public List getDocumentsInFolder(String folderName) { + public List getDocumentsInFolder(String folderName) { return folderMap.getOrDefault(folderName, new ArrayList<>()); } + + public List getDocumentInFolder(String default_folder) { + return null; + } } diff --git a/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryTopFragment.java b/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryTopFragment.java index 65171c2d..3a3aad3b 100644 --- a/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryTopFragment.java +++ b/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryTopFragment.java @@ -104,26 +104,42 @@ public class LibraryTopFragment extends Fragment { LinearLayoutManager layoutManager = new LinearLayoutManager(getContext()); documentRecyclerView.setLayoutManager(layoutManager); - // ドキュメントのメタデータを取得 - List metas = document.getAllDocumentMetas(100); + try { + // ドキュメントのメタデータを取得 + List metas = (List) LacertaLibrary.getLibraryPage(100); - // ドキュメントをデフォルトフォルダに追加 - // フォルダごとにドキュメントを管理する - for (DocumentMeta meta : metas) { - folderManager.addDocumentToFolder("Default Folder", meta); - } - // 特定のフォルダのドキュメントを取得 - List folderDocuments = folderManager.getDocumentsInFolder("Default Folder"); + if (metas != null) { + // ドキュメントのメタデータが取得できた場合の処理 + LibraryItemPage libraryItemPage = new LibraryItemPage("Page Title", "Page ID", convertToLibraryItems(metas)); - // トーストメッセージでドキュメントの数を表示 - Toast.makeText(getContext(), "ドキュメント数: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show(); + + // ドキュメントをデフォルトフォルダに追加 + // フォルダごとにドキュメントを管理する + for (ListItem meta : metas) { + folderManager.addDocumentToFolder("Default Folder", meta); + } + + + // 特定のフォルダのドキュメントを取得 + List folderDocuments = folderManager.getDocumentInFolder("Default Folder"); + + // トーストメッセージでドキュメントの数を表示 + Toast.makeText(getContext(), "ドキュメント数: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show(); //LibraryItemPageを使用してadapterを設定 - LibraryItemPage libraryItemPage = new LibraryItemPage("Page Title", "Page ID", convertToLibraryItems(metas)); - DocumentAdapter adapter = new DocumentAdapter(libraryItemPage.getListItems()); - documentRecyclerView.setAdapter(adapter); + DocumentAdapter adapter = new DocumentAdapter(libraryItemPage.getListItems()); + documentRecyclerView.setAdapter(adapter); + } else { + // ドキュメントのメタデータが null の場合の処理 + Toast.makeText(getContext(), "ドキュメントメタデータが取得できませんでした", Toast.LENGTH_LONG).show(); + } + + } catch (Exception e) { + // 例外処理 + e.printStackTrace(); + } // Use a LinearLayoutManager to specify the layout return view; } diff --git a/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryUtils.java b/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryUtils.java index 0219470b..70ae0cc6 100644 --- a/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryUtils.java +++ b/feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryUtils.java @@ -8,7 +8,7 @@ import one.nem.lacerta.model.document.DocumentMeta; //ListItemとTopを結びつけるためのクラス public class LibraryUtils { - public static ArrayList convertToLibraryItems(List metas) { + public static ArrayList convertToLibraryItems(List metas) { ArrayList libraryItems = new ArrayList<>(); for (DocumentMeta meta : metas) { ListItem listItem = new ListItem();