Compare commits

...
Author SHA1 Message Date
r-ca bda2b82cea アイコンに合わせてプロパティ名を変更 2024-01-27 16:23:35 +09:00
r-ca c05c80f3e7 アイコン変更 2024-01-27 16:22:59 +09:00
r-ca 9ba3c224c4 リファクタリング 2024-01-27 16:22:34 +09:00
r-ca 603a758ab6 不要なコードの削除, テキストを明示 2024-01-27 16:21:41 +09:00
r-ca c7f5502535 選択されたRevisionに推移できるように 2024-01-27 16:20:11 +09:00
r-ca 7ef75bb375 negativeButtonTextが指定されていない場合の既定値を追加 2024-01-27 16:17:52 +09:00
r-ca 78d4345313 イベントを受け取るように WIP 2024-01-27 16:17:09 +09:00
r-ca 542c04b908 アイテムにタッチリスナーを追加 2024-01-27 16:16:52 +09:00
r-ca cf257a44ec レイアウト修正 2024-01-27 16:13:01 +09:00
r-ca f812e6c38e 実際にRevisionを表示するように 2024-01-27 16:09:26 +09:00
r-ca 87c913811b 依存関係追加 2024-01-27 16:03:33 +09:00
r-ca 3cfd54faf0 RevDialog実装WIP 2024-01-27 16:01:03 +09:00
r-ca ffeb701b40 RevDialogAdapter実装WIP 2024-01-27 15:26:18 +09:00
r-ca c48e5becac レイアウトコピー 2024-01-27 15:16:58 +09:00
r-ca 7291ab243e イベントリスナ作成 2024-01-27 15:08:32 +09:00
r-ca a34109441f Rev選択画面のダイアログレイアウト作成 2024-01-27 15:04:09 +09:00
r-ca 75045c3fe3 検証用に設定したアニメーションをもとに戻した 2024-01-27 15:00:38 +09:00
r-ca 733371ecbc 検証用に設定したアニメーションをもとに戻した 2024-01-27 14:50:41 +09:00
r-ca 5096e8de23 iroiro 2024-01-27 14:36:06 +09:00
r-ca 6679f8389c ライブラリ画面のアニメーションを明示 2024-01-26 20:17:47 +09:00
r-ca 8df63b0ac6 アニメーションリソースをいくつか追加 2024-01-26 19:39:43 +09:00
r-ca 4df56774c3 セレクトダイアログの高さを画面の40%に変更 2024-01-26 19:38:14 +09:00
r-ca 834ee42353 リファクタ 2024-01-26 18:41:09 +09:00
r-ca 8a2b4ed12d 表示アニメーションを500ms以上かかった場合のみに 2024-01-26 18:41:05 +09:00
r-ca 58e74dbb16 表示アニメーションを500ms以上かかった場合のみに 2024-01-26 18:38:02 +09:00
r-ca 9d750b5244 リファクタリング 2024-01-26 18:33:44 +09:00
r-ca e96d213c33 パスをサブタイトルに表示するように 2024-01-26 18:33:02 +09:00
r-ca c2f62a5a84 依存関係追加 2024-01-26 18:16:24 +09:00
r-ca dbef7b45d1 ファイルのパスをサブタイトルとして表示するように 2024-01-26 18:16:00 +09:00
r-ca 3c079ffc23 SubtitleCollapsingToolbarLayoutに変更 2024-01-26 18:04:49 +09:00
r-ca f1667788aa バージョン変更 2024-01-26 18:00:46 +09:00
r-ca cad97ef7a3 Subtitle付きのCollapsingToolBarを追加 2024-01-26 17:55:18 +09:00
ろむねこ 5e5e98f0b6 Merge pull request #117 from lacerta-doc/tag/add
タグ管理画面の追加
2024-01-26 15:41:49 +09:00
r-ca 513af3fda8 Cancelでも更新するように 2024-01-26 15:41:15 +09:00
r-ca b0effa21a4 更新処理改善 2024-01-26 15:32:47 +09:00
r-ca 21b198bc35 タグリストの更新を切り出し, 追加後に更新するように 2024-01-26 15:28:41 +09:00
r-ca fad9fcc48a タグを実際に生成するように 2024-01-26 15:26:19 +09:00
r-ca 8acbe6338b IDが指定されなかった場合に自動で生成するように 2024-01-26 15:26:04 +09:00
r-ca 2f9df5a225 クリックイベントスタブ実装 2024-01-26 15:18:32 +09:00
r-ca fc56781c20 ダイアログ挙動修正 2024-01-26 15:17:43 +09:00
r-ca 3960c07482 レイアウト修正 2024-01-26 15:12:22 +09:00
r-ca 6902fbebbd 実装WIP(デバッグ) 2024-01-26 15:06:32 +09:00
r-ca 515a881428 依存関係追加 2024-01-26 15:05:07 +09:00
r-ca cf623c5640 ロジック, リスナ実装WIP 2024-01-26 15:04:20 +09:00
r-ca 4cc4151254 リスナ作成 2024-01-26 15:03:24 +09:00
r-ca c4bd3d761e タイトルなどのGetter/Setter実装 2024-01-26 15:00:53 +09:00
r-ca 9bff04ce2e 実装WIP 2024-01-26 14:59:56 +09:00
r-ca 7ab5449b2d レイアウト作成WIP 2024-01-26 14:58:28 +09:00
ろむねこ 94def7bf1c Merge pull request #116 from lacerta-doc/tag/add
タグシステム実装 WIP
2024-01-25 16:56:03 +09:00
r-ca b259f11529 レイアウトWIP 2024-01-25 16:54:01 +09:00
r-ca c2a8728098 タグ作成ダイアログのレイアウト作成 2024-01-25 16:46:55 +09:00
r-ca 87f6d582dc Fragmentの処理を実装 WIP 2024-01-25 16:46:12 +09:00
r-ca 885f1b40c8 PluginにHiltを追加 2024-01-25 16:45:41 +09:00
r-ca e7529ef62b 依存関係追加 2024-01-25 16:44:12 +09:00
r-ca 4319e1d1ec fix 2024-01-25 16:42:42 +09:00
r-ca 7eb87305ea Adapter実装WIP 2024-01-25 16:42:08 +09:00
r-ca 71986bb17d リストアイテムレイアウト実装 WIP 2024-01-25 16:38:53 +09:00
r-ca 74fcc50615 リストアイテムレイアウト作成 2024-01-25 16:36:09 +09:00
r-ca 3a47cd97fd アダプタ実装 WIP 2024-01-25 16:35:18 +09:00
r-ca b44d1b0746 インタフェース実装 2024-01-25 16:34:05 +09:00
r-ca 2dc3ab6bc6 依存関係追加 2024-01-25 16:32:41 +09:00
r-ca 165d45ad40 TagListItem廃止 2024-01-25 16:31:47 +09:00
r-ca 070cfda21d 修正 2024-01-25 16:30:57 +09:00
r-ca 26b0994343 プロパティ, コンストラクタ, Getter/Setter実装 2024-01-25 16:30:31 +09:00
r-ca 0f6412c792 モデル, アダプタ作成WIP 2024-01-25 16:29:04 +09:00
r-ca b5d7aa4edd レイアウト修正 2024-01-25 16:26:25 +09:00
r-ca 1212d5111b 複合主キーの指定方法を修正 2024-01-25 16:22:54 +09:00
r-ca 28319a60ba アイコンリソースの色を変更 2024-01-25 16:17:09 +09:00
r-ca a818c59a02 トップメニューの項目に追加 WIP 2024-01-25 16:16:21 +09:00
r-ca 5be465df67 ナビゲーショングラフに追加 2024-01-25 16:15:22 +09:00
r-ca a3a5676136 Fragment内実装 WIP 2024-01-25 16:14:21 +09:00
r-ca 062ecad4fd 仮アクション追加 2024-01-25 16:13:17 +09:00
r-ca cdc3019807 レイアウト修正 2024-01-25 16:08:53 +09:00
r-ca a68ee50e6b レイアウト修正 2024-01-25 16:08:42 +09:00
r-ca 7319c8c1a9 レイアウトコピー 2024-01-25 16:07:40 +09:00
r-ca 994ceb414e 引数削除 2024-01-25 16:06:58 +09:00
r-ca 48ae5d7ac0 タグ管理画面フラグメント作成 2024-01-25 16:06:35 +09:00
r-ca f9f395c160 リソース追加 2024-01-25 16:05:23 +09:00
r-ca 397244ffdd fix 2024-01-25 16:00:07 +09:00
r-ca 0dad6d30d4 操作メソッド実装 2024-01-25 15:59:21 +09:00
r-ca 950e0fe2dc 操作メソッド実装 2024-01-25 15:58:28 +09:00
r-ca ea0e52a602 コンバータ実装 2024-01-25 15:54:47 +09:00
r-ca fce59d74bc Impl生成 2024-01-25 15:52:21 +09:00
r-ca 512ac0b775 Tag系インタフェース作成 2024-01-25 15:52:06 +09:00
r-ca 05915a2f4e Dao実装 2024-01-25 15:49:53 +09:00
r-ca 396c5e914f Dao追加 2024-01-25 15:48:42 +09:00
r-ca ae0f023e0e Dao実装 WIP 2024-01-25 15:48:22 +09:00
r-ca b91f0ae022 Entity追加 2024-01-25 15:47:35 +09:00
r-ca 0cdd4b1af1 Tags, DefaultBranch削除 WIP 2024-01-25 15:44:39 +09:00
r-ca 6e50239c9e Tags, DefaultBranch削除 WIP 2024-01-25 15:44:33 +09:00
r-ca cf60bc3423 Tags, DefaultBranch削除 WIP 2024-01-25 15:44:00 +09:00
r-ca 57ec698b78 Toxiテーブル作成 2024-01-25 15:40:30 +09:00
ろむねこ 3f84b1a3e2 Merge pull request #115 from lacerta-doc/custom_dialog
ダイアログのデザインを修正, ディレクトリピッカー実装, フォルダの移動に対応
2024-01-25 15:25:53 +09:00
r-ca 4779d51976 新しい実装にあわせて修正 2024-01-25 15:24:22 +09:00
r-ca 1aeb0184a7 Fix typo 2024-01-25 15:11:01 +09:00
r-ca 74ee492b49 タイトル, メッセージ, 選択肢のテキストを指定できるように, 決定されたらイベントを呼ぶように 2024-01-25 15:10:42 +09:00
r-ca 4f864eb57d リスナ実装 2024-01-25 15:04:23 +09:00
r-ca 6b44435656 インタフェースリネーム 2024-01-25 15:03:12 +09:00
r-ca 44edd1c23e moveDocumentを定義, 実装 2024-01-25 15:01:18 +09:00
r-ca d5ebc2c498 最大サイズを変更 2024-01-25 15:00:03 +09:00
r-ca ce1686a1d7 更新条件を修正 2024-01-25 14:55:55 +09:00
r-ca 5f89955d80 WIP 2024-01-25 14:50:27 +09:00
r-ca 58f9d81555 fix 2024-01-25 14:36:34 +09:00
r-ca e51ce209dc ルートの場合は戻るボタンを表示しないように 2024-01-25 14:33:49 +09:00
r-ca fd9b69174d アイコンを正しく表示できるように 2024-01-25 14:32:43 +09:00
r-ca dde9d460ed 一旦Descriptionを非表示に 2024-01-25 14:31:04 +09:00
r-ca bf756abb16 レイアウト修正 2024-01-25 14:29:47 +09:00
r-ca 0128cecfae LibraryItemPageを使用するように変更, 戻るアクションを実装 2024-01-25 14:28:36 +09:00
r-ca 04bd081d99 インタフェースの変更に追従 2024-01-25 14:17:25 +09:00
r-ca 4f3c79564b インタフェース修正 2024-01-25 14:16:54 +09:00
r-ca 6c8fdc4d81 アクションタイプにバックを追加 2024-01-25 14:15:12 +09:00
r-ca 232967c905 処理修正 2024-01-25 14:12:10 +09:00
r-ca 20ecbeea5c レイアウト調整 2024-01-25 14:11:58 +09:00
nero 1a1dfe1be2 Merge remote-tracking branch 'origin/develop' into develop 2024-01-25 13:51:54 +09:00
r-ca dfe6049775 ダイアログ内でパスを移動できるように 2024-01-25 13:46:51 +09:00
r-ca 69d64fd44f レイアウト修正 2024-01-25 13:40:09 +09:00
r-ca 87054f1b83 レイアウト修正 2024-01-25 13:40:01 +09:00
r-ca 6cff3dd6b4 処理順序修正 2024-01-25 12:54:17 +09:00
r-ca 1dff7381af レイアウト修正 2024-01-25 12:52:56 +09:00
r-ca af55033914 依存関係整理 2024-01-25 12:48:38 +09:00
r-ca 4ad5df6c98 実装整理 2024-01-25 12:21:26 +09:00
r-ca 7fa3588127 依存関係追加 2024-01-25 12:20:44 +09:00
r-ca dbd719368f 実装整理 2024-01-25 12:19:37 +09:00
r-ca 7a9c81282f 依存関係整理 2024-01-25 12:18:48 +09:00
r-ca 6710ae9d56 依存関係整理 2024-01-25 12:18:10 +09:00
r-ca 705b89a500 移植元削除 2024-01-25 12:17:38 +09:00
r-ca afa3460b24 コード移植 2024-01-25 12:17:00 +09:00
r-ca 45fcd95e6f レイアウト移植 2024-01-25 12:16:23 +09:00
r-ca 6ef54e5940 Revert "不要な依存を削除"
This reverts commit 5c165b96d3.
2024-01-25 12:15:32 +09:00
r-ca 5c165b96d3 不要な依存を削除 2024-01-25 12:15:06 +09:00
r-ca 240b4675c8 依存関係追加 2024-01-25 12:08:40 +09:00
r-ca ccfed654df フォルダの一覧を取得するメソッド作成 2024-01-25 12:07:48 +09:00
r-ca 03d78b1200 イベントリスナに対応した実装を作成 WIP 2024-01-25 12:06:21 +09:00
r-ca a815d3b1b4 依存関係追加 2024-01-25 12:03:29 +09:00
r-ca dfbe26ee9a イベントリスナ作成 2024-01-25 11:58:02 +09:00
r-ca 420197e5c3 RecyclerViewDialog WIP 2024-01-25 11:56:15 +09:00
r-ca 38a277c15e アダプタ作成WIP 2024-01-25 11:51:26 +09:00
r-ca 031ef6f088 ディレクトリ選択ダイアログ作成WIP 2024-01-25 11:41:38 +09:00
r-ca 1477169f6c ディレクトリ選択ダイアログ用レイアウト作成 WIP 2024-01-25 11:38:44 +09:00
r-ca d94aab43d5 削除ダイアログをMaterialAlertDialogに 2024-01-25 11:37:47 +09:00
r-ca 434d58bd47 新しいダイアログを使用するように 2024-01-25 11:36:45 +09:00
r-ca b341c78432 新しいダイアログを使用するように 2024-01-25 11:19:58 +09:00
r-ca a711f7284d 新しいダイアログを使用するように 2024-01-25 11:12:08 +09:00
r-ca 4f8751e4b3 廃止 2024-01-25 11:11:52 +09:00
r-ca 5bac9657ac ダイアログ用レイアウト作成 2024-01-25 11:09:49 +09:00
r-ca bc3b74989d 引数変更 2024-01-25 10:32:18 +09:00
r-ca d4c10d8c05 フラグメント作成 2024-01-25 10:31:26 +09:00
ろむねこ 517b7d2c39 Merge pull request #114 from lacerta-doc/vcs_move_rev
リビジョンを遡れるように
2024-01-25 09:55:10 +09:00
r-ca c1c705729a クエリ修正 2024-01-24 18:40:11 +09:00
r-ca 0b7b499624 クエリ変更 2024-01-24 18:36:59 +09:00
r-ca 6b3d0c0dae 失敗したときにログを削除してリカバリするように 2024-01-24 18:36:08 +09:00
r-ca 113bca723f 最後に追加したLogを削除するメソッド追加 2024-01-24 18:34:25 +09:00
r-ca 383b34c3d2 最後のレコードを削除できるように 2024-01-24 18:33:56 +09:00
r-ca 70380df8fd DaoにDeleteを追加 2024-01-24 18:31:45 +09:00
r-ca 749cad231c 処理の順番を改善 2024-01-24 18:29:19 +09:00
r-ca da5b134a2b Indexから溢れたときの処理を追加 WIP 2024-01-24 18:25:59 +09:00
r-ca 16dfccca14 forEach文をやめた 2024-01-24 18:21:59 +09:00
r-ca dfd488329b CREATE_DOCUMENTに対応できるようにした 2024-01-24 18:12:35 +09:00
r-ca 4b1ae7326b ActionTypeを追加するように 2024-01-24 18:11:25 +09:00
r-ca 6e9606b050 ActionTypeを追加するように 2024-01-24 18:10:37 +09:00
r-ca d778840484 コメント追加 2024-01-24 18:09:56 +09:00
r-ca 93cef07ce5 コメント追加 2024-01-24 18:06:45 +09:00
r-ca 826f8928d1 コメント追加 2024-01-24 18:06:10 +09:00
r-ca d3afdbcef5 ログ追加 2024-01-24 18:02:57 +09:00
r-ca f6bc9167d2 修正 2024-01-24 17:58:13 +09:00
r-ca f59c4445dc メソッド名修正 2024-01-24 17:56:44 +09:00
r-ca 929ba7347c リファクタリング 2024-01-24 17:56:26 +09:00
r-ca 8c4e651a79 一部を非同期にした 2024-01-24 17:55:23 +09:00
r-ca cd1a58dcc0 リファクタリング 2024-01-24 17:49:45 +09:00
r-ca b58e80f7ea リファクタリング 2024-01-24 17:48:00 +09:00
r-ca daab41620f リファクタリング 2024-01-24 17:45:16 +09:00
r-ca 615d58f3ca WIP 2024-01-24 17:43:10 +09:00
r-ca 5639117e0e イベントリスナ実装 2024-01-24 17:32:58 +09:00
r-ca 1b60b15187 インタフェース作成 2024-01-24 17:31:21 +09:00
r-ca 7822fdd3c5 リネーム 2024-01-24 17:10:48 +09:00
r-ca 778473f898 リビジョンIDを指定して呼び出した場合にそのバージョンを表示するように 2024-01-24 17:09:32 +09:00
r-ca bd8edc85ce コンストラクタ追加 2024-01-24 17:04:36 +09:00
r-ca 5fc8a501ad ファイル名変更 2024-01-24 17:03:50 +09:00
r-ca aa2ebce32c ファイル名の一覧からPageリストを作成するメソッド実装 2024-01-24 17:01:33 +09:00
r-ca 8d4d9cab9a コメント追加 2024-01-24 16:54:49 +09:00
r-ca f6f7c3a630 getDocumentPageListRev実装, 不要になったメソッドを削除 2024-01-24 16:49:42 +09:00
r-ca 3fbdc761dd LogEntityにActionTypeを追加 2024-01-24 16:42:17 +09:00
r-ca 3c237d3751 修正 2024-01-24 16:37:54 +09:00
r-ca 85dba22f57 Revert "引数/戻り値修正"
This reverts commit 3d01ff3d81.
2024-01-24 16:28:39 +09:00
r-ca 3d01ff3d81 引数/戻り値修正 2024-01-24 16:27:35 +09:00
r-ca d5ca5ebc90 必要なメソッド作成 WIP 2024-01-24 16:21:27 +09:00
r-ca fc1c8f66cc 実装 WIP 2024-01-24 15:53:46 +09:00
r-ca b6f0a5554a リファクタリング, 実装いろいろ 2024-01-24 15:49:17 +09:00
r-ca dafb49cca0 クエリ修正 2024-01-24 15:39:51 +09:00
r-ca 904ae8d39f メソッド追加 2024-01-24 15:38:29 +09:00
r-ca 895cf64a15 メソッド追加 2024-01-24 15:37:03 +09:00
r-ca 93e7c10393 VcsLogModel作成 2024-01-24 15:34:37 +09:00
ろむねこ ab5a8bfa87 Merge pull request #113 from lacerta-doc/submit_jan23
23日に提出した状態に追従
2024-01-24 12:37:26 +09:00
nero 29d0737c00 赤色で名前の部分が表示されてしまう。 2024-01-24 12:01:59 +09:00
nero 281d1eeb39 ブクマ機能おそらくできてる 2024-01-24 11:28:22 +09:00
nero c1b55ef29a Revert "ブクマ機能"
This reverts commit 0cbc81238c.
2024-01-24 10:55:47 +09:00
nero 0cbc81238c ブクマ機能 2024-01-24 10:46:24 +09:00
nero cf79581638 ブクマ作成・保存機能 2024-01-24 10:22:57 +09:00
nero 7beecca0da ブクマ機能実装中 2024-01-24 10:22:25 +09:00
nero 1447148fba ブクマ機能実装中 2024-01-23 12:50:30 +09:00
r-ca af53ba6c86 パーミッションチェックを追加, 使えない機能を非表示に 2024-01-23 05:43:40 +09:00
r-ca 64d7a53616 アイコン変更, 一部フラグ変更 2024-01-23 05:35:42 +09:00
r-ca 696c58921d アイコンリソース生成 2024-01-23 05:32:57 +09:00
ろむねこ bda8496259 Update README.md 2024-01-23 05:26:53 +09:00
ろむねこ 60f279d365 Merge pull request #100 from lacerta-doc/submit_jan23
Submit jan23
2024-01-23 05:25:02 +09:00
r-ca 6e4904967b リファクタリング 2024-01-23 05:24:11 +09:00
r-ca fda8adae80 UI修正 2024-01-23 05:23:21 +09:00
r-ca 1ce3af59e6 UI修正 2024-01-23 05:22:48 +09:00
r-ca 1692399b9a ライブラリからドキュメントを開けるように 2024-01-23 05:21:48 +09:00
r-ca 5288855075 コメント追加 2024-01-23 05:21:19 +09:00
r-ca 7ece8c7b69 Depend 2024-01-23 05:21:13 +09:00
r-ca 56a49d4c7e Revの作成日時を表示できるように 2024-01-23 05:17:53 +09:00
ろむねこ e69d489a96 Merge pull request #99 from lacerta-doc/submit1
提出用訂正いろいろ
2024-01-23 05:13:12 +09:00
r-ca 53c8114708 コメント修正 2024-01-23 05:11:57 +09:00
ろむねこ 4611c46eca Merge pull request #98 from lacerta-doc/r-ca-patch-3
Update README.md
2024-01-23 05:04:08 +09:00
ろむねこ 6f94b3408f Update README.md 2024-01-23 05:04:00 +09:00
r-ca f65732c42b Import Optimize 2024-01-23 04:34:42 +09:00
r-ca 2821ad8552 Import Optimize 2024-01-23 04:33:57 +09:00
r-ca fc5ef3ed8f Import Optimize 2024-01-23 04:33:33 +09:00
r-ca ad05e3db44 Import Optimize 2024-01-23 04:32:53 +09:00
r-ca 18abe66031 Import Optimize 2024-01-23 04:31:41 +09:00
r-ca c5a0079812 整理 2024-01-23 04:31:14 +09:00
r-ca 73c2271782 renameとか 2024-01-23 04:28:18 +09:00
r-ca 06771d2e74 Resume時に更新されるように 2024-01-23 04:27:20 +09:00
r-ca 09c6d47a47 Delete実装 2024-01-23 04:20:59 +09:00
r-ca 29f745bb5c リネーム実装 2024-01-23 04:20:34 +09:00
r-ca cef688187a メニューアイテム追加 2024-01-23 04:17:03 +09:00
r-ca da26641e2f fix 2024-01-23 04:14:48 +09:00
r-ca 9f50696b39 正常にタイトルが表示されるように 2024-01-23 04:13:02 +09:00
r-ca 9865790a98 Bundle追加 2024-01-23 04:07:45 +09:00
r-ca 5df0c7ee52 iroiro 2024-01-23 04:07:14 +09:00
r-ca 872bbd0f4e ドキュメント名を表示するように 2024-01-23 04:07:05 +09:00
r-ca 8e2af0c963 ToolBar, テキスト修正 2024-01-23 03:53:43 +09:00
r-ca b3d095fa40 Drawable追加 2024-01-23 03:49:44 +09:00
r-ca 1c71ac6545 テキスト修正 2024-01-23 03:47:40 +09:00
r-ca c731749233 設定画面を表示できないように 2024-01-23 03:46:30 +09:00
r-ca 0ef6863992 未実装の設定画面をWork In Progressにした 2024-01-23 03:44:18 +09:00
r-ca 1a247d9b8b Work In Progress レイアウト作成 2024-01-23 03:43:45 +09:00
r-ca ce4656558a 提出用: 代替処理実装 2024-01-23 03:38:58 +09:00
r-ca 32b238df58 IndexOutOfBoundsException 修正 2024-01-23 03:24:34 +09:00
r-ca 87099ae693 レイアウト, ToolBar修正 2024-01-23 03:22:01 +09:00
r-ca b11b78fa7f デバッグ用の処理を削除 2024-01-23 03:11:38 +09:00
r-ca cd0c5e81c5 margin調整 2024-01-23 03:10:30 +09:00
r-ca b9d81ab997 fab追加 2024-01-23 03:10:17 +09:00
r-ca a61de24931 fix 2024-01-23 03:09:07 +09:00
r-ca 9de39309bc 依存関係追加 2024-01-23 03:08:42 +09:00
ろむねこ 9d229a2857 Merge pull request #97 from lacerta-doc/scan_setting
Scan setting
2024-01-23 03:05:44 +09:00
r-ca da9cd9be8e 代替としてStoreで管理するように 2024-01-23 03:04:55 +09:00
r-ca 0b2d58470b 代替としてStoreで管理するように 2024-01-23 02:57:36 +09:00
r-ca ed5e699493 WIP 2024-01-23 02:53:53 +09:00
r-ca 29737303af 依存関係追加 2024-01-23 02:35:59 +09:00
ろむねこ 151c2dde25 Merge pull request #96 from lacerta-doc/vcs/rev_list
fixUI
2024-01-23 02:10:38 +09:00
r-ca 18eee403ef fixUI 2024-01-23 02:09:36 +09:00
ろむねこ 2b9a68b6f5 Merge pull request #95 from lacerta-doc/vcs/rev_list
Vcs/rev list
2024-01-23 02:06:26 +09:00
r-ca b820f42007 iroiro, コミット履歴を表示できるように 2024-01-23 02:04:25 +09:00
r-ca af8935cd7f アイテムレイアウト作成 2024-01-23 01:46:47 +09:00
r-ca 6c50675938 修正 2024-01-23 01:29:30 +09:00
r-ca 791084b737 依存関係追加 2024-01-23 01:28:22 +09:00
r-ca 15d4a369d8 移動 2024-01-23 01:27:20 +09:00
r-ca 07e14eb90c getRevisionHistoryByDocumentId実装 2024-01-23 01:27:11 +09:00
r-ca b13f048c7e Adapter作成 2024-01-23 01:15:46 +09:00
r-ca f0ed4327ca Model作成 2024-01-23 01:13:00 +09:00
r-ca b852e9b7ee RevListFragment作成 2024-01-23 01:05:45 +09:00
ろむねこ ca063709dd Merge pull request #94 from lacerta-doc/improve/fixui
Improve/fixui
2024-01-23 01:03:40 +09:00
r-ca 67de02b502 画面推移で発生する問題を概ね解消した 2024-01-23 00:56:31 +09:00
r-ca 5fafbec247 Revert "コンテナフラグメント作成"
This reverts commit 14ff9abab9.
2024-01-23 00:45:15 +09:00
r-ca e104b3d8ff Revert "引数削除など"
This reverts commit 4714e3d8cb.
2024-01-23 00:45:15 +09:00
r-ca d8d8a5932b Revert "WIP"
This reverts commit 113a2fd3d2.
2024-01-23 00:45:14 +09:00
r-ca 113a2fd3d2 WIP 2024-01-23 00:45:02 +09:00
r-ca 4714e3d8cb 引数削除など 2024-01-23 00:38:17 +09:00
r-ca 14ff9abab9 コンテナフラグメント作成 2024-01-23 00:37:23 +09:00
r-ca 1105c17fca WIp 2024-01-23 00:36:26 +09:00
r-ca 37a18704e3 バックスタックに積まずにナビゲーションするメソッドを追加 2024-01-22 23:48:09 +09:00
r-ca d5df291c81 バックスタックに積まずにナビゲーションするメソッドを追加 2024-01-22 23:47:46 +09:00
r-ca 3178e9233b iroiro 2024-01-22 23:46:23 +09:00
r-ca 004bedb45f フォルダを正常に取得できるように, 作成できるように 2024-01-22 23:35:30 +09:00
r-ca de30eb241c ドキュメントを正常に取得できるようになった 2024-01-22 23:29:49 +09:00
r-ca c7f2a3eebe Daoクエリ追加 2024-01-22 23:28:15 +09:00
r-ca 2a7e329ad7 parentIdに切り替え WIP 2024-01-22 23:20:39 +09:00
r-ca 52f41881fd Iroiro 2024-01-22 20:48:47 +09:00
r-ca 68fb0b719b CreateFolder改修 2024-01-22 20:23:36 +09:00
r-ca da8d4fb4fc PublicPathを生成するメソッド作成 2024-01-22 20:22:51 +09:00
r-ca f7d07b0ec3 パス解決メソッドを作成 2024-01-22 20:21:01 +09:00
r-ca 7f71e818a8 fix 2024-01-22 20:10:04 +09:00
r-ca fc6cbb9d37 一部廃止 2024-01-22 20:06:19 +09:00
r-ca df3edbf354 Model修正 2024-01-22 20:03:56 +09:00
r-ca d40b188f87 Model修正 2024-01-22 20:03:42 +09:00
r-ca 253c77d6f5 Dao修正 2024-01-22 20:00:45 +09:00
r-ca b87b635d2b DBバージョンインクリメント 2024-01-22 19:59:21 +09:00
r-ca 9df033af73 Entity更新 2024-01-22 19:58:59 +09:00
r-ca 58e0686304 Entity更新 2024-01-22 19:58:20 +09:00
r-ca a0f89de1ac WIP 2024-01-22 19:41:54 +09:00
r-ca fe4999384a Fix 2024-01-22 19:28:42 +09:00
r-ca bc304f8535 WIP 2024-01-22 19:22:24 +09:00
r-ca e77fafc108 WIP 2024-01-22 19:22:15 +09:00
r-ca 305cbcd679 WIP 2024-01-22 19:17:09 +09:00
r-ca c06d7e6b15 引数のフォルダ名を使って取得開始前にToolBarをinitするように 2024-01-22 18:43:46 +09:00
r-ca 1648e0b7c1 フォルダ名を引数にとるようにした 2024-01-22 18:42:50 +09:00
r-ca 04db160548 フォルダ名を引数にとるようにした 2024-01-22 18:41:24 +09:00
r-ca 611c5b516d 不要な実装を削除 2024-01-22 18:40:24 +09:00
r-ca 734f75b4c7 iroiro 2024-01-22 18:35:18 +09:00
r-ca 6e0c473c66 setupToolbar実装 2024-01-22 18:24:53 +09:00
r-ca 20828e2f0f ステータスバーの色を合わせる処理を移植 2024-01-22 18:18:12 +09:00
r-ca 3b684bec53 不要な実装を削除 2024-01-22 18:15:41 +09:00
r-ca afef074242 ビルドエラー回避 2024-01-22 18:14:42 +09:00
r-ca 1ceb3e29b7 実装修正 2024-01-22 18:14:11 +09:00
r-ca a5fa89252c Merge branch 'develop' into improve/fixui
# Conflicts:
#	app/src/main/java/one/nem/lacerta/MainActivity.java
#	feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryPageFragment.java
2024-01-22 18:13:44 +09:00
ろむねこ 106bb93644 Merge pull request #93 from lacerta-doc/feature/library/open_folder
Feature/library/open folder
2024-01-22 18:11:00 +09:00
r-ca ab39cd4d00 レイアウト復元 2024-01-22 17:26:03 +09:00
r-ca d1a5cd2f23 実装整理 2024-01-22 17:24:05 +09:00
r-ca 0dc69e1d73 実装整理 2024-01-22 17:22:52 +09:00
r-ca 3d8ab69742 実装整理 2024-01-22 17:22:41 +09:00
r-ca 6bc43869c9 レイアウト復元 2024-01-22 17:21:54 +09:00
r-ca 63dfbc120d レイアウト復元 2024-01-22 17:21:30 +09:00
r-ca 064c4edfbe レイアウト復元 2024-01-22 17:20:39 +09:00
r-ca 1a80d00319 フォルダを開けるように WIP 2024-01-22 13:29:40 +09:00
r-ca 3f893fc580 インタフェース修正 2024-01-22 12:16:56 +09:00
r-ca 225058f836 壊れたImportを修正 2024-01-22 12:11:06 +09:00
r-ca c23b92d386 リネーム 2024-01-22 12:10:45 +09:00
ろむねこ 41e5ab2349 Merge pull request #92 from lacerta-doc/feature/library/create_folder
Feature/library/create folder
2024-01-22 12:09:26 +09:00
231 changed files with 5421 additions and 690 deletions

No files matched your search

+2
View File
@@ -4,6 +4,7 @@
<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 +31,7 @@
<option value="$PROJECT_DIR$/source" />
<option value="$PROJECT_DIR$/utils" />
<option value="$PROJECT_DIR$/vcs" />
<option value="$PROJECT_DIR$/viewer2" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
+1 -1
View File
@@ -1,6 +1,6 @@
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
+17 -32
View File
@@ -1,8 +1,10 @@
# Lacerta
WIP
学習に便利な機能とGit-like VCSを持ったドキュメントスキャナ (Work In Progress)
(グループワーク)
## モジュール設計
![Untitled Diagram(2)(1) drawio(1)](https://github.com/lacerta-doc/Lacerta/assets/66072112/f9b9c40f-bed0-4ade-95c1-50e28df68f35)
![Untitled Diagram(2)](https://github.com/lacerta-doc/Lacerta/assets/66072112/9daabaca-5cdc-49f8-ac66-196c588a47c9)
## メモ
- アイコン: Google Material Icons https://fonts.google.com/icons (Weight:300, Grade:0, Optical size: 24px)
@@ -11,45 +13,28 @@ WIP
### モジュール一覧
- `component` : コンポーネント
- `common` : 共通コンポーネント
- UIの中で共通で使う要素(メニューアイテムとか)
- `scanner` : スキャナー
- スキャナーの実装
- `scanner` : スキャナー
- `viewer` : ビューワー
- ドキュメントビューワーの実装
- `data` : データ
- UIからデータを取得/保存するためのラッパーモジュール
- `Document` : ドキュメント関係
- WIP(JavaDocを参照してください, 余裕があったら追記します)
- `data` : UIからデータを取得/保存するためのラッパーモジュール
- `feature` : 機能モジュール(ナビゲーションからみた機能で分割)
- `common`: 共通機能
- 設定画面とか、どこからでも呼ばれうる画面
- `debug`: デバッグメニュー
- `home`: ホーム画面
- `library`: ライブラリ画面
- `scan`: スキャン画面
- `scan`: スキャン画面 (廃止予定)
- `search`: 検索画面
- `model` : モデル
- データモデルをまとめたモジュール (WIP)
- `document` : ドキュメント
- `meta` : メタデータ
- `processor` : プロセッサ
- いくつかの処理をまとめたモジュール
- `DocumentProcessor` : ドキュメント処理(ドキュメントにページを追加したり更新したり)
- `shared` :
- 共有リソース
- `source` : ソース
- (バックエンドが使うのでとりあえず後回し、フロントから直接操作することは絶対にありません)
- `utils` : ユーティリティ
- ちょっとしたユーティリティをまとめたモジュール
- `LacertaLogger` : ロガー
- `XmlMetaParser` : XMLメタデータパーサー(フロントから直接操作することは絶対にありません)
- `model` : データモデルをまとめたモジュール
- `processor` : プロセッサ(例: `DocumentProcessor` : ドキュメント処理(ドキュメントにページを追加したり更新したり))
- `shared`: 共有リソース
- `ui`: UI要素(Theme, Drawable, Colorなど)
- `source` : ソース(DB/FileManagerなど)
- `utils` : ユーティリティ(ちょっとしたユーティリティをまとめたモジュール)
## コーディング規則/推奨(WIP)
### 規則
- `// TODO`コメントには任意のsuffixを付ける
- 全員が同じ`// TODO:`を使っていると検索がむずかしくなるため
- (例: `// TODO-rca:`)
### 推奨
- マジックナンバーは控える(必要な場合もあるので)
## Thanks for
- [SDA-SE/document-scanner-android](https://github.com/SDA-SE/document-scanner-android)
-
+2
View File
@@ -82,4 +82,6 @@ dependencies {
implementation project(':model')
implementation project(':utils')
implementation project(':component:scanner')
}
+1 -1
View File
@@ -17,7 +17,7 @@
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:icon="@mipmap/ic_launcher_temp_round"
android:name=".LacertaApplication"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

@@ -6,6 +6,7 @@ import android.util.Log;
import com.google.android.material.color.DynamicColors;
import dagger.hilt.android.HiltAndroidApp;
import one.nem.lacerta.utils.FeatureSwitch;
@HiltAndroidApp
public class LacertaApplication extends Application {
@@ -15,7 +16,11 @@ public class LacertaApplication extends Application {
if (DynamicColors.isDynamicColorAvailable()) {
Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
DynamicColors.applyToActivitiesIfAvailable(this);
if (FeatureSwitch.Meta.disableDynamicColor) {
Log.d("DynamicColors", "DynamicColors is disabled by FeatureSwitch.");
} else {
DynamicColors.applyToActivitiesIfAvailable(this);
}
} else {
Log.d("DynamicColors", "DynamicColors is not available.");
}
@@ -1,13 +1,20 @@
package one.nem.lacerta;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.navigation.NavController;
import androidx.navigation.NavOptions;
import androidx.navigation.fragment.NavHostFragment;
import androidx.navigation.ui.NavigationUI;
import android.app.ActivityOptions;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
@@ -15,11 +22,14 @@ import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;
import one.nem.lacerta.component.scanner.ScannerManagerActivity;
import one.nem.lacerta.model.FragmentNavigation;
import one.nem.lacerta.model.pref.FeatureSwitchOverride;
import one.nem.lacerta.utils.FeatureSwitch;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.io.NotActiveException;
@@ -30,7 +40,7 @@ import one.nem.lacerta.utils.repository.SharedPrefUtils;
import javax.inject.Inject;
@AndroidEntryPoint
public class MainActivity extends AppCompatActivity {
public class MainActivity extends AppCompatActivity implements FragmentNavigation {
@Inject
SharedPrefUtils sharedPrefUtils;
@@ -52,6 +62,19 @@ public class MainActivity extends AppCompatActivity {
assert navHostFragment != null;
NavController navController = navHostFragment.getNavController();
NavigationUI.setupWithNavController(bottomNavigationView, navController);
bottomNavigationView.setOnItemSelectedListener(item -> {
NavOptions navOptions = new NavOptions.Builder()
.setLaunchSingleTop(true)
.setEnterAnim(androidx.navigation.ui.R.anim.nav_default_enter_anim)
.setExitAnim(androidx.navigation.ui.R.anim.nav_default_exit_anim)
.setPopEnterAnim(androidx.navigation.ui.R.anim.nav_default_pop_enter_anim)
.setPopExitAnim(androidx.navigation.ui.R.anim.nav_default_pop_exit_anim)
.build();
navController.navigate(item.getItemId(), null, navOptions);
return true;
});
}
catch (Exception e) {
Log.e("Init", "Failed to init navigation");
@@ -71,39 +94,28 @@ public class MainActivity extends AppCompatActivity {
// Set status bar color
getWindow().setStatusBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurface));
// Set app bar color
AppBarLayout appBarLayout = findViewById(R.id.app_bar_layout);
appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
// Collapsed
getWindow().setStatusBarColor(ContextCompat.getColor(getApplicationContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getWindow().setStatusBarColor(ContextCompat.getColor(getApplicationContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
} else {
// Somewhere in between
// Here you can add a color transition if you want
}
}
// Fab
findViewById(R.id.scanFab).setOnClickListener(v -> {
Toast.makeText(this, "Scan", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(this.getApplicationContext(), ScannerManagerActivity.class);
// startActivity(intent);
startActivity(intent, ActivityOptions.makeCustomAnimation(this, one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim).toBundle());
});
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
}
// Public
public void setActionBarTitle(String title) {
getSupportActionBar().setTitle(title);
}
public void setActionBarBackButton(boolean isEnabled) {
getSupportActionBar().setDisplayHomeAsUpEnabled(isEnabled);
}
public void setActionBarMenuItem(int itemId, boolean isEnabled) {
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode == 1) {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
Toast.makeText(this, "Permission granted", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
Toast.makeText(this, "カメラの権限は必須です.", Toast.LENGTH_LONG).show();
finish(); // Exit app
}
}
}
private void initializeApp() {
@@ -120,4 +132,69 @@ public class MainActivity extends AppCompatActivity {
boolean isEnabled = FeatureSwitch.Meta.canOverrideSwitch ? sharedPrefUtils.getFeatureSwitchOverride(featureSwitchOverride) : defaultValue;
if (!isEnabled) bottomNavigationView.getMenu().removeItem(menuId);
}
@Override
public void navigateToFragment(Fragment fragment) {
getSupportFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, fragment)
.addToBackStack(null)
.commit();
}
@Override
public void navigateToFragment(Fragment fragment, boolean addToBackStack) {
if (addToBackStack) {
getSupportFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, fragment)
.addToBackStack(null)
.commit();
} else {
getSupportFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, fragment)
.commit();
}
}
@Override
public void navigateToFragment(Fragment fragment, boolean addToBackStack, boolean clearBackStack) {
if (clearBackStack) {
getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
}
if (addToBackStack) {
getSupportFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, fragment)
.addToBackStack(null)
.commit();
} else {
getSupportFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, fragment)
.commit();
}
}
public void navigateToFragmentAlternate(Fragment fragment, boolean addToBackStack) {
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
// get the current fragment
Fragment currentFragment = getSupportFragmentManager().getPrimaryNavigationFragment();
// hide the current fragment
if (currentFragment != null) {
transaction.hide(currentFragment);
}
// Add the new fragment
transaction.add(R.id.nav_host_fragment, fragment);
// Add the transaction to the back stack if needed
if (addToBackStack) {
transaction.addToBackStack(null);
}
// Commit the transaction
transaction.commit();
// Update the primary navigation fragment
getSupportFragmentManager().beginTransaction().setPrimaryNavigationFragment(fragment).commit();
}
}
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#5F4769">
<group android:scaleX="0.377"
android:scaleY="0.377"
android:translateX="7.476"
android:translateY="7.476">
<path
android:fillColor="@android:color/white"
android:pathData="M7,3H4v3H2V1h5V3zM22,6V1h-5v2h3v3H22zM7,21H4v-3H2v5h5V21zM20,18v3h-3v2h5v-5H20zM19,18c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2V18zM15,8H9v2h6V8zM15,11H9v2h6V11zM15,14H9v2h6V14z"/>
</group>
</vector>
+24 -48
View File
@@ -1,61 +1,24 @@
<?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:background="@color/colorSurface">
android:theme="@style/Theme.Lacerta"
tools:context=".MainActivity">
<androidx.coordinatorlayout.widget.CoordinatorLayout
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/bottom_nav"
app:defaultNavHost="true"
app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="160dp"
android:background="@color/colorSurface"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:contentScrim="@color/colorSecondaryContainer"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="HOGE" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:defaultNavHost="true"
app:navGraph="@navigation/main_nav"
tools:layout="@layout/fragment_home_top"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/main_nav"
tools:layout="@layout/fragment_home_top" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_nav"
@@ -71,4 +34,17 @@
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/bottom_nav_menu" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/scanFab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="32dp"
android:layout_marginBottom="32dp"
android:clickable="true"
app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_baseline_add_24" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_temp_background"/>
<foreground android:drawable="@drawable/ic_launcher_temp_foreground"/>
</adaptive-icon>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_temp_background"/>
<foreground android:drawable="@drawable/ic_launcher_temp_foreground"/>
</adaptive-icon>
Binary file not shown.

After

Width:  |  Height:  |  Size: 768 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1004 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_temp_background">#A386EB</color>
</resources>
+10
View File
@@ -1,5 +1,6 @@
plugins {
alias(libs.plugins.com.android.library)
id 'com.google.dagger.hilt.android'
}
android {
@@ -33,5 +34,14 @@ 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 project(':shared:ui')
implementation project(':utils')
implementation project(':model')
implementation project(':data')
implementation project(':vcs')
}
@@ -0,0 +1,87 @@
package one.nem.lacerta.component.common;
import android.app.Dialog;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
import androidx.fragment.app.DialogFragment;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
public class LacertaCreateTagDialog extends DialogFragment {
private String title;
private String message;
private String positiveButtonText;
private String negativeButtonText;
private LacertaCreateTagDialogListener listener;
// Setter
public LacertaCreateTagDialog setListener(LacertaCreateTagDialogListener listener) {
this.listener = listener;
return this;
}
public LacertaCreateTagDialog setTitle(String title) {
this.title = title;
return this;
}
public LacertaCreateTagDialog setMessage(String message) {
this.message = message;
return this;
}
public LacertaCreateTagDialog setPositiveButtonText(String positiveButtonText) {
this.positiveButtonText = positiveButtonText;
return this;
}
public LacertaCreateTagDialog setNegativeButtonText(String negativeButtonText) {
this.negativeButtonText = negativeButtonText;
return this;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
LayoutInflater inflater = requireActivity().getLayoutInflater();
View view = inflater.inflate(R.layout.lacerta_dialog_create_tag, null);
// TextEdit
EditText tag_name_edit_text = view.findViewById(R.id.tag_name_edit_text);
com.google.android.material.textfield.TextInputLayout tag_name_text_input_layout = view.findViewById(R.id.tag_name_text_input_layout);
tag_name_text_input_layout.setHint("タグの名前");
EditText tag_color_edit_text = view.findViewById(R.id.tag_color_edit_text);
com.google.android.material.textfield.TextInputLayout tag_color_text_input_layout = view.findViewById(R.id.tag_color_text_input_layout);
tag_color_text_input_layout.setHint("タグの色(カラーコード)");
builder.setTitle(this.title == null ? "Create new tag" : this.title);
// Button
builder.setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, which) -> {
String tag_name = tag_name_edit_text.getText().toString();
String tag_color = tag_color_edit_text.getText().toString();
if (listener != null) {
listener.onPositiveClick(tag_name, tag_color);
}
});
builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
if (listener != null) {
listener.onNegativeClick();
}
});
builder.setView(view);
return builder.create();
}
}
@@ -0,0 +1,8 @@
package one.nem.lacerta.component.common;
public interface LacertaCreateTagDialogListener {
void onPositiveClick(String tag_name, String tag_color);
void onNegativeClick();
}
@@ -0,0 +1,163 @@
package one.nem.lacerta.component.common;
import android.app.Dialog;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import androidx.fragment.app.DialogFragment;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.utils.LacertaLogger;
@AndroidEntryPoint
public class LacertaSelectDirDialog extends DialogFragment {
@Inject
LacertaLibrary lacertaLibrary;
@Inject
LacertaLogger logger;
private LacertaSelectDirDialogListener listener;
private String title;
private String message;
private String positiveButtonText;
private String negativeButtonText;
private SelectDirDialogItemAdapter adapter;
private RecyclerView recyclerView;
private TextView current_dir_text_view;
// Setter
public LacertaSelectDirDialog setListener(LacertaSelectDirDialogListener listener) {
this.listener = listener;
return this;
}
public LacertaSelectDirDialog setTitle(String title) {
this.title = title;
return this;
}
public LacertaSelectDirDialog setMessage(String message) {
this.message = message;
return this;
}
public LacertaSelectDirDialog setPositiveButtonText(String positiveButtonText) {
this.positiveButtonText = positiveButtonText;
return this;
}
public LacertaSelectDirDialog setNegativeButtonText(String negativeButtonText) {
this.negativeButtonText = negativeButtonText;
return this;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
super.onCreateDialog(savedInstanceState);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
LayoutInflater inflater = requireActivity().getLayoutInflater();
View view = inflater.inflate(R.layout.lacerta_dialog_select_dir, null);
// 高さを画面の40%にする
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
view.setMinimumHeight(height);
this.recyclerView = view.findViewById(R.id.select_dir_recycler_view);
this.current_dir_text_view = view.findViewById(R.id.current_dir_text_view);
this.adapter = new SelectDirDialogItemAdapter(new LacertaSelectDirDialogInternalEventListener() {
@Override
public void onDirSelected(String name, String itemId) {
showRecyclerViewItem(itemId);
}
@Override
public void onBackSelected(String parentId) {
showRecyclerViewItem(parentId);
}
});
this.recyclerView.setAdapter(this.adapter);
builder.setView(view);
showRecyclerViewItem(null); // get root folder
builder.setTitle(this.title == null ? "Select a directory" : this.title);
builder.setMessage(this.message == null ? "Select a directory" : this.message);
builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
if (listener != null) {
listener.onDirSelected(
adapter.getCurrentPageTitle() == null ? null : adapter.getCurrentPageTitle(),
adapter.getCurrentId() == null ? null : adapter.getCurrentId());
}
});
builder.setNegativeButton(this.negativeButtonText == null ? "Cancel" : this.negativeButtonText, (dialog, which) -> {
if (listener != null) {
listener.onCanceled();
}
});
return builder.create();
}
private void showRecyclerViewItem(String targetDirId) {
lacertaLibrary.getPublicPath(targetDirId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
getActivity().runOnUiThread(() -> {
if (publicPath != null) {
current_dir_text_view.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPathの実装を修正する
} else {
current_dir_text_view.setText("/");
}
});
});
lacertaLibrary.getFolderList(targetDirId).thenAccept(libraryItemPage -> {
getActivity().runOnUiThread(() -> {
int currentCount = adapter.getItemCount();
String currentDirId = adapter.getCurrentId();
if (currentDirId == null) {
// Rootが関わる推移 (Rootからの推移)
adapter.setListItems(libraryItemPage);
adapter.notifyItemRangeRemoved(0, currentCount);
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
} else if (libraryItemPage.getPageId() == null) {
// Rootが関わる推移 (Rootへの推移)
adapter.setListItems(libraryItemPage);
adapter.notifyItemRangeRemoved(0, currentCount);
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
} else if (libraryItemPage.getPageId() != null) {
// Rootが関わらない推移
adapter.setListItems(libraryItemPage);
adapter.notifyItemRangeRemoved(1, currentCount);
adapter.notifyItemRangeInserted(1, libraryItemPage.getListItems().size());
} else {
// その他の遷移(安全側に倒すため全アイテム更新)
logger.warn("LacertaSelectDirDialog", "Unknown transition.");
logger.warn("LacertaSelectDirDialog", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
adapter.setListItems(libraryItemPage);
adapter.notifyItemRangeRemoved(0, currentCount);
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
}
});
});
}
}
@@ -0,0 +1,6 @@
package one.nem.lacerta.component.common;
public interface LacertaSelectDirDialogInternalEventListener {
void onDirSelected(String name, String itemId);
void onBackSelected(String parentId);
}
@@ -0,0 +1,7 @@
package one.nem.lacerta.component.common;
public interface LacertaSelectDirDialogListener {
void onDirSelected(String name, String itemId);
void onCanceled();
}
@@ -0,0 +1,112 @@
package one.nem.lacerta.component.common;
import android.app.Dialog;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Toast;
import androidx.fragment.app.DialogFragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
@AndroidEntryPoint
public class LacertaSelectRevDialog extends DialogFragment {
@Inject
LacertaVcsFactory lacertaVcsFactory;
@Inject
LacertaLogger logger;
String title;
String documentId;
String message;
String negativeButtonText;
LacertaSelectRevDialogListener listener;
public LacertaSelectRevDialog setTitle(String title) {
this.title = title;
return this;
}
public LacertaSelectRevDialog setDocumentId(String documentId) {
this.documentId = documentId;
return this;
}
public LacertaSelectRevDialog setMessage(String message) {
this.message = message;
return this;
}
public LacertaSelectRevDialog setNegativeButtonText(String negativeButtonText) {
this.negativeButtonText = negativeButtonText;
return this;
}
public LacertaSelectRevDialog setListener(LacertaSelectRevDialogListener listener) {
this.listener = listener;
return this;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
super.onCreateDialog(savedInstanceState);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
LayoutInflater inflater = requireActivity().getLayoutInflater();
View view = inflater.inflate(R.layout.lacerta_dialog_select_rev, null);
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
view.setMinimumHeight(height);
RecyclerView recyclerView = view.findViewById(R.id.select_rev_recycler_view);
SelectRevDialogItemAdapter adapter = new SelectRevDialogItemAdapter(revId -> {
if (listener != null) {
listener.onItemSelected(revId);
dismiss();
}
});
recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
builder.setView(view);
if (this.documentId == null) {
logger.error("SelectRevDialog", "documentId is null");
logger.e_code("0296fb0c-07a3-4971-a280-bd1a61461bb7");
Toast.makeText(getContext(), "Sorry, something went wrong", Toast.LENGTH_SHORT).show();
dismiss();
}
LacertaVcs lacertaVcs = lacertaVcsFactory.create(this.documentId);
lacertaVcs.getRevisionHistory().thenAccept(revList -> {
adapter.setRevList(revList);
adapter.notifyDataSetChanged(); // TODO-rca:時間に応じてアニメーションをつける
});
builder.setTitle(title == null ? "Select Rev" : title);
builder.setMessage(message == null ? "Select Rev" : message);
builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
if (listener != null) {
listener.onDialogCanceled();
dismiss();
}
});
return builder.create();
}
}
@@ -0,0 +1,6 @@
package one.nem.lacerta.component.common;
public interface LacertaSelectRevDialogInternalListener {
void onItemSelected(String revId);
}
@@ -0,0 +1,8 @@
package one.nem.lacerta.component.common;
public interface LacertaSelectRevDialogListener {
void onItemSelected(String revId);
void onDialogCanceled();
}
@@ -0,0 +1,100 @@
package one.nem.lacerta.component.common;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.ListItemType;
public class SelectDirDialogItemAdapter extends RecyclerView.Adapter<SelectDirDialogItemAdapter.SelectDirDialogItemViewHolder> {
private LibraryItemPage libraryItemPage;
LacertaSelectDirDialogInternalEventListener listener;
public SelectDirDialogItemAdapter(LacertaSelectDirDialogInternalEventListener listener) {
this.listener = listener;
}
public void setListItems(LibraryItemPage libraryItemPage) {
this.libraryItemPage = libraryItemPage;
if (this.libraryItemPage.getPageId() != null) { // ルートディレクトリの場合は戻るボタンを表示しない
this.libraryItemPage.getListItems().add(0, new ListItem("戻る", " ", ListItemType.ITEM_TYPE_ACTION_BACK, null));
}
}
@NonNull
@Override
public SelectDirDialogItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
return new SelectDirDialogItemViewHolder(view);
}
@Override
public void onBindViewHolder(SelectDirDialogItemViewHolder holder, int position) {
ListItem listItem = libraryItemPage.getListItems().get(position);
holder.title.setText(listItem.getTitle());
holder.description.setText(listItem.getDescription());
holder.icon.setImageResource(listItem.getItemType().getIconId());
if(listItem.getItemType() == ListItemType.ITEM_TYPE_ACTION_BACK) {
holder.itemView.setOnClickListener(v -> listener.onBackSelected(this.libraryItemPage.getParentId()));
} else {
holder.itemView.setOnClickListener(v -> listener.onDirSelected(listItem.getTitle(), listItem.getItemId()));
}
}
@Override
public int getItemCount() {
return this.libraryItemPage == null ? 0 : this.libraryItemPage.getListItems().size();
}
public String getCurrentId() {
if (this.libraryItemPage == null) {
return null;
} else {
if (this.libraryItemPage.getPageId() == null) {
return null;
} else {
return this.libraryItemPage.getPageId();
}
}
}
public String getCurrentPageTitle() {
if (this.libraryItemPage == null) {
return null;
} else {
if (this.libraryItemPage.getPageId() == null) {
return null;
} else {
return this.libraryItemPage.getPageTitle();
}
}
}
public static class SelectDirDialogItemViewHolder extends RecyclerView.ViewHolder {
TextView title;
TextView description;
ImageView icon;
public SelectDirDialogItemViewHolder(@NonNull View itemView) {
super(itemView);
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
description.setVisibility(View.GONE); // 暫定
}
}
}
@@ -0,0 +1,66 @@
package one.nem.lacerta.component.common;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import one.nem.lacerta.model.VcsRevModel;
public class SelectRevDialogItemAdapter extends RecyclerView.Adapter<SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder>{
ArrayList<VcsRevModel> revList;
LacertaSelectRevDialogInternalListener listener;
public SelectRevDialogItemAdapter(LacertaSelectRevDialogInternalListener listener) {
this.listener = listener;
}
public void setRevList(ArrayList<VcsRevModel> revList) {
this.revList = revList;
}
@NonNull
@Override
public SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.common_rev_list_item, parent, false);
return new SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder holder, int position) {
VcsRevModel rev = revList.get(position);
holder.title.setText(rev.getCommitMessage());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
holder.description.setText(simpleDateFormat.format(rev.getCreatedAt()));
holder.revId.setText("RevID: " + rev.getId());
holder.itemView.setOnClickListener(v -> listener.onItemSelected(rev.getId()));
}
@Override
public int getItemCount() {
return this.revList == null ? 0 : this.revList.size();
}
public class SelectRevDialogItemViewHolder extends RecyclerView.ViewHolder {
TextView title;
TextView description;
TextView revId;
public SelectRevDialogItemViewHolder(@NonNull View itemView) {
super(itemView);
title = itemView.findViewById(R.id.rev_item_title);
description = itemView.findViewById(R.id.rev_item_detail);
revId = itemView.findViewById(R.id.rev_item_id);
}
}
}
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="24dp"
android:paddingVertical="16dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/item_text_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/rev_item_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginEnd="8dp"
android:text="Placeholder Title"
android:textColor="@color/colorOnSurface"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/rev_item_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:text="2023/01/01 00:00:00 - hogehoge"
android:textColor="@color/colorOnSurfaceSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rev_item_title" />
<TextView
android:id="@+id/rev_item_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
android:text="dd76a029-51f1-40f7-b316-a0c74bbfebb1(Example)"
android:textColor="@color/colorOnSurfaceSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rev_item_detail" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tag_name_text_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingHorizontal="16dp"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tag_name_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tag_color_text_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingHorizontal="16dp"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
<!-- todo: add color picker -->
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tag_color_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/current_dir_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/select_dir_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
</LinearLayout>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/select_rev_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
@@ -1,19 +1,20 @@
package one.nem.lacerta.component.scanner;
import android.Manifest;
import android.app.ProgressDialog;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Toast;
import androidx.activity.EdgeToEdge;
import androidx.annotation.AnimatorRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
@@ -28,11 +29,11 @@ import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
@AndroidEntryPoint
@@ -95,6 +96,14 @@ public class ScannerManagerActivity extends AppCompatActivity {
return insets;
});
if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
!= PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA}, 1); // TODO-rca: リクエストコードを定数にする
}
MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
setSupportActionBar(toolbar);
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
@@ -119,11 +128,12 @@ public class ScannerManagerActivity extends AppCompatActivity {
Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
saveNewDocument();
return true;
} else if (item.getItemId() == R.id.action_insert_exist) {
// 既存ドキュメントに挿入
Toast.makeText(this, "挿入処理", Toast.LENGTH_SHORT).show();
insertToExistDocument();
return true;
// }
// else if (item.getItemId() == R.id.action_insert_exist) {
// // 既存ドキュメントに挿入
// Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
// insertToExistDocument();
// return true;
} else if (item.getItemId() == android.R.id.home) {
finish();
return true;
@@ -139,7 +149,6 @@ public class ScannerManagerActivity extends AppCompatActivity {
if (this.croppedImages.isEmpty()) {
logger.debug(TAG, "this.resultImages is empty");
logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
// TODO-rca: なんかする
} else {
logger.debug(TAG, "this.resultImages is not empty");
updateResultView(this.croppedImages);
@@ -6,9 +6,9 @@
android:icon="@drawable/save_24px"
android:title="Save"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_insert_exist"
android:icon="@drawable/ic_baseline_add_24"
android:title="Save"
app:showAsAction="ifRoom"/>
<!-- <item-->
<!-- android:id="@+id/action_insert_exist"-->
<!-- android:icon="@drawable/description_24px"-->
<!-- android:title="Insert"-->
<!-- app:showAsAction="ifRoom"/>-->
</menu>
+7
View File
@@ -54,4 +54,11 @@ dependencies {
implementation project(':model')
implementation project(':vcs')
implementation project(':component:common')
// TODO-rca: バージョンカタログに切り出す
implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
}
@@ -0,0 +1,73 @@
package one.nem.lacerta.component.viewer.BookMark;
import android.os.Bundle;
import android.view.GestureDetector;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import androidx.fragment.app.Fragment;
import java.util.UUID;
import javax.inject.Inject;
import one.nem.lacerta.component.viewer.R;
// BookMarkFragment.java
public class BookMarkFragment extends Fragment {
@Inject
BookmarkRepository bookmarkRepository;
private GestureDetector gestureDetector;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_bookmark, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onDoubleTap(MotionEvent e) {
// ダブルタップが検出された時の処理
handleDoubleTap();
return true;
}
});
// ブックマークボタンがダブルタップされた時の処理
view.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
return gestureDetector.onTouchEvent(event);
}
});
}
private void handleDoubleTap() {
// ダブルタップが検出された時の処理
// ブックマークを作成
String pageId = "current_page_id";
String title = "current_page_title";
Bookmark bookmark = new Bookmark(
UUID.randomUUID().toString(),
title,
pageId,
System.currentTimeMillis()
);
// ブックマークを保存
bookmarkRepository.addBookmark(bookmark);
// ユーザーに成功メッセージを表示
Toast.makeText(getContext(), "ダブルタップでブックマークが追加されました", Toast.LENGTH_SHORT).show();
}
}
@@ -0,0 +1,48 @@
package one.nem.lacerta.component.viewer.BookMark;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import java.util.List;
import javax.inject.Inject;
import one.nem.lacerta.component.viewer.R;
// BookMarkListFragment.java
public class BookMarkListFragment extends Fragment {
@Inject
BookmarkRepository bookmarkRepository;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_bookmark_list, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// ブックマーク一覧を取得
List<Bookmark> bookmarks = bookmarkRepository.getAllBookmarks();
// ブックマーク一覧を表示するRecyclerViewのセットアップ
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
BookmarkAdapter adapter = new BookmarkAdapter(bookmarks, new OnBookmarkClickListener() {
@Override
public void onBookmarkClick(Bookmark selectedBookmark) {
// ブックマークが選択された時の処理
// 例: ブックマークに関連するページを表示する
}
});
recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
recyclerView.setAdapter(adapter);
}
}
@@ -0,0 +1,56 @@
package one.nem.lacerta.component.viewer.BookMark;
// Bookmark.java
public class Bookmark {
private String id; // ブックマークの一意の識別子
private String title;
private String pageId; // ブックマークが参照するページの識別子
private long timestamp; // ブックマークが作成された時刻
public Bookmark(String id, String title, String pageId, long timestamp) {
this.id = id;
this.title = title;
this.pageId = pageId;
this.timestamp = timestamp;
}
public Bookmark() {
// Empty constructor
}
// Getter
public String getId() {
return id;
}
public String getTitle() {
return title;
}
public String getPageId() {
return pageId;
}
public long getTimestamp() {
return timestamp;
}
// Setter
public void setId(String id) {
this.id = id;
}
public void setTitle(String title) {
this.title = title;
}
public void setPageId(String pageId) {
this.pageId = pageId;
}
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
}
@@ -0,0 +1,61 @@
package one.nem.lacerta.component.viewer.BookMark;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.List;
import one.nem.lacerta.component.viewer.R;
public class BookmarkAdapter extends RecyclerView.Adapter<BookmarkAdapter.BookmarkViewHolder> {
private List<Bookmark> bookmarks;
private OnBookmarkClickListener listener;
public BookmarkAdapter(List<Bookmark> bookmarks, OnBookmarkClickListener listener) {
this.bookmarks = bookmarks;
this.listener = listener;
}
@NonNull
@Override
public BookmarkViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.fragment_bookmark, parent, false);
return new BookmarkViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull BookmarkViewHolder holder, int position) {
final Bookmark bookmark = bookmarks.get(position);
holder.titleTextView.setText(bookmark.getTitle());
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ブックマークがクリックされたときの処理
listener.onBookmarkClick(bookmark);
}
});
}
@Override
public int getItemCount() {
return bookmarks.size();
}
static class BookmarkViewHolder extends RecyclerView.ViewHolder {
TextView titleTextView;
public BookmarkViewHolder(@NonNull View itemView) {
super(itemView);
titleTextView = itemView.findViewById(R.id.titleTextView);
}
}
}
@@ -0,0 +1,21 @@
package one.nem.lacerta.component.viewer.BookMark;
// BookmarkRepository.java
import java.util.ArrayList;
import java.util.List;
public class BookmarkRepository {
private List<Bookmark> bookmarks = new ArrayList<>();
public List<Bookmark> getAllBookmarks() {
return bookmarks;
}
public void addBookmark(Bookmark bookmark) {
bookmarks.add(bookmark);
}
public void removeBookmark(Bookmark bookmark) {
bookmarks.remove(bookmark);
}
}
@@ -0,0 +1,10 @@
package one.nem.lacerta.component.viewer.BookMark;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
// OnBookmarkClickListener.java
public interface OnBookmarkClickListener {
void onBookmarkClick(Bookmark selectedBookmark);
}
@@ -1,88 +0,0 @@
package one.nem.lacerta.component.viewer;
import android.graphics.Bitmap;
import android.os.Bundle;
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.Toast;
import java.util.ArrayList;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.page.Page;
import one.nem.lacerta.utils.LacertaLogger;
/**
* A simple {@link Fragment} subclass.
* Use the {@link ComponentViewerTopFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class ComponentViewerTopFragment extends Fragment {
@Inject
Document document;
@Inject
LacertaLogger logger;
private static final String TAG = "ComponentViewerTopFragment";
private String documentId;
public ComponentViewerTopFragment() {
// Required empty public constructor
}
public static ComponentViewerTopFragment newInstance(String documentId) {
ComponentViewerTopFragment fragment = new ComponentViewerTopFragment();
Bundle args = new Bundle();
args.putString("documentId", documentId);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
documentId = getArguments().getString("documentId");
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
});
recyclerView.setAdapter(viewerBodyAdapter);
document.getDocument(documentId).thenAccept(documentDetail -> {
ArrayList<Page> pages = documentDetail.getPages();
logger.debug(TAG, "pages.size(): " + pages.size());
viewerBodyAdapter.setPages(pages);
getActivity().runOnUiThread(() -> {
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
});
});
return view;
}
}
@@ -0,0 +1,93 @@
package one.nem.lacerta.component.viewer;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import one.nem.lacerta.component.viewer.model.RevSelectListener;
import one.nem.lacerta.model.VcsRevModel;
import one.nem.lacerta.utils.FeatureSwitch;
public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
private ArrayList<VcsRevModel> revModels;
private RevSelectListener revSelectListener;
public RevAdapter(ArrayList<VcsRevModel> revModels) {
this.revModels = revModels;
}
public RevAdapter(RevSelectListener revSelectListener) {
this.revSelectListener = revSelectListener;
}
public void setRevModels(ArrayList<VcsRevModel> revModels) {
this.revModels = revModels;
}
@NonNull
@Override
public RevAdapter.RevViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.viewer_rev_list_item, parent, false);
return new RevAdapter.RevViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull RevAdapter.RevViewHolder holder, int position) {
VcsRevModel revModel = revModels.get(position);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
holder.title.setText(revModel.getCommitMessage());
if (FeatureSwitch.Vcs.disableBranchDisplay) {
// holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()));
holder.detail.setText(simpleDateFormat.format(revModel.getCreatedAt()));
} else {
// holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()) + " " + revModel.getBranchName());
holder.detail.setText(simpleDateFormat.format(revModel.getCreatedAt())+ " " + revModel.getBranchName());
}
holder.revId.setText("RevID: " + revModel.getId());
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
revSelectListener.onRevSelect(revModel.getId());
}
});
}
@Override
public int getItemCount() {
if (revModels == null) {
return 0;
} else {
return revModels.size();
}
}
class RevViewHolder extends RecyclerView.ViewHolder {
TextView title;
TextView detail;
TextView revId;
public RevViewHolder(@NonNull View itemView) {
super(itemView);
title = itemView.findViewById(R.id.rev_item_title);
detail = itemView.findViewById(R.id.rev_item_detail);
revId = itemView.findViewById(R.id.rev_item_id);
}
}
}
@@ -0,0 +1,272 @@
package one.nem.lacerta.component.viewer;
import android.os.Bundle;
import androidx.appcompat.widget.Toolbar;
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.Toast;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.ArrayList;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.common.LacertaSelectDirDialog;
import one.nem.lacerta.component.common.LacertaSelectDirDialogListener;
import one.nem.lacerta.component.common.LacertaSelectRevDialog;
import one.nem.lacerta.component.common.LacertaSelectRevDialogListener;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.model.document.page.Page;
import one.nem.lacerta.utils.FeatureSwitch;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
/**
* A simple {@link Fragment} subclass.
* Use the {@link ViewerListFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class ViewerListFragment extends Fragment {
@Inject
Document document;
@Inject
LacertaLibrary lacertaLibrary;
@Inject
LacertaLogger logger;
@Inject
LacertaVcsFactory lacertaVcsFactory;
private static final String TAG = "ComponentViewerTopFragment";
private String documentId;
private String documentName;
private String revisionId;
public ViewerListFragment() {
// Required empty public constructor
}
public static ViewerListFragment newInstance(String documentId, String documentName) {
ViewerListFragment fragment = new ViewerListFragment();
Bundle args = new Bundle();
args.putString("documentId", documentId);
args.putString("documentName", documentName);
fragment.setArguments(args);
return fragment;
}
public static ViewerListFragment newInstance(String documentId, String documentName, String revisionId) {
ViewerListFragment fragment = new ViewerListFragment();
Bundle args = new Bundle();
args.putString("documentId", documentId);
args.putString("documentName", documentName);
args.putString("revisionId", revisionId);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
documentId = getArguments().getString("documentId");
documentName = getArguments().getString("documentName");
revisionId = getArguments().getString("revisionId");
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
// Toolbar
Toolbar toolbar = view.findViewById(R.id.toolbar);
toolbarSetup(toolbar, true, this.documentName == null ? "Document" : this.documentName, null);
RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
});
recyclerView.setAdapter(viewerBodyAdapter);
if (revisionId == null) {
logger.debug(TAG, "revisionId is empty, loading latest revision");
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
document.getDocument(documentId).thenAccept(documentDetail -> {
ArrayList<Page> pages = documentDetail.getPages();
logger.debug(TAG, "pages.size(): " + pages.size());
viewerBodyAdapter.setPages(pages);
getActivity().runOnUiThread(() -> {
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
});
}).thenCompose(aVoid -> lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT)).thenAccept(publicPath -> {
updateToolbarSubtitle(toolbar, "/" + publicPath.parent().getStringPath());
});
} else {
logger.debug(TAG, "revisionId: " + revisionId);
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
LacertaVcs lacertaVcs = lacertaVcsFactory.create(documentId);
lacertaVcs.getDocumentPagePathListRev(revisionId).thenAccept(documentPathList -> {
logger.debug(TAG, "documentPathList.size(): " + documentPathList.size());
document.getDocumentPageListByFileNameList(documentId, documentPathList).thenAccept(pages -> {
logger.debug(TAG, "pages.size(): " + pages.size());
viewerBodyAdapter.setPages(pages);
getActivity().runOnUiThread(() -> {
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
});
});
}).thenCompose(aVoid -> lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT)).thenAccept(publicPath -> {
updateToolbarSubtitle(toolbar, "/" + publicPath.parent().getStringPath()); // TODO-rca: リビジョンの場合はリビジョン名を表示する?
});
}
return view;
}
/**
* Toolbarのサブタイトルを更新
* @param subtitle サブタイトル
*/
private void updateToolbarSubtitle(Toolbar toolbar, String subtitle) {
getActivity().runOnUiThread(() -> {
toolbar.setSubtitle(subtitle);
});
}
/**
* ToolbarをInitする
*
* @param toolbar Toolbar
* @param showCloseButton 戻るボタンを表示するか
* @param title タイトル
*/
private void toolbarSetup(Toolbar toolbar, boolean showCloseButton, String title, String Subtitle) {
getActivity().runOnUiThread(() -> {
if (showCloseButton) {
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.close_24px);
toolbar.setNavigationOnClickListener(v -> {
// Stop Activity
getActivity().finish();
});
} else {
toolbar.setNavigationIcon(null);
}
toolbar.setTitle(title);
if (Subtitle != null) toolbar.setSubtitle(Subtitle);
toolbar.inflateMenu(R.menu.viewer_menu);
toolbar.setOnMenuItemClickListener(item -> {
if (item.getItemId() == R.id.action_open_vcs_rev_list) {
LacertaSelectRevDialog lacertaSelectRevDialog = new LacertaSelectRevDialog();
lacertaSelectRevDialog.setDocumentId(this.documentId).setTitle("リビジョンの選択").setMessage("リビジョンを選択してください。").setNegativeButtonText("キャンセル");
lacertaSelectRevDialog.setListener(new LacertaSelectRevDialogListener() {
@Override
public void onItemSelected(String revId) {
getParentFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName, revisionId))
.commit();
}
@Override
public void onDialogCanceled() {
logger.debug(TAG, "Canceled");
}
});
lacertaSelectRevDialog.show(getParentFragmentManager(), "select_rev_dialog");
return true;
} else if (item.getItemId() == R.id.action_rename) {
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
builder.setTitle("ファイル名の変更");
View view = LayoutInflater.from(requireContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
final com.google.android.material.textfield.TextInputEditText input = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
final com.google.android.material.textfield.TextInputLayout inputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
inputLayout.setHint("ファイル名");
builder.setView(view);
builder.setPositiveButton("変更", (dialog, which) -> {
document.renameDocument(documentId, input.getText().toString()).thenAccept(aVoid -> {
getActivity().runOnUiThread(() -> {
toolbar.setTitle(input.getText().toString());
documentName = input.getText().toString();
});
});
});
builder.setNegativeButton("キャンセル", (dialog, which) -> {
dialog.cancel();
});
builder.show();
return true;
} else if (item.getItemId() == R.id.action_delete) {
// TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
builder.setTitle("ファイルの削除");
builder.setMessage("ファイルを削除しますか?");
builder.setPositiveButton("削除", (dialog, which) -> {
document.deleteDocument(documentId).thenAccept(aVoid -> {
getActivity().runOnUiThread(() -> {
// Stop Activity
getActivity().finish();
});
});
});
builder.setNegativeButton("キャンセル", (dialog, which) -> {
dialog.cancel();
});
builder.show();
return true;
} else if (item.getItemId() == R.id.action_move) {
LacertaSelectDirDialog lacertaSelectDirDialog = new LacertaSelectDirDialog();
lacertaSelectDirDialog.setListener(new LacertaSelectDirDialogListener() {
@Override
public void onDirSelected(String name, String itemId) {
logger.debug(TAG, "Selected dir: " + name + ", " + itemId);
document.moveDocument(documentId, itemId).thenAccept(aVoid -> {
getActivity().runOnUiThread(() -> {
// Stop Activity
getActivity().finish(); // TODO-rca: ファイル移動後に終了するべきかは検討
});
});
}
@Override
public void onCanceled() {
logger.debug(TAG, "Canceled");
}
});
lacertaSelectDirDialog.setTitle("ファイルの移動")
.setMessage("ファイルを移動するフォルダを選択してください。")
.setPositiveButtonText("移動")
.setNegativeButtonText("キャンセル");
lacertaSelectDirDialog.show(getParentFragmentManager(), "select_dir_dialog");
return true;
} else {
return false;
}
});
});
}
}
@@ -2,20 +2,14 @@ package one.nem.lacerta.component.viewer;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
import androidx.activity.EdgeToEdge;
import androidx.activity.OnBackPressedCallback;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.FragmentManager;
import androidx.navigation.NavController;
import androidx.navigation.fragment.NavHostFragment;
import androidx.navigation.ui.NavigationUI;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import javax.inject.Inject;
@@ -35,6 +29,7 @@ public class ViewerMainActivity extends AppCompatActivity {
// Variables
private static final String TAG = "ViewerMainActivity";
String documentId;
String documentName;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -47,9 +42,13 @@ public class ViewerMainActivity extends AppCompatActivity {
return insets;
});
// // Transition
// overridePendingTransition(one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim);
Intent intent = getIntent();
try {
documentId = intent.getStringExtra("documentId");
documentName = intent.getStringExtra("documentName");
}
catch (Exception e) {
logger.error(TAG, "Failed to get documentId from intent");
@@ -58,8 +57,10 @@ public class ViewerMainActivity extends AppCompatActivity {
finish();
}
// Navigation
getSupportFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId))
.commitNow();
.replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
.commit();
}
}
@@ -0,0 +1,102 @@
package one.nem.lacerta.component.viewer;
import android.os.Bundle;
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 javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
/**
* A simple {@link Fragment} subclass.
* Use the {@link ViewerVcsRevListFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class ViewerVcsRevListFragment extends Fragment {
@Inject
LacertaVcsFactory lacertaVcsFactory;
@Inject
LacertaLogger logger;
LacertaVcs lacertaVcs;
private String documentId;
private String documentName;
public ViewerVcsRevListFragment() {
// Required empty public constructor
}
public static ViewerVcsRevListFragment newInstance(String documentId, String documentName) {
ViewerVcsRevListFragment fragment = new ViewerVcsRevListFragment();
Bundle args = new Bundle();
args.putString("documentId", documentId);
args.putString("documentName", documentName);
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
return inflater.inflate(R.layout.fragment_viewer_vcs_rev_list, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// Init arg
if (getArguments() != null) {
this.documentId = getArguments().getString("documentId");
logger.debug("ViewerVcsRevListFragment", "documentId: " + this.documentId);
}
// Init vcs
lacertaVcs = lacertaVcsFactory.create(this.documentId);
// Init view
RecyclerView recyclerView = view.findViewById(R.id.rev_list);
// Init adapter
RevAdapter revAdapter = new RevAdapter(revisionId -> {
logger.debug("ViewerVcsRevListFragment", "Selected revisionId: " + revisionId);
getParentFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(this.documentId, this.documentName, revisionId))
.commit();
});
// Set adapter
recyclerView.setAdapter(revAdapter);
// Set layout manager
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
lacertaVcs.getRevisionHistory().thenAccept(revModels -> {
logger.debug("ViewerVcsRevListFragment", "revModels.size(): " + revModels.size());
getActivity().runOnUiThread(() -> {
revAdapter.setRevModels(revModels);
revAdapter.notifyDataSetChanged();
});
});
}
}
@@ -0,0 +1,5 @@
package one.nem.lacerta.component.viewer.model;
public interface RevSelectListener {
void onRevSelect(String revisionId);
}
@@ -9,7 +9,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
android:name="one.nem.lacerta.component.viewer.ViewerListFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorSurface">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<!-- item_bookmark.xml -->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/titleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"/>
</FrameLayout>
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
@@ -35,7 +35,17 @@
app:layout_collapseMode="pin"
app:title="Title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.SubtitleCollapsingToolbarLayout>
<ProgressBar
android:id="@+id/loading_progress_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:indeterminate="true"
android:background="@color/colorSurface"
android:visibility="gone" />
</com.google.android.material.appbar.AppBarLayout>
@@ -0,0 +1,12 @@
<?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=".ViewerVcsRevListFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rev_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
@@ -11,6 +11,7 @@
android:layout_height="wrap_content"
android:elevation="8dp"
android:adjustViewBounds="true"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="24dp"
android:paddingVertical="16dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/item_text_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/rev_item_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginEnd="8dp"
android:text="Placeholder Title"
android:textColor="@color/colorOnSurface"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/rev_item_detail"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="14sp"
android:text="2023/01/01 00:00:00 - hogehoge"
android:textColor="@color/colorOnSurfaceSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rev_item_title" />
<TextView
android:id="@+id/rev_item_id"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="12sp"
android:text="dd76a029-51f1-40f7-b316-a0c74bbfebb1(Example)"
android:textColor="@color/colorOnSurfaceSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rev_item_detail" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/action_open_vcs_rev_list"
android:title="Open VCS Rev List" />
<item
android:id="@+id/action_rename"
android:title="リネーム" />
<item
android:id="@+id/action_delete"
android:title="削除" />
<item
android:id="@+id/action_move"
android:title="移動" />
</menu>
@@ -1,11 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation 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:id="@+id/component_viewer_navigation"
app:startDestination="@id/componentViewerTopFragment">
app:startDestination="@id/viewerListFragment">
<fragment
android:id="@+id/componentViewerTopFragment"
android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
android:label="ComponentViewerTopFragment" />
android:id="@+id/viewerListFragment"
android:name="one.nem.lacerta.component.viewer.ViewerListFragment"
android:label="ComponentViewerTopFragment" >
<action
android:id="@+id/action_componentViewerTopFragment_to_viewerVcsRevListFragment"
app:destination="@id/viewerVcsRevListFragment" />
</fragment>
<fragment
android:id="@+id/viewerVcsRevListFragment"
android:name="one.nem.lacerta.component.viewer.ViewerVcsRevListFragment"
android:label="fragment_viewer_vcs_rev_list"
tools:layout="@layout/fragment_viewer_vcs_rev_list" />
</navigation>
@@ -6,6 +6,7 @@ import java.util.concurrent.CompletableFuture;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.page.Page;
import one.nem.lacerta.model.document.path.DocumentPath;
import one.nem.lacerta.model.document.tag.DocumentTag;
@@ -18,9 +19,15 @@ public interface Document {
CompletableFuture<DocumentDetail> createDocument();
CompletableFuture<Void> renameDocument(String documentId, String name);
CompletableFuture<Void> deleteDocument(String documentId);
CompletableFuture<Void> moveDocument(String documentId, String parentId);
CompletableFuture<Void> updateDocument(DocumentDetail detail);
CompletableFuture<DocumentDetail> getDocument(String documentId);
CompletableFuture<ArrayList<Page>> getDocumentPageListByFileNameList(String documentId, ArrayList<String> fileNameList);
}
@@ -7,7 +7,9 @@ import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.PublicPath;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.tag.DocumentTag;
public interface LacertaLibrary {
@@ -15,13 +17,30 @@ public interface LacertaLibrary {
CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit);
CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset);
// Get Library page
CompletableFuture<LibraryItemPage> getLibraryPage(int limit);
CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset);
// Get Library Page
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit);
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset);
// Create Folder
CompletableFuture<String> createFolder(String path, String name);
// Get Folder List
CompletableFuture<LibraryItemPage> getFolderList(String parentId);
// Create Folder
CompletableFuture<String> createFolder(String parentId, String name);
// Get Public Path
CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType);
// Tag
CompletableFuture<ArrayList<DocumentTag>> getTagList();
CompletableFuture<Void> createTag(DocumentTag tag);
CompletableFuture<Void> updateTag(DocumentTag tag);
CompletableFuture<Void> deleteTag(String tagId);
CompletableFuture<Void> addTagToDocument(String documentId, String tagId);
CompletableFuture<Void> removeTagFromDocument(String documentId, String tagId);
}
@@ -1,5 +1,7 @@
package one.nem.lacerta.data.impl;
import androidx.room.Update;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
@@ -76,11 +78,9 @@ public class DocumentImpl implements Document {
documentEntity.id = meta.getId();
documentEntity.title = meta.getTitle();
documentEntity.author = meta.getAuthor();
documentEntity.defaultBranch = meta.getDefaultBranch();
documentEntity.updatedAt = meta.getUpdatedAt();
documentEntity.createdAt = meta.getCreatedAt();
documentEntity.publicPath = meta.getPath().getStringPath();
documentEntity.tagIds = meta.getTagIds();
documentEntity.parentId = meta.getParentId();
database.documentDao().insert(documentEntity);
@@ -101,17 +101,33 @@ public class DocumentImpl implements Document {
meta.setId(UUID.randomUUID().toString());
meta.setTitle("New Document");
meta.setAuthor("author");
meta.setDefaultBranch("master");
meta.setUpdatedAt(new Date());
meta.setCreatedAt(new Date());
meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
meta.setTags(new ArrayList<>());
meta.setParentId(null);
return createDocument(meta);
}
@Override
public CompletableFuture<Void> deleteDocument(String documentId) {
return CompletableFuture.supplyAsync(() -> {
DocumentEntity documentEntity = database.documentDao().findById(documentId);
if (documentEntity == null) {
throw new IllegalArgumentException("documentId is not found");
}
database.documentDao().delete(documentEntity);
return null;
});
}
@Override
public CompletableFuture<Void> moveDocument(String documentId, String parentId) {
return CompletableFuture.supplyAsync(() -> {
DocumentEntity documentEntity = database.documentDao().findById(documentId);
if (documentEntity == null) {
throw new IllegalArgumentException("documentId is not found");
}
documentEntity.parentId = parentId;
database.documentDao().update(documentEntity);
return null;
});
}
@@ -124,6 +140,19 @@ public class DocumentImpl implements Document {
});
}
@Override
public CompletableFuture<Void> renameDocument(String documentId, String name) {
return CompletableFuture.supplyAsync(() -> {
DocumentEntity documentEntity = database.documentDao().findById(documentId);
if (documentEntity == null) {
throw new IllegalArgumentException("documentId is not found");
}
documentEntity.title = name;
database.documentDao().update(documentEntity);
return null;
});
}
@Override
public CompletableFuture<DocumentDetail> getDocument(String documentId) {
return CompletableFuture.supplyAsync(() -> {
@@ -135,11 +164,9 @@ public class DocumentImpl implements Document {
meta.setId(documentEntity.id);
meta.setTitle(documentEntity.title);
meta.setAuthor(documentEntity.author);
meta.setDefaultBranch(documentEntity.defaultBranch);
meta.setUpdatedAt(documentEntity.updatedAt);
meta.setCreatedAt(documentEntity.createdAt);
meta.setPath(new PublicPath().resolve(documentEntity.publicPath));
meta.setTags(new ArrayList<>()); // TODO-rca: タグを取得する
meta.setParentId(documentEntity.parentId);
DocumentDetail detail = new DocumentDetail();
@@ -153,6 +180,34 @@ public class DocumentImpl implements Document {
});
}
@Override
public CompletableFuture<ArrayList<Page>> getDocumentPageListByFileNameList(String documentId, ArrayList<String> fileNameList) {
return CompletableFuture.supplyAsync(() -> {
ArrayList<Page> pages = new ArrayList<>();
FileManager fileManager;
try {
fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory()).resolve(documentId).resolve("raw");
} catch (IOException e) {
logger.error(TAG, "FileManager resolve error");
logger.trace(TAG, e.getMessage());
logger.e_code("1210ae5b-dd2f-42ef-bc15-40b9a9bbdb16");
return null;
}
fileNameList.forEach(fileName -> {
try {
pages.add(new Page(fileName, fileManager.loadBitmap(fileName)));
} catch (IOException e) {
logger.error(TAG, "Bitmap decode error");
logger.trace(TAG, e.getMessage());
logger.e_code("6f9ba0dc-ac63-401c-8f50-a2bd9ff5cb91");
}
});
return pages;
});
}
private CompletableFuture<ArrayList<XmlMetaPageModel>> getPagesByXmlMeta(String documentId) {
return CompletableFuture.supplyAsync(() -> {
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
@@ -1,10 +1,15 @@
package one.nem.lacerta.data.impl;
import android.nfc.Tag;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
@@ -16,10 +21,14 @@ import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.model.PublicPath;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.tag.DocumentTag;
import one.nem.lacerta.source.database.LacertaDatabase;
import one.nem.lacerta.source.database.common.DateTypeConverter;
import one.nem.lacerta.source.database.entity.DocumentEntity;
import one.nem.lacerta.source.database.entity.FolderEntity;
import one.nem.lacerta.source.database.entity.TagEntity;
import one.nem.lacerta.source.database.entity.ToxiDocumentTagEntity;
import one.nem.lacerta.utils.FeatureSwitch;
import one.nem.lacerta.utils.LacertaLogger;
public class LacertaLibraryImpl implements LacertaLibrary {
@@ -36,13 +45,6 @@ public class LacertaLibraryImpl implements LacertaLibrary {
@Override
public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit) {
return CompletableFuture.supplyAsync(() -> {
// 5秒フリーズさせる
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
ArrayList<ListItem> listItems = new ArrayList<>();
@@ -64,59 +66,58 @@ public class LacertaLibraryImpl implements LacertaLibrary {
return null; // TODO-rca: Implement
}
// Internal
private CompletableFuture<List<FolderEntity>> getFolderEntitiesByPublicPath(String publicPath) {
return CompletableFuture.supplyAsync(() -> {
return database.folderDao().findByPublicPathWithLimit(publicPath, 10); // TODO-rca: ハードコーディングやめる
});
}
private CompletableFuture<List<DocumentEntity>> getDocumentEntitiesByPublicPath(String publicPath) {
return CompletableFuture.supplyAsync(() -> {
return database.documentDao().findByPublicPathWithLimit(publicPath, 10); // TODO-rca: ハードコーディングやめる
});
}
@Override
public CompletableFuture<LibraryItemPage> getLibraryPage(int limit) {
public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit) {
return CompletableFuture.supplyAsync(() -> {
// 5秒フリーズさせる
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
LibraryItemPage libraryItemPage = new LibraryItemPage();
List<FolderEntity> folderEntities = getFolderEntitiesByPublicPath("/").join();
logger.debug("LacertaLibraryImpl", "folderEntities.size(): " + folderEntities.size());
List<DocumentEntity> documentEntities = getDocumentEntitiesByPublicPath("/").join();
logger.debug("LacertaLibraryImpl", "documentEntities.size(): " + documentEntities.size());
List<FolderEntity> folderEntities;
List<DocumentEntity> documentEntities;
if (pageId == null) { // When root folder
libraryItemPage.setPageTitle("ライブラリ");
libraryItemPage.setPageId(null);
libraryItemPage.setParentId(null);
folderEntities = database.folderDao().findRootFolders();
documentEntities = database.documentDao().findRootDocuments();
} else {
FolderEntity folderEntity = database.folderDao().findById(pageId);
if (folderEntity == null) {
logger.warn("LacertaLibraryImpl", pageId + " is not found.");
return null;
}
libraryItemPage.setPageTitle(folderEntity.name);
libraryItemPage.setPageId(folderEntity.id);
libraryItemPage.setParentId(folderEntity.parentId);
folderEntities = database.folderDao().findByParentId(pageId);
documentEntities = database.documentDao().findByParentId(pageId);
}
ArrayList<ListItem> listItems = new ArrayList<>();
for (FolderEntity folderEntity : folderEntities) {
logger.debug("LacertaLibraryImpl", "folderEntity.name: " + folderEntity.name);
for (FolderEntity childFolderEntity : folderEntities) {
logger.debug("LacertaLibraryImpl", "childFolderEntity.name: " + childFolderEntity.name);
ListItem listItem = new ListItem();
listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
listItem.setTitle(folderEntity.name);
listItem.setTitle(childFolderEntity.name);
listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
listItem.setItemId(folderEntity.id);
listItem.setItemId(childFolderEntity.id);
listItems.add(listItem);
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:");
for (DocumentEntity documentEntity : documentEntities) {
logger.debug("LacertaLibraryImpl", "documentEntity.title: " + documentEntity.title);
ListItem listItem = new ListItem();
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
listItem.setTitle(documentEntity.title);
// listItem.setDescription(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm").format(documentEntity.updatedAt.toInstant()));
listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
listItem.setItemId(documentEntity.id);
listItems.add(listItem);
}
libraryItemPage.setPageTitle("/");
libraryItemPage.setPageId("root");
libraryItemPage.setListItems(listItems);
logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
@@ -125,20 +126,6 @@ public class LacertaLibraryImpl implements LacertaLibrary {
});
}
@Override
public CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset) {
return CompletableFuture.supplyAsync(() -> {
return null;
});
}
@Override
public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit) {
return CompletableFuture.supplyAsync(() -> {
return null;
});
}
@Override
public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset) {
return CompletableFuture.supplyAsync(() -> {
@@ -147,23 +134,193 @@ public class LacertaLibraryImpl implements LacertaLibrary {
}
@Override
public CompletableFuture<String> createFolder(String parentId, String name) {
public CompletableFuture<LibraryItemPage> getFolderList(String targetDirId) {
return CompletableFuture.supplyAsync(() -> {
LibraryItemPage libraryItemPage = new LibraryItemPage();
FolderEntity parentFolderEntity = database.folderDao().findById(parentId);
PublicPath publicPath;
if (parentFolderEntity == null) {
publicPath = new PublicPath().resolve("/");
List<FolderEntity> folderEntities;
if (targetDirId == null) { // When root folder
folderEntities = database.folderDao().findRootFolders();
libraryItemPage.setParentId(null);
libraryItemPage.setPageId(null);
libraryItemPage.setPageTitle("ライブラリ");
} else {
publicPath = new PublicPath().resolve(parentFolderEntity.publicPath);
folderEntities = database.folderDao().findByParentId(targetDirId);
FolderEntity folderEntity = database.folderDao().findById(targetDirId);
if (folderEntity == null) {
logger.warn("LacertaLibraryImpl", targetDirId + " is not found.");
return null;
}
libraryItemPage.setParentId(folderEntity.parentId);
libraryItemPage.setPageId(folderEntity.id);
libraryItemPage.setPageTitle(folderEntity.name);
}
ArrayList<ListItem> listItems = new ArrayList<>();
for (FolderEntity childFolderEntity : folderEntities) {
logger.debug("LacertaLibraryImpl", "childFolderEntity.name: " + childFolderEntity.name);
ListItem listItem = new ListItem();
listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
listItem.setTitle(childFolderEntity.name);
listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
listItem.setItemId(childFolderEntity.id);
listItems.add(listItem);
}
libraryItemPage.setListItems(listItems);
return libraryItemPage;
});
}
@Override
public CompletableFuture<String> createFolder(String parentId, String name) {
return CompletableFuture.supplyAsync(() -> {
FolderEntity folderEntity = new FolderEntity();
folderEntity.id = UUID.randomUUID().toString();
folderEntity.name = name;
folderEntity.publicPath = publicPath.getStringPath();
folderEntity.parentId = parentId;
database.folderDao().insert(folderEntity);
return folderEntity.id;
});
}
@Override
public CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType) {
return CompletableFuture.supplyAsync(() -> {
if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
DocumentEntity documentEntity = database.documentDao().findById(itemId);
if (documentEntity == null) {
logger.warn("LacertaLibraryImpl", itemId + " is not found.");
return null;
}
PublicPath publicPath = recursiveResolve(documentEntity.parentId);
publicPath.resolve(documentEntity.title);
return publicPath;
} else if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
FolderEntity folderEntity = database.folderDao().findById(itemId);
if (folderEntity == null) {
return null;
}
return recursiveResolve(folderEntity.id);
} else {
logger.warn("LacertaLibraryImpl", "Unknown ListItemType: " + itemType);
return null;
}
});
}
// Converter
private DocumentTag convertTagEntityToDocumentTag(TagEntity tagEntity) {
DocumentTag documentTag = new DocumentTag();
documentTag.setId(tagEntity.id);
documentTag.setName(tagEntity.tagName);
documentTag.setColor(tagEntity.color);
return documentTag;
}
private TagEntity convertDocumentTagToTagEntity(DocumentTag documentTag) {
TagEntity tagEntity = new TagEntity();
tagEntity.id = documentTag.getId();
tagEntity.tagName = documentTag.getName();
tagEntity.color = documentTag.getColor();
return tagEntity;
}
@Override
public CompletableFuture<ArrayList<DocumentTag>> getTagList() {
return CompletableFuture.supplyAsync(() -> {
List<TagEntity> tagEntities = database.tagDao().findAll();
logger.debug("LacertaLibraryImpl", "Database Query: Get TagEntity List (Size: " + tagEntities.size() + ")");
ArrayList<DocumentTag> documentTags = new ArrayList<>();
for (TagEntity tagEntity : tagEntities) {
documentTags.add(convertTagEntityToDocumentTag(tagEntity));
}
return documentTags;
});
}
@Override
public CompletableFuture<Void> createTag(DocumentTag tag) {
return CompletableFuture.supplyAsync(() -> {
TagEntity tagEntity = convertDocumentTagToTagEntity(tag);
if (Objects.isNull(tagEntity.id) || tagEntity.id.isEmpty()) {
tagEntity.id = UUID.randomUUID().toString();
}
database.tagDao().insert(tagEntity);
logger.debug("LacertaLibraryImpl", "Database Query: Inserted TagEntity (" + tag.getId() + ")");
return null;
});
}
@Override
public CompletableFuture<Void> updateTag(DocumentTag tag) {
return CompletableFuture.supplyAsync(() -> {
TagEntity tagEntity = convertDocumentTagToTagEntity(tag);
database.tagDao().update(tagEntity);
logger.debug("LacertaLibraryImpl", "Database Query: Updated TagEntity (" + tag.getId() + ")");
return null;
});
}
@Override
public CompletableFuture<Void> deleteTag(String tagId) {
return CompletableFuture.supplyAsync(() -> {
database.tagDao().deleteById(tagId);
logger.debug("LacertaLibraryImpl", "Database Query: Deleted TagEntity (" + tagId + ")");
return null;
});
}
@Override
public CompletableFuture<Void> addTagToDocument(String documentId, String tagId) {
return CompletableFuture.supplyAsync(() -> {
ToxiDocumentTagEntity toxiDocumentTagEntity = new ToxiDocumentTagEntity();
toxiDocumentTagEntity.documentId = documentId;
toxiDocumentTagEntity.tagId = tagId;
database.toxiDocumentTagDao().insert(toxiDocumentTagEntity);
logger.debug("LacertaLibraryImpl", "Database Query: Inserted ToxiDocumentTagEntity");
return null;
});
}
@Override
public CompletableFuture<Void> removeTagFromDocument(String documentId, String tagId) {
return CompletableFuture.supplyAsync(() -> {
database.toxiDocumentTagDao().deleteByDocumentIdAndTagId(documentId, tagId);
logger.debug("LacertaLibraryImpl", "Database Query: Deleted ToxiDocumentTagEntity");
return null;
});
}
/**
* 再帰的にパスを解決する
*
* @param folderId
* @return
*/
private PublicPath recursiveResolve(String folderId) {
String current = folderId;
boolean continueFlag = true;
ArrayList<String> folderNames = new ArrayList<>();
while (continueFlag) {
FolderEntity folderEntity = database.folderDao().findById(current);
if (folderEntity == null) { // 存在しないフォルダIDが指定された場合
continueFlag = false;
} else {
folderNames.add(folderEntity.name);
current = folderEntity.parentId;
if (current == null) { // ルートフォルダに到達した場合
continueFlag = false;
}
}
}
// フォルダ名を逆順にしてListに変換
Collections.reverse(folderNames);
List<String> folderNamesReversed = new ArrayList<>(folderNames);
return new PublicPath(folderNamesReversed);
}
}
@@ -1,5 +1,5 @@
package one.nem.lacerta.feature.home;
public interface DocumentSelectListener {
void onDocumentSelect(String documentId);
void onDocumentSelect(String documentId, String documentName);
}
@@ -1,41 +1,28 @@
package one.nem.lacerta.feature.home;
import android.app.ActivityOptions;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.navigation.Navigation;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.viewer.ViewerMainActivity;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.utils.FeatureSwitch;
/**
@@ -49,6 +36,8 @@ public class HomeTopFragment extends Fragment {
@Inject
LacertaLibrary lacertaLibrary;
private ListItemAdapter listItemAdapter;
public HomeTopFragment() {
// Required empty public constructor
}
@@ -71,7 +60,17 @@ public class HomeTopFragment extends Fragment {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_home_top, container, false);
setHasOptionsMenu(true);
// Set status bar color
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
// Collapsed
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
}
});
return view;
}
@@ -81,28 +80,73 @@ public class HomeTopFragment extends Fragment {
RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
Toolbar toolbar = view.findViewById(R.id.home_toolbar);
toolbarSetup(toolbar, false, "ホーム");
ListItemAdapter listItemAdapter = new ListItemAdapter(documentId -> {
Log.d("HomeTopFragment", "onViewCreated: " + documentId);
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
intent.putExtra("documentId", documentId);
startActivity(intent);
this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
@Override
public void onDocumentSelect(String documentId, String documentName) {
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
Log.d("HomeTopFragment", "onDocumentSelect: " + documentId + " " + documentName);
intent.putExtra("documentId", documentId);
intent.putExtra("documentName", documentName);
startActivity(intent, ActivityOptions.makeCustomAnimation(getContext(), one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim).toBundle());
}
});
recyclerView.setAdapter(listItemAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
listItemAdapter.setListItems(listItems);
getActivity().runOnUiThread(() -> {
listItemAdapter.notifyItemRangeInserted(0, listItems.size());
});
});
updateList();
}
@Override
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
inflater.inflate(R.menu.drawer_menu, menu);
super.onCreateOptionsMenu(menu, inflater);
public void onResume() {
super.onResume();
updateList();
}
private void updateList() {
long startTime = System.currentTimeMillis();
lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
long endTime = System.currentTimeMillis();
if (listItems == null) {
return;
}
this.listItemAdapter.setListItems(listItems);
if (endTime - startTime > 500) { // 500ms以上かかった場合は表示アニメーションをする
getActivity().runOnUiThread(() -> {
this.listItemAdapter.notifyItemRangeInserted(0, listItems.size());
});
} else {
getActivity().runOnUiThread(() -> {
this.listItemAdapter.notifyDataSetChanged();
});
}
});
}
/**
* ToolbarをInitする
*
* @param toolbar Toolbar
* @param showBackButton 戻るボタンを表示するか
* @param title タイトル
*/
private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
getActivity().runOnUiThread(() -> {
if (showBackButton) {
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
toolbar.setNavigationOnClickListener(v -> {
//this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
// Back
Navigation.findNavController(requireView()).popBackStack();
});
} else {
toolbar.setNavigationIcon(null);
}
toolbar.setTitle(title);
});
}
}
@@ -46,15 +46,17 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
holder.description.setText(listItem.getDescription());
holder.itemView.setOnClickListener( v -> {
Intent intent = new Intent(v.getContext(), ViewerMainActivity.class);
intent.putExtra("documentId", listItem.getItemId());
v.getContext().startActivity(intent);
listener.onDocumentSelect(listItem.getItemId(), listItem.getTitle());
});
}
@Override
public int getItemCount() {
return listItems.size();
if (listItems == null) {
return 0;
} else {
return listItems.size();
}
}
public static class ListItemViewHolder extends RecyclerView.ViewHolder{
@@ -1,11 +1,50 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/colorSurface">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/home_item_recycler_view"
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/home_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="HOGE" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/home_item_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
+3
View File
@@ -53,5 +53,8 @@ dependencies {
implementation project(':utils')
implementation project(':component:viewer')
// TODO-rca: バージョンカタログに切り出す
implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
}
@@ -1,5 +1,6 @@
package one.nem.lacerta.feature.library;
public interface DocumentSelectListener {
void onDocumentSelect(String documentId);
void onFolderSelected(String folderId, String folderName);
void onDocumentSelected(String documentId, String documentName);
}
@@ -1,5 +1,9 @@
package one.nem.lacerta.feature.library;
/*
Currently, this file is not used in the app.
*/
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -0,0 +1,277 @@
package one.nem.lacerta.feature.library;
import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.navigation.Navigation;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.viewer.ViewerMainActivity;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.utils.FeatureSwitch;
import one.nem.lacerta.utils.LacertaLogger;
/**
* A simple {@link Fragment} subclass.
* Use the {@link LibraryPageFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class LibraryPageFragment extends Fragment {
// Variables
// このインスタンスで表示されているページ
LibraryItemPage libraryItemPage;
// Arguments
String folderId;
String title;
String parentId;
Toolbar toolbar;
@Inject
LacertaLibrary lacertaLibrary;
@Inject
LacertaLogger logger;
ListItemAdapter listItemAdapter;
public LibraryPageFragment() {
// Required empty public constructor
}
public static LibraryPageFragment newInstance(String folderId, String title, String parentId) {
LibraryPageFragment fragment = new LibraryPageFragment();
Bundle args = new Bundle();
args.putString("folderId", folderId);
args.putString("title", title);
args.putString("publicPath", parentId);
fragment.setArguments(args);
return fragment;
}
public static LibraryPageFragment newInstance(String folderId) { // Back action
LibraryPageFragment fragment = new LibraryPageFragment();
Bundle args = new Bundle();
args.putString("folderId", folderId);
args.putString("title", null);
args.putString("publicPath", null);
fragment.setArguments(args);
return fragment;
}
public static LibraryPageFragment newInstance() {
LibraryPageFragment fragment = new LibraryPageFragment();
Bundle args = new Bundle();
args.putString("folderId", null);
args.putString("title", null);
args.putString("publicPath", null);
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_library_top, container, false);
// Set status bar color
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
// Collapsed
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
}
});
return view;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
if (getArguments() != null) {
this.folderId = getArguments().getString("folderId"); // Required
if (getArguments().getString("title") == null && getArguments().getString("publicPath") == null) {
this.libraryItemPage = new LibraryItemPage();
} else {
this.title = getArguments().getString("title");
this.parentId = getArguments().getString("publicPath");
}
} else {
logger.debug("LibraryTopFragment", "getArguments() is null(maybe root)");
this.libraryItemPage = new LibraryItemPage();
}
this.toolbar = view.findViewById(R.id.library_toolbar);
// Toolbar Setup
toolbarSetup(this.toolbar, this.folderId != null, this.title != null ? this.title : "ライブラリ");
if(this.folderId == null) {
updateToolbarSubtitle(this.toolbar, null); //負荷軽減のため+邪魔なので(folderIdがnullの場合は、ルートフォルダを表示しているので)
} else {
lacertaLibrary.getPublicPath(this.folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
updateToolbarSubtitle(this.toolbar, "/" + publicPath.parent().getStringPath());
});
}
// RecyclerView Setup
RecyclerView recyclerView = view.findViewById(R.id.library_item_recycler_view);
this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
@Override
public void onFolderSelected(String folderId, String folderName) {
logger.debug("LibraryTopFragment", "Folder selected! folderId: " + folderId + ", folderName: " + folderName);
// // 画面遷移
// FragmentNavigation fragmentNavigation = (FragmentNavigation) getActivity();
// // folderId: 推移先で表示するフォルダのID, folderName: 推移先で表示するフォルダの名前, parentId: このフラグメントで表示しているフォルダのID(推移先の親)
// fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId, folderName, libraryItemPage != null ? libraryItemPage.getParentId() : null), false);
Bundle bundle = new Bundle();
bundle.putString("folderId", folderId);
bundle.putString("title", folderName);
bundle.putString("publicPath", libraryItemPage != null ? libraryItemPage.getParentId() : null);
try {
Navigation.findNavController(requireView()).navigate(R.id.action_feature_library_top_fragment_self, bundle);
} catch (IllegalStateException e) {
logger.error("LibraryTopFragment", "IllegalStateException: " + e.getMessage());
}
}
@Override
public void onDocumentSelected(String documentId, String documentName) {
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
logger.debug("LibraryTopFragment", "Document selected! documentId: " + documentId + ", documentName: " + documentName);
intent.putExtra("documentId", documentId);
intent.putExtra("documentName", documentName);
startActivity(intent);
}
});
recyclerView.setAdapter(listItemAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
// Get library page and update RecyclerView items
updateItem(this.folderId);
}
/**
* Currentにフォルダを作成する
*/
private void createFolder(String pageId) {
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
builder.setTitle("フォルダの作成");
builder.setMessage("フォルダ名を入力してください");
View view = LayoutInflater.from(requireContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
final com.google.android.material.textfield.TextInputEditText input = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
final com.google.android.material.textfield.TextInputLayout inputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
inputLayout.setHint("フォルダ名");
builder.setView(view);
builder.setPositiveButton("作成", (dialog, which) -> {
lacertaLibrary.createFolder(pageId, input.getText().toString()).thenAccept(folderId -> {
// Refresh
updateItem(pageId);
});
});
builder.setNegativeButton("キャンセル", (dialog, which) -> {
dialog.cancel();
});
builder.show();
}
/**
* RecyclerViewのアイテムとUIを更新する
*/
private void updateItem(String pageId) {
long startTime = System.currentTimeMillis();
lacertaLibrary.getLibraryPage(pageId, 10).thenAccept(libraryItemPage -> {
long endTime = System.currentTimeMillis();
this.libraryItemPage = libraryItemPage;
logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
listItemAdapter.setLibraryItemPage(libraryItemPage);
if (endTime - startTime > 500) { // 500ms以上かかった場合は表示アニメーションをする
getActivity().runOnUiThread(() -> {
listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size());
});
} else {
getActivity().runOnUiThread(() -> {
listItemAdapter.notifyDataSetChanged();
});
}
});
}
/**
* Toolbarのサブタイトルを更新
* @param subtitle サブタイトル
*/
private void updateToolbarSubtitle(Toolbar toolbar, String subtitle) {
getActivity().runOnUiThread(() -> {
toolbar.setSubtitle(subtitle);
});
}
/**
* ToolbarをInitする
*
* @param toolbar Toolbar
* @param showBackButton 戻るボタンを表示するか
* @param title タイトル
*/
private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
getActivity().runOnUiThread(() -> {
if (showBackButton) {
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
toolbar.setNavigationOnClickListener(v -> {
//this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
// Back
Navigation.findNavController(requireView()).popBackStack();
});
} else {
toolbar.setNavigationIcon(null);
}
toolbar.setTitle(title);
toolbar.getMenu().clear();
toolbar.inflateMenu(R.menu.dir_menu);
toolbar.setOnMenuItemClickListener(item -> {
if (item.getItemId() == R.id.menu_item_create_new_folder) {
createFolder(this.folderId);
return true;
} else {
return false;
}
});
});
}
}
@@ -1,156 +0,0 @@
package one.nem.lacerta.feature.library;
import android.app.AlertDialog;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;
import org.w3c.dom.Text;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.tag.DocumentTag;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.utils.TextInputDialog;
/**
* A simple {@link Fragment} subclass.
* Use the {@link LibraryTopFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class LibraryTopFragment extends Fragment {
@Inject
LacertaLibrary lacertaLibrary;
@Inject
LacertaLogger logger;
ListItemAdapter listItemAdapter;
int currentTotalItemCount = 0;
public LibraryTopFragment() {
// Required empty public constructor
}
public static LibraryTopFragment newInstance() {
LibraryTopFragment fragment = new LibraryTopFragment();
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_library_top, container, false);
setHasOptionsMenu(true);
return view;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
RecyclerView recyclerView = view.findViewById(R.id.library_item_recycler_view);
this.listItemAdapter = new ListItemAdapter(documentId -> {
Toast.makeText(getContext(), documentId, Toast.LENGTH_SHORT).show();
});
recyclerView.setAdapter(listItemAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
lacertaLibrary.getLibraryPage(10).thenAccept(libraryItemPage -> {
logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
listItemAdapter.setLibraryItemPage(libraryItemPage);
this.currentTotalItemCount = libraryItemPage.getListItems().size();
getActivity().runOnUiThread(() -> {
listItemAdapter.notifyItemRangeInserted(0, this.currentTotalItemCount - 1);
});
});
}
@Override
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
inflater.inflate(R.menu.dir_menu, menu);
super.onCreateOptionsMenu(menu, inflater);
}
// Selected
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
if (item.getItemId() == R.id.menu_item_create_new_folder) {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle("フォルダの作成");
builder.setMessage("フォルダ名を入力してください");
final android.widget.EditText input = new android.widget.EditText(getContext());
input.setText("フォルダ名");
builder.setView(input);
builder.setPositiveButton("作成", (dialog, which) -> {
lacertaLibrary.createFolder(null, input.getText().toString()).thenAccept(folderId -> {
logger.debug("LibraryTopFragment", "folderId: " + folderId);
});
// Refresh
updateItem();
});
builder.setNegativeButton("キャンセル", (dialog, which) -> {
dialog.cancel();
});
builder.show();
return true;
} else {
return super.onOptionsItemSelected(item);
}
}
private void updateItem() {
lacertaLibrary.getLibraryPage(10).thenAccept(libraryItemPage -> {
logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
getActivity().runOnUiThread(() -> {
listItemAdapter.notifyItemRangeRemoved(0, this.currentTotalItemCount - 1);
});
listItemAdapter.setLibraryItemPage(libraryItemPage);
getActivity().runOnUiThread(() -> {
listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
});
this.currentTotalItemCount = libraryItemPage.getListItems().size();
});
}
}
@@ -1,6 +1,5 @@
package one.nem.lacerta.feature.library;
import android.content.Intent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -10,10 +9,9 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.ListItemType;
public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListItemViewHolder>{
@@ -46,9 +44,12 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
holder.description.setText(listItem.getDescription());
holder.itemView.setOnClickListener( v -> {
// Intent intent = new Intent(v.getContext(), ViewerMainActivity.class);
// intent.putExtra("documentId", listItem.getItemId());
// v.getContext().startActivity(intent);
if (listItem.getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
listener.onDocumentSelected(listItem.getItemId(), listItem.getTitle());
}
else if (listItem.getItemType() == ListItemType.ITEM_TYPE_FOLDER) {
listener.onFolderSelected(listItem.getItemId(), listItem.getTitle());
}
});
}
@@ -1,11 +1,50 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/colorSurface">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/library_item_recycler_view"
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/library_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="HOGE" />
</com.google.android.material.appbar.SubtitleCollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/library_item_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -4,8 +4,8 @@
<item
android:id="@+id/menu_item_create_new_folder"
android:icon="@drawable/developer_mode_24px"
android:title="@string/app_name"
app:showAsAction="ifRoom"/> <!-- TODO-rca: change this -->
android:icon="@drawable/create_new_folder_24px"
android:title="@string/create_new_folder"
app:showAsAction="never"/>
</menu>
@@ -6,7 +6,17 @@
app:startDestination="@id/feature_library_top_fragment">
<fragment
android:id="@+id/feature_library_top_fragment"
android:name="one.nem.lacerta.feature.library.LibraryTopFragment"
android:name="one.nem.lacerta.feature.library.LibraryPageFragment"
android:label="fragment_library_top"
tools:layout="@layout/fragment_library_top" />
tools:layout="@layout/fragment_library_top" >
<action
android:id="@+id/action_feature_library_top_fragment_self"
app:destination="@id/feature_library_top_fragment"
app:enterAnim="@anim/nav_twitter_enter_anim"
app:exitAnim="@anim/nav_twitter_exit_anim"
app:popEnterAnim="@anim/nav_twitter_pop_enter_anim"
app:popExitAnim="@anim/nav_twitter_pop_exit_anim"
app:popUpTo="@id/feature_library_top_fragment"
app:popUpToInclusive="false"/>
</fragment>
</navigation>
@@ -1,3 +1,4 @@
<resources>
<string name="app_name">Library</string>
<string name="create_new_folder">新しいフォルダを作成</string>
</resources>
+11
View File
@@ -1,5 +1,6 @@
plugins {
alias(libs.plugins.com.android.library)
id 'com.google.dagger.hilt.android'
}
android {
@@ -45,4 +46,14 @@ dependencies {
// shared
implementation project(':shared:ui')
implementation project(':component:common')
implementation project(':data')
implementation project(':model')
// https://mvnrepository.com/artifact/androidx.preference/preference
implementation 'androidx.preference:preference:1.2.1'
}
@@ -2,8 +2,12 @@ package one.nem.lacerta.setting;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.PreferenceFragmentCompat;
import android.preference.PreferenceFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -18,6 +22,11 @@ public class SettingScanPageFragment extends Fragment {
public SettingScanPageFragment() {
// Required empty public constructor
}
//
// @Override
// public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
//// addPreferencesFromResource(R.xml.scan_preferences);
// }
public static SettingScanPageFragment newInstance() {
SettingScanPageFragment fragment = new SettingScanPageFragment();
@@ -27,15 +36,14 @@ public class SettingScanPageFragment extends Fragment {
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_setting_scan_page, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
}
}
@@ -0,0 +1,148 @@
package one.nem.lacerta.setting;
import android.os.Bundle;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.navigation.Navigation;
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.Toast;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.common.LacertaCreateTagDialog;
import one.nem.lacerta.component.common.LacertaCreateTagDialogListener;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.document.tag.DocumentTag;
/**
* A simple {@link Fragment} subclass.
* Use the {@link SettingTagManageFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class SettingTagManageFragment extends Fragment {
@Inject
LacertaLibrary lacertaLibrary;
private RecyclerView recyclerView;
private TagListItemAdapter adapter;
public SettingTagManageFragment() {
// Required empty public constructor
}
public static SettingTagManageFragment newInstance() {
SettingTagManageFragment fragment = new SettingTagManageFragment();
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_setting_tag_manage, container, false);
// Toolbar
Toolbar toolbar = view.findViewById(R.id.tag_manage_toolbar);
toolbarSetup(toolbar, true, "タグ管理");
return view;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
this.recyclerView = view.findViewById(R.id.tag_item_recycler_view);
this.adapter = new TagListItemAdapter((tagId, tagName, tagColor) -> {
Toast.makeText(getContext(), "Tag Clicked", Toast.LENGTH_SHORT).show();
});
recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
updateTagList();
}
/**
* タグリストを更新する
*/
private void updateTagList() {
lacertaLibrary.getTagList().thenAccept(documentTags -> {
int currentTagCount = this.adapter.getItemCount();
this.adapter.setDocumentTags(documentTags);
if (currentTagCount != this.adapter.getItemCount()) {
this.adapter.notifyItemRangeRemoved(0, currentTagCount);
this.adapter.notifyItemRangeInserted(0, this.adapter.getItemCount());
}
});
}
/**
* ToolbarをInitする
*
* @param toolbar Toolbar
* @param showBackButton 戻るボタンを表示するか
* @param title タイトル
*/
private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
getActivity().runOnUiThread(() -> {
if (showBackButton) {
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
toolbar.setNavigationOnClickListener(v -> {
//this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
// Back
Navigation.findNavController(requireView()).popBackStack();
});
} else {
toolbar.setNavigationIcon(null);
}
toolbar.setTitle(title);
toolbar.getMenu().clear();
toolbar.inflateMenu(R.menu.setting_tag_manage_menu);
toolbar.setOnMenuItemClickListener(item -> {
if (item.getItemId() == R.id.setting_tag_manage_menu_add) {
Toast.makeText(getContext(), "Add Clicked", Toast.LENGTH_SHORT).show();
LacertaCreateTagDialog dialog = new LacertaCreateTagDialog();
dialog.setListener(new LacertaCreateTagDialogListener() {
@Override
public void onPositiveClick(String tagName, String tagColor) {
Toast.makeText(getContext(), "Positive Clicked", Toast.LENGTH_SHORT).show();
DocumentTag newTag = new DocumentTag();
newTag.setName(tagName);
newTag.setColor(tagColor);
lacertaLibrary.createTag(newTag).join();
updateTagList();
}
@Override
public void onNegativeClick() {
Toast.makeText(getContext(), "Negative Clicked", Toast.LENGTH_SHORT).show();
updateTagList();
}
});
dialog.show(getParentFragmentManager(), "create_tag_dialog");
return true;
} else {
return false;
}
});
});
}
}
@@ -1,15 +1,16 @@
package one.nem.lacerta.setting;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.core.content.ContextCompat;
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 com.google.android.material.appbar.AppBarLayout;
import java.util.ArrayList;
@@ -73,6 +74,15 @@ public class SettingTopFragment extends Fragment {
)
);
settingListItems.add(
new SettingListItem(
"タグ管理", // TODO-rca: リソースに移動
"タグの追加・編集・削除", // TODO-rca: リソースに移動
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.sell_24px),
R.id.action_settingTopFragment_to_settingTagManageFragment
)
);
settingListItems.add(
new SettingListItem(
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_about_title),
@@ -87,6 +97,17 @@ public class SettingTopFragment extends Fragment {
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerView.setAdapter(new ListItemAdapter(settingListItems));
// Set status bar color
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
// Collapsed
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
}
});
return view;
}
}
@@ -0,0 +1,69 @@
package one.nem.lacerta.setting;
import android.graphics.Color;
import android.media.Image;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import one.nem.lacerta.model.document.tag.DocumentTag;
public class TagListItemAdapter extends RecyclerView.Adapter<TagListItemAdapter.TagListItemViewHolder> {
ArrayList<DocumentTag> documentTags;
TagListItemSelectListener listener;
public TagListItemAdapter(TagListItemSelectListener listener) {
this.listener = listener;
}
public void setDocumentTags(ArrayList<DocumentTag> documentTags) {
this.documentTags = documentTags;
}
@NonNull
@Override
public TagListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.tag_list_full_item, parent, false);
return new TagListItemViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull TagListItemViewHolder holder, int position) {
DocumentTag documentTag = documentTags.get(position);
holder.tag_name.setText(documentTag.getName());
try {
holder.tag_icon.setColorFilter(Color.parseColor(documentTag.getColor()));
} catch (Exception e) {
holder.tag_name.setText("Sorry, Parse Error occurred");
}
}
@Override
public int getItemCount() {
return documentTags == null ? 0 : documentTags.size();
}
public static class TagListItemViewHolder extends RecyclerView.ViewHolder {
ImageView tag_icon;
TextView tag_name;
public TagListItemViewHolder(@NonNull View itemView) {
super(itemView);
tag_icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.tag_icon);
tag_name = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.tag_name);
}
}
}
@@ -0,0 +1,6 @@
package one.nem.lacerta.setting;
public interface TagListItemSelectListener {
void onTagListItemSelect(String tagId, String tagName, String tagColor);
}
@@ -1,14 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingAboutPageFragment">
android:background="@color/colorSurface">
<!-- TODO: Update blank fragment layout -->
<TextView
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="@string/setting_top_about_title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:padding="32dp"
android:background="@drawable/rounded_secondary_container" >
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Work in Progress..."
android:textSize="24sp"
android:textColor="@color/colorOnSurfaceSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="実装中..."
android:textSize="16sp"
android:textColor="@color/colorOnSurfaceSecondary"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -1,14 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingDataPageFragment">
android:background="@color/colorSurface">
<!-- TODO: Update blank fragment layout -->
<TextView
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="@string/setting_top_data_title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:padding="32dp"
android:background="@drawable/rounded_secondary_container" >
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Work in Progress..."
android:textSize="24sp"
android:textColor="@color/colorOnSurfaceSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="実装中..."
android:textSize="16sp"
android:textColor="@color/colorOnSurfaceSecondary"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -1,14 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingDisplayPageFragment">
android:background="@color/colorSurface">
<!-- TODO: Update blank fragment layout -->
<TextView
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="@string/setting_top_display_title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:padding="32dp"
android:background="@drawable/rounded_secondary_container" >
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Work in Progress..."
android:textSize="24sp"
android:textColor="@color/colorOnSurfaceSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="実装中..."
android:textSize="16sp"
android:textColor="@color/colorOnSurfaceSecondary"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -1,14 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingScanPageFragment">
android:background="@color/colorSurface">
<!-- TODO: Update blank fragment layout -->
<TextView
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="@string/setting_top_scan_title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:padding="32dp"
android:background="@drawable/rounded_secondary_container" >
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Work in Progress..."
android:textSize="24sp"
android:textColor="@color/colorOnSurfaceSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="実装中..."
android:textSize="16sp"
android:textColor="@color/colorOnSurfaceSecondary"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -0,0 +1,50 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorSurface">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tag_manage_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="@string/setting_top_display_title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/tag_item_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -1,11 +1,50 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/colorSurface">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/setting_item_recycler_view"
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="@string/setting_title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/setting_item_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/setting_tag_manage_menu_add"
android:icon="@drawable/outline_developer_mode_24"
android:title="@string/placeholder"
app:showAsAction="ifRoom"/>
</menu>
@@ -37,6 +37,9 @@
app:exitAnim="@anim/slide_to_left"
app:popEnterAnim="@anim/slide_from_left"
app:popExitAnim="@anim/slide_to_right" />
<action
android:id="@+id/action_settingTopFragment_to_settingTagManageFragment"
app:destination="@id/settingTagManageFragment" />
</fragment>
<fragment
android:id="@+id/settingAboutPageFragment"
@@ -58,4 +61,8 @@
android:name="one.nem.lacerta.setting.SettingScanPageFragment"
android:label="fragment_setting_scan_page"
tools:layout="@layout/fragment_setting_scan_page" />
<fragment
android:id="@+id/settingTagManageFragment"
android:name="one.nem.lacerta.setting.SettingTagManageFragment"
android:label="SettingTagManageFragment" />
</navigation>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="png_quality_array">
<item name="5">5</item>
<item name="6">6</item>
<item name="7">7</item>
<item name="8">8</item>
<item name="9">9</item>
</array>
</resources>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="png_quality_default">70</integer>
<integer name="png_quality_min">5</integer>
<integer name="png_quality_max">100</integer>
</resources>
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:title="@string/setting_scan_quality_title">
<SeekBarPreference
android:defaultValue="@integer/png_quality_default"
android:key="png_quality"
android:max="@integer/png_quality_max"
android:min="@integer/png_quality_min"
android:summary="@string/setting_scan_quality_png_quality_description"
android:title="@string/setting_scan_quality_png_quality_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/setting_scan_default_title">
<EditTextPreference
android:defaultValue="Untitled"
android:key="new_doc_default_title"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/setting_scan_default_document_name" />
<EditTextPreference
android:defaultValue="NewFolder"
android:key="new_dir_default_title"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/setting_scan_default_folder_name" />
</PreferenceCategory>
</PreferenceScreen>
+1
View File
@@ -0,0 +1 @@
/build
+39
View File
@@ -0,0 +1,39 @@
plugins {
id 'com.android.application'
}
android {
namespace 'com.example.lacerta'
compileSdk 33
defaultConfig {
applicationId "com.example.lacerta"
minSdk 26
targetSdk 33
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
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 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
+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
Loaded 100 of 231 files, more files were not shown because too many files have changed in this diff. Show more