Compare commits

...
Author SHA1 Message Date
r-ca 20f6333dcc エラーIDをログに流すメソッドを実装 2024-01-16 12:03:33 +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
r-ca f937503840 インタフェース設計 WIP 2024-01-12 10:18:04 +09:00
r-ca 9f41632b0f リネーム 2024-01-12 09:56:18 +09:00
r-ca fb2ba1e6e5 戻り値の型変更 2024-01-12 09:55:34 +09:00
r-ca 3930ec6d9c WIP 2024-01-12 09:54:48 +09:00
r-ca ca61d2c055 ListItemモデルをラッピングするモデルを作成 2024-01-12 09:54:38 +09:00
r-ca 451e8532d1 ListItemモデルをラッピングするモデルを作成 2024-01-11 16:12:29 +09:00
r-ca 8314f850f6 Repository, Module, Implファイル作成 2024-01-11 15:55:51 +09:00
ろむねこ 78ad88206c Merge pull request #47 from lacerta-doc/model/add_list_item_model
ListItemのモデルを追加
2024-01-11 15:08:33 +09:00
r-ca 5dcb27a2e9 アイコンIDを追加 2024-01-11 15:04:42 +09:00
r-ca f833465dc8 :shared:uiを依存関係に追加 2024-01-11 15:03:44 +09:00
r-ca 4ac03fd4f3 重複を削除, 名前を統一 2024-01-11 15:02:41 +09:00
r-ca 17b2392fea drawableにアイコンを2個追加 2024-01-11 15:01:17 +09:00
r-ca 68f2ba3b59 修正 2024-01-11 14:55:06 +09:00
r-ca 91bbca54ff enum作成 2024-01-11 14:53:20 +09:00
r-ca 19dfa070fd ListItemモデル作成, コンストラクタ定義, Getter 2024-01-11 14:52:30 +09:00
r-ca b7f55ef0db ListItemモデル作成 2024-01-11 14:03:10 +09:00
ろむねこ 1c91b52431 Merge pull request #45 from lacerta-doc/improve/document_1
Readme.mdに説明を追加
2024-01-11 13:55:39 +09:00
r-ca 1b85845499 Readme.mdに説明を追加 2024-01-11 10:59:36 +09:00
ろむねこ 523008ff3f Merge pull request #41 from lacerta-doc/improve/improve_debug_menu
デバッグメニューから不要になったアイテムを削除
2024-01-10 12:28:11 +09:00
r-ca 50c2b1dc4d リンクを削除 2024-01-10 12:23:17 +09:00
r-ca ae8f7ef1f1 ナビゲーショングラフから削除 2024-01-10 12:23:03 +09:00
r-ca 27766effc1 メタデータを表示するフラグメント, クラスを削除 2024-01-10 12:22:49 +09:00
r-ca f7fe8b35b1 メニューから削除 2024-01-10 12:11:29 +09:00
r-ca 87c4738f37 ナビゲーションから削除 2024-01-10 12:10:48 +09:00
r-ca 96bfca0550 レイアウト, クラス削除 2024-01-10 12:10:37 +09:00
ろむねこ 0140c0376b Merge pull request #34 from lacerta-doc/improve/remove_page_index
Indexの廃止
2024-01-09 17:26:14 +09:00
r-ca 89a3a179bd index廃止 2024-01-09 17:23:56 +09:00
r-ca ff905d9280 index廃止 2024-01-09 17:23:08 +09:00
r-ca 4b0ea02f16 cleanup 2024-01-09 17:22:23 +09:00
r-ca ca37a97e2f Indexを廃止 2024-01-09 17:21:00 +09:00
ろむねこ 217f096a38 Merge pull request #33 from lacerta-doc/feature/add_doc_proc_missing
DocumentProcessorの不足しているメソッドを実装する(1)
2024-01-09 17:16:11 +09:00
r-ca 0c59c85b28 addNewPageBeforeIndex実装 2024-01-09 17:12:13 +09:00
r-ca e3a5dee36c addNewPageAfterIndex実装 2024-01-09 17:07:37 +09:00
r-ca 1805cd7d73 WIP 2024-01-09 17:05:25 +09:00
r-ca 513a91b41e throws追加 2024-01-09 17:04:42 +09:00
ろむねこ 3f2534b1eb Merge pull request #30 from lacerta-doc/improve/improve_file_manager
FileManagerの修正
2024-01-09 16:26:20 +09:00
69 changed files with 1711 additions and 242 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">
+38
View File
@@ -7,6 +7,44 @@ WIP
## メモ
- アイコン: Google Material Icons https://fonts.google.com/icons (Weight:300, Grade:0, Optical size: 24px)
## モジュール構成
### モジュール一覧
- `component` : コンポーネント
- `common` : 共通コンポーネント
- UIの中で共通で使う要素(メニューアイテムとか)
- `scanner` : スキャナー
- スキャナーの実装
- `viewer` : ビューワー
- ドキュメントビューワーの実装
- `data` : データ
- UIからデータを取得/保存するためのラッパーモジュール
- `Document` : ドキュメント関係
- WIP(JavaDocを参照してください, 余裕があったら追記します)
- `feature` : 機能モジュール(ナビゲーションからみた機能で分割)
- `common`: 共通機能
- 設定画面とか、どこからでも呼ばれうる画面
- `debug`: デバッグメニュー
- `home`: ホーム画面
- `library`: ライブラリ画面
- `scan`: スキャン画面
- `search`: 検索画面
- `model` : モデル
- データモデルをまとめたモジュール (WIP)
- `document` : ドキュメント
- `meta` : メタデータ
- `processor` : プロセッサ
- いくつかの処理をまとめたモジュール
- `DocumentProcessor` : ドキュメント処理(ドキュメントにページを追加したり更新したり)
- `shared` :
- 共有リソース
- `source` : ソース
- (バックエンドが使うのでとりあえず後回し、フロントから直接操作することは絶対にありません)
- `utils` : ユーティリティ
- ちょっとしたユーティリティをまとめたモジュール
- `LacertaLogger` : ロガー
- `XmlMetaParser` : XMLメタデータパーサー(フロントから直接操作することは絶対にありません)
## コーディング規則/推奨(WIP)
### 規則
- `// TODO`コメントには任意のsuffixを付ける
+3
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
@@ -0,0 +1,22 @@
package one.nem.lacerta.data;
import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.document.DocumentDetail;
public interface LacertaLibrary {
// Get History
LibraryItemPage getRecentDocument(int limit);
LibraryItemPage getRecentDocument(int limit, int offset);
// Get Library page
LibraryItemPage getLibraryPage(int limit);
LibraryItemPage getLibraryPage(int limit, int offset);
LibraryItemPage getLibraryPage(String pageId, int limit);
LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
// GetDocument
DocumentDetail getDocumentDetailById(String id);
}
@@ -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);
}
@@ -0,0 +1,42 @@
package one.nem.lacerta.data.impl;
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();
}
}
@@ -0,0 +1,21 @@
package one.nem.lacerta.data.module;
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,110 +0,0 @@
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;
}
}
@@ -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);
}
}
}
}
@@ -48,10 +48,10 @@ public class DebugMenuTopFragment extends Fragment {
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
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));
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;
}
}
@@ -10,16 +10,16 @@ import android.view.ViewGroup;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuMetaDataFragment#newInstance} factory method to
* Use the {@link DebugMenuVcsRevRecordFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class DebugMenuMetaDataFragment extends Fragment {
public DebugMenuMetaDataFragment() {
public class DebugMenuVcsRevRecordFragment extends Fragment {
public DebugMenuVcsRevRecordFragment() {
// Required empty public constructor
}
public static DebugMenuMetaDataFragment newInstance() {
DebugMenuMetaDataFragment fragment = new DebugMenuMetaDataFragment();
public static DebugMenuVcsRevRecordFragment newInstance() {
DebugMenuVcsRevRecordFragment fragment = new DebugMenuVcsRevRecordFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
@@ -34,6 +34,8 @@ public class DebugMenuMetaDataFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_debug_menu_meta_data, container, false);
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_rev_record, container, false);
return view;
}
}
@@ -1,40 +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=".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>
@@ -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=".DebugMenuLibraryItemListPageFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/item_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>
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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=".DebugMenuMetaDataFragment">
<!-- TODO: Update blank fragment layout -->
</FrameLayout>
@@ -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>
@@ -10,9 +10,6 @@
android:name="one.nem.lacerta.feature.debug.DebugMenuTopFragment"
android:label="fragment_debug_menu_top"
tools:layout="@layout/fragment_debug_menu_top" >
<action
android:id="@+id/action_debugMenuTopFragment_to_debugMenuMetaDataFragment"
app:destination="@id/debugMenuMetaDataFragment" />
<action
android:id="@+id/action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment"
app:destination="@id/debugMenuDocumentTesterTopFragment" />
@@ -20,14 +17,12 @@
android:id="@+id/action_debugMenuTopFragment_to_scannerDataManagerStubFragment"
app:destination="@id/scannerDataManagerStubFragment" />
<action
android:id="@+id/action_debugMenuTopFragment_to_debugMenuFileManagerTesterFragment"
app:destination="@id/debugMenuFileManagerTesterFragment" />
android:id="@+id/action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment"
app:destination="@id/debugMenuLibraryItemListPageFragment" />
<action
android:id="@+id/action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment"
app:destination="@id/debugMenuVcsGeneralFragment" />
</fragment>
<fragment
android:id="@+id/debugMenuMetaDataFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuMetaDataFragment"
android:label="fragment_debug_menu_meta_data"
tools:layout="@layout/fragment_debug_menu_meta_data" />
<fragment
android:id="@+id/debugMenuDocumentTesterTopFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
@@ -55,8 +50,38 @@
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" />
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" />
</navigation>
+2
View File
@@ -36,4 +36,6 @@ dependencies {
// JGit
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
implementation project(":shared:ui")
}
@@ -0,0 +1,51 @@
package one.nem.lacerta.model;
import java.util.ArrayList;
public class LibraryItemPage {
String pageTitle;
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;
}
public String getPageId() {
return pageId;
}
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;
}
}
@@ -0,0 +1,63 @@
package one.nem.lacerta.model;
import android.graphics.drawable.Drawable;
public class ListItem {
// Properties
String title;
String description;
ListItemType itemType;
String itemId;
// Constructor
public ListItem(String title, String description, ListItemType itemType, String itemId) {
this.title = title;
this.description = description;
this.itemType = itemType;
this.itemId = itemId;
}
public ListItem() {
// Empty constructor
}
// Getter
public String getTitle() {
return title;
}
public String getDescription() {
return description;
}
public ListItemType getItemType() {
return itemType;
}
public String getItemId() {
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,17 @@
package one.nem.lacerta.model;
public enum ListItemType {
ITEM_TYPE_FOLDER(one.nem.lacerta.shared.ui.R.drawable.folder_24px),
ITEM_TYPE_DOCUMENT(one.nem.lacerta.shared.ui.R.drawable.description_24px);
private int iconId;
ListItemType(int iconId) {
this.iconId = iconId;
}
public int getIconId() {
return iconId;
}
}
@@ -0,0 +1,68 @@
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);
}
}
@@ -70,35 +70,4 @@ public class XmlMetaModel {
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);
}
}
}
@@ -2,7 +2,6 @@ package one.nem.lacerta.model.document.internal;
public class XmlMetaPageModel {
int index;
String filename;
// Constructor
@@ -10,27 +9,18 @@ public class XmlMetaPageModel {
public XmlMetaPageModel() {
}
public XmlMetaPageModel(int index, String filename) {
this.index = index;
public XmlMetaPageModel(String filename) {
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;
}
@@ -7,9 +7,9 @@ public interface DocumentProcessor {
// ページ操作
void addNewPageToLast(Bitmap bitmap) throws Exception;
void addNewPagesToLast(Bitmap[] bitmaps) throws Exception;
void addNewPageAfterIndex(Bitmap bitmap, int index);
void addNewPageBeforeIndex(Bitmap bitmap, int index);
void removePageAtIndex(int index);
void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception;
void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception;
void removePageAtIndex(int index) throws Exception;
// 更新
void updatePageAtIndex(Bitmap bitmap, int index);
@@ -102,11 +102,10 @@ public class DocumentProcessorImpl implements DocumentProcessor{
XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
xmlMetaPageModel.setFilename(filename);
xmlMetaPageModel.setIndex(xmlMetaModel.getPages().size() + 1);
xmlMetaModel.getPages().add(xmlMetaPageModel);
logger.info("addNewPageToLast", "finished");
logger.info("addNewPageToLast", "filename: " + filename + ", index: " + xmlMetaPageModel.getIndex());
logger.info("addNewPageToLast", "filename: " + filename);
}
@Override
@@ -119,13 +118,27 @@ public class DocumentProcessorImpl implements DocumentProcessor{
}
@Override
public void addNewPageAfterIndex(Bitmap bitmap, int index) {
public void addNewPageAfterIndex(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);
}
@Override
public void addNewPageBeforeIndex(Bitmap bitmap, int index) {
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);
}
@Override
+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="@android:color/white"
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>
@@ -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();
@@ -41,7 +41,6 @@ public class XmlMetaParserImpl implements XmlMetaParser{
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);
}
@@ -73,7 +72,6 @@ public class XmlMetaParserImpl implements XmlMetaParser{
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);
}
+1
View File
@@ -0,0 +1 @@
/build
+59
View File
@@ -0,0 +1,59 @@
plugins {
alias(libs.plugins.com.android.library)
}
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,15 @@
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);
// 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,62 @@
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 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);
}
}