Compare commits

..
Author SHA1 Message Date
r-ca bc5d0edd68 unused警告を無効に 2024-01-08 12:52:45 +09:00
r-ca 3540f20c46 ログ追加 2024-01-08 12:52:10 +09:00
r-ca 164b6ea6d4 ログ追加 2024-01-08 12:50:44 +09:00
r-ca 8fdefb9850 Logger追加 2024-01-08 12:50:26 +09:00
r-ca 8e4018beb0 必要のなかった戻り値を削除 2024-01-08 12:49:52 +09:00
r-ca ddd2b097e6 import整理 2024-01-08 12:48:20 +09:00
r-ca 9fe646fad8 import整理 2024-01-08 12:48:04 +09:00
r-ca 5e1d1f6a76 書き換えない変数をfinalに 2024-01-08 12:47:39 +09:00
r-ca 649d6ccfdc ログ修正 2024-01-08 12:46:42 +09:00
r-ca dccb3090e1 Merge branch 'common/improve_logger' into source/add_files_refactor1 2024-01-08 12:43:58 +09:00
r-ca de4a501c3f Revert "KeyValueログモデル作成"
This reverts commit b75759b650.
2024-01-08 12:43:49 +09:00
r-ca 28b5f97c31 Revert "移動"
This reverts commit 3453d224e1.
2024-01-08 12:43:49 +09:00
r-ca 4656914203 Revert "Key-Valueなログを出力しやすくした"
This reverts commit a439bbd888.
2024-01-08 12:43:48 +09:00
r-ca 1996d8dc4a Revert "修正"
This reverts commit 3b6d88bafd.
2024-01-08 12:43:48 +09:00
r-ca 3b6d88bafd 修正 2024-01-08 12:41:10 +09:00
r-ca a439bbd888 Key-Valueなログを出力しやすくした 2024-01-08 12:39:37 +09:00
r-ca 3453d224e1 移動 2024-01-08 12:36:39 +09:00
r-ca b75759b650 KeyValueログモデル作成 2024-01-08 12:35:30 +09:00
r-ca a78cac8178 リファクタリング 2024-01-08 12:29:24 +09:00
r-ca a42ef8f4fc 改行の訂正 2024-01-08 12:27:00 +09:00
r-ca 5c16ea6e21 メタデータの書き込みに対応 2024-01-08 12:23:48 +09:00
r-ca f000addbce Documentオブジェクト読み込みメソッド作成 2024-01-08 12:20:12 +09:00
r-ca 73fa8201d6 Documentオブジェクト保存メソッド作成 2024-01-08 12:17:16 +09:00
r-ca 5c0fd4fdbb WIP Documentオブジェクト保存メソッド作成 2024-01-08 12:16:03 +09:00
r-ca 6e514b216a パーサー作り直し 2024-01-08 12:14:23 +09:00
r-ca 59ba2cdcfc WIP 2024-01-08 12:03:26 +09:00
r-ca b3be0b9e21 Initメソッド作り直し 2024-01-08 12:00:22 +09:00
r-ca a836410cbd ファイルにStringを保存するメソッド作成 2024-01-08 11:56:24 +09:00
r-ca 15d454690e ファイルにStringを保存するメソッド作成 WIP 2024-01-08 11:54:13 +09:00
r-ca 2ba243ea4a ファイルの中身をStringで読み出すメソッド作成 2024-01-08 11:48:17 +09:00
r-ca 52657fdbbd ファイルを取得するメソッド作成 2024-01-08 11:42:58 +09:00
r-ca 88cd58f920 いくつかのメソッドで対応する引数を増やした 2024-01-08 11:38:05 +09:00
r-ca 1ee0a1b8ea ファイル名から検索するメソッドを追加 2024-01-08 11:35:09 +09:00
r-ca 656482e968 一気に移動する処理を作成 WIP 2024-01-08 11:32:46 +09:00
r-ca efc16423d4 ログ 2024-01-08 11:30:48 +09:00
r-ca 38db65c9d3 挙動修正 2024-01-08 11:30:30 +09:00
r-ca 31a0220b90 Currentまでを自動で作成するメソッドを作成 2024-01-08 11:27:59 +09:00
r-ca 5cb57997b8 WIP 2024-01-08 11:27:09 +09:00
r-ca 0fade2c41b ファイルマネージャにメソッド追加, 微修正 2024-01-08 11:26:18 +09:00
r-ca 5a0b215626 ファイルマネージャにメソッド追加 WIP 2024-01-08 11:24:29 +09:00
r-ca 49775a1f49 WIP 2024-01-08 11:23:06 +09:00
r-ca 552f0e42b5 親ディレクトリが不足している場合は作成するように WIP 2024-01-08 11:19:05 +09:00
r-ca b8e70cd015 ログポイント追加 2024-01-08 11:14:48 +09:00
r-ca 67350639c7 ファイル作成/削除を追加 WIP 2024-01-08 11:12:51 +09:00
r-ca eb6a13baba ボタン追加WIP 2024-01-08 11:00:55 +09:00
r-ca bd0a16bec6 ボタン追加WIP 2024-01-08 10:56:33 +09:00
r-ca 1019b1d035 init処理を追加 2024-01-08 10:54:46 +09:00
r-ca 2f0460a9ea サンプルにパスを追加 2024-01-08 10:53:20 +09:00
r-ca 2b4a24de7c クラス変数作成 2024-01-08 10:51:39 +09:00
r-ca b683c311df クラス変数作成 2024-01-08 10:51:10 +09:00
r-ca 4bbb119729 Listで追加するメソッドを実装 2024-01-08 10:50:31 +09:00
r-ca 8c714d5193 修正 2024-01-08 09:52:19 +09:00
r-ca f441a957f7 pluginにHiltを追加 2024-01-07 19:37:38 +09:00
r-ca dfe5c36e9e リファクタリング 2024-01-07 19:36:49 +09:00
r-ca c54967f016 WIP 2024-01-07 19:22:57 +09:00
r-ca 95beda8cc2 WIP 2024-01-07 18:07:43 +09:00
r-ca 02d72ffa68 グローバル変数作成 2024-01-07 18:04:07 +09:00
r-ca b159db97bb サンプルを生成するメソッド作成 2024-01-07 18:03:33 +09:00
r-ca 1653da9c94 依存関係に追加 2024-01-07 18:01:33 +09:00
r-ca 1b00f2c64e WIP 2024-01-07 18:00:40 +09:00
r-ca de668412fc WIP 2024-01-07 17:55:39 +09:00
r-ca 07042f4e91 リスナー作成 いろいろ 2024-01-07 17:52:56 +09:00
r-ca 78c36df105 レイアウト修正 2024-01-07 17:52:17 +09:00
r-ca 14837f83cc 依存関係追加 2024-01-07 17:48:44 +09:00
r-ca 4fd490ee12 Factory作成 2024-01-07 17:47:47 +09:00
r-ca d453c0705f import 2024-01-07 17:44:42 +09:00
r-ca aca90aa6e1 依存関係に追加 2024-01-07 16:38:12 +09:00
r-ca f52d00f930 リスナー追加 2024-01-07 16:37:07 +09:00
r-ca 9b70adecac レイアウト修正 WIP 2024-01-07 16:36:19 +09:00
r-ca 80c5bca179 WIP 2024-01-07 16:32:44 +09:00
r-ca 0a639d4b05 レイアウト修正 2024-01-07 16:30:57 +09:00
r-ca 3ed6f7b5a6 テーマをインポート 2024-01-07 16:29:22 +09:00
r-ca f86dc981b4 レイアウト修正 WIP 2024-01-07 16:28:33 +09:00
r-ca c9eda4837b いろいろ 2024-01-07 16:26:46 +09:00
r-ca 4d72fc10bf 引数の処理を削除 2024-01-07 16:25:38 +09:00
r-ca c9a594763d デバッグ用フラグメント作成 2024-01-07 16:25:04 +09:00
r-ca 5a93b79b07 依存関係追加 2024-01-07 16:23:33 +09:00
r-ca 8a5cbe7b18 メタデータのパース処理実装 WIP 2023-12-25 15:51:11 +09:00
r-ca ca153f5602 Injectできるように 2023-12-25 15:45:42 +09:00
r-ca 73f553cff3 パーサーを依存関係に追加 2023-12-25 15:44:15 +09:00
r-ca bd1a1d56cb XMLMetaのパーサーを作成 Impl WIP 2023-12-25 15:43:03 +09:00
r-ca b98fa18cae XMLMetaのパーサーを作成 Impl WIP 2023-12-25 15:34:17 +09:00
r-ca 4875394417 XMLMetaのパーサーを作成 Repository WIP 2023-12-25 15:33:56 +09:00
r-ca b675e7ffa9 XMLMetaのパーサーを作成 WIP 2023-12-25 15:32:57 +09:00
r-ca 453fa4c4cf utilsの依存関係にmodelを追加 2023-12-25 15:31:39 +09:00
r-ca ce3565c082 依存修正 2023-12-25 15:31:10 +09:00
r-ca 523a66429e モデル移動 2023-12-25 15:30:13 +09:00
r-ca b7062a4942 一旦コメントアウト 2023-12-25 15:15:58 +09:00
r-ca 43c7f4ae0f 一旦コメントアウト 2023-12-25 15:15:55 +09:00
r-ca 77702b9da5 Revert "XMLメタデータを読み取るメソッド追加"
This reverts commit d2950ab781.
2023-12-25 15:14:09 +09:00
r-ca d2950ab781 XMLメタデータを読み取るメソッド追加 2023-12-25 15:13:55 +09:00
r-ca 4aefae6b51 XMLメタデータを読み取るメソッド追加 2023-12-25 15:07:00 +09:00
r-ca f2ed0515f8 モデルを移動 2023-12-25 15:05:49 +09:00
r-ca b30834479e initメソッド実装 WIP 2023-12-25 15:04:16 +09:00
r-ca aa0728e97b initメソッド作成 2023-12-25 15:03:04 +09:00
r-ca 3affd2dd2f ログ追加 2023-12-25 15:00:14 +09:00
r-ca 9534e36a9d LoggerをInjectした 2023-12-25 14:57:21 +09:00
r-ca 3bfcc9fd63 close()を追加 WIP 2023-12-25 14:55:02 +09:00
r-ca e3186249a0 XmlMetaProcessor廃止 2023-12-25 14:53:12 +09:00
r-ca c8517ad814 Impl 2023-12-25 14:49:04 +09:00
r-ca ffb6ebb358 Repository追加 2023-12-25 14:46:45 +09:00
r-ca a4db519fcf 操作メソッド追加 2023-12-25 14:29:10 +09:00
r-ca 5ff6ac32ba コンストラクタ, Getter, Setter 2023-12-25 14:25:22 +09:00
r-ca bc06438811 メタデータのモデル作成 WIP 2023-12-25 14:23:12 +09:00
r-ca 6adcbf81c6 メタデータのモデル作成 WIP 2023-12-25 14:23:08 +09:00
r-ca bc24ec45af メタデータのプロセッサーを作成 2023-12-25 14:16:46 +09:00
r-ca ca3b4d78a5 Revert "メタデータのプロセッサーを作成"
This reverts commit c1b8722b82.
2023-12-25 14:16:13 +09:00
r-ca c1b8722b82 メタデータのプロセッサーを作成 2023-12-25 14:15:54 +09:00
r-ca 646627ac49 一旦コメントアウト 2023-12-25 13:34:04 +09:00
r-ca 6a98deab83 FileManagerに普通のファイル読み書きを追加 WIP 2023-12-25 13:33:28 +09:00
r-ca 92b48336ac FileManagerに普通のファイル読み書きを追加 WIP 2023-12-25 13:30:46 +09:00
r-ca 81d545b90b addNewPage実装 WIP 2023-12-25 13:29:02 +09:00
r-ca 9daccbb084 山っぽいものを描画するように 2023-12-25 12:13:22 +09:00
r-ca a47d652275 pngで保存するように変更 2023-12-25 11:57:48 +09:00
r-ca e55b5709dd pngで保存するように変更 2023-12-25 11:57:44 +09:00
r-ca 9fc5d160ac pngで保存するように変更 2023-12-25 11:57:37 +09:00
r-ca 544b09dc39 デバッグメニューロジック実装 2023-12-25 11:55:42 +09:00
r-ca bc42d59471 デバッグメニューレイアウト修正 2023-12-25 11:52:10 +09:00
r-ca 5d46fc3e81 デバッグメニューレイアウト作成 2023-12-25 11:50:13 +09:00
r-ca 9a17910862 saveの中身を実装 WIP 2023-12-25 11:49:01 +09:00
r-ca 8441b88ab3 save/load/removeを追加 Impl WIP 2023-12-25 11:46:54 +09:00
r-ca 92d147ab65 Revert "save/load/removeを追加 Impl WIP"
This reverts commit 1eee31316a.
2023-12-25 11:45:33 +09:00
r-ca 1eee31316a save/load/removeを追加 Impl WIP 2023-12-25 11:44:58 +09:00
r-ca 302eccfdfe save/load/removeを追加 Impl WIP 2023-12-25 11:42:51 +09:00
r-ca 93d1fa3f19 save/load/removeを追加 2023-12-25 11:41:37 +09:00
r-ca 2154e67178 WIP 2023-12-25 11:38:14 +09:00
r-ca de9b78035a Merge remote-tracking branch 'origin/source/add_files' into source/add_files 2023-12-24 15:07:30 +09:00
r-ca 7cb5b1ca7c アノテーション忘れ修正 2023-12-24 15:07:17 +09:00
r-ca 85c419c3ea アノテーション忘れ修正 2023-12-24 15:07:17 +09:00
r-ca 685bdd56f8 メニューに追加 2023-12-24 15:07:16 +09:00
r-ca a32ea3568f Navigationに追加 2023-12-24 15:07:16 +09:00
r-ca 275cd77f53 Impl, Factory修正 2023-12-24 15:07:15 +09:00
r-ca a8274d3882 ロジック実装 2023-12-24 15:07:15 +09:00
r-ca 8b0b58ce99 ID変更 2023-12-24 15:07:14 +09:00
r-ca eeb5387cdf WIP レイアウト 2023-12-24 15:07:14 +09:00
r-ca 41d5f8d71f ファイルマネージャーのデバッグ用フラグメント作成 2023-12-24 15:07:13 +09:00
r-ca b90ef6a487 Factory作成, 実装 2023-12-24 15:07:13 +09:00
r-ca 734f6eb41d Module実装 2023-12-24 15:07:13 +09:00
r-ca 4f762627cf Module作成 2023-12-24 15:07:12 +09:00
r-ca 85a1f8a505 create/remove実装 2023-12-24 15:07:12 +09:00
r-ca 98232dc403 create/removeの引数変更 2023-12-24 15:07:11 +09:00
r-ca e925893ad2 getList修正 2023-12-24 15:07:11 +09:00
r-ca 2f21ecd6bd getList修正 2023-12-24 15:07:10 +09:00
r-ca d203b1b76e Revert "パッケージ整理"
This reverts commit f2dfd2ca56.
2023-12-24 15:07:10 +09:00
r-ca a15383d420 Revert "WIP"
This reverts commit bbad45fbbd.
2023-12-24 15:07:09 +09:00
r-ca 6433b9a1ae WIP 2023-12-24 15:07:09 +09:00
r-ca 1a1446ac62 パッケージ整理 2023-12-24 15:07:09 +09:00
r-ca 60544c7905 Impl実装 WIP 2023-12-24 15:07:08 +09:00
r-ca 7e7d72f903 Impl実装 WIP 2023-12-24 15:07:08 +09:00
r-ca 5a468e37f9 なんかもう全部変えた 2023-12-24 15:07:07 +09:00
r-ca 25cbc32ef9 リネーム 2023-12-24 15:07:07 +09:00
r-ca 310944f51e ImplクラスInit 2023-12-24 15:07:06 +09:00
r-ca c90715b0f5 Repository実装 2023-12-24 15:07:06 +09:00
r-ca effdd8e9f3 リネーム 2023-12-24 15:07:05 +09:00
r-ca b07d370e69 モジュール整理 2023-12-24 15:07:05 +09:00
r-ca f51313411b 依存関係にHiltを追加 2023-12-24 15:07:04 +09:00
r-ca c183327842 依存関係にJGitを追加 2023-12-24 15:07:04 +09:00
r-ca 95d9af1281 インポート追加 2023-12-24 15:07:04 +09:00
r-ca 413c42fdc1 Impl実装 WIP 2023-12-24 15:07:03 +09:00
r-ca 7eca8e9528 リポジトリ更新 2023-12-24 15:07:03 +09:00
r-ca a0deb45fa0 WIP 2023-12-24 15:07:02 +09:00
r-ca e19198446b Factory作成 2023-12-24 15:07:02 +09:00
r-ca e0fe27eadd Impl, Moduleクラス作成 2023-12-24 15:07:01 +09:00
r-ca 83707f8bec パッケージ整理 2023-12-24 15:07:01 +09:00
r-ca c3d9bb0cf9 DocumentProcessor リポジトリ作成 2023-12-24 15:07:00 +09:00
r-ca 39d356841b 依存関係修正 2023-12-24 15:07:00 +09:00
r-ca 4db67a59d7 Init 2023-12-24 15:07:00 +09:00
r-ca 26f5968a4a Init WIP 2023-12-24 15:06:56 +09:00
r-ca 21f2f55531 アノテーション忘れ修正 2023-12-21 16:55:50 +09:00
r-ca 02f1ac13cf アノテーション忘れ修正 2023-12-21 16:54:52 +09:00
r-ca e0f634fcb6 メニューに追加 2023-12-21 16:54:13 +09:00
r-ca 69a0b392ff Navigationに追加 2023-12-21 16:53:55 +09:00
r-ca 0d42dc3461 Impl, Factory修正 2023-12-21 16:53:17 +09:00
r-ca 2aa6bf8c5b ロジック実装 2023-12-21 16:49:17 +09:00
r-ca 123145b6a8 ID変更 2023-12-21 16:49:13 +09:00
r-ca e723174b81 WIP レイアウト 2023-12-21 16:45:26 +09:00
r-ca c1b3c06a9d ファイルマネージャーのデバッグ用フラグメント作成 2023-12-21 16:38:59 +09:00
r-ca a23010b535 Factory作成, 実装 2023-12-21 15:13:31 +09:00
r-ca 29e0dca2c7 Module実装 2023-12-21 15:12:21 +09:00
r-ca a1c87535c6 Module作成 2023-12-21 15:09:15 +09:00
r-ca a0c4718b3a create/remove実装 2023-12-21 15:08:32 +09:00
r-ca 7c0d82f25c create/removeの引数変更 2023-12-21 15:07:32 +09:00
r-ca 5f74123c63 getList修正 2023-12-21 15:06:56 +09:00
r-ca d0543d89b9 getList修正 2023-12-21 15:05:56 +09:00
r-ca fd74f5eab0 Revert "パッケージ整理"
This reverts commit f2dfd2ca56.
2023-12-21 15:03:51 +09:00
r-ca 1bac068c8c Revert "WIP"
This reverts commit bbad45fbbd.
2023-12-21 15:03:51 +09:00
r-ca bbad45fbbd WIP 2023-12-21 15:03:44 +09:00
r-ca f2dfd2ca56 パッケージ整理 2023-12-21 15:02:02 +09:00
r-ca e3d6826912 Impl実装 WIP 2023-12-21 14:59:12 +09:00
r-ca b28a939792 Impl実装 WIP 2023-12-21 14:54:45 +09:00
r-ca 7ba70cc84b なんかもう全部変えた 2023-12-21 14:53:04 +09:00
r-ca 865d8b994c リネーム 2023-12-21 14:49:36 +09:00
r-ca 1c5325711a ImplクラスInit 2023-12-21 14:45:35 +09:00
r-ca aff7af76d4 Repository実装 2023-12-21 14:44:36 +09:00
r-ca 9fecefeb4e リネーム 2023-12-21 14:41:06 +09:00
r-ca 577453a4db モジュール整理 2023-12-21 14:35:41 +09:00
r-ca 814dfd23fa 依存関係にHiltを追加 2023-12-21 14:31:04 +09:00
r-ca 0309864d0b 依存関係にJGitを追加 2023-12-21 14:29:53 +09:00
r-ca 947c2aa2ab インポート追加 2023-12-21 14:29:16 +09:00
r-ca 0f4ce1b9b1 Impl実装 WIP 2023-12-21 14:27:28 +09:00
r-ca 8a851e4f11 リポジトリ更新 2023-12-21 14:26:59 +09:00
r-ca a298247824 WIP 2023-12-21 14:09:00 +09:00
r-ca 59e32fe696 Factory作成 2023-12-21 14:00:22 +09:00
r-ca 15beb0af57 Impl, Moduleクラス作成 2023-12-21 12:47:23 +09:00
r-ca 14e7fbd127 パッケージ整理 2023-12-21 12:46:49 +09:00
r-ca 144ff7dfd2 DocumentProcessor リポジトリ作成 2023-12-21 12:44:42 +09:00
r-ca d030847992 依存関係修正 2023-12-21 12:42:50 +09:00
r-ca eb1ad1f4af Init 2023-12-21 12:27:50 +09:00
r-ca fc048c9bd6 Init WIP 2023-12-21 12:27:28 +09:00
36 changed files with 1315 additions and 68 deletions

No files matched your search

@@ -1,17 +0,0 @@
---
name: 不具合用テンプレート
about: 不具合用テンプレート
title: "[BUG]: "
labels: バグ
assignees: ''
---
# 概要
<!-- Issueの概要 -->
# 詳細
<!-- バグの詳細 -->
# 影響箇所
<!-- 予想される影響箇所(省略可) -->
@@ -1,17 +0,0 @@
---
name: 改善用テンプレート
about: 改善用テンプレート
title: "[IMPROVE]"
labels: ''
assignees: ''
---
# 概要
<!-- Issueの概要 -->
# 詳細
<!-- 改善内容の詳細 -->
# 影響箇所
<!-- 予想される影響箇所(省略可) -->
@@ -1,20 +1,10 @@
---
name: 新機能用テンプレート
about: 新規能用テンプレート
about: 新規開発Issue用テンプレート
title: ''
labels: 新機能
labels: ''
assignees: ''
---
# 概要
<!-- Issueの概要 -->
# 詳細
<!-- 機能の詳細 -->
# 関連Issue
<!-- 関連するIssueがあれば -->
# 影響箇所
<!-- 予想される影響箇所(省略可) -->
WIP
-18
View File
@@ -1,18 +0,0 @@
# 概要
<!-- PRの概要 -->
# 関連Issue
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
# 詳細
<!-- 詳細 -->
# 影響箇所
<!-- 予想される影響箇所 -->
# チェック
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
- [ ] 機能として完成している
- [ ] WIP(Work in progress: 作業中)
- [ ] 正常にビルド/起動ができる
- [ ] 既存の機能を壊していない
+9
View File
@@ -1,5 +1,6 @@
plugins {
alias(libs.plugins.com.android.library)
id 'com.google.dagger.hilt.android'
}
android {
@@ -33,8 +34,16 @@ dependencies {
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 'com.websitebeaver:documentscanner:1.0.0'
implementation project(':shared:ui')
implementation project(':model')
implementation project(':processor')
implementation project(':utils')
}
@@ -25,15 +25,32 @@ import android.widget.Toast;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;
import java.util.UUID;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
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.processor.DocumentProcessor;
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
/**
* A simple {@link Fragment} subclass.
* Use the {@link ScannerDataManagerStubFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class ScannerDataManagerStubFragment extends Fragment {
// TODO-rca: 時間があったらcacheを使うようにする?
@@ -43,6 +60,19 @@ public class ScannerDataManagerStubFragment extends Fragment {
private Uri photoURI;
private DocumentDetail documentDetail;
private DocumentProcessor documentProcessor;
@Inject
DocumentProcessorFactory documentProcessorFactory;
@Inject
LacertaLogger logger;
@Inject
DeviceInfoUtils deviceInfoUtils;
private final ActivityResultLauncher<Intent> cameraLauncher = registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
result -> {
@@ -120,6 +150,61 @@ public class ScannerDataManagerStubFragment extends Fragment {
}
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();
this.documentProcessor.init();
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;
}
for (CapturedData capturedData : this.results) {
this.documentProcessor.addNewPageToLast(capturedData.getBitmap());
}
});
}
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");
}
@Override
@@ -11,6 +11,7 @@
android:id="@+id/action_button_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:weightSum="2"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -19,7 +20,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/button_call_camera"
style="@style/Widget.Material3.Button.IconButton.Filled"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16px"
android:layout_weight="1"
@@ -27,6 +28,58 @@
</LinearLayout>
<LinearLayout
android:id="@+id/init_button_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal"
android:weightSum="2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/action_button_container">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_create_documnent"
style="@style/Widget.Material3.Button.IconButton.Filled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16px"
android:layout_weight="1"
android:text="Create Doc Obj" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_init_document_processor"
style="@style/Widget.Material3.Button.IconButton.Filled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16px"
android:layout_weight="1"
android:text="Init Processor" />
</LinearLayout>
<LinearLayout
android:id="@+id/doc_button_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:weightSum="2"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/init_button_container">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_add_page"
style="@style/Widget.Material3.Button.IconButton.Filled"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16px"
android:layout_weight="1"
android:text="Add page to last" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/result_recycler_view"
android:layout_width="match_parent"
@@ -35,6 +88,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/action_button_container" />
app:layout_constraintTop_toBottomOf="@id/doc_button_container" />
</androidx.constraintlayout.widget.ConstraintLayout>
+3
View File
@@ -65,4 +65,7 @@ dependencies {
// Scanner
implementation project(':component:scanner')
// Processor
implementation project(':processor')
}
@@ -0,0 +1,44 @@
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 DebugMenuDocProcessorTesterFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class DebugMenuDocProcessorTesterFragment extends Fragment {
public DebugMenuDocProcessorTesterFragment() {
// Required empty public constructor
}
public static DebugMenuDocProcessorTesterFragment newInstance() {
DebugMenuDocProcessorTesterFragment fragment = new DebugMenuDocProcessorTesterFragment();
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_doc_processor_tester, container, false);
return view;
}
}
@@ -0,0 +1,110 @@
package one.nem.lacerta.feature.debug;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.source.file.FileManager;
import one.nem.lacerta.source.file.factory.FileManagerFactory;
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
import javax.inject.Inject;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuFileManagerTesterFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugMenuFileManagerTesterFragment extends Fragment {
public DebugMenuFileManagerTesterFragment() {
// Required empty public constructor
}
@Inject
FileManagerFactory fileManagerFactory;
@Inject
DeviceInfoUtils deviceInfoUtils;
// TODO: Rename and change types and number of parameters
public static DebugMenuFileManagerTesterFragment newInstance() {
DebugMenuFileManagerTesterFragment fragment = new DebugMenuFileManagerTesterFragment();
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_file_manager_tester, container, false);
view.findViewById(R.id.button_create_directory).setOnClickListener(v -> {
EditText editText = view.findViewById(R.id.edit_text_dir_name);
String dirName = editText.getText().toString();
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
fileManager.createDir(dirName);
});
view.findViewById(R.id.button_save_item).setOnClickListener(v -> {
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
fileManager.createDir("test");
fileManager.changeDir("test");
Bitmap bitmap = Bitmap.createBitmap(1000, 1000, Bitmap.Config.ARGB_8888);
// Bitmapに描画処理を行う
Canvas canvas = new Canvas(bitmap);
// 大きな山の形状を作成
android.graphics.Path bigMountainPath = new android.graphics.Path();
bigMountainPath.moveTo(100, 800); // 左下の開始点
bigMountainPath.lineTo(500, 300); // 頂点
bigMountainPath.lineTo(900, 800); // 右下
bigMountainPath.close(); // パスを閉じる
// 山の描画設定
Paint mountainPaint = new Paint();
mountainPaint.setColor(Color.GREEN);
mountainPaint.setStyle(Paint.Style.FILL);
// 大きな山を描画
canvas.drawPath(bigMountainPath, mountainPaint);
// 小さな山の形状を作成
android.graphics.Path smallMountainPath = new android.graphics.Path();
smallMountainPath.moveTo(400, 800); // 左下の開始点
smallMountainPath.lineTo(650, 400); // 頂点
smallMountainPath.lineTo(900, 800); // 右下
smallMountainPath.close(); // パスを閉じる
Paint smallMountainPaint = new Paint();
smallMountainPaint.setColor(Color.parseColor("#006e54"));
smallMountainPaint.setStyle(Paint.Style.FILL);
// 小さな山を描画
canvas.drawPath(smallMountainPath, smallMountainPaint);
fileManager.saveBitmapAtCurrent(bitmap, "test.png");
});
return view;
}
}
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
import java.util.ArrayList;
import java.util.List;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuListItemAdapter;
import one.nem.lacerta.feature.debug.common.model.DebugMenuListItem;
@@ -20,6 +21,7 @@ import one.nem.lacerta.feature.debug.common.model.DebugMenuListItem;
* Use the {@link DebugMenuTopFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugMenuTopFragment extends Fragment {
public DebugMenuTopFragment() {
// Required empty public constructor
@@ -49,6 +51,7 @@ public class DebugMenuTopFragment extends Fragment {
debugMenuListItems.add(new DebugMenuListItem("Meta Data", "View meta data", R.id.action_debugMenuTopFragment_to_debugMenuMetaDataFragment, true));
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("File Manager", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuFileManagerTesterFragment, true));
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
recyclerView.setAdapter(adapter);
@@ -0,0 +1,36 @@
<?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"
android:theme="@style/Theme.Lacerta"
tools:context=".DebugMenuDocProcessorTesterFragment" >
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:orientation="vertical"
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="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_gen_random_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Generate random image" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,40 @@
<?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=".DebugMenuFileManagerTesterFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<EditText
android:id="@+id/edit_text_dir_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Button
android:id="@+id/button_create_directory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Create dir" />
<Button
android:id="@+id/button_dir_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="List item in current" />
<Button
android:id="@+id/button_save_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Save Test Image" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -19,6 +19,9 @@
<action
android:id="@+id/action_debugMenuTopFragment_to_scannerDataManagerStubFragment"
app:destination="@id/scannerDataManagerStubFragment" />
<action
android:id="@+id/action_debugMenuTopFragment_to_debugMenuFileManagerTesterFragment"
app:destination="@id/debugMenuFileManagerTesterFragment" />
</fragment>
<fragment
android:id="@+id/debugMenuMetaDataFragment"
@@ -51,4 +54,9 @@
android:id="@+id/scannerDataManagerStubFragment"
android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
android:label="ScannerDataManagerStubFragment" />
<fragment
android:id="@+id/debugMenuFileManagerTesterFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuFileManagerTesterFragment"
android:label="fragment_debug_menu_file_manager_tester"
tools:layout="@layout/fragment_debug_menu_file_manager_tester" />
</navigation>
@@ -0,0 +1,104 @@
package one.nem.lacerta.model.document.internal;
import java.util.ArrayList;
public class XmlMetaModel {
String title;
String author;
String description;
// Date created;
// Date updated;
String defaultBranch;
ArrayList<XmlMetaPageModel> pages;
// Constructor
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;
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 ArrayList<XmlMetaPageModel> getPages() {
return pages;
}
// 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 setPages(ArrayList<XmlMetaPageModel> pages) {
this.pages = pages;
}
// Public Methods
public void addPage(XmlMetaPageModel page) {
this.pages.add(page);
}
public void addPageAfterIndex(int index, XmlMetaPageModel page) {
this.pages.add(index, page);
//Update index
this.updateIndex();
}
public void removePage(XmlMetaPageModel page) {
this.pages.remove(page);
}
public void removePageAtIndex(int index) {
this.pages.remove(index);
//Update index
this.updateIndex();
}
// Internal Methods
private void updateIndex() { // TODO-rca: 効率悪そう
for (int i = 0; i < this.pages.size(); i++) {
this.pages.get(i).setIndex(i);
}
}
}
@@ -0,0 +1,37 @@
package one.nem.lacerta.model.document.internal;
public class XmlMetaPageModel {
int index;
String filename;
// Constructor
public XmlMetaPageModel() {
}
public XmlMetaPageModel(int index, String filename) {
this.index = index;
this.filename = filename;
}
// Getter
public int getIndex() {
return index;
}
public String getFilename() {
return filename;
}
// Setter
public void setIndex(int index) {
this.index = index;
}
public void setFilename(String filename) {
this.filename = filename;
}
}
+12
View File
@@ -32,4 +32,16 @@ dependencies {
testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core
// DI
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler
// JGit
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
implementation project(':model')
implementation project(':source')
implementation project(':utils')
implementation project(':data')
}
@@ -0,0 +1,24 @@
package one.nem.lacerta.processor;
import android.graphics.Bitmap;
public interface DocumentProcessor {
// ページ操作
void addNewPageToLast(Bitmap bitmap);
void addNewPagesToLast(Bitmap[] bitmaps);
void addNewPageAfterIndex(Bitmap bitmap, int index);
void addNewPageBeforeIndex(Bitmap bitmap, int index);
void removePageAtIndex(int index);
// 更新
void updatePageAtIndex(Bitmap bitmap, int index);
// ページ取得
Bitmap getPageAtIndex(int index);
int getPageCount();
void close();
void init();
}
@@ -0,0 +1,10 @@
package one.nem.lacerta.processor.factory;
import dagger.assisted.AssistedFactory;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.processor.impl.DocumentProcessorImpl;
@AssistedFactory
public interface DocumentProcessorFactory {
DocumentProcessorImpl create(DocumentDetail documentDetail);
}
@@ -0,0 +1,152 @@
package one.nem.lacerta.processor.impl;
import android.graphics.Bitmap;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.UUID;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
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.source.file.FileManager;
import one.nem.lacerta.source.file.factory.FileManagerFactory;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.utils.XmlMetaParser;
public class DocumentProcessorImpl implements DocumentProcessor{
// Magic Numbers
private static final String DEFAULT_SAVE_DIR = "raw";
private final DocumentDetail documentDetail;
private XmlMetaModel xmlMetaModel;
private Path documentRootPath;
// Injection
private final FileManagerFactory fileManagerFactory;
private final LacertaLogger logger;
private final XmlMetaParser xmlMetaParser;
@AssistedInject
public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, @Assisted DocumentDetail documentDetail) {
this.fileManagerFactory = fileManagerFactory;
this.logger = logger;
this.xmlMetaParser = xmlMetaParser;
if (documentDetail == null) {
throw new IllegalArgumentException("documentDetail must not be null");
}
this.documentDetail = documentDetail;
}
@Override
public void init() {
logger.debug("init", "called");
// Init Variables
this.documentRootPath = documentDetail.getPath().getFullPath();
logger.debug("init", "documentRootPath: " + this.documentRootPath);
FileManager fileManager = fileManagerFactory.create(this.documentRootPath); //Initialize FileManager
logger.debug("init", "fileManager created");
fileManager.autoCreateDir(this.documentRootPath);
// rawディレクトリInit
fileManager.autoCreateDir(DEFAULT_SAVE_DIR);
// xmlファイルの読み込み
if (fileManager.isExist("meta.xml")) {
logger.debug("init", "meta.xml found");
try {
xmlMetaModel = xmlMetaParser.deserialize(fileManager.loadDocument("meta.xml"));
} 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(documentDetail.getMeta().getTitle());
xmlMetaModel.setAuthor(documentDetail.getAuthor());
xmlMetaModel.setDescription(""); // FIXME-rca:
xmlMetaModel.setDefaultBranch(documentDetail.getDefaultBranch());
xmlMetaModel.setPages(new ArrayList<>());
try {
fileManager.saveDocument(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
logger.debug("init", "meta.xml saved");
} catch (Exception e) {
logger.error("init", "meta.xml save failed");
logger.trace("init", e.getMessage());
}
}
logger.info("init", "finished");
}
@Override
public void addNewPageToLast(Bitmap bitmap) {
logger.debug("addNewPageToLast", "called");
String fileName = String.format(UUID.randomUUID().toString() + ".png"); // TODO-rca: 対応表をもたせる
logger.debug("addNewPageToLast", "fileName: " + fileName);
FileManager fileManager = fileManagerFactory.create(this.documentRootPath);
if(fileManager.getList().contains(this.documentRootPath.resolve(DEFAULT_SAVE_DIR))) {
logger.debug("addNewPageToLast", "raw dir found");
fileManager.changeDir(DEFAULT_SAVE_DIR);
} else {
logger.debug("addNewPageToLast", "raw dir not found");
fileManager.createDir(DEFAULT_SAVE_DIR);
fileManager.changeDir(DEFAULT_SAVE_DIR);
}
fileManager.saveBitmapAtCurrent(bitmap, fileName);
}
@Override
public void addNewPagesToLast(Bitmap[] bitmaps) {
logger.debug("addNewPagesToLast(List)", "called");
for(Bitmap bitmap : bitmaps) {
addNewPageToLast(bitmap);
} // TODO-rca: 保存処理をまとめて行う?
}
@Override
public void addNewPageAfterIndex(Bitmap bitmap, int index) {
}
@Override
public void addNewPageBeforeIndex(Bitmap bitmap, int index) {
}
@Override
public void removePageAtIndex(int index) {
}
@Override
public void updatePageAtIndex(Bitmap bitmap, int index) {
}
@Override
public Bitmap getPageAtIndex(int index) {
return null;
}
@Override
public int getPageCount() {
return 0;
}
@Override
public void close() {
}
}
Whitespace-only changes.
@@ -0,0 +1,16 @@
package one.nem.lacerta.processor.module;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
import one.nem.lacerta.model.document.DocumentDetail;
public class DocumentProcessorModule {
private final DocumentDetail documentDetail;
@AssistedInject
public DocumentProcessorModule(@Assisted DocumentDetail documentDetail) {
this.documentDetail = documentDetail;
}
}
Whitespace-only changes.
Whitespace-only changes.
@@ -0,0 +1,4 @@
<resources>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>
@@ -0,0 +1,57 @@
package one.nem.lacerta.source.file;
import android.graphics.Bitmap;
import org.w3c.dom.Document;
import java.io.File;
import java.nio.file.Path;
import java.util.List;
/** @noinspection unused*/
public interface FileManager {
Path getRootDir();
void changeDir(String dirName); //cd
void changeDir(Path path); //cd
void backDir(); //cd ..
void backRootDir(); //cd /
List<Path> getList();
void createDir(String dirName);
void createDir(Path path);
void removeDir(String dirName);
void removeDir(Path path);
File createFile(String fileName);
void removeFile(String fileName);
File getFile(String fileName);
File getFile(Path path);
String loadText(String fileName);
String loadText(Path path);
void saveText(String text, String fileName);
void saveText(String text, Path path);
void saveDocument(Document document, String fileName);
void saveDocument(Document document, Path path);
Document loadDocument(String fileName);
Document loadDocument(Path path);
boolean isExist(Path path);
boolean isExist(String fileName);
void autoCreateDir(Path path);
void autoCreateDir(String dirName);
void autoCreateToCurrentDir();
void saveBitmapAtCurrent(Bitmap bitmap, String fileName);
Bitmap loadBitmap(Path path);
void removeBitmap(Path path);
}
@@ -0,0 +1,11 @@
package one.nem.lacerta.source.file.factory;
import java.nio.file.Path;
import dagger.assisted.AssistedFactory;
import one.nem.lacerta.source.file.impl.FileManagerImpl;
@AssistedFactory
public interface FileManagerFactory {
FileManagerImpl create(Path rootDir);
}
Whitespace-only changes.
@@ -0,0 +1,342 @@
package one.nem.lacerta.source.file.impl;
import android.graphics.Bitmap;
import org.w3c.dom.Document;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
import one.nem.lacerta.source.file.FileManager;
import one.nem.lacerta.utils.LacertaLogger;
public class FileManagerImpl implements FileManager {
// RootDir
private Path rootDir;
// CurrentDir
private Path currentDir;
// Internal Methods
private Path convertPath(String path) {
Path convertedPath = currentDir.resolve(path);
if (convertedPath.startsWith(rootDir)) { // 異常なパスの場合はnullを返す // TODO-rca: エラーハンドリング
return convertedPath;
} else {
return null;
}
}
// Injection
private LacertaLogger logger;
@AssistedInject
public FileManagerImpl(LacertaLogger logger, @Assisted Path rootDir) {
this.logger = logger;
this.rootDir = rootDir;
this.currentDir = rootDir;
}
@Override
public Path getRootDir() {
return rootDir;
}
@Override
public void changeDir(String dirName) {
this.currentDir = rootDir.resolve(dirName);
}
@Override
public void changeDir(Path path) {
if (path.startsWith(rootDir)) {
this.currentDir = path;
}
else {
logger.debug("changeDir", "invalid path: " + path);
// TODO-rca: 例外を投げる
}
}
@Override
public void backDir() {
this.currentDir = currentDir.getParent();
}
@Override
public void backRootDir() {
this.currentDir = rootDir;
}
@Override
public List<Path> getList() {
List<Path> list = new ArrayList<>();
try (DirectoryStream<Path> stream = Files.newDirectoryStream(currentDir)) {
for (Path entry : stream) { // TODO-rca: エラーハンドリング, 効率化
list.add(entry);
}
} catch (IOException e) {
e.printStackTrace();
}
return list;
}
@Override
public void createDir(String dirName) {
//ディレクトリ作成
logger.debug("createDir", "called");
Path path = currentDir.resolve(dirName);
logger.debug("createDir", "path: " + path);
try {
Files.createDirectory(path);
} catch (IOException e) {
e.printStackTrace();
}
}
@Override
public void createDir(Path path) {
logger.debug("createDir", "called");
try {
Files.createDirectory(path);
} catch (IOException e) {
e.printStackTrace();
}
}
@Override
public void removeDir(String dirName) {
logger.debug("removeDir", "called");
currentDir.resolve(dirName).toFile().delete(); // TODO-rca: エラーハンドリング
}
@Override
public void removeDir(Path path) {
logger.debug("removeDir", "called");
path.toFile().delete(); // TODO-rca: エラーハンドリング
}
@Override
public File createFile(String fileName) {
logger.debug("createFile", "called");
return currentDir.resolve(fileName).toFile();
}
@Override
public void removeFile(String fileName) {
logger.debug("removeFile", "called");
currentDir.resolve(fileName).toFile().delete(); // TODO-rca: エラーハンドリング
}
@Override
public File getFile(String fileName) {
logger.debug("getFile", "called");
return currentDir.resolve(fileName).toFile();
}
@Override
public File getFile(Path path) {
logger.debug("getFile", "called");
return path.toFile();
}
@Override
public String loadText(String fileName) { // TODO-rca: 統合
try(FileInputStream fileInputStream = new FileInputStream(currentDir.resolve(fileName).toFile())) {
byte[] bytes = new byte[fileInputStream.available()];
fileInputStream.read(bytes); // TODO-rca: エラーハンドリング
return new String(bytes);
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
@Override
public String loadText(Path path) {
try(FileInputStream fileInputStream = new FileInputStream(path.toFile())) {
byte[] bytes = new byte[fileInputStream.available()];
fileInputStream.read(bytes); // TODO-rca: エラーハンドリング
return new String(bytes);
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
@Override
public void saveText(String text, String fileName) { // TODO-rca: リファクタリング // TODO-rca: 統合
if (isExist(fileName)) {
logger.debug("saveText", "file already exists");
// Overwrite
try {
Files.write(currentDir.resolve(fileName), text.getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
else {
try {
Files.createFile(currentDir.resolve(fileName));
Files.write(currentDir.resolve(fileName), text.getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void saveText(String text, Path path) {
if (isExist(path)) {
logger.debug("saveText", "file already exists");
// Overwrite
try {
Files.write(path, text.getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
else {
try {
Files.createFile(path);
Files.write(path, text.getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void saveDocument(Document document, String fileName) {
try {
TransformerFactory transformerFactory = TransformerFactory.newInstance();
Transformer transformer = transformerFactory.newTransformer();
DOMSource source = new DOMSource(document);
File file = createFile(fileName);
StreamResult result = new StreamResult(file);
transformer.transform(source, result);
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public void saveDocument(Document document, Path path) {
// TODO-rca 実装する
}
@Override
public Document loadDocument(String fileName) {
try {
File file = getFile(fileName);
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
Document document = builder.parse(file);
return document;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
@Override
public Document loadDocument(Path path) {
// TODO-rca 実装する
return null;
}
@Override
public boolean isExist(Path path) {
logger.debug("isExist", "called");
return Files.exists(path);
}
@Override
public boolean isExist(String fileName) {
logger.debug("isExist", "called");
return Files.exists(currentDir.resolve(fileName));
}
@Override
public void autoCreateDir(Path path) {
logger.debug("autoCreateDir", "called");
if (!Files.exists(path)) {
try {
Files.createDirectories(path);
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void autoCreateDir(String dirName) {
logger.debug("autoCreateDir", "called");
if (!Files.exists(currentDir.resolve(dirName))) {
try {
Files.createDirectories(currentDir.resolve(dirName));
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void autoCreateToCurrentDir() {
logger.debug("autoGenerateToCurrentDir", "called");
if (isExist(currentDir)) {
logger.debug("autoGenerateToCurrentDir", "currentDir already exists");
return;
}
else {
try {
Files.createDirectories(currentDir);
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void saveBitmapAtCurrent(Bitmap bitmap, String fileName) { // TODO-rca: ファイル形式を変更できるようにする?
logger.debug("saveBitmapAtCurrent", "called");
try {
File file = currentDir.resolve(fileName).toFile();
bitmap.compress(Bitmap.CompressFormat.PNG, 100, Files.newOutputStream(file.toPath()));
} catch (IOException e) {
e.printStackTrace();
}
}
@Override
public Bitmap loadBitmap(Path path) {
return null;
}
@Override
public void removeBitmap(Path path) {
}
}
Whitespace-only changes.
@@ -0,0 +1,20 @@
package one.nem.lacerta.source.file.module;
import java.nio.file.Path;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
public class FileManagerModule {
private final Path rootDir;
@AssistedInject
public FileManagerModule(@Assisted Path rootDir) {
this.rootDir = rootDir;
}
public Path getRootDir() {
return rootDir;
}
}
Whitespace-only changes.
+2 -1
View File
@@ -37,5 +37,6 @@ dependencies {
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler
//
// model
implementation project(':model')
}
@@ -0,0 +1,13 @@
package one.nem.lacerta.utils;
import org.w3c.dom.Document;
import one.nem.lacerta.model.document.internal.XmlMetaModel;
public interface XmlMetaParser {
XmlMetaModel deserialize(Document document);
Document serialize(XmlMetaModel meta);
}
@@ -0,0 +1,98 @@
package one.nem.lacerta.utils.impl;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import java.util.ArrayList;
import javax.inject.Inject;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import one.nem.lacerta.model.document.internal.XmlMetaModel;
import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
import one.nem.lacerta.utils.XmlMetaParser;
import one.nem.lacerta.utils.LacertaLogger;
public class XmlMetaParserImpl implements XmlMetaParser{
@Inject
LacertaLogger logger;
@Inject
public XmlMetaParserImpl() {
}
@Override
public XmlMetaModel deserialize(Document document) {
logger.debug("deserialize", "called");
try {
Element rootElement = document.getDocumentElement();
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());
ArrayList<XmlMetaPageModel> pages = new ArrayList<>();
for(int i = 0; i < rootElement.getElementsByTagName("pages").getLength(); i++) {
Element pageElement = (Element) rootElement.getElementsByTagName("page").item(i);
XmlMetaPageModel page = new XmlMetaPageModel();
page.setIndex(Integer.parseInt(pageElement.getElementsByTagName("index").item(0).getTextContent()));
page.setFilename(pageElement.getElementsByTagName("filename").item(0).getTextContent());
pages.add(page);
}
meta.setPages(pages);
return meta;
} catch (Exception e) {
logger.error("deserialize", "something wrong");
logger.trace("deserialize", e.getMessage());
}
return null;
}
@Override
public Document serialize(XmlMetaModel meta) {
logger.debug("serialize", "called");
try {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
Document document = builder.newDocument();
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());
Element pagesElement = document.createElement("pages");
for(XmlMetaPageModel page : meta.getPages()) {
Element pageElement = document.createElement("page");
appendElement(document, pageElement, "index", String.valueOf(page.getIndex()));
appendElement(document, pageElement, "filename", page.getFilename());
pagesElement.appendChild(pageElement);
}
rootElement.appendChild(pagesElement);
document.appendChild(rootElement);
return document;
} catch (Exception e) {
logger.error("serialize", "something wrong");
logger.trace("serialize", e.getMessage());
}
return null;
}
// Internal Methods
private void appendElement(Document document, Element rootElement, String name, String textContent) {
Element element = document.createElement(name);
element.setTextContent(textContent);
rootElement.appendChild(element);
}
}
@@ -0,0 +1,17 @@
package one.nem.lacerta.utils.module;
import dagger.Binds;
import dagger.Module;
import dagger.hilt.InstallIn;
import dagger.hilt.components.SingletonComponent;
import one.nem.lacerta.utils.XmlMetaParser;
import one.nem.lacerta.utils.impl.XmlMetaParserImpl;
@Module
@InstallIn(SingletonComponent.class)
abstract public class XmlMetaParserModule {
@Binds
public abstract XmlMetaParser bindXmlMetaParser(XmlMetaParserImpl impl);
}