Compare commits

..
Author SHA1 Message Date
r-ca e6ce3571bf Inject追加 2024-01-16 12:25:37 +09:00
r-ca 462ea77e91 依存関係に追加 2024-01-16 12:21:44 +09:00
r-ca faf0971ffe アクションをメニューに合わせて更新 2024-01-16 12:16:33 +09:00
r-ca 3eac0cf49c アクションをメニューに合わせて更新 WIP 2024-01-16 12:15:16 +09:00
r-ca 680b101476 メニューアイテム更新 2024-01-16 12:14:00 +09:00
r-ca 8200a03168 ログ修正 2024-01-16 12:08:29 +09:00
r-ca 290795d3aa Merge remote-tracking branch 'origin/improve/logger_add_error_code' into add_scanner_component 2024-01-16 12:04:19 +09:00
r-ca 20f6333dcc エラーIDをログに流すメソッドを実装 2024-01-16 12:03:33 +09:00
r-ca d30e68b23f コメント修正 2024-01-16 11:59:36 +09:00
r-ca 24e54ec0f0 終了ボタンを実装 2024-01-16 11:58:42 +09:00
r-ca d01f5b9c79 ToolBar実装 WIP 2024-01-16 11:50:50 +09:00
r-ca 8502bcdcab 命名修正 2024-01-16 11:45:49 +09:00
r-ca 7c91987c76 アイコン色修正 2024-01-16 11:44:24 +09:00
r-ca 74aef19312 アイコン追加 2024-01-16 11:43:34 +09:00
r-ca 2168f67fea scaleType修正 2024-01-16 11:27:03 +09:00
r-ca 380e8117b8 プレビュー実装 WIP 2024-01-16 11:06:44 +09:00
r-ca a6aeb5480a スキャン後の操作を行う画面を実装 WIP 2024-01-16 11:05:43 +09:00
r-ca 78505c62e6 暫定Drawable作成 2024-01-16 10:50:49 +09:00
r-ca 467d5ae9ee WIP 2024-01-16 10:37:36 +09:00
r-ca 0f4b66eb37 いろいろ 2024-01-16 10:29:15 +09:00
r-ca cec7f3bb15 レイアウト設計WIP 2024-01-16 10:26:25 +09:00
r-ca 1137604515 レイアウトリソース作成 2024-01-16 10:18:11 +09:00
r-ca 091467d113 Revert "フラグメント作成"
This reverts commit d780e57e39.
2024-01-16 10:17:30 +09:00
r-ca aefe5d1001 スキャナ実装いろいろ 2024-01-16 10:16:58 +09:00
r-ca d780e57e39 フラグメント作成 2024-01-16 10:16:45 +09:00
r-ca 35b998eebe アクティビティ作成 2024-01-15 15:09:58 +09:00
r-ca b99efb3336 いろいろ 2024-01-15 15:03:24 +09:00
r-ca 9ebf656274 メニューに追加 2024-01-15 15:03:21 +09:00
r-ca 84a8d0d44d Revert "アクティビティ作成"
This reverts commit 5b1461ff26.
2024-01-15 14:59:13 +09:00
r-ca 5b1461ff26 アクティビティ作成 2024-01-15 14:50:09 +09:00
r-ca 57ca804b2b Revert "アクティビティ作成"
This reverts commit b81f8d5c87.
2024-01-15 14:49:39 +09:00
r-ca b81f8d5c87 アクティビティ作成 2024-01-15 14:48:55 +09:00
r-ca e44313d418 ナビゲーショングラフに追加 2024-01-15 14:46:18 +09:00
r-ca 334d1ccba2 処理実装 WIP 2024-01-15 14:45:23 +09:00
r-ca 5bf55ada0e 依存関係追加 2024-01-15 14:36:52 +09:00
r-ca 75c0700144 レイアウト編集, 処理init 2024-01-15 14:36:10 +09:00
r-ca dbb737d896 ScannerManagerFragment作成 2024-01-15 14:32:16 +09:00
r-ca 3045c75c45 ビルドエラー回避コメントアウト 2024-01-14 17:36:21 +09:00
r-ca aac94922df HiltをPluginに追加 2024-01-14 17:35:17 +09:00
r-ca 78ff41b3e3 ビルドエラー回避コメントアウト 2024-01-14 17:34:32 +09:00
r-ca e026da96fa DocumentDebugを削除 2024-01-14 17:27:43 +09:00
r-ca 9245981233 仕様変更でスタブが壊れたのでとりあえずコメントアウト 2024-01-14 17:26:01 +09:00
r-ca bc74ee605e 不要になったデバッグメニューの画面を削除 2024-01-14 17:25:19 +09:00
r-ca 475e378b7c Impl 2024-01-14 17:22:37 +09:00
r-ca 6c8233536c コメント追加 2024-01-14 17:18:37 +09:00
r-ca 3878c139af createDocument実装 2024-01-14 17:18:25 +09:00
r-ca 56a3acf36d createDocument実装 2024-01-14 17:17:34 +09:00
r-ca 0cab05c581 PublicPathにrootを返すメソッドを追加 2024-01-14 17:16:28 +09:00
r-ca 9db85bb9b3 Setter追加漏れ修正 2024-01-14 17:13:43 +09:00
r-ca 17cb2829ce 依存関係追加 2024-01-14 17:08:22 +09:00
r-ca 397c923cc1 修正 2024-01-14 17:00:10 +09:00
r-ca 94cec3432e 修正 2024-01-14 16:59:36 +09:00
r-ca e78ee829ce 修正 2024-01-14 16:59:21 +09:00
r-ca 4ae2a9fe3a メソッドの統合 2024-01-14 16:59:02 +09:00
r-ca d6a0dbeaa2 VCSに変更履歴を登録するように WIP 2024-01-14 16:58:19 +09:00
r-ca 98c3820679 Initを廃止 2024-01-14 16:55:50 +09:00
r-ca de85626d66 依存関係追加 2024-01-14 16:53:30 +09:00
r-ca 7e20d8e443 close()を廃止, DocumentDetailを取得できるように 2024-01-14 16:48:04 +09:00
r-ca eba02abfd4 DocumentProcessor更新 WIP 2024-01-14 16:45:48 +09:00
r-ca aa7f285773 WIP 2024-01-14 16:40:03 +09:00
r-ca e5e1b3a2bb パーサー更新 2024-01-14 16:35:22 +09:00
r-ca cd5a588545 XmlMetaModel更新 2024-01-14 16:34:41 +09:00
r-ca bd5a041424 Impl生成し直し 2024-01-14 16:28:28 +09:00
r-ca 9d793c3c0a Documentインタフェース実装 2024-01-14 16:27:56 +09:00
r-ca 0d4f0686b7 DocumentDetailにPagesを追加 2024-01-14 16:13:09 +09:00
r-ca 5e6fa45fed コメント 2024-01-14 16:11:43 +09:00
r-ca 885cd77d5b Pageオブジェクトを作成 2024-01-14 16:11:17 +09:00
r-ca cbd7c103c5 コメント 2024-01-14 16:07:48 +09:00
r-ca ddd303fa88 コンストラクタ追加 2024-01-14 16:06:58 +09:00
r-ca 14fbb56dcd Setter追加 2024-01-14 16:06:36 +09:00
r-ca bf01610eb5 Getter追加 2024-01-14 16:06:14 +09:00
r-ca b63e2dd862 コンストラクタ変更 2024-01-14 16:05:23 +09:00
r-ca 8f0f95d8af 移動したフィールドを追加 2024-01-14 16:04:55 +09:00
r-ca d75ecff0e7 DefaultBranchをMetaに移動, Repositoryを廃止 2024-01-14 16:03:50 +09:00
r-ca bc20c92d44 DocumentPathを廃止, 作者情報をMetaに移動WIP 2024-01-14 16:02:49 +09:00
ろむねこ 5837a1a2d3 Merge pull request #63 from lacerta-doc/feature/add_vcs
VCS追加(WIP)
2024-01-14 15:39:10 +09:00
r-ca 176d8da59d Revert "Log一覧フラグメント実装WIP"
This reverts commit dc516bc083.
2024-01-14 15:19:36 +09:00
r-ca dc516bc083 Log一覧フラグメント実装WIP 2024-01-14 15:19:33 +09:00
r-ca 5c83c8fe13 リネーム 2024-01-14 15:18:08 +09:00
r-ca 200af1955b コミット漏れ 2024-01-14 15:10:07 +09:00
r-ca 951ee15235 コミット漏れ 2024-01-14 15:10:04 +09:00
r-ca 9a35c218b3 仮の実装を追加 2024-01-14 15:09:56 +09:00
r-ca 52894cf19c デバッグのためにデータベースの破壊を許可 2024-01-14 15:09:44 +09:00
r-ca 656d3a5964 DBバージョンのインクリメント 2024-01-14 15:09:31 +09:00
r-ca f95a2d64c3 アイテム追加 2024-01-14 14:57:27 +09:00
r-ca 92f9cfe4aa ビルドエラー回避のために一旦rootPathを戻した 2024-01-14 14:56:30 +09:00
r-ca 162f0a7bdb ビルドエラー修正 2024-01-14 14:54:12 +09:00
r-ca ba119fdb3d 壊れたインポートを削除 2024-01-14 14:53:47 +09:00
r-ca c711ad304b アノテーション修正 2024-01-14 14:53:35 +09:00
r-ca b2a619629f リネーム 2024-01-14 14:51:24 +09:00
r-ca a3426b6620 デバッグロジック実装 WIP 2024-01-14 14:01:43 +09:00
r-ca a9fb6283e7 依存関係追加 2024-01-14 13:59:53 +09:00
r-ca 6153e944eb レイアウト作成 WIP 2024-01-14 13:59:14 +09:00
r-ca a0baaf02cb WIP 2024-01-14 13:59:06 +09:00
r-ca 623be098d1 レイアウト変更 2024-01-14 13:56:30 +09:00
r-ca 999de728f0 メニューにアイテム追加 2024-01-14 13:55:40 +09:00
r-ca a032b9c1b1 ナビゲーショングラフ追加 2024-01-14 13:53:32 +09:00
r-ca 34de82cec3 引数削除など 2024-01-14 13:52:31 +09:00
r-ca fb4ba28391 引数削除など 2024-01-14 13:49:30 +09:00
r-ca 44baef8199 デバッグ用フラグメント作成 2024-01-14 13:48:52 +09:00
r-ca 60f86cd9a2 デバッグ用フラグメント作成 2024-01-14 13:48:22 +09:00
r-ca add140ad39 ナビゲーショングラフに追加 2024-01-14 13:46:22 +09:00
r-ca 4c40f9926e フラグメント作成, 引数関係を削除 2024-01-14 13:45:43 +09:00
r-ca f119264599 WIP 画面推移実装 2024-01-14 13:44:04 +09:00
r-ca 7f7e7d4af3 レイアウト修正 2024-01-14 13:43:09 +09:00
r-ca b99277082d 引数関係を削除 2024-01-14 13:40:25 +09:00
r-ca a6167b98af ナビゲーショングラフに追加 2024-01-14 13:34:30 +09:00
r-ca f75594233f デバッグ用フラグメント実装 WIP 2024-01-14 13:32:33 +09:00
r-ca 32ee755d08 Factory実装 WIP 2024-01-14 13:29:47 +09:00
r-ca 0758b697a2 Impl実装 WIP 2024-01-14 13:28:02 +09:00
r-ca 1abfcc1e62 依存関係にRoomを追加 2024-01-14 13:26:59 +09:00
r-ca a1b6ed81df VcsLogDao実装 2024-01-14 13:25:29 +09:00
r-ca 00a141a101 VcsRevDao実装 2024-01-14 13:23:48 +09:00
r-ca 6845e552ef Entity微修正 2024-01-14 13:22:28 +09:00
r-ca f98614c5f2 Implクラスコンストラクタ実装 WIP 2024-01-14 13:00:29 +09:00
r-ca b040e2572c Implクラス作成, Impl生成 2024-01-14 12:55:09 +09:00
r-ca 3eb94cade0 インタフェース実装 WIP 2024-01-14 12:54:29 +09:00
r-ca e9b7ad4d92 fromJson実装 WIP 2024-01-14 12:50:56 +09:00
r-ca e07cbda769 toJson実装 2024-01-14 12:48:54 +09:00
r-ca 80aeb8811b Action系のModelはActionBaseを継承するように 2024-01-14 12:40:46 +09:00
r-ca 2d7dfe1b5b ActionBaseを作成 2024-01-14 12:39:45 +09:00
r-ca 362eda782d 実装を後回しにする部分にコメントを追加 2024-01-14 12:30:44 +09:00
r-ca b51eeb50ac 一旦後回しにするので削除 2024-01-14 12:28:56 +09:00
r-ca 2673fb6bce 実装を後回しにする部分にコメントを追加 2024-01-14 12:28:02 +09:00
r-ca bb5c38cbca パッケージを間違えてたので修正 2024-01-14 12:27:28 +09:00
r-ca 3f4614cf6b CreateBranchモデル作成, コンストラクタ, Getter作成 2024-01-14 12:27:10 +09:00
r-ca dc65cdbac8 DeletePageモデル作成, コンストラクタ, Getter作成 2024-01-14 12:25:16 +09:00
r-ca dbbdda79f4 UpdatePageモデル作成, コンストラクタ, Getter作成 2024-01-14 12:24:46 +09:00
r-ca 20c0dbd371 InsertPageモデル作成, コンストラクタ, Getter作成 2024-01-14 12:23:23 +09:00
r-ca ccaed8387a パッケージ構成変更 2024-01-14 12:17:05 +09:00
r-ca bfb6bee14a modelを定義するパッケージ作成, placeholder 2024-01-14 12:15:48 +09:00
r-ca 3b283c1b05 依存関係にJacksonを追加 2024-01-14 12:08:46 +09:00
r-ca e718e13ed9 表記ゆれ修正 2024-01-14 12:05:53 +09:00
r-ca 8277258760 ActionTypes定義 WIP 2024-01-14 11:56:44 +09:00
r-ca 062e8c8bf9 Dao作成 WIP 2024-01-14 11:31:33 +09:00
r-ca 0439370bd0 Dao作成 WIP 2024-01-14 11:30:56 +09:00
r-ca 541b748501 Dao作成 WIP 2024-01-14 11:30:43 +09:00
r-ca 88546fe89a Databaseに追加 WIP 2024-01-14 11:29:58 +09:00
r-ca 53b3ebebef Rev実装 2024-01-14 11:28:51 +09:00
r-ca a7195c4079 Converter追加 2024-01-13 15:51:35 +09:00
r-ca e848f40b8b エンティティ実装 WIP 2024-01-13 15:51:09 +09:00
r-ca 578f1ef8a8 変更履歴を管理するEntity追加 2024-01-13 15:47:29 +09:00
r-ca fca44e1753 リビジョンを管理するエンティティ作成 2024-01-13 15:46:42 +09:00
r-ca da1dba5fda DBにパブリックパスを追加 2024-01-13 15:43:38 +09:00
r-ca c614230744 WIP 2024-01-13 15:42:51 +09:00
r-ca e5c3b3aa92 依存関係追加 2024-01-13 15:37:08 +09:00
r-ca 442ac4866a インタフェース作成 2024-01-13 15:36:42 +09:00
r-ca 8d00386f20 依存関係追加 2024-01-13 15:34:43 +09:00
r-ca 9a14b1db23 VCSモジュール作成 2024-01-13 15:33:54 +09:00
ろむねこ 385f2f327d Merge pull request #60 from lacerta-doc/model/public_path
PublicPathの追加
2024-01-13 15:20:45 +09:00
ろむねこ f09d35b8c0 Merge pull request #59 from lacerta-doc/data/add_search_stub
JavaDoc対応
2024-01-13 15:18:32 +09:00
r-ca 002c78d09b 実装 2024-01-13 15:17:48 +09:00
r-ca 171c8b380c 効率化 2024-01-13 15:13:56 +09:00
r-ca 04651f3b8e 実装 WIP 2024-01-13 15:12:03 +09:00
r-ca 180428fbb7 実装 WIP 2024-01-13 15:07:11 +09:00
r-ca 955e9fa6c8 JavaDoc対応 2024-01-13 14:59:54 +09:00
ろむねこ 1d3015a7e4 Merge pull request #58 from lacerta-doc/data/add_search_stub
LacertaSearchインタフェースにスタブを追加
2024-01-13 14:39:12 +09:00
r-ca 4ce8315678 HiltModule実装 2024-01-13 14:36:59 +09:00
r-ca 3c66480f0f 受け取ったクエリをコンソールに吐き出すようにした 2024-01-13 14:35:25 +09:00
r-ca 82d0187a11 LacertaLibraryの実装を流用して取得できるように 2024-01-13 14:34:07 +09:00
r-ca dc340f1a96 継承, impl生成 2024-01-13 14:30:30 +09:00
r-ca 1d24467c09 インタフェースの戻り値を修正 2024-01-13 14:29:58 +09:00
ろむねこ bf385b952c Merge pull request #55 from lacerta-doc/data/add_search_interface
検索インタフェースをを追加
2024-01-13 14:27:29 +09:00
r-ca da207fe251 autoSearch追加 2024-01-13 14:22:50 +09:00
r-ca e7ababe65a Revert "検索オブジェクト作成 WIP"
This reverts commit 9725c1a07c.
2024-01-13 14:14:07 +09:00
r-ca cbf56dd331 Revert "検索オブジェクト作成 WIP"
This reverts commit c2aada949e.
2024-01-13 14:14:07 +09:00
r-ca 1a360057b6 Revert "検索モード実装"
This reverts commit e8f51d3717.
2024-01-13 14:14:06 +09:00
r-ca bc8e68126b Revert "iroiro"
This reverts commit 8eee8843b7.
2024-01-13 14:14:06 +09:00
r-ca ccb4dc4bb6 Revert "AUTO追加"
This reverts commit 2690eec511.
2024-01-13 14:14:06 +09:00
r-ca 2690eec511 AUTO追加 2024-01-13 14:12:06 +09:00
r-ca 8eee8843b7 iroiro 2024-01-13 14:11:49 +09:00
r-ca e8f51d3717 検索モード実装 2024-01-13 14:10:45 +09:00
r-ca c2aada949e 検索オブジェクト作成 WIP 2024-01-13 14:08:59 +09:00
r-ca 9725c1a07c 検索オブジェクト作成 WIP 2024-01-13 14:07:03 +09:00
r-ca 1090e1bf74 インタフェース生成 2024-01-13 14:03:54 +09:00
ろむねこ a9b76161b7 Merge pull request #53 from lacerta-doc/data/add_library_item_stub
LacertaLibraryインターフェースにスタブを追加
2024-01-13 14:02:05 +09:00
r-ca 37af356c92 Debug 2024-01-12 12:47:14 +09:00
r-ca af4513212d 適当な日付を表示するようにした 2024-01-12 12:43:01 +09:00
r-ca 3f58c623f3 LayoutManager追加 2024-01-12 12:40:46 +09:00
r-ca a754198d75 修正 2024-01-12 12:38:56 +09:00
r-ca 8ee554d445 ナビゲーショングラフ追加 2024-01-12 12:28:31 +09:00
r-ca c346170a9d HiltModuleのアノテーション修正 2024-01-12 12:27:51 +09:00
r-ca 5bd84e730f コンストラクタのアノテーション忘れ修正 2024-01-12 12:25:01 +09:00
r-ca 9a56846e3a デバッグロジック実装 2024-01-12 12:24:30 +09:00
r-ca 8cd49804ca 命名修正 2024-01-12 12:19:12 +09:00
r-ca 993f34e1fe レイアウト作成 2024-01-12 12:18:11 +09:00
r-ca 81ceaaf0d6 init 2024-01-12 12:16:11 +09:00
r-ca d77cedc68f 引数削除 2024-01-12 12:15:45 +09:00
r-ca 283146a81f デバッグ用フラグメント作成 2024-01-12 12:15:11 +09:00
r-ca dc4879c900 HiltModule作成 2024-01-12 12:14:01 +09:00
r-ca 2f6bd99572 JavaDoc対応 2024-01-12 12:11:17 +09:00
r-ca 527d3c309f getDocumentDetailByIdのスタブを実装 2024-01-12 11:04:18 +09:00
r-ca f326771aaf idを正しく返すように修正 2024-01-12 11:03:14 +09:00
r-ca d2ebed3934 DocumentDetailを生成する内部メソッド作成 2024-01-12 11:02:50 +09:00
r-ca 3cd1f50f34 スタブメソッド実装 2024-01-12 10:59:39 +09:00
r-ca c663d78e11 履歴を生成する内部メソッド作成 2024-01-12 10:59:16 +09:00
r-ca bb36458c4d スタブメソッド生成 2024-01-12 10:54:28 +09:00
r-ca 7107b03de9 空のコンストラクタを追加, コメントを追加 2024-01-12 10:50:19 +09:00
r-ca db4da7812b LibraryItemPageにSetterを追加 2024-01-12 10:49:44 +09:00
r-ca a6ee0c12f4 ListItemに空のコンストラクタを追加 2024-01-12 10:41:13 +09:00
r-ca f9f07972ac ListItemにSetterを追加 2024-01-12 10:40:32 +09:00
r-ca e8876cec73 JavaFakerを依存関係に追加 2024-01-12 10:32:33 +09:00
r-ca 01f0d74ab6 継承, Impl生成 2024-01-12 10:27:36 +09:00
r-ca 1036cbe5d9 スタブクラス作成, 2024-01-12 10:27:04 +09:00
r-ca b1886438e1 継承, impl生成 2024-01-12 10:26:32 +09:00
ろむねこ 5bc54f6083 Merge pull request #50 from lacerta-doc/data/add_library_item_interface
ライブラリを取得するインタフェースを実装
2024-01-12 10:24:00 +09:00
89 changed files with 2368 additions and 767 deletions

No files matched your search

+1 -1
View File
@@ -4,7 +4,6 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" />
<option name="modules">
@@ -30,6 +29,7 @@
<option value="$PROJECT_DIR$/shared/ui" />
<option value="$PROJECT_DIR$/source" />
<option value="$PROJECT_DIR$/utils" />
<option value="$PROJECT_DIR$/vcs" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
+2 -1
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
+6
View File
@@ -30,6 +30,8 @@ dependencies {
implementation libs.androidx.appcompat
implementation libs.com.google.android.material
implementation libs.androidx.activity
implementation libs.androidx.constraintlayout
testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core
@@ -46,4 +48,8 @@ dependencies {
implementation project(':processor')
implementation project(':utils')
implementation project(':vcs')
implementation project(':data')
}
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".ScannerManagerActivity"
android:exported="false" />
</application>
</manifest>
@@ -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
@@ -0,0 +1,181 @@
package one.nem.lacerta.component.scanner;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Toast;
import androidx.activity.EdgeToEdge;
import androidx.annotation.AnimatorRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import com.google.android.material.appbar.MaterialToolbar;
import com.websitebeaver.documentscanner.DocumentScanner;
import java.util.ArrayList;
import java.util.Objects;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.data.Document;
@AndroidEntryPoint
public class ScannerManagerActivity extends AppCompatActivity {
String TAG = "ScannerManagerActivity";
@Inject
LacertaLogger logger;
@Inject
Document document;
// Variables
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
View view;
DocumentScanner documentScanner = new DocumentScanner(
this,
(croppedImageResults) -> {
logger.debug(TAG, "croppedImage size: " + croppedImageResults.size());
ArrayList<Bitmap> croppedImages = new ArrayList<>();
for (String result : croppedImageResults) {
croppedImages.add(BitmapFactory.decodeFile(result));
}
processResult(croppedImages);
return null;
},
(errorMessage) -> {
// an error happened
logger.error(TAG, "Error: " + errorMessage);
logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
return null;
},
() -> {
// user canceled document scan
logger.debug(TAG, "User canceled document scan");
return null;
},
null,
null,
null
);
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EdgeToEdge.enable(this);
setContentView(R.layout.activity_scanner_manager);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
setSupportActionBar(toolbar);
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
documentScanner.startScan();
// Init
this.view = findViewById(R.id.main); // TODO-rca:なんとかする
}
@Override
public boolean onCreateOptionsMenu(android.view.Menu menu) {
getMenuInflater().inflate(R.menu.scanner_result_toolbar, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(android.view.MenuItem item) {
if (item.getItemId() == R.id.action_save_new) {
// 新ドキュメントとして保存
Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
saveNewDocument();
return true;
} else if (item.getItemId() == R.id.action_insert_exist) {
// 既存ドキュメントに挿入
Toast.makeText(this, "挿入処理", Toast.LENGTH_SHORT).show();
insertToExistDocument();
return true;
} else if (item.getItemId() == android.R.id.home) {
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
private void processResult(ArrayList<Bitmap> resultImages) {
logger.debug(TAG, "processResult");
if (resultImages.isEmpty()) {
logger.debug(TAG, "resultImages(arg) is empty");
if (this.croppedImages.isEmpty()) {
logger.debug(TAG, "this.resultImages is empty");
logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
// TODO-rca: なんかする
} else {
logger.debug(TAG, "this.resultImages is not empty");
updateResultView(this.croppedImages);
}
} else {
logger.debug(TAG, "resultImages(arg) is not empty");
updateResultView(resultImages);
this.croppedImages = resultImages;
}
}
private void saveNewDocument() {
logger.debug(TAG, "saveNewDocument");
}
private void insertToExistDocument() {
logger.debug(TAG, "insertToExistDocument");
// TODO-rca: 実装
}
private void updateResultView(ArrayList<Bitmap> resultImages) {
logger.debug(TAG, "updateResultView");
LinearLayout resultView = findViewById(R.id.result_list_container);
ImageView selectedImage = findViewById(R.id.selected_image);
resultView.removeAllViews();
for (Bitmap resultImage : resultImages) {
View resultImageView = getLayoutInflater().inflate(R.layout.result_image_container_item, null);
ImageView imageView = resultImageView.findViewById(R.id.result_image);
imageView.setImageBitmap(resultImage);
imageView.setOnClickListener(v -> {
selectedImage.setImageBitmap(resultImage);
for (int i = 0; i < resultView.getChildCount(); i++) {
View child = resultView.getChildAt(i).findViewById(R.id.result_image);
child.setSelected(false);
}
v.setSelected(true);
});
resultView.addView(resultImageView);
}
}
}
@@ -0,0 +1,95 @@
package one.nem.lacerta.component.scanner;
import android.content.Intent;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.websitebeaver.documentscanner.DocumentScanner;
import com.websitebeaver.documentscanner.DocumentScannerActivity;
import java.util.Objects;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
@AndroidEntryPoint
public class ScannerManagerFragment extends Fragment {
String TAG = getClass().getSimpleName();
@Inject
LacertaLogger logger;
@Inject
LacertaVcsFactory vcsFactory;
private static final boolean DEFAULT_SINGLE_PAGE = false;
private boolean singlePage;
public ScannerManagerFragment() {
// Required empty public constructor
}
// public static ScannerManagerFragment newInstance(boolean singlePage) {
// ScannerManagerFragment fragment = new ScannerManagerFragment();
// Bundle args = new Bundle();
// args.putBoolean("singlePage", singlePage);
// fragment.setArguments(args);
// return fragment;
// }
public static ScannerManagerFragment newInstance() {
ScannerManagerFragment fragment = new ScannerManagerFragment();
Bundle args = new Bundle();
args.putBoolean("singlePage", DEFAULT_SINGLE_PAGE);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
singlePage = getArguments().getBoolean("singlePage", DEFAULT_SINGLE_PAGE);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_scanner_manager, container, false);
// ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
// ViewGroup.LayoutParams.MATCH_PARENT,
// ViewGroup.LayoutParams.MATCH_PARENT
// );
// view.setLayoutParams(layoutParams);
return view;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// Init
logger.debug(TAG, "called");
view.findViewById(R.id.button_intent_scanner_manager_activity).setOnClickListener(v -> {
// DocumentScannerActivityを起動する
Intent intent = new Intent(requireActivity().getApplicationContext(), ScannerManagerActivity.class);
startActivity(intent);
});
}
}
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#00000000" />
<corners android:radius="8dp" />
<stroke android:color="#FF0000" android:width="2dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="#00000000" />
<corners android:radius="8dp" />
</shape>
</item>
</selector>
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main"
android:theme="@style/Theme.Lacerta"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimaryContainer"
app:titleTextColor="@color/colorOnPrimaryContainer"
app:title="Preview"
android:minHeight="?attr/actionBarSize"
android:theme="?attr/actionBarTheme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/selected_image"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_above="@+id/horizontal_scroll"
android:scaleType="centerInside"
app:layout_constraintBottom_toTopOf="@+id/horizontal_scroll"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_toolbar" />
<HorizontalScrollView
android:id="@+id/horizontal_scroll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:scrollbars="none"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/selected_image">
<LinearLayout
android:id="@+id/result_list_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
</LinearLayout>
</HorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ScannerManagerFragment">
<Button
android:id="@+id/button_intent_scanner_manager_activity"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/result_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxHeight="64dp"
android:adjustViewBounds="true"
android:background="@drawable/result_image_container_item_border"
android:padding="8dp"
android:scaleType="centerCrop" />
</FrameLayout>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_save_new"
android:icon="@drawable/save_24px"
android:title="Save"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_insert_exist"
android:icon="@drawable/ic_baseline_add_24"
android:title="Save"
app:showAsAction="ifRoom"/>
</menu>
+5
View File
@@ -41,6 +41,9 @@ dependencies {
// JGit
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
// Java Faker
implementation 'com.github.javafaker:javafaker:1.0.2'
// Room
implementation libs.androidx.room.runtime
annotationProcessor libs.androidx.room.compiler
@@ -53,4 +56,6 @@ dependencies {
// データソースモジュール
implementation project(':source')
implementation project(':vcs')
}
@@ -13,34 +13,13 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
*/
public interface Document {
ArrayList<DocumentMeta> getAllDocumentMetas(int limit);
DocumentDetail createDocument(DocumentMeta meta);
ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset);
DocumentDetail createDocument();
/**
* 更新の新しいドキュメントから順に並べてlimit件取得する
* @param limit 取得する上限数
*/
ArrayList<DocumentMeta> getRecentDocumentMetas(int limit);
void deleteDocument(String documentId);
/**
* 更新の新しいドキュメントから順に並べてoffset位置からlimit件取得する
* @param limit 取得する上限数
* @param offset 取得するオフセット
*/
ArrayList<DocumentMeta> 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);
}
@@ -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);
}
@@ -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に統合する
}
@@ -0,0 +1,13 @@
package one.nem.lacerta.data;
import java.util.ArrayList;
import one.nem.lacerta.model.ListItem;
public interface LacertaSearch {
ArrayList<ListItem> autoSearch(String query, int limit);
ArrayList<ListItem> autoSearch(String query, int limit, int offset);
}
@@ -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);
}
}
@@ -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,124 +21,90 @@ 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{
public class DocumentImpl implements Document {
private LacertaDatabase database;
String TAG = getClass().getSimpleName();
@Inject
public DocumentImpl(LacertaDatabase database) {
this.database = database;
LacertaLogger logger;
@Inject
LacertaDatabase database;
@Inject
LacertaVcs vcs;
@Inject
public DocumentImpl() {
// Init
logger.debug(TAG, "called");
}
@Inject
JGitRepository jGitRepository;
@Inject
DeviceInfoUtils deviceInfoUtils;
@Override
public ArrayList<DocumentMeta> getAllDocumentMetas(int limit) {
ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
List<DocumentEntity> documentEntities = database.documentDao().getAllWithLimit(limit);
public DocumentDetail createDocument(DocumentMeta meta) {
DocumentDetail detail = new DocumentDetail();
detail.setMeta(meta);
detail.setPages(new ArrayList<>());
for (DocumentEntity documentEntity : documentEntities) {
// タグ取得
// TODO-rca: 切り出すべきかも?
List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
ArrayList<DocumentTag> documentTags = new ArrayList<>();
for (TagEntity tagEntity : tagEntities) {
documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
}
// TODO-rca: UIスレッドから追い出す
// 組み立て処理
// 可読性が終わるのでコンストラクタはつかわないほうがいいかも?
DocumentMeta documentMeta = new DocumentMeta();
documentMeta.setId(documentEntity.id);
documentMeta.setTitle(documentEntity.title);
documentMeta.setCreatedAt(documentEntity.createdAt);
documentMeta.setUpdatedAt(documentEntity.updatedAt);
documentMeta.setTags(documentTags);
// 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();
documentMetas.add(documentMeta);
}
database.documentDao().insert(documentEntity);
return documentMetas;
// Vcs
vcs.createDocument(meta.getId());
return detail;
}
@Override
public ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset) {
return null; // TODO-rca: 実装する
public DocumentDetail createDocument() {
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
public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit) {
// ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
// database.documentDao().
// TODO-rca: 履歴取得するDao実装する
public void deleteDocument(String documentId) {
}
@Override
public void updateDocument(DocumentMeta meta, DocumentDetail detail) {
}
@Override
public DocumentDetail getDocument(String documentId) {
return null;
}
@Override
public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset) {
return null;
}
@Override
public DocumentDetail getDocumentDetail(String id) {
DocumentDetail documentDetail = new DocumentDetail();
DocumentEntity documentEntity = database.documentDao().findById(id);
// タグ取得
// TODO-rca: 切り出すべきかも?
List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
ArrayList<DocumentTag> 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はもらった物を使うようにする(処理を切り分ける?)
}
@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;
}
}
@@ -1,4 +1,42 @@
package one.nem.lacerta.data.impl;
public class LacertaLibraryImpl {
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.document.DocumentDetail;
public class LacertaLibraryImpl implements LacertaLibrary {
@Override
public LibraryItemPage getRecentDocument(int limit) {
return null;
}
@Override
public LibraryItemPage getRecentDocument(int limit, int offset) {
return null;
}
@Override
public LibraryItemPage getLibraryPage(int limit) {
return null;
}
@Override
public LibraryItemPage getLibraryPage(int limit, int offset) {
return null;
}
@Override
public LibraryItemPage getLibraryPage(String pageId, int limit) {
return null;
}
@Override
public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
return null;
}
@Override
public DocumentDetail getDocumentDetailById(String id) {
return null;
}
}
@@ -0,0 +1,219 @@
package one.nem.lacerta.data.impl;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.path.DocumentPath;
import one.nem.lacerta.utils.LacertaLogger;
import com.github.javafaker.DateAndTime;
import com.github.javafaker.Faker;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Objects;
import java.util.UUID;
import javax.inject.Inject;
/**
* LacertaLibraryのスタブ実装
*/
public class LacertaLibraryStubImpl implements LacertaLibrary {
LacertaLogger logger;
Faker faker;
@Inject
public LacertaLibraryStubImpl(LacertaLogger logger) {
faker = new Faker(); // Init Faker
this.logger = logger;
logger.debug("LibraryStub", "Initialized");
}
// Internal Methods
// Generate Stub Data
private LibraryItemPage generateStubLibraryItemPage(int limit, String pageId) {
logger.debug("LibraryStub", "generateStubLibraryItemPage");
ArrayList<ListItem> listItems = new ArrayList<>();
int itemTotal = faker.number().numberBetween(1, limit); // 実際に返却するアイテム数を決定
int folderTotal;
// フォルダ数の抽選
if (itemTotal > 4) {
folderTotal = faker.number().numberBetween(1, itemTotal - 2);
}
else {
if (itemTotal > 2) {
folderTotal = 1;
}
else { // ドキュメント数がゼロにならないように
folderTotal = 0;
}
}
int documentTotal = itemTotal - folderTotal; // ドキュメント数を決定
logger.debug("LibraryStub", "itemTotal: " + itemTotal);
logger.debug("LibraryStub", "folderTotal: " + folderTotal);
logger.debug("LibraryStub", "documentTotal: " + documentTotal);
// フォルダを生成
for (int i = 0; i < folderTotal; i++) {
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_FOLDER));
}
// ドキュメントを生成
for (int i = 0; i < documentTotal; i++) {
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
}
LibraryItemPage libraryItemPage = new LibraryItemPage();
libraryItemPage.setListItems(listItems);
if (pageId == null) {
libraryItemPage.setPageId(UUID.randomUUID().toString());
} else {
libraryItemPage.setPageId(pageId);
}
libraryItemPage.setPageTitle("FakePage" + faker.number().digits(3));
return libraryItemPage;
}
private ListItem generateStubListItem(ListItemType itemType) {
if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
ListItem listItem = new ListItem();
listItem.setTitle("FakeFolder" + faker.number().digits(3));
listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
listItem.setItemId(UUID.randomUUID().toString());
return listItem;
} else if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
ListItem listItem = new ListItem();
listItem.setTitle("FakeDocument" + faker.book().title());
listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
listItem.setItemId(UUID.randomUUID().toString());
return listItem;
} else {
return null;
}
}
private LibraryItemPage getRecentDocumentPage(int limit) {
int itemTotal = faker.number().numberBetween(1, limit);
ArrayList<ListItem> listItems = new ArrayList<>();
for (int i = 0; i < itemTotal; i++) {
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
}
// DescriptionからDateを抽出して新しい順にソート
listItems.sort((a, b) -> {
String aDate = a.getDescription().substring(11);
String bDate = b.getDescription().substring(11);
return bDate.compareTo(aDate);
});
LibraryItemPage libraryItemPage = new LibraryItemPage();
libraryItemPage.setListItems(listItems);
libraryItemPage.setPageId(UUID.randomUUID().toString());
libraryItemPage.setPageTitle("RecentDocument");
return libraryItemPage;
}
private DocumentDetail generateStubDocumentDetail(String id) throws IllegalArgumentException {
if (Objects.isNull(id)) {
throw new IllegalArgumentException("id is null");
}
DocumentMeta documentMeta = new DocumentMeta();
documentMeta.setId(id);
documentMeta.setTitle("FakeDocument" + faker.book().title());
documentMeta.setCreatedAt(faker.date().birthday());
documentMeta.setUpdatedAt(faker.date().birthday()); // TODO-rca: 更新日のほうが古くなることがあるのでなんとかする?
ArrayList<String> tagIds = new ArrayList<>();
DocumentDetail documentDetail = new DocumentDetail();
documentDetail.setMeta(documentMeta);
// documentDetail.setPath(null); // TODO-rca: なんとかする
// documentDetail.setAuthor(faker.name().fullName());
// documentDetail.setRepository(null); // TODO-rca: なんとかする
return documentDetail;
}
/**
* 履歴ページを取得する
* @param limit 取得するアイテム数
* @return ページオブジェクト
*/
@Override
public LibraryItemPage getRecentDocument(int limit) {
return getRecentDocumentPage(limit);
}
/**
* 履歴ページを取得する
* @param limit 取得するアイテム数
* @param offset 取得するアイテムのオフセット
* @return ページオブジェクト
*/
@Override
public LibraryItemPage getRecentDocument(int limit, int offset) {
return getRecentDocumentPage(limit);
}
/**
* ライブラリページを取得する
* @param limit 取得するアイテム数
* @return ページオブジェクト
*/
@Override
public LibraryItemPage getLibraryPage(int limit) {
return generateStubLibraryItemPage(limit, null);
}
/**
* ライブラリページを取得する
* @param limit 取得するアイテム数
* @param offset 取得するアイテムのオフセット
* @return ページオブジェクト
*/
@Override
public LibraryItemPage getLibraryPage(int limit, int offset) {
return generateStubLibraryItemPage(limit, null);
}
/**
* ライブラリページを取得する
* @param pageId ページID
* @param limit 取得するアイテム数
* @return ページオブジェクト
*/
@Override
public LibraryItemPage getLibraryPage(String pageId, int limit) {
return generateStubLibraryItemPage(limit, pageId);
}
/**
* ライブラリページを取得する
* @param pageId ページID
* @param limit 取得するアイテム数
* @param offset 取得するアイテムのオフセット
* @return ページオブジェクト
*/
@Override
public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
return generateStubLibraryItemPage(limit, pageId);
}
/**
* ドキュメント詳細を取得する
* @param id ドキュメントID
* @return ドキュメント詳細オブジェクト
*/
@Override
public DocumentDetail getDocumentDetailById(String id) throws IllegalArgumentException {
return generateStubDocumentDetail(id);
}
}
@@ -0,0 +1,51 @@
package one.nem.lacerta.data.impl;
import java.util.ArrayList;
import javax.inject.Inject;
import one.nem.lacerta.data.LacertaSearch;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.utils.LacertaLogger;
public class LacertaSearchStubImpl implements LacertaSearch {
private LacertaLibrary library;
private LacertaLogger logger;
@Inject
public LacertaSearchStubImpl(LacertaLibrary library, LacertaLogger logger) {
this.library = library;
this.logger = logger;
}
/**
* 検索
* @param query 検索クエリ
* @param limit 最大取得件数
* @return 検索結果
*/
@Override
public ArrayList<ListItem> autoSearch(String query, int limit) {
logger.debug("SearchStub", "autoSearch");
logger.debug("SearchStub", "query: " + query);
return library.getLibraryPage(limit).getListItems();
}
/**
* 検索
* @param query 検索クエリ
* @param limit 最大取得件数
* @param offset オフセット
* @return 検索結果
*/
@Override
public ArrayList<ListItem> autoSearch(String query, int limit, int offset) {
logger.debug("SearchStub", "autoSearch");
logger.debug("SearchStub", "query: " + query);
return library.getLibraryPage(limit, offset).getListItems();
}
}
@@ -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);
}
@@ -1,4 +1,21 @@
package one.nem.lacerta.data.module;
public class LacertaLibraryModule {
import dagger.Binds;
import dagger.Module;
import dagger.hilt.InstallIn;
import dagger.hilt.android.components.FragmentComponent;
import dagger.hilt.migration.DisableInstallInCheck;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.data.impl.LacertaLibraryStubImpl;
import one.nem.lacerta.utils.LacertaLogger;
@Module
// Fragmentにinstall
@InstallIn(FragmentComponent.class)
abstract public class LacertaLibraryModule {
@Binds
public abstract LacertaLibrary bindLacertaLibrary(LacertaLibraryStubImpl impl);
}
@@ -0,0 +1,16 @@
package one.nem.lacerta.data.module;
import dagger.Binds;
import dagger.Module;
import dagger.hilt.InstallIn;
import dagger.hilt.android.components.FragmentComponent;
import one.nem.lacerta.data.LacertaSearch;
import one.nem.lacerta.data.impl.LacertaSearchStubImpl;
@Module
@InstallIn(FragmentComponent.class)
abstract public class LacertaSearchModule {
@Binds
public abstract LacertaSearch bindLacertaSearch(LacertaSearchStubImpl impl);
}
+3
View File
@@ -68,4 +68,7 @@ dependencies {
// Processor
implementation project(':processor')
// LacertaVcs
implementation project(':vcs')
}
@@ -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<DocumentMeta> documentMetas = document.getAllDocumentMetas(100);
logger.debug("Debug/DocList", "Document count: " + documentMetas.size());
List<DebugMenuDocumentListItem> 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;
}
}
@@ -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;
}
}
@@ -47,8 +47,8 @@ public class DebugMenuDocumentTesterTopFragment extends Fragment {
List<DebugMenuListItem> 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);
@@ -0,0 +1,115 @@
package one.nem.lacerta.feature.debug;
import android.os.Bundle;
import androidx.annotation.AnimatorRes;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import java.util.ArrayList;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.ListItemType;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuLibraryItemListPageFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugMenuLibraryItemListPageFragment extends Fragment {
@Inject
LacertaLibrary lacertaLibrary;
public DebugMenuLibraryItemListPageFragment() {
// Required empty public constructor
}
public static DebugMenuLibraryItemListPageFragment newInstance() {
DebugMenuLibraryItemListPageFragment fragment = new DebugMenuLibraryItemListPageFragment();
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_library_item_list_page, container, false);
LibraryItemPage libraryItemPage = lacertaLibrary.getRecentDocument(10);
for (ListItem listItem : libraryItemPage.getListItems()) {
System.out.println(listItem.getTitle());
}
RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
recyclerView.setAdapter(new ItemAdapter(libraryItemPage.getListItems()));
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
return view;
}
private class ItemAdapter extends RecyclerView.Adapter<ItemAdapter.ItemViewHolder> {
private ArrayList<ListItem> listItems;
public ItemAdapter(ArrayList<ListItem> listItems) {
this.listItems = listItems;
}
@Override
public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_debug_menu_document, parent, false);
return new ItemViewHolder(view);
}
@Override
public void onBindViewHolder(ItemViewHolder holder, int position) {
ListItem listItem = listItems.get(position);
holder.document_list_item_title.setText(listItem.getTitle());
holder.document_list_item_description.setText(listItem.getDescription());
holder.document_list_item_updated_at.setText(listItem.getItemType().toString());
}
@Override
public int getItemCount() {
return listItems.size();
}
public class ItemViewHolder extends RecyclerView.ViewHolder {
TextView document_list_item_title;
TextView document_list_item_description;
TextView document_list_item_updated_at;
public ItemViewHolder(View itemView) {
super(itemView);
document_list_item_title = itemView.findViewById(R.id.document_list_item_title);
document_list_item_description = itemView.findViewById(R.id.document_list_item_description);
document_list_item_updated_at = itemView.findViewById(R.id.document_list_item_updated_at);
}
}
}
}
@@ -49,7 +49,10 @@ public class DebugMenuTopFragment extends Fragment {
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
debugMenuListItems.add(new DebugMenuListItem("ScannerStub", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerManagerFragment, true));
debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true));
debugMenuListItems.add(new DebugMenuListItem("VCS", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment, true));
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
recyclerView.setAdapter(adapter);
@@ -0,0 +1,58 @@
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 javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuVcsGeneralActionFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugMenuVcsGeneralActionFragment extends Fragment {
@Inject
LacertaVcsFactory lacertaVcsFactory;
public DebugMenuVcsGeneralActionFragment() {
// Required empty public constructor
}
public static DebugMenuVcsGeneralActionFragment newInstance() {
DebugMenuVcsGeneralActionFragment fragment = new DebugMenuVcsGeneralActionFragment();
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_vcs_general_action, container, false);
view.findViewById(R.id.add_sample_log_rev_button).setOnClickListener(v -> {
LacertaVcs lacertaVcs = lacertaVcsFactory.create("example_id");
lacertaVcs.insertPage(1, "example_id");
});
return view;
}
}
@@ -0,0 +1,59 @@
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.util.ArrayList;
import java.util.List;
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuListItemAdapter;
import one.nem.lacerta.feature.debug.common.model.DebugMenuListItem;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuVcsGeneralFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class DebugMenuVcsGeneralFragment extends Fragment {
public DebugMenuVcsGeneralFragment() {
// Required empty public constructor
}
public static DebugMenuVcsGeneralFragment newInstance() {
DebugMenuVcsGeneralFragment fragment = new DebugMenuVcsGeneralFragment();
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_vcs_general, container, false);
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
debugMenuListItems.add(new DebugMenuListItem("General Action", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsGeneralActionFragment, true));
debugMenuListItems.add(new DebugMenuListItem("Log Record", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsLogRecordFragment, true));
debugMenuListItems.add(new DebugMenuListItem("Rev Record", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsRevRecordFragment, true));
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
recyclerView.setAdapter(adapter);
return view;
}
}
@@ -0,0 +1,42 @@
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;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuVcsLogRecordFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class DebugMenuVcsLogRecordFragment extends Fragment {
public DebugMenuVcsLogRecordFragment() {
// Required empty public constructor
}
public static DebugMenuVcsLogRecordFragment newInstance() {
DebugMenuVcsLogRecordFragment fragment = new DebugMenuVcsLogRecordFragment();
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_vcs_log_record, container, false);
return view;
}
}
@@ -0,0 +1,41 @@
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;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuVcsRevRecordFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class DebugMenuVcsRevRecordFragment extends Fragment {
public DebugMenuVcsRevRecordFragment() {
// Required empty public constructor
}
public static DebugMenuVcsRevRecordFragment newInstance() {
DebugMenuVcsRevRecordFragment fragment = new DebugMenuVcsRevRecordFragment();
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_vcs_rev_record, container, false);
return view;
}
}
@@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".DebugMenuDocumentTesterManageFragment" >
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_margin="16dp"
android:background="@drawable/rounded_secondary_container">
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:textSize="16sp"
android:textColor="@color/colorOnSecondaryContainer"
android:text="Debug actions" />
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Document title"
android:id="@+id/edit_text_document_title"
android:layout_margin="16dp"
android:inputType="text"
android:textSize="16sp"
style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_insert_test_data"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="Insert test data"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".DebugMenuDocumentTesterListFragment" >
tools:context=".DebugMenuLibraryItemListPageFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view_document_list"
android:layout_width="match_parent"
android:id="@+id/item_recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".DebugMenuVcsGeneralFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".DebugMenuVcsGeneralActionFragment">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<Button
android:id="@+id/add_sample_log_rev_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add Sample log/Rev" />
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".DebugMenuVcsGeneralFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/log_recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".DebugMenuVcsGeneralFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rev_recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -16,31 +16,63 @@
<action
android:id="@+id/action_debugMenuTopFragment_to_scannerDataManagerStubFragment"
app:destination="@id/scannerDataManagerStubFragment" />
<action
android:id="@+id/action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment"
app:destination="@id/debugMenuLibraryItemListPageFragment" />
<action
android:id="@+id/action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment"
app:destination="@id/debugMenuVcsGeneralFragment" />
<action
android:id="@+id/action_debugMenuTopFragment_to_scannerManagerFragment"
app:destination="@id/scannerManagerFragment" />
</fragment>
<fragment
android:id="@+id/debugMenuDocumentTesterTopFragment"
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" >
<action
android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment"
app:destination="@id/debugMenuDocumentTesterListFragment" />
<action
android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment"
app:destination="@id/debugMenuDocumentTesterManageFragment" />
</fragment>
<fragment
android:id="@+id/debugMenuDocumentTesterListFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterListFragment"
android:label="fragment_debug_menu_document_tester_list"
tools:layout="@layout/fragment_debug_menu_document_tester_list" />
<fragment
android:id="@+id/debugMenuDocumentTesterManageFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterManageFragment"
android:label="fragment_debug_menu_document_tester_manage"
tools:layout="@layout/fragment_debug_menu_document_tester_manage" />
<fragment
android:id="@+id/scannerDataManagerStubFragment"
android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
android:label="ScannerDataManagerStubFragment" />
<fragment
android:id="@+id/debugMenuLibraryItemListPageFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuLibraryItemListPageFragment"
android:label="fragment_debug_menu_library_item_list_page"
tools:layout="@layout/fragment_debug_menu_library_item_list_page" />
<fragment
android:id="@+id/debugMenuVcsGeneralFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsGeneralFragment"
android:label="fragment_debug_menu_vcs_general"
tools:layout="@layout/fragment_debug_menu_vcs_general" >
<action
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsGeneralActionFragment"
app:destination="@id/debugMenuVcsGeneralActionFragment" />
<action
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsRevRecordFragment"
app:destination="@id/debugMenuVcsRevRecordFragment" />
<action
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsLogRecordFragment"
app:destination="@id/debugMenuVcsLogRecordFragment" />
</fragment>
<fragment
android:id="@+id/debugMenuVcsGeneralActionFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsGeneralActionFragment"
android:label="fragment_debug_menu_vcs_general_action"
tools:layout="@layout/fragment_debug_menu_vcs_general_action" />
<fragment
android:id="@+id/debugMenuVcsLogRecordFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsLogRecordFragment"
android:label="fragment_debug_menu_vcs_log_record"
tools:layout="@layout/fragment_debug_menu_vcs_log_record" />
<fragment
android:id="@+id/debugMenuVcsRevRecordFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsRevRecordFragment"
android:label="fragment_debug_menu_vcs_rev_record"
tools:layout="@layout/fragment_debug_menu_vcs_rev_record" />
<fragment
android:id="@+id/scannerManagerFragment"
android:name="one.nem.lacerta.component.scanner.ScannerManagerFragment"
android:label="ScannerManagerFragment" />
</navigation>
@@ -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
@@ -90,13 +90,13 @@ public class LibraryTopFragment extends Fragment {
//データを取得
List<DocumentMeta> metas = document.getAllDocumentMetas(100);
// List<DocumentMeta> 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;
@@ -8,12 +8,20 @@ public class LibraryItemPage {
String pageId;
ArrayList<ListItem> listItems;
// Constructor
public LibraryItemPage(String pageTitle, String pageId, ArrayList<ListItem> listItems) {
this.pageTitle = pageTitle;
this.pageId = pageId;
this.listItems = listItems;
}
public LibraryItemPage() {
// Empty constructor
}
// Getter
public String getPageTitle() {
return pageTitle;
}
@@ -25,4 +33,19 @@ public class LibraryItemPage {
public ArrayList<ListItem> getListItems() {
return listItems;
}
// Setter
public void setPageTitle(String pageTitle) {
this.pageTitle = pageTitle;
}
public void setPageId(String pageId) {
this.pageId = pageId;
}
public void setListItems(ArrayList<ListItem> listItems) {
this.listItems = listItems;
}
}
@@ -20,6 +20,10 @@ public class ListItem {
this.itemId = itemId;
}
public ListItem() {
// Empty constructor
}
// Getter
public String getTitle() {
@@ -38,4 +42,22 @@ public class ListItem {
return itemId;
}
// Setter
public void setTitle(String title) {
this.title = title;
}
public void setDescription(String description) {
this.description = description;
}
public void setItemType(ListItemType itemType) {
this.itemType = itemType;
}
public void setItemId(String itemId) {
this.itemId = itemId;
}
}
@@ -0,0 +1,74 @@
package one.nem.lacerta.model;
import java.util.ArrayList;
import java.util.List;
public class PublicPath {
/*
* ユーザーが扱うパス(内部パスの代替)
* (時間がないのでInjectされることは考慮しない)
*
* TODO-rca:
* - こわれたパスを検知する
* - バリデーション
*/
List<String> path = new ArrayList<String>();
public PublicPath() {
}
public PublicPath(List<String> path) {
this.path = path;
}
private void add(String path) {
this.path.add(path);
}
private void resolveInternal(String path) {
if (path.equals("..")) {
this.path.remove(this.path.size() - 1);
} else {
add(path);
}
}
public PublicPath resolve(String path) {
resolveInternal(path);
return this;
}
public PublicPath resolve(List<String> path) {
for (String p : path) {
resolveInternal(p);
}
return this;
}
public PublicPath resolve(PublicPath path) {
for (String p : path.getPath()) {
resolveInternal(p);
}
return this;
}
public PublicPath parent() {
this.path.remove(this.path.size() - 1);
return this;
}
public List<String> getPath() {
return path;
}
public String getStringPath() {
return String.join("/", path);
}
public PublicPath getRoot() {
PublicPath root = new PublicPath();
root.add("/");
return root;
}
}
@@ -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;
/**
* ドキュメントの詳細データ
*/
@@ -19,31 +22,21 @@ public class DocumentDetail {
DocumentMeta meta;
/**
* ドキュメントのパス(DocumentPathインスタンス)
* ドキュメントのページ(Pageインスタンスのリスト)
*/
DocumentPath path;
/**
* ドキュメントの作者(String)
*/
String author;
/**
* ドキュメントのデフォルトブランチ(String)
*/
String defaultBranch;
Repository repository;
ArrayList<Page> pages;
// Constructor
public DocumentDetail() {
}
public DocumentDetail(DocumentMeta meta, DocumentPath path, String author, String defaultBranch) {
public DocumentDetail(DocumentMeta meta) {
this.meta = meta;
this.path = path;
this.author = author;
this.defaultBranch = defaultBranch;
}
public DocumentDetail(DocumentMeta meta, ArrayList<Page> pages) {
this.meta = meta;
this.pages = pages;
}
// Getter
@@ -56,34 +49,12 @@ public class DocumentDetail {
}
/**
* ドキュメントのパス(DocumentPathインスタンス)を取得する
* ドキュメントのページ(Pageインスタンスのリスト)を取得する
*/
public DocumentPath getPath() {
return path;
public ArrayList<Page> getPages() {
return pages;
}
/**
* ドキュメントの作者(String)を取得する
*/
public String getAuthor() {
return author;
}
/**
* ドキュメントのデフォルトブランチ(String)を取得する
*/
public String getDefaultBranch() {
return defaultBranch;
}
/**
* ドキュメントのリポジトリを取得する
*/
public Repository getRepository() {
return repository;
}
// Setter
/**
@@ -95,34 +66,11 @@ public class DocumentDetail {
}
/**
* ドキュメントのパス(DocumentPathインスタンス)を設定する
* @param path DocumentPathインスタンス
* ドキュメントのページ(Pageインスタンスのリスト)を設定する
* @param pages Pageインスタンスのリスト
*/
public void setPath(DocumentPath path) {
this.path = path;
}
/**
* ドキュメントの作者(String)を設定する
* @param author ドキュメントの作者
*/
public void setAuthor(String author) {
this.author = author;
}
/**
* ドキュメントのデフォルトブランチ(String)を設定する
* @param defaultBranch ドキュメントのデフォルトブランチ
*/
public void setDefaultBranch(String defaultBranch) {
this.defaultBranch = defaultBranch;
}
/**
* ドキュメントのリポジトリを設定する
*/
public void setRepository(Repository repository) {
this.repository = repository;
public void setPages(ArrayList<Page> pages) {
this.pages = pages;
}
}
@@ -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;
@@ -9,7 +11,7 @@ import java.util.UUID;
/**
* ドキュメントのメタデータ
*/
public class DocumentMeta {
public class DocumentMeta { // TODO-rca: JavaDoc対応
/**
* ドキュメントのID(String)
*/
@@ -35,42 +37,52 @@ public class DocumentMeta {
*/
List<DocumentTag> tags;
PublicPath path;
String author;
String defaultBranch;
// Constructor
public DocumentMeta() {
}
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags) { // With all
public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
this.id = UUID.randomUUID().toString();
this.title = title;
this.tags = tags;
this.author = author;
this.defaultBranch = defaultBranch;
}
public DocumentMeta(String id, String title, List<DocumentTag> tags, String author, String defaultBranch) {
this.id = id;
this.title = title;
this.tags = tags;
this.author = author;
this.defaultBranch = defaultBranch;
}
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> 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) { // Without tags
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, PublicPath path, 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.path = path;
this.author = author;
this.defaultBranch = defaultBranch;
}
// Getter
@@ -121,6 +133,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
/**
@@ -163,6 +196,30 @@ 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;
}
/**
* ドキュメントのデフォルトブランチ(String)を設定する
* @param defaultBranch ドキュメントのデフォルトブランチ
*/
public void setDefaultBranch(String defaultBranch) {
this.defaultBranch = defaultBranch;
}
/**
* updatedAtを現在時刻に設定する
*/
@@ -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<XmlMetaPageModel> pages;
// Constructor
@@ -17,31 +13,15 @@ public class XmlMetaModel {
public XmlMetaModel() {
}
public XmlMetaModel(String title, String author, String description, String defaultBranch, ArrayList<XmlMetaPageModel> pages) {
this.title = title;
this.author = author;
this.description = description;
this.defaultBranch = defaultBranch;
public XmlMetaModel(String revisionId, ArrayList<XmlMetaPageModel> 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<XmlMetaPageModel> 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<XmlMetaPageModel> pages) {
this.pages = pages;
}
}
@@ -0,0 +1,39 @@
package one.nem.lacerta.model.document.page;
import android.graphics.Bitmap;
public class Page {
String fileName;
Bitmap bitmap;
// Constructor
public Page() {
}
public Page(String fileName, Bitmap bitmap) {
this.fileName = fileName;
this.bitmap = bitmap;
}
// Getter
public String getFileName() {
return fileName;
}
public Bitmap getBitmap() {
return bitmap;
}
// Setter
public void setFileName(String fileName) {
this.fileName = fileName;
}
public void setBitmap(Bitmap bitmap) {
this.bitmap = bitmap;
}
}
+1
View File
@@ -44,4 +44,5 @@ dependencies {
implementation project(':source')
implementation project(':utils')
implementation project(':data')
implementation project(':vcs')
}
@@ -2,13 +2,14 @@ package one.nem.lacerta.processor;
import android.graphics.Bitmap;
import one.nem.lacerta.model.document.DocumentDetail;
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;
// 更新
@@ -18,7 +19,5 @@ public interface DocumentProcessor {
Bitmap getPageAtIndex(int index);
int getPageCount();
void close() throws Exception;
void init() throws Exception; // TODO-rca: 例外処理
DocumentDetail getDocumentDetail();
}
@@ -14,12 +14,18 @@ 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;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
public class DocumentProcessorImpl implements DocumentProcessor{
@@ -32,77 +38,47 @@ 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, @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
this.documentRootPath = this.documentDetail.getPath().getFullPath();
// 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
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");
this.lacertaVcs = lacertaVcsFactory.create(this.documentDetail.getMeta().getId());
}
@Override
public void addNewPageToLast(Bitmap bitmap) throws Exception{
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);
lacertaVcs.insertPage(documentDetail.getPages().size(), filename);
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
logger.info("addNewPageToLast", "finished");
logger.info("addNewPageToLast", "filename: " + filename);
@@ -118,27 +94,18 @@ public class DocumentProcessorImpl implements DocumentProcessor{
}
@Override
public void addNewPageAfterIndex(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: 拡張子を動的にする
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, page);
@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);
XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
xmlMetaPageModel.setFilename(filename);
xmlMetaModel.getPages().add(index - 1, xmlMetaPageModel);
lacertaVcs.insertPage(index, filename);
}
@Override
@@ -162,14 +129,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;
}
}
+1
View File
@@ -31,3 +31,4 @@ include ':model'
include ':processor'
include ':shared:ui'
include ':shared:icon'
include ':vcs'
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@color/colorOnBackground"
android:pathData="M256,746.15L213.85,704L437.85,480L213.85,256L256,213.85L480,437.85L704,213.85L746.15,256L522.15,480L746.15,704L704,746.15L480,522.15L256,746.15Z"/>
</vector>
@@ -5,6 +5,6 @@
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:fillColor="@color/colorOnBackground"
android:pathData="M330,710L630,710L630,650L330,650L330,710ZM330,550L630,550L630,490L330,490L330,550ZM252.31,860Q222,860 201,839Q180,818 180,787.69L180,172.31Q180,142 201,121Q222,100 252.31,100L570,100L780,310L780,787.69Q780,818 759,839Q738,860 707.69,860L252.31,860ZM540,340L540,160L252.31,160Q247.69,160 243.85,163.85Q240,167.69 240,172.31L240,787.69Q240,792.31 243.85,796.15Q247.69,800 252.31,800L707.69,800Q712.31,800 716.15,796.15Q720,792.31 720,787.69L720,340L540,340ZM240,160L240,160L240,340L240,340L240,160L240,340L240,340L240,787.69Q240,792.31 240,796.15Q240,800 240,800L240,800Q240,800 240,796.15Q240,792.31 240,787.69L240,172.31Q240,167.69 240,163.85Q240,160 240,160Z"/>
</vector>
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@color/colorOnBackground"
android:pathData="M820,288.46L820,747.69Q820,778 799,799Q778,820 747.69,820L212.31,820Q182,820 161,799Q140,778 140,747.69L140,212.31Q140,182 161,161Q182,140 212.31,140L671.54,140L820,288.46ZM760,314L646,200L212.31,200Q206.92,200 203.46,203.46Q200,206.92 200,212.31L200,747.69Q200,753.08 203.46,756.54Q206.92,760 212.31,760L747.69,760Q753.08,760 756.54,756.54Q760,753.08 760,747.69L760,314ZM480,690.77Q521.54,690.77 550.77,661.54Q580,632.31 580,590.77Q580,549.23 550.77,520Q521.54,490.77 480,490.77Q438.46,490.77 409.23,520Q380,549.23 380,590.77Q380,632.31 409.23,661.54Q438.46,690.77 480,690.77ZM255.39,395.38L583.84,395.38L583.84,255.39L255.39,255.39L255.39,395.38ZM200,314L200,747.69Q200,753.08 200,756.54Q200,760 200,760L200,760Q200,760 200,756.54Q200,753.08 200,747.69L200,212.31Q200,206.92 200,203.46Q200,200 200,200L200,200L200,314Z"/>
</vector>
@@ -7,15 +7,21 @@ import androidx.room.RoomDatabase;
import one.nem.lacerta.source.database.entity.TagEntity;
import one.nem.lacerta.source.database.entity.DocumentEntity;
import one.nem.lacerta.source.database.entity.LibraryEntity;
import one.nem.lacerta.source.database.entity.VcsRevEntity;
import one.nem.lacerta.source.database.entity.VcsLogEntity;
// Daos
import one.nem.lacerta.source.database.dao.TagDao;
import one.nem.lacerta.source.database.dao.DocumentDao;
import one.nem.lacerta.source.database.dao.LibraryDao;
import one.nem.lacerta.source.database.dao.VcsRevDao;
import one.nem.lacerta.source.database.dao.VcsLogDao;
@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class}, version = 1)
@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class}, version = 2)
public abstract class LacertaDatabase extends RoomDatabase {
public abstract TagDao tagDao();
public abstract DocumentDao documentDao();
public abstract LibraryDao libraryDao();
public abstract VcsRevDao vcsRevDao();
public abstract VcsLogDao vcsLogDao();
}
@@ -20,6 +20,8 @@ public class LacertaDatabaseModule {
LacertaDatabase.class,
"lacerta.db")
.allowMainThreadQueries() // Debug
.fallbackToDestructiveMigration() // Debug Only: マイグレーションがない場合などにデータベースを再生成する
.fallbackToDestructiveMigrationOnDowngrade() // Debug Only: マイグレーションがない場合などにデータベースを再生成する
.build();
}
}
@@ -5,7 +5,7 @@ import androidx.room.TypeConverter;
import java.util.ArrayList;
import java.util.Arrays;
public class TagArrayListConverter {
public class ArrayListConverter {
@TypeConverter
public static ArrayList<String> fromString(String value) {
@@ -0,0 +1,39 @@
package one.nem.lacerta.source.database.dao;
import androidx.room.Dao;
import androidx.room.Insert;
import androidx.room.Query;
import java.util.List;
import one.nem.lacerta.source.database.entity.VcsLogEntity;
@Dao
public interface VcsLogDao {
// Select
@Query("SELECT * FROM vcs_log WHERE id = :id")
VcsLogEntity findById(String id);
@Query("SELECT * FROM vcs_log")
List<VcsLogEntity> findAll();
@Query("SELECT * FROM vcs_log WHERE id IN (:ids)")
List<VcsLogEntity> findByIds(List<String> ids);
@Query("SELECT * FROM vcs_log WHERE document_id = :documentId")
List<VcsLogEntity> findByDocumentId(String documentId);
// Insert
@Insert
void insertAll(VcsLogEntity... vcsLogs);
@Insert
void insertAll(List<VcsLogEntity> vcsLogs);
@Insert
void insert(VcsLogEntity vcsLog);
// TODO-rca: Update, Deleteが必要か検討
}
@@ -0,0 +1,44 @@
package one.nem.lacerta.source.database.dao;
import androidx.room.Dao;
import androidx.room.Insert;
import androidx.room.Query;
import java.util.List;
import one.nem.lacerta.source.database.entity.VcsRevEntity;
@Dao
public interface VcsRevDao {
// Select
@Query("SELECT * FROM vcs_rev WHERE id = :id")
VcsRevEntity findById(String id);
@Query("SELECT * FROM vcs_rev")
List<VcsRevEntity> findAll();
@Query("SELECT * FROM vcs_rev WHERE id IN (:ids)")
List<VcsRevEntity> findByIds(List<String> ids);
@Query("SELECT * FROM vcs_rev WHERE document_id = :documentId")
List<VcsRevEntity> findByDocumentId(String documentId);
@Query("SELECT * FROM vcs_rev WHERE document_id = :documentId ORDER BY created_at DESC LIMIT 1")
VcsRevEntity findLatestByDocumentId(String documentId);
@Query("SELECT * FROM vcs_rev WHERE document_id = :documentId AND branch_name = :branchName ORDER BY created_at DESC LIMIT 1")
VcsRevEntity findLatestByDocumentIdAndBranchName(String documentId, String branchName);
@Insert
void insertAll(VcsRevEntity... vcsRevs);
@Insert
void insertAll(List<VcsRevEntity> vcsRevs);
@Insert
void insert(VcsRevEntity vcsRev);
// TODO-rca: Update, Deleteが必要か検討
}
@@ -8,7 +8,6 @@ import androidx.room.TypeConverter;
import androidx.room.TypeConverters;
import one.nem.lacerta.source.database.common.DateTypeConverter;
import one.nem.lacerta.source.database.common.TagArrayListConverter;
import one.nem.lacerta.source.database.common.TagListConverter;
import java.util.ArrayList;
@@ -40,4 +39,7 @@ public class DocumentEntity {
@ColumnInfo(name = "tag_ids")
public List<String> tagIds; // タグ
@ColumnInfo(name = "public_path")
public String publicPath; // 公開パス
}
@@ -16,10 +16,12 @@ public class LibraryEntity {
@NonNull
public String id; // ドキュメントID
@ColumnInfo(name = "root_path")
public String rootPath; // rootのパス
// TODO-rca: 廃止?
@ColumnInfo(name = "path")
public String path; // パス
@ColumnInfo(name = "root_path")
public String rootPath; // ルートパス
}
@@ -0,0 +1,48 @@
package one.nem.lacerta.source.database.entity;
import androidx.annotation.NonNull;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
import androidx.room.TypeConverters;
import java.util.Date;
import one.nem.lacerta.source.database.common.DateTypeConverter;
@Entity(tableName = "vcs_log")
@TypeConverters({DateTypeConverter.class})
public class VcsLogEntity {
/**
* イベントID
*/
@PrimaryKey
@ColumnInfo(name = "id")
@NonNull
public String id;
/**
* ドキュメントID
*/
@ColumnInfo(name = "document_id")
public String documentId;
/**
* ブランチ名
*/
@ColumnInfo(name = "branch_name")
public String branchName;
/**
* 発生日時
*/
@ColumnInfo(name = "created_at")
public Date createdAt;
/**
* 発生アクション
*/
@ColumnInfo(name = "action")
public String action;
}
@@ -0,0 +1,58 @@
package one.nem.lacerta.source.database.entity;
import androidx.annotation.NonNull;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
import androidx.room.TypeConverters;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import one.nem.lacerta.source.database.common.ArrayListConverter;
import one.nem.lacerta.source.database.common.DateTypeConverter;
@Entity(tableName = "vcs_rev")
@TypeConverters({DateTypeConverter.class, ArrayListConverter.class})
public class VcsRevEntity {
/**
* リビジョンID
*/
@PrimaryKey
@ColumnInfo(name = "id")
@NonNull
public String id;
/**
* ドキュメントID
*/
@ColumnInfo(name = "document_id")
public String documentId;
/**
* ブランチ名
*/
@ColumnInfo(name = "branch_name")
public String branchName;
/**
* コミットメッセージ
*/
@ColumnInfo(name = "commit_message")
public String commitMessage;
/**
* コミット日時
*/
@ColumnInfo(name = "created_at")
public Date createdAt;
/**
* 含まれるLogのID
*/
@ColumnInfo(name = "log_ids")
public ArrayList<String> logIds;
}
@@ -11,6 +11,8 @@ public interface LacertaLogger {
void trace(String tag, String message);
void fatal(String tag, String message);
void e_code(String errorId);
String buildKVMessage(KeyValueLog... logs);
// With name
String buildKVMessage(String name, KeyValueLog... logs);
@@ -43,6 +43,11 @@ public class LacertaLoggerImpl implements LacertaLogger{
Log.wtf(tag, message);
}
@Override
public void e_code(String errorId) {
Log.e("ErrorReport", "An error occurred. Searchable error ID: " + errorId);
}
@Override
public String buildKVMessage(KeyValueLog... logs) {
StringBuilder builder = new StringBuilder();
@@ -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<XmlMetaPageModel> 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()) {
+1
View File
@@ -0,0 +1 @@
/build
+60
View File
@@ -0,0 +1,60 @@
plugins {
alias(libs.plugins.com.android.library)
id 'com.google.dagger.hilt.android'
}
android {
namespace 'one.nem.lacerta.vcs'
compileSdk 34
defaultConfig {
minSdk 26
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
dependencies {
implementation libs.androidx.appcompat
implementation libs.com.google.android.material
testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core
// Hilt (DI)
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler
implementation project(':model')
implementation project(':source')
implementation project(':utils')
// Jackson
// TODO-rca: バージョンカタログにうつす
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
implementation 'com.fasterxml.jackson.core:jackson-core:2.16.1'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.1'
// Room
implementation libs.androidx.room.runtime
annotationProcessor libs.androidx.room.compiler
}
View File
Whitespace-only changes.
+21
View File
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
@@ -0,0 +1,26 @@
package one.nem.lacerta.vcs;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("one.nem.lacerta.vcs.test", appContext.getPackageName());
}
}
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
@@ -0,0 +1,48 @@
package one.nem.lacerta.vcs;
public enum ActionType {
INSERT_PAGE("insert_page"),
UPDATE_PAGE("update_page"),
DELETE_PAGE("delete_page"),
// TODO-rca: 実装----------------------------------------
UPDATE_PAGE_ORDER("update_page_order"),
INSERT_PAGE_CONTENT("insert_page_content"),
UPDATE_PAGE_CONTENT("update_page_content"),
DELETE_PAGE_CONTENT("delete_page_content"),
CREATE_BRANCH("create_branch"),
DROP_BRANCH("drop_branch"),
REBASE_BRANCH("rebase_branch"),
// -----------------------------------------------------
CREATE_DOCUMENT("create_document"),
DROP_DOCUMENT("drop_document"),
// TODO-rca: 実装----------------------------------------
UPDATE_DOCUMENT_META("update_document_meta"),
// -----------------------------------------------------
OTHER("other");
private final String value;
ActionType(String value) {
this.value = value;
}
public String getValue() {
return value;
}
public static ActionType fromValue(String value) {
for (ActionType actionType : ActionType.values()) {
if (actionType.getValue().equals(value)) {
return actionType;
}
}
return ActionType.OTHER;
}
}
@@ -0,0 +1,17 @@
package one.nem.lacerta.vcs;
public interface LacertaVcs {
// Actions
public void updatePage(int index, String fileName);
public void insertPage(int index, String fileName);
public void deletePage(int index);
public void createDocument(String documentId);
// debug
public void printLog();
}
@@ -0,0 +1,10 @@
package one.nem.lacerta.vcs.factory;
import dagger.assisted.AssistedFactory;
import one.nem.lacerta.vcs.impl.LacertaVcsImpl;
@AssistedFactory
public interface LacertaVcsFactory {
LacertaVcsImpl create(String documentId);
}
@@ -0,0 +1,67 @@
package one.nem.lacerta.vcs.impl;
import java.util.UUID;
import javax.inject.Inject;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
import one.nem.lacerta.source.database.LacertaDatabase;
import one.nem.lacerta.source.database.entity.VcsLogEntity;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.vcs.LacertaVcs;
public class LacertaVcsImpl implements LacertaVcs {
// TAG
private static final String TAG = LacertaVcsImpl.class.getSimpleName();
String documentId;
LacertaDatabase database;
LacertaLogger logger;
@AssistedInject
public LacertaVcsImpl(LacertaLogger logger, LacertaDatabase database, @Assisted String documentId) {
this.logger = logger;
this.database = database;
this.documentId = documentId;
logger.debug(TAG, "LacertaVcsImpl constructor");
}
@Override
public void updatePage(int index, String fileName) {
}
@Override
public void insertPage(int index, String fileName) {
logger.debug(TAG, "insertPage");
VcsLogEntity vcsLogEntity = new VcsLogEntity();
vcsLogEntity.id = UUID.randomUUID().toString();
vcsLogEntity.documentId = documentId;
vcsLogEntity.branchName = "master";
vcsLogEntity.createdAt = new java.util.Date();
vcsLogEntity.action = "placeholder";
database.vcsLogDao().insert(vcsLogEntity);
}
@Override
public void deletePage(int index) {
}
@Override
public void createDocument(String documentId) {
}
@Override
public void printLog() {
logger.debug(TAG, "printLog");
database.vcsLogDao().findAll().forEach(vcsLog -> {
logger.debug(TAG, vcsLog.id);
});
}
}
@@ -0,0 +1,65 @@
package one.nem.lacerta.vcs.internal;
import android.provider.ContactsContract;
import one.nem.lacerta.vcs.ActionType;
import one.nem.lacerta.vcs.model.action.DeletePage;
import one.nem.lacerta.vcs.model.action.InsertPage;
import one.nem.lacerta.vcs.model.action.UpdatePage;
import one.nem.lacerta.vcs.model.action.common.ActionBase;
import com.fasterxml.jackson.databind.ObjectMapper;
public class JsonUtils {
// TODO-rca: Injectionで実装しなおす
// Public methods
public static String toJson(Object object) {
ActionBase converted;
if (object == null) {
return null;
} else if (object instanceof ActionBase) {
ObjectMapper mapper = new ObjectMapper();
switch (((ActionBase) object).getActionType()) {
case INSERT_PAGE:
converted = (InsertPage) object;
break;
case UPDATE_PAGE:
converted = (UpdatePage) object;
break;
case DELETE_PAGE:
converted = (DeletePage) object;
break;
default:
throw new IllegalArgumentException("Unknown action type");
}
try {
return mapper.writeValueAsString(converted);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
throw new IllegalArgumentException("Unknown object type");
}
public static Object fromJson(String json, ActionType actionType) {
ObjectMapper mapper = new ObjectMapper();
try {
switch (actionType) {
case INSERT_PAGE:
return mapper.readValue(json, InsertPage.class);
case UPDATE_PAGE:
return mapper.readValue(json, UpdatePage.class);
case DELETE_PAGE:
return mapper.readValue(json, DeletePage.class);
default:
throw new IllegalArgumentException("Unknown action type");
}
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
@@ -0,0 +1,19 @@
package one.nem.lacerta.vcs.model.action;
import one.nem.lacerta.vcs.model.action.common.ActionBase;
public class DeletePage extends ActionBase {
private int index;
public DeletePage() {
}
public DeletePage(int index) {
this.index = index;
}
public int getIndex() {
return index;
}
}
@@ -0,0 +1,25 @@
package one.nem.lacerta.vcs.model.action;
import one.nem.lacerta.vcs.model.action.common.ActionBase;
public class InsertPage extends ActionBase {
private int index;
private String fileName;
public InsertPage() {
}
public InsertPage(int index, String fileName) {
this.index = index;
this.fileName = fileName;
}
public int getIndex() {
return index;
}
public String getFileName() {
return fileName;
}
}
@@ -0,0 +1,25 @@
package one.nem.lacerta.vcs.model.action;
import one.nem.lacerta.vcs.model.action.common.ActionBase;
public class UpdatePage extends ActionBase {
private int index;
private String fileName;
public UpdatePage() {
}
public UpdatePage(int index, String fileName) {
this.index = index;
this.fileName = fileName;
}
public int getIndex() {
return index;
}
public String getFileName() {
return fileName;
}
}
@@ -0,0 +1,22 @@
package one.nem.lacerta.vcs.model.action.common;
import one.nem.lacerta.vcs.ActionType;
public class ActionBase {
private ActionType actionType;
public ActionBase() {
}
public ActionBase(ActionType actionType) {
this.actionType = actionType;
}
public ActionType getActionType() {
return actionType;
}
public void setActionType(ActionType actionType) {
this.actionType = actionType;
}
}
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
@@ -0,0 +1,17 @@
package one.nem.lacerta.vcs;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}