From bc20c92d44c9077ab35d9dc9a7619afca31b1cf8 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:02:49 +0900 Subject: [PATCH 01/38] =?UTF-8?q?DocumentPath=E3=82=92=E5=BB=83=E6=AD=A2,?= =?UTF-8?q?=20=E4=BD=9C=E8=80=85=E6=83=85=E5=A0=B1=E3=82=92Meta=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E5=8B=95WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/document/DocumentDetail.java | 44 +------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java index 13559491..eda4c484 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java @@ -18,16 +18,6 @@ public class DocumentDetail { */ DocumentMeta meta; - /** - * ドキュメントのパス(DocumentPathインスタンス) - */ - DocumentPath path; - - /** - * ドキュメントの作者(String) - */ - String author; - /** * ドキュメントのデフォルトブランチ(String) */ @@ -39,10 +29,8 @@ public class DocumentDetail { public DocumentDetail() { } - public DocumentDetail(DocumentMeta meta, DocumentPath path, String author, String defaultBranch) { + public DocumentDetail(DocumentMeta meta, String defaultBranch) { this.meta = meta; - this.path = path; - this.author = author; this.defaultBranch = defaultBranch; } @@ -55,20 +43,6 @@ public class DocumentDetail { return meta; } - /** - * ドキュメントのパス(DocumentPathインスタンス)を取得する - */ - public DocumentPath getPath() { - return path; - } - - /** - * ドキュメントの作者(String)を取得する - */ - public String getAuthor() { - return author; - } - /** * ドキュメントのデフォルトブランチ(String)を取得する */ @@ -94,22 +68,6 @@ public class DocumentDetail { this.meta = meta; } - /** - * ドキュメントのパス(DocumentPathインスタンス)を設定する - * @param path DocumentPathインスタンス - */ - public void setPath(DocumentPath path) { - this.path = path; - } - - /** - * ドキュメントの作者(String)を設定する - * @param author ドキュメントの作者 - */ - public void setAuthor(String author) { - this.author = author; - } - /** * ドキュメントのデフォルトブランチ(String)を設定する * @param defaultBranch ドキュメントのデフォルトブランチ From d75ecff0e75a5adccabbd7483cb16b3d89ab7d1c Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:03:50 +0900 Subject: [PATCH 02/38] =?UTF-8?q?DefaultBranch=E3=82=92Meta=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E5=8B=95,=20Repository=E3=82=92=E5=BB=83=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/document/DocumentDetail.java | 40 +------------------ 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java index eda4c484..c28bcb61 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java @@ -18,20 +18,12 @@ public class DocumentDetail { */ DocumentMeta meta; - /** - * ドキュメントのデフォルトブランチ(String) - */ - String defaultBranch; - - Repository repository; - // Constructor public DocumentDetail() { } - public DocumentDetail(DocumentMeta meta, String defaultBranch) { + public DocumentDetail(DocumentMeta meta) { this.meta = meta; - this.defaultBranch = defaultBranch; } // Getter @@ -43,21 +35,6 @@ public class DocumentDetail { return meta; } - /** - * ドキュメントのデフォルトブランチ(String)を取得する - */ - public String getDefaultBranch() { - return defaultBranch; - } - - /** - * ドキュメントのリポジトリを取得する - */ - public Repository getRepository() { - return repository; - } - - // Setter /** @@ -68,19 +45,4 @@ public class DocumentDetail { this.meta = meta; } - /** - * ドキュメントのデフォルトブランチ(String)を設定する - * @param defaultBranch ドキュメントのデフォルトブランチ - */ - public void setDefaultBranch(String defaultBranch) { - this.defaultBranch = defaultBranch; - } - - /** - * ドキュメントのリポジトリを設定する - */ - public void setRepository(Repository repository) { - this.repository = repository; - } - } From 8f0f95d8af39f3d904b24e14e451d492b32a5dc6 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:04:55 +0900 Subject: [PATCH 03/38] =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/lacerta/model/document/DocumentMeta.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java index c191fcde..f41fc33e 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java @@ -1,6 +1,8 @@ package one.nem.lacerta.model.document; import java.util.ArrayList; + +import one.nem.lacerta.model.PublicPath; import one.nem.lacerta.model.document.tag.DocumentTag; import java.util.Date; import java.util.List; @@ -35,6 +37,12 @@ public class DocumentMeta { */ List tags; + PublicPath path; + + String author; + + String defaultBranch; + // Constructor public DocumentMeta() { } From b63e2dd86294d1650abf0473784bc90dae85c027 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:05:23 +0900 Subject: [PATCH 04/38] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=A9=E3=82=AF=E3=82=BF=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lacerta/model/document/DocumentMeta.java | 35 +++++-------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java index f41fc33e..6970b17f 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java @@ -44,41 +44,24 @@ public class DocumentMeta { String defaultBranch; // Constructor + public DocumentMeta() { } - public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List tags) { // With all - this.id = id; + public DocumentMeta(String title, List tags, String author, String defaultBranch) { + this.id = UUID.randomUUID().toString(); this.title = title; - this.updatedAt = updatedAt; - this.createdAt = createdAt; this.tags = tags; + this.author = author; + this.defaultBranch = defaultBranch; } - public DocumentMeta(String id, String title, Date updatedAt, Date createdAt) { // Without tags + public DocumentMeta(String id, String title, List tags, String author, String defaultBranch) { this.id = id; this.title = title; - this.updatedAt = updatedAt; - this.createdAt = createdAt; - this.tags = new ArrayList<>(); - } - - public DocumentMeta(String id, String title) { // Without tags, updatedAt, createdAt - this.id = id; - this.title = title; - // 現在時刻を設定 - this.updatedAt = new Date(); - this.createdAt = new Date(); - this.tags = new ArrayList<>(); - } - - public DocumentMeta(String title) { // title only - this.id = UUID.randomUUID().toString(); // 新規作成時想定なのでコンストラクタで生成してしまう(使う人が楽なので) - this.title = title; - // 現在時刻を設定 - this.updatedAt = new Date(); - this.createdAt = new Date(); - this.tags = new ArrayList<>(); + this.tags = tags; + this.author = author; + this.defaultBranch = defaultBranch; } // Getter From bf01610eb5efe88a85983397c2e2aa23ce6994cd Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:06:14 +0900 Subject: [PATCH 05/38] =?UTF-8?q?Getter=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lacerta/model/document/DocumentMeta.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java index 6970b17f..d00850b2 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java @@ -112,6 +112,27 @@ public class DocumentMeta { return tagIds; } + /** + * PublicPathを取得する + */ + public PublicPath getPath() { + return path; + } + + /** + * ドキュメントの作者(String)を取得する + */ + public String getAuthor() { + return author; + } + + /** + * ドキュメントのデフォルトブランチ(String)を取得する + */ + public String getDefaultBranch() { + return defaultBranch; + } + // Setter /** From 14fbb56dcdcd8137aea1d31585a7ab47362cef61 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:06:36 +0900 Subject: [PATCH 06/38] =?UTF-8?q?Setter=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/lacerta/model/document/DocumentMeta.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java index d00850b2..606e7044 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java @@ -175,6 +175,22 @@ public class DocumentMeta { this.tags = tags; } + /** + * PublicPathを設定する + * @param path PublicPath + */ + public void setPath(PublicPath path) { + this.path = path; + } + + /** + * ドキュメントの作者(String)を設定する + * @param author ドキュメントの作者 + */ + public void setAuthor(String author) { + this.author = author; + } + /** * updatedAtを現在時刻に設定する */ From ddd303fa883a59da6f2ad4785f291197db630f24 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:06:58 +0900 Subject: [PATCH 07/38] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=A9=E3=82=AF=E3=82=BF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lacerta/model/document/DocumentMeta.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java index 606e7044..bb176224 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java @@ -64,6 +64,27 @@ public class DocumentMeta { this.defaultBranch = defaultBranch; } + public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List tags, String author, String defaultBranch) { + this.id = id; + this.title = title; + this.updatedAt = updatedAt; + this.createdAt = createdAt; + this.tags = tags; + this.author = author; + this.defaultBranch = defaultBranch; + } + + public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List tags, PublicPath path, String author, String defaultBranch) { + this.id = id; + this.title = title; + this.updatedAt = updatedAt; + this.createdAt = createdAt; + this.tags = tags; + this.path = path; + this.author = author; + this.defaultBranch = defaultBranch; + } + // Getter /** From cbd7c103c5e09581cd69614be1537603a2fd40f9 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:07:48 +0900 Subject: [PATCH 08/38] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/one/nem/lacerta/model/document/DocumentMeta.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java index bb176224..5ef334cb 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java @@ -11,7 +11,7 @@ import java.util.UUID; /** * ドキュメントのメタデータ */ -public class DocumentMeta { +public class DocumentMeta { // TODO-rca: JavaDoc対応 /** * ドキュメントのID(String) */ From 885cd77d5beed5d518289c4c592b2d42e094f5b0 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:11:17 +0900 Subject: [PATCH 09/38] =?UTF-8?q?Page=E3=82=AA=E3=83=96=E3=82=B8=E3=82=A7?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/lacerta/model/document/page/Page.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 model/src/main/java/one/nem/lacerta/model/document/page/Page.java diff --git a/model/src/main/java/one/nem/lacerta/model/document/page/Page.java b/model/src/main/java/one/nem/lacerta/model/document/page/Page.java new file mode 100644 index 00000000..eca30d30 --- /dev/null +++ b/model/src/main/java/one/nem/lacerta/model/document/page/Page.java @@ -0,0 +1,33 @@ +package one.nem.lacerta.model.document.page; + +import android.graphics.Bitmap; + +public class Page { + + String fileName; + Bitmap bitmap; + + public Page() { + } + + public Page(String fileName, Bitmap bitmap) { + this.fileName = fileName; + this.bitmap = bitmap; + } + + public String getFileName() { + return fileName; + } + + public Bitmap getBitmap() { + return bitmap; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public void setBitmap(Bitmap bitmap) { + this.bitmap = bitmap; + } +} From 5e6fa45fed4eb426a89508bd55522d39623db4c0 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:11:43 +0900 Subject: [PATCH 10/38] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/one/nem/lacerta/model/document/page/Page.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/model/src/main/java/one/nem/lacerta/model/document/page/Page.java b/model/src/main/java/one/nem/lacerta/model/document/page/Page.java index eca30d30..97f65214 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/page/Page.java +++ b/model/src/main/java/one/nem/lacerta/model/document/page/Page.java @@ -7,6 +7,8 @@ public class Page { String fileName; Bitmap bitmap; + // Constructor + public Page() { } @@ -15,6 +17,8 @@ public class Page { this.bitmap = bitmap; } + // Getter + public String getFileName() { return fileName; } @@ -23,6 +27,8 @@ public class Page { return bitmap; } + // Setter + public void setFileName(String fileName) { this.fileName = fileName; } From 0d4f0686b72ab26ae1996ad087da36e3b762da1c Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:13:09 +0900 Subject: [PATCH 11/38] =?UTF-8?q?DocumentDetail=E3=81=ABPages=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/document/DocumentDetail.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java index c28bcb61..6108525d 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java @@ -3,11 +3,14 @@ package one.nem.lacerta.model.document; import org.eclipse.jgit.lib.Repository; import java.nio.file.Path; +import java.util.ArrayList; import java.util.Date; import one.nem.lacerta.model.document.path.DocumentPath; import one.nem.lacerta.model.document.DocumentMeta; +import one.nem.lacerta.model.document.page.Page; + /** * ドキュメントの詳細データ */ @@ -18,6 +21,11 @@ public class DocumentDetail { */ DocumentMeta meta; + /** + * ドキュメントのページ(Pageインスタンスのリスト) + */ + ArrayList pages; + // Constructor public DocumentDetail() { } @@ -26,6 +34,11 @@ public class DocumentDetail { this.meta = meta; } + public DocumentDetail(DocumentMeta meta, ArrayList pages) { + this.meta = meta; + this.pages = pages; + } + // Getter /** @@ -35,6 +48,13 @@ public class DocumentDetail { return meta; } + /** + * ドキュメントのページ(Pageインスタンスのリスト)を取得する + */ + public ArrayList getPages() { + return pages; + } + // Setter /** @@ -45,4 +65,12 @@ public class DocumentDetail { this.meta = meta; } + /** + * ドキュメントのページ(Pageインスタンスのリスト)を設定する + * @param pages Pageインスタンスのリスト + */ + public void setPages(ArrayList pages) { + this.pages = pages; + } + } From 9d793c3c0a2307194b1ea25fe0f957a2291df125 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:27:56 +0900 Subject: [PATCH 12/38] =?UTF-8?q?Document=E3=82=A4=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=95=E3=82=A7=E3=83=BC=E3=82=B9=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/lacerta/data/Document.java | 31 +++---------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/data/src/main/java/one/nem/lacerta/data/Document.java b/data/src/main/java/one/nem/lacerta/data/Document.java index 78293c85..145a5905 100644 --- a/data/src/main/java/one/nem/lacerta/data/Document.java +++ b/data/src/main/java/one/nem/lacerta/data/Document.java @@ -13,34 +13,13 @@ import one.nem.lacerta.model.document.tag.DocumentTag; */ public interface Document { - ArrayList getAllDocumentMetas(int limit); + DocumentDetail createDocument(DocumentMeta meta); - ArrayList getAllDocumentMetas(int limit, int offset); + DocumentDetail createDocument(); - /** - * 更新の新しいドキュメントから順に並べてlimit件取得する - * @param limit 取得する上限数 - */ - ArrayList getRecentDocumentMetas(int limit); + void deleteDocument(String documentId); - /** - * 更新の新しいドキュメントから順に並べてoffset位置からlimit件取得する - * @param limit 取得する上限数 - * @param offset 取得するオフセット - */ - ArrayList getRecentDocumentMetas(int limit, int offset); + void updateDocument(DocumentMeta meta, DocumentDetail detail); - /** - * ドキュメントIDからDocumentDetailを取得する - * @param id ドキュメントID - */ - DocumentDetail getDocumentDetail(String id); - - /** - * DocumentMetaからDocumentDetailを取得する - * @param meta DocumentMeta - */ - DocumentDetail getDocumentDetailByMeta(DocumentMeta meta); // 簡単に使えるように - - DocumentDetail createDocumentByMeta(DocumentMeta meta); + DocumentDetail getDocument(String documentId); } From bd5a041424982e20ad400b137f1c032dcf15a8fa Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:28:28 +0900 Subject: [PATCH 13/38] =?UTF-8?q?Impl=E7=94=9F=E6=88=90=E3=81=97=E7=9B=B4?= =?UTF-8?q?=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/lacerta/data/impl/DocumentImpl.java | 106 ++---------------- 1 file changed, 8 insertions(+), 98 deletions(-) diff --git a/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java b/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java index 0be30724..09a3dc13 100644 --- a/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java +++ b/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java @@ -22,120 +22,30 @@ import one.nem.lacerta.source.jgit.JGitRepository; import one.nem.lacerta.utils.repository.DeviceInfoUtils; -public class DocumentImpl implements Document{ - - private LacertaDatabase database; - - @Inject - public DocumentImpl(LacertaDatabase database) { - this.database = database; - } - - @Inject - JGitRepository jGitRepository; - - @Inject - DeviceInfoUtils deviceInfoUtils; +public class DocumentImpl implements Document { @Override - public ArrayList getAllDocumentMetas(int limit) { - ArrayList documentMetas = new ArrayList<>(); - List documentEntities = database.documentDao().getAllWithLimit(limit); - - for (DocumentEntity documentEntity : documentEntities) { - // タグ取得 - // TODO-rca: 切り出すべきかも？ - List tagEntities = database.tagDao().findByIds(documentEntity.tagIds); - ArrayList documentTags = new ArrayList<>(); - for (TagEntity tagEntity : tagEntities) { - documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color)); - } - - // 組み立て処理 - // 可読性が終わるのでコンストラクタはつかわないほうがいいかも？ - DocumentMeta documentMeta = new DocumentMeta(); - documentMeta.setId(documentEntity.id); - documentMeta.setTitle(documentEntity.title); - documentMeta.setCreatedAt(documentEntity.createdAt); - documentMeta.setUpdatedAt(documentEntity.updatedAt); - documentMeta.setTags(documentTags); - - documentMetas.add(documentMeta); - } - - return documentMetas; - } - - @Override - public ArrayList getAllDocumentMetas(int limit, int offset) { - return null; // TODO-rca: 実装する - } - - @Override - public ArrayList getRecentDocumentMetas(int limit) { -// ArrayList documentMetas = new ArrayList<>(); -// database.documentDao(). - // TODO-rca: 履歴取得するDao実装する + public DocumentDetail createDocument(DocumentMeta meta) { return null; } @Override - public ArrayList getRecentDocumentMetas(int limit, int offset) { + public DocumentDetail createDocument() { return null; } @Override - public DocumentDetail getDocumentDetail(String id) { - DocumentDetail documentDetail = new DocumentDetail(); - DocumentEntity documentEntity = database.documentDao().findById(id); + public void deleteDocument(String documentId) { - // タグ取得 - // TODO-rca: 切り出すべきかも？ - List tagEntities = database.tagDao().findByIds(documentEntity.tagIds); - ArrayList documentTags = new ArrayList<>(); - for (TagEntity tagEntity : tagEntities) { - documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color)); - } - - // パス取得 - // TODO-rca: 切り出すべきかも？ - LibraryEntity libraryEntity = database.libraryDao().findById(id); - DocumentPath documentPath = new DocumentPath(libraryEntity.rootPath, libraryEntity.path); - - // リポジトリ取得 - documentDetail.setRepository(jGitRepository.getRepository(id)); // TODO-rca: エラーハンドリング - - // 組み立て処理 - // 可読性が終わるのでコンストラクタはつかわないほうがいいかも？ - DocumentMeta documentMeta = new DocumentMeta(); - documentMeta.setId(documentEntity.id); - documentMeta.setTitle(documentEntity.title); - documentMeta.setCreatedAt(documentEntity.createdAt); - documentMeta.setUpdatedAt(documentEntity.updatedAt); - documentMeta.setTags(documentTags); - - documentDetail.setMeta(documentMeta); - documentDetail.setAuthor(documentEntity.author); - documentDetail.setPath(documentPath); - documentDetail.setDefaultBranch(documentEntity.defaultBranch); - - return documentDetail; } @Override - public DocumentDetail getDocumentDetailByMeta(DocumentMeta meta) { - return getDocumentDetail(meta.getId()); // TODO-rca: 効率悪いのでMetaはもらった物を使うようにする（処理を切り分ける？） + public void updateDocument(DocumentMeta meta, DocumentDetail detail) { + } @Override - public DocumentDetail createDocumentByMeta(DocumentMeta meta) { - DocumentDetail documentDetail = new DocumentDetail(); - - documentDetail.setMeta(meta); - documentDetail.setAuthor("author"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする or Gitの設定を参照するようにする - documentDetail.setPath(new DocumentPath(deviceInfoUtils.getExternalStorageDirectoryString(), meta.getId())); - documentDetail.setDefaultBranch("master"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする？ - - return documentDetail; + public DocumentDetail getDocument(String documentId) { + return null; } } From cd5a588545a2e32b611fc5a8346f7972798a8f91 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:34:41 +0900 Subject: [PATCH 14/38] =?UTF-8?q?XmlMetaModel=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/document/internal/XmlMetaModel.java | 49 +++---------------- 1 file changed, 8 insertions(+), 41 deletions(-) diff --git a/model/src/main/java/one/nem/lacerta/model/document/internal/XmlMetaModel.java b/model/src/main/java/one/nem/lacerta/model/document/internal/XmlMetaModel.java index a4dff2e2..55ae05d7 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/internal/XmlMetaModel.java +++ b/model/src/main/java/one/nem/lacerta/model/document/internal/XmlMetaModel.java @@ -4,12 +4,8 @@ import java.util.ArrayList; public class XmlMetaModel { - String title; - String author; - String description; -// Date created; -// Date updated; - String defaultBranch; + String revisionId; + ArrayList pages; // Constructor @@ -17,31 +13,15 @@ public class XmlMetaModel { public XmlMetaModel() { } - public XmlMetaModel(String title, String author, String description, String defaultBranch, ArrayList pages) { - this.title = title; - this.author = author; - this.description = description; - this.defaultBranch = defaultBranch; + public XmlMetaModel(String revisionId, ArrayList pages) { + this.revisionId = revisionId; this.pages = pages; } - // Getter - public String getTitle() { - return title; - } - - public String getAuthor() { - return author; - } - - public String getDescription() { - return description; - } - - public String getDefaultBranch() { - return defaultBranch; + public String getRevisionId() { + return revisionId; } public ArrayList getPages() { @@ -50,24 +30,11 @@ public class XmlMetaModel { // Setter - public void setTitle(String title) { - this.title = title; - } - - public void setAuthor(String author) { - this.author = author; - } - - public void setDescription(String description) { - this.description = description; - } - - public void setDefaultBranch(String defaultBranch) { - this.defaultBranch = defaultBranch; + public void setRevisionId(String revisionId) { + this.revisionId = revisionId; } public void setPages(ArrayList pages) { this.pages = pages; } - } From e5e1b3a2bb51f6062eaa488a6ea7aaaa31e638e0 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:35:22 +0900 Subject: [PATCH 15/38] =?UTF-8?q?=E3=83=91=E3=83=BC=E3=82=B5=E3=83=BC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/lacerta/utils/impl/XmlMetaParserImpl.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/utils/src/main/java/one/nem/lacerta/utils/impl/XmlMetaParserImpl.java b/utils/src/main/java/one/nem/lacerta/utils/impl/XmlMetaParserImpl.java index 7874a0b9..60263d68 100644 --- a/utils/src/main/java/one/nem/lacerta/utils/impl/XmlMetaParserImpl.java +++ b/utils/src/main/java/one/nem/lacerta/utils/impl/XmlMetaParserImpl.java @@ -32,10 +32,7 @@ public class XmlMetaParserImpl implements XmlMetaParser{ XmlMetaModel meta = new XmlMetaModel(); - meta.setTitle(rootElement.getElementsByTagName("title").item(0).getTextContent()); - meta.setAuthor(rootElement.getElementsByTagName("author").item(0).getTextContent()); - meta.setDescription(rootElement.getElementsByTagName("description").item(0).getTextContent()); - meta.setDefaultBranch(rootElement.getElementsByTagName("defaultBranch").item(0).getTextContent()); + meta.setRevisionId(rootElement.getElementsByTagName("revisionId").item(0).getTextContent()); ArrayList pages = new ArrayList<>(); for(int i = 0; i < rootElement.getElementsByTagName("pages").getLength(); i++) { @@ -64,10 +61,7 @@ public class XmlMetaParserImpl implements XmlMetaParser{ Element rootElement = document.createElement("meta"); - appendElement(document, rootElement, "title", meta.getTitle()); - appendElement(document, rootElement, "author", meta.getAuthor()); - appendElement(document, rootElement, "description", meta.getDescription()); - appendElement(document, rootElement, "defaultBranch", meta.getDefaultBranch()); + appendElement(document, rootElement, "revisionId", meta.getRevisionId()); Element pagesElement = document.createElement("pages"); for(XmlMetaPageModel page : meta.getPages()) { From aa7f285773e112c7a0a6f93f2c1acac9ad78e220 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:40:03 +0900 Subject: [PATCH 16/38] WIP --- .../nem/lacerta/data/impl/DocumentImpl.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java b/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java index 09a3dc13..9a1e0ff1 100644 --- a/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java +++ b/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java @@ -18,12 +18,37 @@ import one.nem.lacerta.source.database.entity.DocumentEntity; import one.nem.lacerta.source.database.entity.LibraryEntity; import one.nem.lacerta.source.database.entity.TagEntity; +import one.nem.lacerta.source.file.factory.FileManagerFactory; import one.nem.lacerta.source.jgit.JGitRepository; +import one.nem.lacerta.utils.LacertaLogger; +import one.nem.lacerta.utils.XmlMetaParser; import one.nem.lacerta.utils.repository.DeviceInfoUtils; public class DocumentImpl implements Document { + String TAG = getClass().getSimpleName(); + + @Inject + LacertaLogger logger; + + @Inject + LacertaDatabase database; + + + @Inject + public DocumentImpl() { + // Init + logger.debug(TAG, "called"); + } + + + // Internal methods + private DocumentDetail createDocumentDetail(DocumentEntity documentEntity) { + + return detail; + } + @Override public DocumentDetail createDocument(DocumentMeta meta) { return null; From eba02abfd4809b1bcc3afeb9d3643d50bfb71a09 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:45:48 +0900 Subject: [PATCH 17/38] =?UTF-8?q?DocumentProcessor=E6=9B=B4=E6=96=B0=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processor/impl/DocumentProcessorImpl.java | 67 +++++++------------ 1 file changed, 23 insertions(+), 44 deletions(-) diff --git a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java index d6b15343..004a82fe 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java +++ b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java @@ -14,12 +14,16 @@ import one.nem.lacerta.processor.DocumentProcessor; import one.nem.lacerta.model.document.DocumentDetail; import one.nem.lacerta.model.document.internal.XmlMetaModel; + +import one.nem.lacerta.model.document.page.Page; + import one.nem.lacerta.source.file.FileManager; import one.nem.lacerta.source.file.factory.FileManagerFactory; import one.nem.lacerta.utils.LacertaLogger; import one.nem.lacerta.utils.XmlMetaParser; +import one.nem.lacerta.utils.repository.DeviceInfoUtils; public class DocumentProcessorImpl implements DocumentProcessor{ @@ -37,8 +41,10 @@ public class DocumentProcessorImpl implements DocumentProcessor{ private final FileManagerFactory fileManagerFactory; private final LacertaLogger logger; private final XmlMetaParser xmlMetaParser; + + private final DeviceInfoUtils deviceInfoUtils; @AssistedInject - public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, @Assisted DocumentDetail documentDetail) { + public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, DeviceInfoUtils deviceInfoUtils, @Assisted DocumentDetail documentDetail) { this.fileManagerFactory = fileManagerFactory; this.logger = logger; this.xmlMetaParser = xmlMetaParser; @@ -46,51 +52,20 @@ public class DocumentProcessorImpl implements DocumentProcessor{ throw new IllegalArgumentException("documentDetail must not be null"); } this.documentDetail = documentDetail; + this.deviceInfoUtils = deviceInfoUtils; } @Override public void init() throws Exception{ logger.debug("init", "called"); // Init Variables - this.documentRootPath = this.documentDetail.getPath().getFullPath(); + this.documentRootPath = deviceInfoUtils.getExternalStorageDirectory().resolve(this.documentDetail.getMeta().getId()); logger.debug("init", "documentRootPath: " + this.documentRootPath); this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager - FileManager initFileManager = this.fileManager.getNewInstance(); logger.debug("init", "fileManager created"); - - // xmlファイルの読み込み - if (initFileManager.isExist("meta.xml")) { - logger.debug("init", "meta.xml found"); - try { - this.xmlMetaModel = xmlMetaParser.deserialize(this.fileManager.loadXml("meta.xml")); - logger.debug("init", "meta.xml parsed"); - } catch (Exception e) { - logger.debug("init", "meta.xml parse failed"); - logger.trace("init", e.getMessage()); - } - } else { - logger.debug("init", "meta.xml not found"); - xmlMetaModel = new XmlMetaModel(); - - xmlMetaModel.setTitle(this.documentDetail.getMeta().getTitle()); - xmlMetaModel.setAuthor(this.documentDetail.getAuthor()); - xmlMetaModel.setDescription(""); // FIXME-rca: - xmlMetaModel.setDefaultBranch(this.documentDetail.getDefaultBranch()); - xmlMetaModel.setPages(new ArrayList<>()); - - try { - initFileManager.createFileIfNotExist("meta.xml").saveXml(xmlMetaParser.serialize(xmlMetaModel), "meta.xml"); - logger.debug("init", "meta.xml saved"); - } catch (Exception e) { - logger.error("init", "meta.xml save failed"); - logger.trace("init", e.getMessage()); - } - } - - logger.info("init", "finished"); } @Override @@ -98,11 +73,12 @@ public class DocumentProcessorImpl implements DocumentProcessor{ logger.debug("addNewPageToLast", "called"); String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする - this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename); + Page page = new Page(); + page.setFileName(filename); + page.setBitmap(bitmap); + this.documentDetail.getPages().add(page); - XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel(); - xmlMetaPageModel.setFilename(filename); - xmlMetaModel.getPages().add(xmlMetaPageModel); + this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename); logger.info("addNewPageToLast", "finished"); logger.info("addNewPageToLast", "filename: " + filename); @@ -124,9 +100,10 @@ public class DocumentProcessorImpl implements DocumentProcessor{ this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename); - XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel(); - xmlMetaPageModel.setFilename(filename); - xmlMetaModel.getPages().add(index, xmlMetaPageModel); + Page page = new Page(); + page.setFileName(filename); + page.setBitmap(bitmap); + this.documentDetail.getPages().add(index + 1, page); } @Override @@ -136,9 +113,11 @@ public class DocumentProcessorImpl implements DocumentProcessor{ this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename); - XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel(); - xmlMetaPageModel.setFilename(filename); - xmlMetaModel.getPages().add(index - 1, xmlMetaPageModel); + Page page = new Page(); + page.setFileName(filename); + page.setBitmap(bitmap); + this.documentDetail.getPages().add(index, page); + } @Override From 7e20d8e443a6755e881df09fb00925858666487a Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:48:04 +0900 Subject: [PATCH 18/38] =?UTF-8?q?close()=E3=82=92=E5=BB=83=E6=AD=A2,=20Doc?= =?UTF-8?q?umentDetail=E3=82=92=E5=8F=96=E5=BE=97=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/lacerta/processor/DocumentProcessor.java | 4 +++- .../lacerta/processor/impl/DocumentProcessorImpl.java | 11 ++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java b/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java index d5584c24..1f8e77c6 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java +++ b/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java @@ -2,6 +2,8 @@ package one.nem.lacerta.processor; import android.graphics.Bitmap; +import one.nem.lacerta.model.document.DocumentDetail; + public interface DocumentProcessor { // ページ操作 @@ -18,7 +20,7 @@ public interface DocumentProcessor { Bitmap getPageAtIndex(int index); int getPageCount(); - void close() throws Exception; + DocumentDetail getDocumentDetail(); void init() throws Exception; // TODO-rca: 例外処理 } diff --git a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java index 004a82fe..3badf9cc 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java +++ b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java @@ -141,14 +141,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{ } @Override - public void close() throws Exception{ - logger.debug("close", "called"); - try { - this.fileManager.getNewInstance().createFileIfNotExist("meta.xml").saveXml(xmlMetaParser.serialize(xmlMetaModel), "meta.xml"); - logger.debug("close", "meta.xml saved"); - } catch (Exception e) { - logger.error("close", "meta.xml save failed"); - logger.trace("close", e.getMessage()); - } + public DocumentDetail getDocumentDetail() { + return this.documentDetail; } } From de85626d66c8731119c88e8043efcfb35995b47f Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:53:30 +0900 Subject: [PATCH 19/38] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- processor/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/processor/build.gradle b/processor/build.gradle index ec1ea9b1..34829cc7 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -44,4 +44,5 @@ dependencies { implementation project(':source') implementation project(':utils') implementation project(':data') + implementation project(':vcs') } \ No newline at end of file From 98c3820679201b0b2fff7087c6c7dd4cc56205e3 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:55:50 +0900 Subject: [PATCH 20/38] =?UTF-8?q?Init=E3=82=92=E5=BB=83=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lacerta/processor/DocumentProcessor.java | 2 -- .../processor/impl/DocumentProcessorImpl.java | 20 +++++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java b/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java index 1f8e77c6..75c8fd39 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java +++ b/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java @@ -21,6 +21,4 @@ public interface DocumentProcessor { int getPageCount(); DocumentDetail getDocumentDetail(); - void init() throws Exception; // TODO-rca: 例外処理 - } diff --git a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java index 3badf9cc..7f97fa66 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java +++ b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java @@ -24,6 +24,8 @@ import one.nem.lacerta.utils.LacertaLogger; import one.nem.lacerta.utils.XmlMetaParser; import one.nem.lacerta.utils.repository.DeviceInfoUtils; +import one.nem.lacerta.vcs.LacertaVcs; +import one.nem.lacerta.vcs.factory.LacertaVcsFactory; public class DocumentProcessorImpl implements DocumentProcessor{ @@ -36,38 +38,34 @@ public class DocumentProcessorImpl implements DocumentProcessor{ private XmlMetaModel xmlMetaModel; private Path documentRootPath; private FileManager fileManager; + private LacertaVcs lacertaVcs; // Injection private final FileManagerFactory fileManagerFactory; private final LacertaLogger logger; private final XmlMetaParser xmlMetaParser; - + private final LacertaVcsFactory lacertaVcsFactory; private final DeviceInfoUtils deviceInfoUtils; @AssistedInject - public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, DeviceInfoUtils deviceInfoUtils, @Assisted DocumentDetail documentDetail) { + public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, LacertaVcsFactory lacertaVcsFactory, DeviceInfoUtils deviceInfoUtils, @Assisted DocumentDetail documentDetail) { this.fileManagerFactory = fileManagerFactory; this.logger = logger; this.xmlMetaParser = xmlMetaParser; if (documentDetail == null) { throw new IllegalArgumentException("documentDetail must not be null"); } + this.lacertaVcsFactory = lacertaVcsFactory; this.documentDetail = documentDetail; this.deviceInfoUtils = deviceInfoUtils; - } - @Override - public void init() throws Exception{ - logger.debug("init", "called"); - // Init Variables + // Init this.documentRootPath = deviceInfoUtils.getExternalStorageDirectory().resolve(this.documentDetail.getMeta().getId()); logger.debug("init", "documentRootPath: " + this.documentRootPath); - this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager - - - logger.debug("init", "fileManager created"); + this.lacertaVcs = lacertaVcsFactory.create(this.documentDetail.getMeta().getId()); } + @Override public void addNewPageToLast(Bitmap bitmap) throws Exception{ logger.debug("addNewPageToLast", "called"); From d6a0dbeaa2c5adffdc98af84aaf1daac608eed77 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:58:19 +0900 Subject: [PATCH 21/38] =?UTF-8?q?VCS=E3=81=AB=E5=A4=89=E6=9B=B4=E5=B1=A5?= =?UTF-8?q?=E6=AD=B4=E3=82=92=E7=99=BB=E9=8C=B2=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/lacerta/processor/impl/DocumentProcessorImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java index 7f97fa66..5efcb976 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java +++ b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java @@ -76,6 +76,8 @@ public class DocumentProcessorImpl implements DocumentProcessor{ page.setBitmap(bitmap); this.documentDetail.getPages().add(page); + lacertaVcs.insertPage(documentDetail.getPages().size(), filename); + this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename); logger.info("addNewPageToLast", "finished"); @@ -102,6 +104,8 @@ public class DocumentProcessorImpl implements DocumentProcessor{ page.setFileName(filename); page.setBitmap(bitmap); this.documentDetail.getPages().add(index + 1, page); + + lacertaVcs.insertPage(index + 1, filename); } @Override @@ -116,6 +120,8 @@ public class DocumentProcessorImpl implements DocumentProcessor{ page.setBitmap(bitmap); this.documentDetail.getPages().add(index, page); + lacertaVcs.insertPage(index, filename); + } @Override From 4ae2a9fe3adef7e0dfc0d8655718c537adb2ea38 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:59:02 +0900 Subject: [PATCH 22/38] =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?= =?UTF-8?q?=E3=81=AE=E7=B5=B1=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lacerta/processor/DocumentProcessor.java | 3 +-- .../processor/impl/DocumentProcessorImpl.java | 18 +----------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java b/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java index 75c8fd39..8a967ff0 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java +++ b/processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java @@ -9,8 +9,7 @@ public interface DocumentProcessor { // ページ操作 void addNewPageToLast(Bitmap bitmap) throws Exception; void addNewPagesToLast(Bitmap[] bitmaps) throws Exception; - void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception; - void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception; + void insertPageAtIndex(Bitmap bitmap, int index) throws Exception; void removePageAtIndex(int index) throws Exception; // 更新 diff --git a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java index 5efcb976..db63175c 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java +++ b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java @@ -94,7 +94,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{ } @Override - public void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception { + public void addNewPageAtIndex(Bitmap bitmap, int index) throws Exception { logger.debug("addNewPageAfterIndex", "called"); String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする @@ -108,22 +108,6 @@ public class DocumentProcessorImpl implements DocumentProcessor{ lacertaVcs.insertPage(index + 1, filename); } - @Override - public void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception { - logger.debug("addNewPageBeforeIndex", "called"); - String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする - - this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename); - - Page page = new Page(); - page.setFileName(filename); - page.setBitmap(bitmap); - this.documentDetail.getPages().add(index, page); - - lacertaVcs.insertPage(index, filename); - - } - @Override public void removePageAtIndex(int index) { From e78ee829cef412e964d65c3ab52219cac81c4b22 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:59:21 +0900 Subject: [PATCH 23/38] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/lacerta/processor/impl/DocumentProcessorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java index db63175c..b92ca981 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java +++ b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java @@ -94,7 +94,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{ } @Override - public void addNewPageAtIndex(Bitmap bitmap, int index) throws Exception { + public void insertNewPageAtIndex(Bitmap bitmap, int index) throws Exception { logger.debug("addNewPageAfterIndex", "called"); String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする From 94cec3432e106b1a70c5394b2708ed0cf9925d50 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 16:59:36 +0900 Subject: [PATCH 24/38] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/lacerta/processor/impl/DocumentProcessorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java index b92ca981..899d7e16 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java +++ b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java @@ -94,7 +94,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{ } @Override - public void insertNewPageAtIndex(Bitmap bitmap, int index) throws Exception { + public void insertPageAtIndex(Bitmap bitmap, int index) throws Exception { logger.debug("addNewPageAfterIndex", "called"); String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする From 397c923cc1e8c6dbbc57b18cd35d26c3ab06d4b3 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:00:10 +0900 Subject: [PATCH 25/38] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/lacerta/processor/impl/DocumentProcessorImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java index 899d7e16..684a71af 100644 --- a/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java +++ b/processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java @@ -103,9 +103,9 @@ public class DocumentProcessorImpl implements DocumentProcessor{ Page page = new Page(); page.setFileName(filename); page.setBitmap(bitmap); - this.documentDetail.getPages().add(index + 1, page); + this.documentDetail.getPages().add(index, page); - lacertaVcs.insertPage(index + 1, filename); + lacertaVcs.insertPage(index, filename); } @Override From 17cb2829ce81b6d03c31757a4f74d7b3c100e672 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:08:22 +0900 Subject: [PATCH 26/38] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/build.gradle b/data/build.gradle index 4615289e..8af2cd06 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -56,4 +56,6 @@ dependencies { // データソースモジュール implementation project(':source') + + implementation project(':vcs') } \ No newline at end of file From 9db85bb9b3de5c5e95e13aeafda59a1540a1b494 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:13:43 +0900 Subject: [PATCH 27/38] =?UTF-8?q?Setter=E8=BF=BD=E5=8A=A0=E6=BC=8F?= =?UTF-8?q?=E3=82=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/lacerta/model/document/DocumentMeta.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java index 5ef334cb..038b625e 100644 --- a/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java +++ b/model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java @@ -212,6 +212,14 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応 this.author = author; } + /** + * ドキュメントのデフォルトブランチ(String)を設定する + * @param defaultBranch ドキュメントのデフォルトブランチ + */ + public void setDefaultBranch(String defaultBranch) { + this.defaultBranch = defaultBranch; + } + /** * updatedAtを現在時刻に設定する */ From 0cab05c581536c5ca2ac102625cd58d781f67e54 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:16:28 +0900 Subject: [PATCH 28/38] =?UTF-8?q?PublicPath=E3=81=ABroot=E3=82=92=E8=BF=94?= =?UTF-8?q?=E3=81=99=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/src/main/java/one/nem/lacerta/model/PublicPath.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/model/src/main/java/one/nem/lacerta/model/PublicPath.java b/model/src/main/java/one/nem/lacerta/model/PublicPath.java index 980a3a9d..47f68ca7 100644 --- a/model/src/main/java/one/nem/lacerta/model/PublicPath.java +++ b/model/src/main/java/one/nem/lacerta/model/PublicPath.java @@ -65,4 +65,10 @@ public class PublicPath { public String getStringPath() { return String.join("/", path); } + + public PublicPath getRoot() { + PublicPath root = new PublicPath(); + root.add("/"); + return root; + } } From 56a3acf36d84566a70b9ac8968c176327207dfe7 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:17:34 +0900 Subject: [PATCH 29/38] =?UTF-8?q?createDocument=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/lacerta/data/impl/DocumentImpl.java | 50 ++++++++++++++++--- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java b/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java index 9a1e0ff1..69c98bc1 100644 --- a/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java +++ b/data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java @@ -1,12 +1,15 @@ package one.nem.lacerta.data.impl; import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.UUID; import javax.inject.Inject; import one.nem.lacerta.data.Document; +import one.nem.lacerta.model.PublicPath; import one.nem.lacerta.model.document.DocumentMeta; import one.nem.lacerta.model.document.DocumentDetail; @@ -18,11 +21,14 @@ import one.nem.lacerta.source.database.entity.DocumentEntity; import one.nem.lacerta.source.database.entity.LibraryEntity; import one.nem.lacerta.source.database.entity.TagEntity; +import one.nem.lacerta.source.database.entity.VcsLogEntity; +import one.nem.lacerta.vcs.ActionType; import one.nem.lacerta.source.file.factory.FileManagerFactory; import one.nem.lacerta.source.jgit.JGitRepository; import one.nem.lacerta.utils.LacertaLogger; import one.nem.lacerta.utils.XmlMetaParser; import one.nem.lacerta.utils.repository.DeviceInfoUtils; +import one.nem.lacerta.vcs.LacertaVcs; public class DocumentImpl implements Document { @@ -35,6 +41,9 @@ public class DocumentImpl implements Document { @Inject LacertaDatabase database; + @Inject + LacertaVcs vcs; + @Inject public DocumentImpl() { @@ -43,20 +52,45 @@ public class DocumentImpl implements Document { } - // Internal methods - private DocumentDetail createDocumentDetail(DocumentEntity documentEntity) { + @Override + public DocumentDetail createDocument(DocumentMeta meta) { + DocumentDetail detail = new DocumentDetail(); + detail.setMeta(meta); + detail.setPages(new ArrayList<>()); + + // TODO-rca: UIスレッドから追い出す + + // Create DocumentEntity + DocumentEntity documentEntity = new DocumentEntity(); + documentEntity.id = meta.getId(); + documentEntity.title = meta.getTitle(); + documentEntity.author = meta.getAuthor(); + documentEntity.defaultBranch = meta.getDefaultBranch(); + documentEntity.updatedAt = meta.getUpdatedAt(); + documentEntity.createdAt = meta.getCreatedAt(); + documentEntity.publicPath = meta.getPath().getStringPath(); + documentEntity.tagIds = meta.getTagIds(); + + database.documentDao().insert(documentEntity); + + // Vcs + vcs.createDocument(meta.getId()); return detail; } - @Override - public DocumentDetail createDocument(DocumentMeta meta) { - return null; - } - @Override public DocumentDetail createDocument() { - return null; + DocumentMeta meta = new DocumentMeta(); + meta.setId(UUID.randomUUID().toString()); + meta.setTitle("New Document"); + meta.setAuthor("author"); + meta.setDefaultBranch("master"); + meta.setUpdatedAt(new Date()); + meta.setCreatedAt(new Date()); + meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする + meta.setTags(new ArrayList<>()); + return createDocument(meta); } @Override From 3878c139af8d0f49f71ba572d18e96ff49cecf94 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:18:25 +0900 Subject: [PATCH 30/38] =?UTF-8?q?createDocument=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vcs/src/main/java/one/nem/lacerta/vcs/LacertaVcs.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vcs/src/main/java/one/nem/lacerta/vcs/LacertaVcs.java b/vcs/src/main/java/one/nem/lacerta/vcs/LacertaVcs.java index 29125361..46640d37 100644 --- a/vcs/src/main/java/one/nem/lacerta/vcs/LacertaVcs.java +++ b/vcs/src/main/java/one/nem/lacerta/vcs/LacertaVcs.java @@ -9,6 +9,8 @@ public interface LacertaVcs { public void deletePage(int index); + public void createDocument(String documentId); + // debug public void printLog(); From 6c8233536c4c43cabf06d9fc49892c14acec646c Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:18:37 +0900 Subject: [PATCH 31/38] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/java/one/nem/lacerta/data/LacertaLibrary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/one/nem/lacerta/data/LacertaLibrary.java b/data/src/main/java/one/nem/lacerta/data/LacertaLibrary.java index 408a9171..4748d7d0 100644 --- a/data/src/main/java/one/nem/lacerta/data/LacertaLibrary.java +++ b/data/src/main/java/one/nem/lacerta/data/LacertaLibrary.java @@ -18,5 +18,5 @@ public interface LacertaLibrary { LibraryItemPage getLibraryPage(String pageId, int limit, int offset); // GetDocument - DocumentDetail getDocumentDetailById(String id); + DocumentDetail getDocumentDetailById(String id); // TODO-rca: Documentに統合する } From 475e378b7c96aa98d22357f1b74cabb6066d0e8d Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:22:37 +0900 Subject: [PATCH 32/38] Impl --- .../main/java/one/nem/lacerta/vcs/impl/LacertaVcsImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vcs/src/main/java/one/nem/lacerta/vcs/impl/LacertaVcsImpl.java b/vcs/src/main/java/one/nem/lacerta/vcs/impl/LacertaVcsImpl.java index 0a20e5e3..15e343da 100644 --- a/vcs/src/main/java/one/nem/lacerta/vcs/impl/LacertaVcsImpl.java +++ b/vcs/src/main/java/one/nem/lacerta/vcs/impl/LacertaVcsImpl.java @@ -52,6 +52,11 @@ public class LacertaVcsImpl implements LacertaVcs { } + @Override + public void createDocument(String documentId) { + + } + @Override public void printLog() { logger.debug(TAG, "printLog"); From bc74ee605ed43b991661b5201a2386f97d161425 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:25:19 +0900 Subject: [PATCH 33/38] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E3=83=A1?= =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE=E7=94=BB=E9=9D=A2=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DebugMenuDocumentTesterListFragment.java | 81 ------------------- ...DebugMenuDocumentTesterManageFragment.java | 72 ----------------- .../DebugMenuDocumentTesterTopFragment.java | 4 +- ...agment_debug_menu_document_tester_list.xml | 17 ---- ...ment_debug_menu_document_tester_manage.xml | 60 -------------- .../feature_debug_internal_navigation.xml | 16 ---- 6 files changed, 2 insertions(+), 248 deletions(-) delete mode 100644 feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterListFragment.java delete mode 100644 feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterManageFragment.java delete mode 100644 feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_list.xml delete mode 100644 feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_manage.xml diff --git a/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterListFragment.java b/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterListFragment.java deleted file mode 100644 index a0d57399..00000000 --- a/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterListFragment.java +++ /dev/null @@ -1,81 +0,0 @@ -package one.nem.lacerta.feature.debug; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.RecyclerView; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; - -import javax.inject.Inject; - -import dagger.hilt.android.AndroidEntryPoint; -import one.nem.lacerta.data.Document; -import one.nem.lacerta.feature.debug.common.adapter.DebugMenuDocumentListItemAdapter; -import one.nem.lacerta.feature.debug.common.model.DebugMenuDocumentListItem; -import one.nem.lacerta.model.document.DocumentMeta; -import one.nem.lacerta.utils.LacertaLogger; - -/** - * A simple {@link Fragment} subclass. - * Use the {@link DebugMenuDocumentTesterListFragment#newInstance} factory method to - * create an instance of this fragment. - */ - -@AndroidEntryPoint -public class DebugMenuDocumentTesterListFragment extends Fragment { - - @Inject - Document document; - - @Inject - LacertaLogger logger; - - public DebugMenuDocumentTesterListFragment() { - // Required empty public constructor - } - - public static DebugMenuDocumentTesterListFragment newInstance() { - DebugMenuDocumentTesterListFragment fragment = new DebugMenuDocumentTesterListFragment(); - Bundle args = new Bundle(); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_list, container, false); - - RecyclerView recyclerView = view.findViewById(R.id.recycler_view_document_list); - recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext())); - - ArrayList documentMetas = document.getAllDocumentMetas(100); - - logger.debug("Debug/DocList", "Document count: " + documentMetas.size()); - - List debugMenuDocumentListItems = new ArrayList<>(); - - for (DocumentMeta documentMeta : documentMetas) { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - debugMenuDocumentListItems.add(new DebugMenuDocumentListItem(documentMeta.getTitle(), "Internal Id: " + documentMeta.getId(), simpleDateFormat.format(documentMeta.getUpdatedAt()))); - } - - DebugMenuDocumentListItemAdapter adapter = new DebugMenuDocumentListItemAdapter(debugMenuDocumentListItems); - recyclerView.setAdapter(adapter); - - return view; - } -} \ No newline at end of file diff --git a/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterManageFragment.java b/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterManageFragment.java deleted file mode 100644 index b46ee40d..00000000 --- a/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterManageFragment.java +++ /dev/null @@ -1,72 +0,0 @@ -package one.nem.lacerta.feature.debug; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.google.android.material.textfield.TextInputEditText; - -import java.util.UUID; - -import javax.inject.Inject; - -import dagger.hilt.android.AndroidEntryPoint; -import dagger.multibindings.IntKey; -import one.nem.lacerta.data.DocumentDebug; - -import one.nem.lacerta.model.document.DocumentMeta; -import one.nem.lacerta.model.document.DocumentDetail; - -import one.nem.lacerta.model.document.path.DocumentPath; -import one.nem.lacerta.model.document.tag.DocumentTag; - -/** - * A simple {@link Fragment} subclass. - * Use the {@link DebugMenuDocumentTesterManageFragment#newInstance} factory method to - * create an instance of this fragment. - */ -@AndroidEntryPoint -public class DebugMenuDocumentTesterManageFragment extends Fragment { - - @Inject - DocumentDebug documentDebug; - - public DebugMenuDocumentTesterManageFragment() { - // Required empty public constructor - } - - public static DebugMenuDocumentTesterManageFragment newInstance() { - DebugMenuDocumentTesterManageFragment fragment = new DebugMenuDocumentTesterManageFragment(); - Bundle args = new Bundle(); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_manage, container, false); - - TextInputEditText editTextDocumentTitle = view.findViewById(R.id.edit_text_document_title); - view.findViewById(R.id.button_insert_test_data).setOnClickListener( v -> { - - DocumentMeta meta = new DocumentMeta(editTextDocumentTitle != null ? editTextDocumentTitle.getText().toString() : "empty title"); // TODO-rca: Nullable - DocumentPath path = new DocumentPath("root", "test_path"); - DocumentDetail detail = new DocumentDetail(meta, path, "test_author", "test_default_branch"); - - documentDebug.insertDocument(meta, detail); - }); - - return view; - } -} \ No newline at end of file diff --git a/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterTopFragment.java b/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterTopFragment.java index 6d9bbe3e..369b41cc 100644 --- a/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterTopFragment.java +++ b/feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterTopFragment.java @@ -47,8 +47,8 @@ public class DebugMenuDocumentTesterTopFragment extends Fragment { List debugMenuDocTesterListItems = new ArrayList<>(); - debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true)); - debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true)); +// debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true)); +// debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true)); DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems); diff --git a/feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_list.xml b/feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_list.xml deleted file mode 100644 index 65642307..00000000 --- a/feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_list.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_manage.xml b/feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_manage.xml deleted file mode 100644 index e4b8b046..00000000 --- a/feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_manage.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/feature/debug/src/main/res/navigation/feature_debug_internal_navigation.xml b/feature/debug/src/main/res/navigation/feature_debug_internal_navigation.xml index d0f2126d..ebd05b44 100644 --- a/feature/debug/src/main/res/navigation/feature_debug_internal_navigation.xml +++ b/feature/debug/src/main/res/navigation/feature_debug_internal_navigation.xml @@ -28,23 +28,7 @@ android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment" android:label="fragment_debug_menu_document_tester_top" tools:layout="@layout/fragment_debug_menu_document_tester_top" > - - - - Date: Sun, 14 Jan 2024 17:26:01 +0900 Subject: [PATCH 34/38] =?UTF-8?q?=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=A7=E3=82=B9=E3=82=BF=E3=83=96=E3=81=8C=E5=A3=8A=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/lacerta/data/impl/LacertaLibraryStubImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryStubImpl.java b/data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryStubImpl.java index 55129bba..47d547f8 100644 --- a/data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryStubImpl.java +++ b/data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryStubImpl.java @@ -136,9 +136,9 @@ public class LacertaLibraryStubImpl implements LacertaLibrary { DocumentDetail documentDetail = new DocumentDetail(); documentDetail.setMeta(documentMeta); - documentDetail.setPath(null); // TODO-rca: なんとかする - documentDetail.setAuthor(faker.name().fullName()); - documentDetail.setRepository(null); // TODO-rca: なんとかする +// documentDetail.setPath(null); // TODO-rca: なんとかする +// documentDetail.setAuthor(faker.name().fullName()); +// documentDetail.setRepository(null); // TODO-rca: なんとかする return documentDetail; } From e026da96fadc87885c1ca422620ef6d3baa78590 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:27:43 +0900 Subject: [PATCH 35/38] =?UTF-8?q?DocumentDebug=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/lacerta/data/DocumentDebug.java | 12 ----- .../lacerta/data/impl/DocumentDebugImpl.java | 47 ------------------- .../data/module/DocumentDebugModule.java | 16 ------- 3 files changed, 75 deletions(-) delete mode 100644 data/src/main/java/one/nem/lacerta/data/DocumentDebug.java delete mode 100644 data/src/main/java/one/nem/lacerta/data/impl/DocumentDebugImpl.java delete mode 100644 data/src/main/java/one/nem/lacerta/data/module/DocumentDebugModule.java diff --git a/data/src/main/java/one/nem/lacerta/data/DocumentDebug.java b/data/src/main/java/one/nem/lacerta/data/DocumentDebug.java deleted file mode 100644 index 94ae5b42..00000000 --- a/data/src/main/java/one/nem/lacerta/data/DocumentDebug.java +++ /dev/null @@ -1,12 +0,0 @@ -package one.nem.lacerta.data; - -import one.nem.lacerta.model.document.DocumentMeta; -import one.nem.lacerta.model.document.DocumentDetail; -import one.nem.lacerta.model.document.path.DocumentPath; -import one.nem.lacerta.model.document.tag.DocumentTag; - -public interface DocumentDebug { - - void insertDocument(DocumentMeta meta, DocumentDetail detail); - -} diff --git a/data/src/main/java/one/nem/lacerta/data/impl/DocumentDebugImpl.java b/data/src/main/java/one/nem/lacerta/data/impl/DocumentDebugImpl.java deleted file mode 100644 index 0985436f..00000000 --- a/data/src/main/java/one/nem/lacerta/data/impl/DocumentDebugImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package one.nem.lacerta.data.impl; - -import java.util.List; - -import javax.inject.Inject; - -import one.nem.lacerta.data.DocumentDebug; -import one.nem.lacerta.model.document.DocumentDetail; -import one.nem.lacerta.model.document.DocumentMeta; - -import one.nem.lacerta.source.database.entity.DocumentEntity; -import one.nem.lacerta.source.database.entity.LibraryEntity; -import one.nem.lacerta.source.database.entity.TagEntity; - -import one.nem.lacerta.source.database.LacertaDatabase; - -public class DocumentDebugImpl implements DocumentDebug{ - - @Inject - LacertaDatabase database; - - @Inject - public DocumentDebugImpl() { - } - - - public void insertDocument(DocumentMeta meta, DocumentDetail detail) { - DocumentEntity documentEntity = new DocumentEntity(); - LibraryEntity libraryEntity = new LibraryEntity(); - - documentEntity.id = meta.getId(); - documentEntity.title = meta.getTitle(); - documentEntity.createdAt = meta.getCreatedAt(); - documentEntity.updatedAt = meta.getUpdatedAt(); - documentEntity.author = detail.getAuthor(); - documentEntity.defaultBranch = detail.getDefaultBranch(); - // ArrayListからListに変換 - documentEntity.tagIds = meta.getTagIds(); - - libraryEntity.id = meta.getId(); - libraryEntity.path = "Placeholder"; - libraryEntity.rootPath = "Placeholder"; - - database.documentDao().insert(documentEntity); - database.libraryDao().insert(libraryEntity); - } -} diff --git a/data/src/main/java/one/nem/lacerta/data/module/DocumentDebugModule.java b/data/src/main/java/one/nem/lacerta/data/module/DocumentDebugModule.java deleted file mode 100644 index bcf5c7c5..00000000 --- a/data/src/main/java/one/nem/lacerta/data/module/DocumentDebugModule.java +++ /dev/null @@ -1,16 +0,0 @@ -package one.nem.lacerta.data.module; - -import dagger.Binds; -import dagger.Module; -import dagger.hilt.InstallIn; -import dagger.hilt.components.SingletonComponent; -import one.nem.lacerta.data.DocumentDebug; -import one.nem.lacerta.data.impl.DocumentDebugImpl; - -@Module -@InstallIn(SingletonComponent.class) // TODO-rca: Singletonでいいのか検討する -abstract public class DocumentDebugModule { - - @Binds - public abstract DocumentDebug bindDocumentDebug(DocumentDebugImpl documentDebugImpl); -} From 78ff41b3e39a87391e63212a0af2387c358bc23c Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:34:32 +0900 Subject: [PATCH 36/38] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E5=9B=9E=E9=81=BF=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScannerDataManagerStubFragment.java | 201 +++++++++--------- .../feature/library/LibraryTopFragment.java | 8 +- 2 files changed, 105 insertions(+), 104 deletions(-) diff --git a/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerDataManagerStubFragment.java b/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerDataManagerStubFragment.java index 043f5cb7..9fd979b9 100644 --- a/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerDataManagerStubFragment.java +++ b/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerDataManagerStubFragment.java @@ -123,109 +123,110 @@ public class ScannerDataManagerStubFragment extends Fragment { public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - view.findViewById(R.id.button_call_camera).setOnClickListener(v -> { - Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked"); - Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); - if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) { - File photoFile = null; - try { - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date()); - String imageFileName = "JPEG_" + timeStamp + "_"; - File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES); - photoFile = File.createTempFile(imageFileName, ".jpg", storageDir); - } catch (IOException ex) { - Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex); - } - if (photoFile != null) { - photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile); - takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI); - cameraLauncher.launch(takePictureIntent); - } - else { - Log.d("ScannerDataManagerStubFragment", "photoFile is null"); - } - } - else { - Log.d("ScannerDataManagerStubFragment", "camera not available"); - } - updateResults(); - }); - - view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> { - Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked"); - Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show(); - - this.documentDetail = createSampleDocumentDetail(); - - }); - - view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> { - Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked"); - Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show(); - // TODO-rca: ここでDocumentProcessorを初期化する - if (this.documentDetail == null) { - Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show(); - return; - } - this.documentProcessor = documentProcessorFactory.create(this.documentDetail); - Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show(); - try { - this.documentProcessor.init(); - } catch (Exception e) { - Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show(); - Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e); - } - Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show(); - }); - - view.findViewById(R.id.button_add_page).setOnClickListener(v -> { - Log.d("ScannerDataManagerStubFragment", "button_add_page clicked"); - Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show(); - if (this.documentProcessor == null) { - Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show(); - return; - } - Bitmap[] bitmaps = new Bitmap[results.size()]; - for (int i = 0; i < results.size(); i++) { - bitmaps[i] = results.get(i).getBitmap(); - } - - try { - this.documentProcessor.addNewPagesToLast(bitmaps); - } catch (Exception e) { - Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show(); - Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e); - } - - Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show(); - - try { - this.documentProcessor.close(); - } catch (Exception e) { - Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show(); - Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e); - } - }); +// view.findViewById(R.id.button_call_camera).setOnClickListener(v -> { +// Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked"); +// Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); +// if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) { +// File photoFile = null; +// try { +// String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date()); +// String imageFileName = "JPEG_" + timeStamp + "_"; +// File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES); +// photoFile = File.createTempFile(imageFileName, ".jpg", storageDir); +// } catch (IOException ex) { +// Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex); +// } +// if (photoFile != null) { +// photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile); +// takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI); +// cameraLauncher.launch(takePictureIntent); +// } +// else { +// Log.d("ScannerDataManagerStubFragment", "photoFile is null"); +// } +// } +// else { +// Log.d("ScannerDataManagerStubFragment", "camera not available"); +// } +// updateResults(); +// }); +// +// view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> { +// Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked"); +// Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show(); +// +// this.documentDetail = createSampleDocumentDetail(); +// +// }); +// +// view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> { +// Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked"); +// Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show(); +// // TODO-rca: ここでDocumentProcessorを初期化する +// if (this.documentDetail == null) { +// Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show(); +// return; +// } +// this.documentProcessor = documentProcessorFactory.create(this.documentDetail); +// Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show(); +// try { +// this.documentProcessor.init(); +// } catch (Exception e) { +// Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show(); +// Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e); +// } +// Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show(); +// }); +// +// view.findViewById(R.id.button_add_page).setOnClickListener(v -> { +// Log.d("ScannerDataManagerStubFragment", "button_add_page clicked"); +// Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show(); +// if (this.documentProcessor == null) { +// Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show(); +// return; +// } +// Bitmap[] bitmaps = new Bitmap[results.size()]; +// for (int i = 0; i < results.size(); i++) { +// bitmaps[i] = results.get(i).getBitmap(); +// } +// +// try { +// this.documentProcessor.addNewPagesToLast(bitmaps); +// } catch (Exception e) { +// Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show(); +// Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e); +// } +// +// Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show(); +// +// try { +// this.documentProcessor.close(); +// } catch (Exception e) { +// Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show(); +// Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e); +// } +// }); } public DocumentDetail createSampleDocumentDetail() { - - String id = UUID.randomUUID().toString(); - - Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show(); - //logger.debug("CreateSample", "Generated id: " + id); - - DocumentMeta meta = new DocumentMeta( - id, - "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()), - new Date(), - new Date()); - - DocumentPath path = new DocumentPath( - deviceInfoUtils.getExternalStorageDirectoryString(), - "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now())); - - return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch"); +// +// String id = UUID.randomUUID().toString(); +// +// Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show(); +// //logger.debug("CreateSample", "Generated id: " + id); +// +// DocumentMeta meta = new DocumentMeta( +// id, +// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()), +// new Date(), +// new Date()); +// +// DocumentPath path = new DocumentPath( +// deviceInfoUtils.getExternalStorageDirectoryString(), +// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now())); +// +// return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch"); + return null; } @Override 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 eb672856..bbae876e 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 @@ -90,13 +90,13 @@ public class LibraryTopFragment extends Fragment { //データを取得 - List metas = document.getAllDocumentMetas(100); +// List metas = document.getAllDocumentMetas(100); - Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show(); +// Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show(); // Create and set the adapter - DocumentAdapter adapter = new DocumentAdapter(metas); - documentRecyclerView.setAdapter(adapter); +// DocumentAdapter adapter = new DocumentAdapter(metas); +// documentRecyclerView.setAdapter(adapter); // Use a LinearLayoutManager to specify the layout return view; From aac94922dfcd325e3fb88ce2065cde1a9fe75046 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:35:17 +0900 Subject: [PATCH 37/38] =?UTF-8?q?Hilt=E3=82=92Plugin=E3=81=AB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vcs/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/vcs/build.gradle b/vcs/build.gradle index 874bad5d..52036d31 100644 --- a/vcs/build.gradle +++ b/vcs/build.gradle @@ -1,5 +1,6 @@ plugins { alias(libs.plugins.com.android.library) + id 'com.google.dagger.hilt.android' } android { From 3045c75c45ac6902627804087dd9f44cbec064a0 Mon Sep 17 00:00:00 2001 From: r-ca Date: Sun, 14 Jan 2024 17:36:21 +0900 Subject: [PATCH 38/38] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E5=9B=9E=E9=81=BF=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/lacerta/feature/library/LibraryTopFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bbae876e..79aeeeb2 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 @@ -33,8 +33,8 @@ import one.nem.lacerta.model.document.tag.DocumentTag; @AndroidEntryPoint public class LibraryTopFragment extends Fragment { - @Inject - Document document; +// @Inject +// Document document; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER